From 5d69f82a87e75b7f68a492a4b0941eeea8dd73a3 Mon Sep 17 00:00:00 2001 From: Soomin Kim Date: Thu, 10 Jan 2019 23:30:50 +0900 Subject: [PATCH] [RAMEN9610-10736][9610] arm64: dtsi: GPIO optimization ver2 Change-Id: I8a85eaf005716b32f06af284c5b9cc3e1eb4f428 Signed-off-by: Soomin Kim --- .../exynos/exynos9609-robusta2_common.dtsi | 41 ++++++++++++++++++- .../boot/dts/exynos/exynos9610-pinctrl.dtsi | 22 +++++++++- sound/soc/samsung/abox/abox.c | 2 +- 3 files changed, 60 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi index 4125aebe8740..524fa836c67d 100755 --- a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi @@ -1482,6 +1482,7 @@ sleep_alive: sleep-state { PIN_EINT_PUD(gpa0-2, DIS); /* SPK_PA_INT */ + PIN_IN_PUD(gpa0-3, DIS); /* SC_INTB */ PIN_IN_PUD(gpa0-4, DIS); /* IF_PMIC_MRSTB */ PIN_EINT_PUD(gpa0-6, DIS); /* CODEC_IRQ_N */ //PIN_IN_PUD(gpa0-7, DOWN); /* SD_SIM_DET */ @@ -1522,7 +1523,7 @@ PIN_IN_PUD(gpm16-0, DOWN); /* NC */ PIN_IN_PUD(gpm17-0, DOWN); /* NC */ PIN_EINT_PUD(gpm20-0, DIS); /* PSENSOR_INT */ - PIN_IN_PUD(gpm22-0, DOWN); /* NFC_PVDDEN */ + //PIN_IN_PUD(gpm22-0, DOWN); /* NFC_PVDDEN */ PIN_IN_PUD(gpm25-0, DIS); /* SPK_ID */ }; }; @@ -1625,9 +1626,45 @@ PIN_SLP(gpp0-1, IN, DIS); /* I2C0_FG_PMIC_SCL */ PIN_SLP(gpp0-2, IN, DIS); /* I2C1_IF_PMIC_SDA */ PIN_SLP(gpp0-3, IN, DIS); /* I2C1_IF_PMIC_SCL */ + + /* Add 18.12.31 start */ + PIN_SLP(gpp0-4, IN, DIS); /* I2C2_NFC_SDA */ + PIN_SLP(gpp0-5, IN, DIS); /* I2C2_NFC_SCL */ + PIN_SLP(gpp0-6, IN, DOWN); /* N.C. */ + PIN_SLP(gpp0-7, IN, DOWN); /* N.C. */ + + PIN_SLP(gpp1-0, IN, DIS); /* I2C4_TSP_SDA */ + PIN_SLP(gpp1-1, IN, DIS); /* I2C4_TSP_SCL */ + PIN_SLP(gpp1-2, IN, DOWN); /* N.C. */ + PIN_SLP(gpp1-3, IN, DOWN); /* N.C. */ + PIN_SLP(gpp1-4, IN, DOWN); /* N.C. */ + PIN_SLP(gpp1-5, IN, DOWN); /* N.C. */ + + PIN_SLP(gpc0-0, IN, DIS); /* I2C_CAM0_REAR_MAIN_SDA */ + PIN_SLP(gpc0-1, IN, DIS); /* I2C_CAM0_REAR_MAIN_SCL */ + PIN_SLP(gpc0-2, IN, DIS); /* I2C_CAM1_REAR_SUB_SDA */ + PIN_SLP(gpc0-3, IN, DIS); /* I2C_CAM1_REAR_SUB_SCL */ + PIN_SLP(gpc0-4, IN, DIS); /* I2C_CAM2_FRONT_SDA */ + PIN_SLP(gpc0-5, IN, DIS); /* I2C_CAM2_FRONT_SCL */ + PIN_SLP(gpc0-6, IN, DOWN); /* N.C. */ + PIN_SLP(gpc0-7, IN, DOWN); /* N.C. */ + /* Add 18.12.31 end */ + + /* ADD 19.01.01 start */ + PIN_SLP(gpc1-2, IN, DOWN); /* N.C. */ + + PIN_SLP(gpc2-3, PREV, DIS); /* DISP_TES added 19.01.05 */ + PIN_SLP(gpc2-4, IN, DOWN); /* N.C. */ + + PIN_SLP(gpg0-0, PREV, DIS); /* NFC_PD */ + + //PIN_SLP(gpg0-1, PREV, DIS); /* NFC_CLKREQ */ + //PIN_SLP(gpg0-2, PREV, DIS); /* NFC_WAKE */ + /* ADD 19.01.01 end t*/ + PIN_SLP(gpg0-7, PREV, DIS); /* PMIC_WRSTBI */ - PIN_SLP(gpg1-1, PREV, DIS); /* VDD_CODEC_EN */ + //PIN_SLP(gpg1-1, PREV, DIS); /* VDD_CODEC_EN */ PIN_SLP(gpg1-4, PREV, DIS); /* LCD_RESET_N */ //PIN_SLP(gpg2-0, PREV, DIS); /* FP_LDO_EN_3V3 */ diff --git a/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi index 838819ff064b..f2a7c38582eb 100755 --- a/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi @@ -612,12 +612,16 @@ samsung,pins = "gpb0-0"; samsung,pin-function = <2>; samsung,pin-pud = <1>; + samsung,pin-con-pdn = <2>; + samsung,pin-pud-pdn = <1>; }; aud_codec_mclk_idle: aud-codec-mclk-idle { samsung,pins = "gpb0-0"; samsung,pin-function = <0>; samsung,pin-pud = <1>; + samsung,pin-con-pdn = <2>; + samsung,pin-pud-pdn = <1>; }; aud_i2s0_bus: aud-i2s0-bus { @@ -640,6 +644,8 @@ samsung,pins = "gpb0-1", "gpb0-2", "gpb0-3", "gpb0-4"; samsung,pin-function = <0>; samsung,pin-pud = <1>; + samsung,pin-con-pdn = <2>; + samsung,pin-pud-pdn = <1>; }; aud_i2s1_bus: aud-i2s1-bus { @@ -655,13 +661,15 @@ samsung,pin-function = <2>; samsung,pin-pud = <1>; samsung,pin-con-pdn =<2>; - samsung,pin-pud-pdn = <3>; + samsung,pin-pud-pdn = <1>; }; aud_i2s1_idle: aud-i2s1-idle { samsung,pins = "gpb1-0", "gpb1-1", "gpb1-2", "gpb1-3"; samsung,pin-function = <0>; samsung,pin-pud = <1>; + samsung,pin-con-pdn =<2>; + samsung,pin-pud-pdn = <1>; }; aud_i2s2_bus: aud-i2s2-bus { @@ -677,37 +685,47 @@ samsung,pin-function = <2>; samsung,pin-pud = <1>; samsung,pin-con-pdn =<2>; - samsung,pin-pud-pdn = <3>; + samsung,pin-pud-pdn = <1>; }; aud_i2s2_idle: aud-i2s2-idle { samsung,pins = "gpb2-0", "gpb2-1", "gpb2-2", "gpb2-3"; samsung,pin-function = <0>; samsung,pin-pud = <1>; + samsung,pin-con-pdn =<2>; + samsung,pin-pud-pdn = <1>; }; aud_dsd_bus: aud-dsd-bus { samsung,pins = "gpb2-0", "gpb2-1", "gpb2-2"; samsung,pin-function = <3>; samsung,pin-pud = <1>; + samsung,pin-con-pdn =<2>; + samsung,pin-pud-pdn = <1>; }; aud_dsd_idle: aud-dsd-idle { samsung,pins = "gpb2-0", "gpb2-1", "gpb2-2"; samsung,pin-function = <0>; samsung,pin-pud = <1>; + samsung,pin-con-pdn =<2>; + samsung,pin-pud-pdn = <1>; }; aud_fm_bus: aud-fm-bus { samsung,pins = "gpb2-4"; samsung,pin-function = <2>; samsung,pin-pud = <1>; + samsung,pin-con-pdn =<2>; + samsung,pin-pud-pdn = <1>; }; aud_fm_idle: aud-fm-idle { samsung,pins = "gpb2-4"; samsung,pin-function = <0>; samsung,pin-pud = <1>; + samsung,pin-con-pdn =<2>; + samsung,pin-pud-pdn = <1>; }; }; diff --git a/sound/soc/samsung/abox/abox.c b/sound/soc/samsung/abox/abox.c index 86007870beaf..d7f420814a10 100644 --- a/sound/soc/samsung/abox/abox.c +++ b/sound/soc/samsung/abox/abox.c @@ -5418,7 +5418,7 @@ static int abox_disable(struct device *dev) abox_log_drain_all(dev); abox_request_dram_on(pdev, dev, false); abox_save_register(data); - abox_cfg_gpio(dev, "idle"); + abox_cfg_gpio(dev, "sleep"); abox_pad_retention(true); data->enabled = false; clk_disable(data->clk_cpu); -- 2.20.1