From d7c6b6bd6101c96d041f5376258d3ac25c242533 Mon Sep 17 00:00:00 2001 From: shengfei Xu Date: Tue, 24 Jul 2018 11:41:32 +0800 Subject: [PATCH] mfd: rk809: the sw1 interconvert with sw2 The patch is in line with the latest SPEC. Change-Id: I874ba2bea37c72745c34ca926a06881f605746ac Signed-off-by: shengfei Xu --- arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts | 10 ++++------ arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts | 10 ++++------ arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts | 11 +++++------ arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts | 10 ++++------ drivers/regulator/rk808-regulator.c | 8 ++++---- 5 files changed, 21 insertions(+), 28 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts index e9fc5c96950a..2e474a950c62 100644 --- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts @@ -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"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts index b779c8c5cefb..f7cea779f39c 100644 --- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts @@ -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"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts index 060602aa4ec8..4078487f87f4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts @@ -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"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts index 6f22fdda9a1f..18f812713c65 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts @@ -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"; }; }; diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c index df992c516ac8..04845af6e52a 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c @@ -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,