From: Jia Lee Date: Thu, 31 Oct 2019 01:31:29 +0000 (+0900) Subject: [RAMEN9610-20799][ERD][9610] nfc: add config to control ldo37 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b8800cf80a9f6c553c0c86dbc248349272039bf8;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [RAMEN9610-20799][ERD][9610] nfc: add config to control ldo37 Change-Id: I493d248552459c7b0eef5f2a14ee0fff44b35967 Signed-off-by: Jia Lee --- diff --git a/arch/arm64/boot/dts/exynos/exynos9610-erd9610_common.dtsi b/arch/arm64/boot/dts/exynos/exynos9610-erd9610_common.dtsi index 5b16ce1a7369..05546bd7356c 100644 --- a/arch/arm64/boot/dts/exynos/exynos9610-erd9610_common.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos9610-erd9610_common.dtsi @@ -327,7 +327,8 @@ regulator-min-microvolt = <1620000>; regulator-max-microvolt = <1900000>; regulator-ramp-delay = <12000>; - regulator-always-on; + /* regulator-always-on; */ + regulator-initial-mode = <3>; }; l38_reg: LDO38 { @@ -1503,6 +1504,8 @@ nfc_pd: nfc-pd { samsung,pins ="gpg0-0"; + samsung,pin-function = <1>; + samsung,pin-pud = <0>; samsung,pin-con-pdn =<3>; samsung,pin-pud-pdn = <0>; }; @@ -1591,6 +1594,7 @@ sec-nfc,irq-gpio = <&gpa1 2 0>; sec-nfc,clk_req-gpio = <&gpg0 1 0>; + sec-nfc,pmic-ldo = "vdd_ldo37"; clock-names = "OSC_NFC"; clocks = <&clock OSC_NFC>; diff --git a/arch/arm64/configs/erd9610_Q_defconfig b/arch/arm64/configs/erd9610_Q_defconfig index f3beead7cd69..3b266d4b3db9 100644 --- a/arch/arm64/configs/erd9610_Q_defconfig +++ b/arch/arm64/configs/erd9610_Q_defconfig @@ -597,6 +597,7 @@ CONFIG_SEC_NFC=y CONFIG_SEC_NFC_PRODUCT_N5=y CONFIG_SEC_NFC_IF_I2C=y CONFIG_SEC_NFC_CLK_REQ=y +CONFIG_SEC_NFC_PMIC_LDO=y CONFIG_SENSORS_CLASS=y CONFIG_INPUT_EGISTEC_320=y CONFIG_AW8695_HAPTIC=y diff --git a/arch/arm64/configs/erd9610_defconfig b/arch/arm64/configs/erd9610_defconfig old mode 100755 new mode 100644 index 63ac8ad59b50..4ff41e331132 --- a/arch/arm64/configs/erd9610_defconfig +++ b/arch/arm64/configs/erd9610_defconfig @@ -596,6 +596,7 @@ CONFIG_SEC_NFC=y CONFIG_SEC_NFC_PRODUCT_N5=y CONFIG_SEC_NFC_IF_I2C=y CONFIG_SEC_NFC_CLK_REQ=y +CONFIG_SEC_NFC_PMIC_LDO=y CONFIG_SENSORS_CLASS=y CONFIG_INPUT_EGISTEC_320=y CONFIG_AW8695_HAPTIC=y