github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 06:25:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

mfd: rk809: the sw1 interconvert with sw2

Browse Source 
The patch is in line with the latest SPEC.

Change-Id: I874ba2bea37c72745c34ca926a06881f605746ac
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
This commit is contained in:
shengfei Xu 2018-07-24 11:41:32 +08:00 committed by Tao Huang
parent cbd6ff3011
commit d7c6b6bd61
5 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts
View File

@ -571,15 +571,13 @@ regulator-state-mem {
};
};
vcc3v3_lcd: SWITCH_REG1 {
regulator-boot-on;
regulator-name = "vcc3v3_lcd";
vcc5v0_host: SWITCH_REG1 {
regulator-name = "vcc5v0_host";
};
vcc5v0_host: SWITCH_REG2 {
regulator-always-on;
vcc3v3_lcd: SWITCH_REG2 {
regulator-boot-on;
regulator-name = "vcc5v0_host";
regulator-name = "vcc3v3_lcd";
};
};

10
arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts
View File

@ -558,15 +558,13 @@ regulator-state-mem {
};
};
vcc3v3_lcd: SWITCH_REG1 {
regulator-boot-on;
regulator-name = "vcc3v3_lcd";
vcc5v0_host: SWITCH_REG1 {
regulator-name = "vcc5v0_host";
};
vcc5v0_host: SWITCH_REG2 {
regulator-always-on;
vcc3v3_lcd: SWITCH_REG2 {
regulator-boot-on;
regulator-name = "vcc5v0_host";
regulator-name = "vcc3v3_lcd";
};
};

11
arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts
View File

@ -623,15 +623,14 @@ regulator-state-mem {
};
};
vcc3v3_lcd: SWITCH_REG1 {
regulator-boot-on;
regulator-name = "vcc3v3_lcd";
vcc5v0_host: SWITCH_REG1 {
regulator-name = "vcc5v0_host";
};
vcc5v0_host: SWITCH_REG2 {
regulator-always-on;
vcc3v3_lcd: SWITCH_REG2 {
regulator-boot-on;
regulator-name = "vcc5v0_host";
regulator-name = "vcc3v3_lcd";
};
};

10
arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts
View File

@ -635,15 +635,13 @@ regulator-state-mem {
};
};
vcc3v3_lcd: SWITCH_REG1 {
regulator-boot-on;
regulator-name = "vcc3v3_lcd";
vcc5v0_host: SWITCH_REG1 {
regulator-name = "vcc5v0_host";
};
vcc5v0_host: SWITCH_REG2 {
regulator-always-on;
vcc3v3_lcd: SWITCH_REG2 {
regulator-boot-on;
regulator-name = "vcc5v0_host";
regulator-name = "vcc3v3_lcd";
};
};

8
drivers/regulator/rk808-regulator.c
View File

@ -1473,12 +1473,12 @@ static const struct regulator_desc rk809_reg[] = {
RK817_LDO_ON_VSEL_REG(8), RK817_LDO_VSEL_MASK,
RK817_POWER_EN_REG(3), ENABLE_MASK(0), ENABLE_MASK(0),
DISABLE_VAL(0), 400),
RK817_DESC_SWITCH(RK809_ID_SW1, "SWITCH_REG1", "vcc8",
RK817_POWER_EN_REG(3), ENABLE_MASK(3),
ENABLE_MASK(3), DISABLE_VAL(3)),
RK817_DESC_SWITCH(RK809_ID_SW2, "SWITCH_REG2", "vcc9",
RK817_DESC_SWITCH(RK809_ID_SW1, "SWITCH_REG1", "vcc9",
RK817_POWER_EN_REG(3), ENABLE_MASK(2),
ENABLE_MASK(2), DISABLE_VAL(2)),
RK817_DESC_SWITCH(RK809_ID_SW2, "SWITCH_REG2", "vcc8",
RK817_POWER_EN_REG(3), ENABLE_MASK(3),
ENABLE_MASK(3), DISABLE_VAL(3)),
};
static int rk808_regulator_dt_parse_pdata(struct device *dev,