From 328887ae298783dd39b3492b044b7480bcc4af93 Mon Sep 17 00:00:00 2001 From: yao zhengming Date: Thu, 24 Jan 2019 23:05:56 -0500 Subject: [PATCH] arm/dts:Pick from ODM's base (CR):[Kane][audio]kernel:spk id gpio config error 1,add pin configuration for gpm25,and disable pud Change-Id: Ibd1ee4daf8562d175425158e8d6e2e601e24f395 Signed-off-by: zhangjiaquan Signed-off-by: yaozm1 Reviewed-on: https://gerrit.mot.com/1301198 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi | 2 +- arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi index 6553b98f4b28..c18a8533f226 100755 --- a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi @@ -794,7 +794,7 @@ clock-names = "xclkout"; clocks = <&clock OSC_AUD>; pinctrl-names = "default"; - pinctrl-0 = <&xclkout0>; + pinctrl-0 = <&xclkout0 &spk_id>; cirrus,sysclk = <1 4 98304000>; cirrus,dspclk = <8 4 147456000>; diff --git a/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi index f2a7c38582eb..62e2ccab725e 100755 --- a/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi @@ -580,6 +580,12 @@ samsung,pin-pud = <0>; }; + spk_id: spk_id { + samsung,pins = "gpm25-0"; + samsung,pin-function = <0>; + samsung,pin-pud = <0>; + }; + }; /* DISPAUD */ -- 2.20.1