mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-28 09:41:41 +00:00
150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
|
|
index 4849b44..f0ccd33 100644
|
|
--- a/drivers/regulator/s2mps11.c
|
|
+++ b/drivers/regulator/s2mps11.c
|
|
@@ -1094,8 +1094,21 @@ static const struct regulator_desc s2mpu02_regulators[] = {
|
|
static int s2mps11_pmic_ethonoff(struct platform_device *pdev, bool onoff)
|
|
{
|
|
struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
|
|
+ unsigned int reg_val = 0;
|
|
int ret = 0;
|
|
|
|
+ ret = regmap_read(iodev->regmap_pmic, S2MPS11_REG_L15CTRL, ®_val);
|
|
+ if (ret) {
|
|
+ dev_err(&pdev->dev, "failed to read S2MPS11_REG_L15CTRL value\n");
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
+ ret = regmap_read(iodev->regmap_pmic, S2MPS11_REG_L17CTRL, ®_val);
|
|
+ if (ret) {
|
|
+ dev_err(&pdev->dev, "failed to read S2MPS11_REG_L17CTRL value\n");
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
if (onoff) {
|
|
/* ETH VDD0 ON */
|
|
ret = regmap_update_bits(iodev->regmap_pmic, S2MPS11_REG_L15CTRL, 0xFF, 0x72);
|
|
@@ -1221,24 +1234,14 @@ static int s2mps11_wdt_enable(struct sec_pmic_dev *iodev)
|
|
/* USB3.0 Hub Power OFF(GL3512) : BUCK9 */
|
|
static void s2mps11_buck9_reset(struct sec_pmic_dev *iodev)
|
|
{
|
|
- int ret;
|
|
- unsigned int reg_val;
|
|
-
|
|
- ret = regmap_read(iodev->regmap_pmic, S2MPS11_REG_B9CTRL1, ®_val);
|
|
-
|
|
- if (ret < 0) {
|
|
- pr_err("%s : could not read S2MPS11_REG_B9CTRL1 value\n", __func__);
|
|
- return;
|
|
- }
|
|
-
|
|
- mdelay (10);
|
|
- if (regmap_update_bits(iodev->regmap_pmic,
|
|
+ if(regmap_update_bits(iodev->regmap_pmic,
|
|
S2MPS11_REG_B9CTRL1, 0xC0, 0))
|
|
pr_err("%s : S2MPS11_REG_B9CTRL1 Error!!\n", __func__);
|
|
|
|
- mdelay (10);
|
|
+ mdelay(10);
|
|
+
|
|
if (regmap_update_bits(iodev->regmap_pmic,
|
|
- S2MPS11_REG_B9CTRL1, 0xFF, reg_val))
|
|
+ S2MPS11_REG_B9CTRL1, 0xC0, 0xC0))
|
|
pr_err("%s : S2MPS11_REG_B9CTRL1 Error!!\n", __func__);
|
|
}
|
|
|