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 <zhangjiaquan@huaqin.com>
Signed-off-by: yaozm1 <yaozm1@mt.com>
Reviewed-on: https://gerrit.mot.com/1301198
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key

diff --git a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi
index 6553b98f4b282488d3c69223341a5c1c1c37b3ab..c18a8533f226852c7dae236c209b8eaa0eb42c27 100755 (executable)
--- 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 f2a7c38582eb99015af7edde61278cb97552d039..62e2ccab725ec36708e25e8f655e7b2be98d7830 100755 (executable)
--- 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 */