projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0a5e463)
dts: axg: fix bluetooth pinmux problems
authorPeipeng Zhao <peipeng.zhao@amlogic.com>
Tue, 22 Aug 2017 07:06:29 +0000 (15:06 +0800)
committerJianxin Pan <jianxin.pan@amlogic.com>
Tue, 22 Aug 2017 08:11:47 +0000 (01:11 -0700)
PD#149672:
modified dts tdma data pinmux, tdma output data pin
need be set tdma_out1. otherwise soc can not send data
to Bluetooth.

Change-Id: I62a0ea89de092c6b9c3504223822e8c7fd58ecad
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
arch/arm64/boot/dts/amlogic/axg_s400.dts patch | blob | history
arch/arm64/boot/dts/amlogic/axg_s400_v03.dts patch | blob | history
arch/arm64/boot/dts/amlogic/axg_s420.dts patch | blob | history
arch/arm64/boot/dts/amlogic/axg_s420_128m.dts patch | blob | history
arch/arm64/boot/dts/amlogic/axg_s420_v03.dts patch | blob | history

diff --git a/arch/arm64/boot/dts/amlogic/axg_s400.dts b/arch/arm64/boot/dts/amlogic/axg_s400.dts
index 7acc7dd..4fa0ed0 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/axg_s400.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s400.dts
@@ -929,7 +929,7 @@
                                GIC_SPI 88 IRQ_TYPE_EDGE_RISING>;
                interrupt-names = "tdmin", "tdmout";
                pinctrl-names = "tdm_pins";
-               pinctrl-0 = <&tdmout_a &tdmin_a>;
+               pinctrl-0 = <&tdmout_a &tdmin_a &tdmout_a_data>;
        };
 
        aml_tdmb: tdmb {
@@ -1045,16 +1045,21 @@
 &pinctrl_periphs {
        tdmout_a: tdmout_a {
                mux {
-                       pins = "GPIOX_12", "GPIOX_13", "GPIOX_15";
-                       //pins = "GPIOX_15";//slave
+                       pins = "GPIOX_12", "GPIOX_13";
                        function = "tdma_out";
                };
        };
 
+       tdmout_a_data: tdmout_a_data {
+               mux {
+                       pins = "GPIOX_15";
+                       function = "tdma_out1";
+               };
+       };
+
        tdmin_a: tdmin_a {
                mux {
                        pins = "GPIOX_14";
-                       //pins = "GPIOX_12", "GPIOX_13", "GPIOX_14";//slave
                        function = "tdma_in";
                };
        };
diff --git a/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts
index 6ef5488..a44f368 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts
@@ -926,7 +926,7 @@
                                GIC_SPI 88 IRQ_TYPE_EDGE_RISING>;
                interrupt-names = "tdmin", "tdmout";
                pinctrl-names = "tdm_pins";
-               pinctrl-0 = <&tdmout_a &tdmin_a>;
+               pinctrl-0 = <&tdmout_a &tdmin_a &tdmout_a_data>;
        };
 
        aml_tdmb: tdmb {
@@ -1043,16 +1043,21 @@
 &pinctrl_periphs {
        tdmout_a: tdmout_a {
                mux {
-                       pins = "GPIOX_12", "GPIOX_13", "GPIOX_15";
-                       //pins = "GPIOX_15";//slave
+                       pins = "GPIOX_12", "GPIOX_13";
                        function = "tdma_out";
                };
        };
 
+       tdmout_a_data: tdmout_a_data {
+               mux {
+                       pins = "GPIOX_15";
+                       function = "tdma_out1";
+               };
+       };
+
        tdmin_a: tdmin_a {
                mux {
                        pins = "GPIOX_14";
-                       //pins = "GPIOX_12", "GPIOX_13", "GPIOX_14";//slave
                        function = "tdma_in";
                };
        };
diff --git a/arch/arm64/boot/dts/amlogic/axg_s420.dts b/arch/arm64/boot/dts/amlogic/axg_s420.dts
index 893b065..b398a97 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/axg_s420.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s420.dts
@@ -759,8 +759,8 @@
        aml_tdma: tdma {
                compatible = "amlogic, snd-tdma";
                #sound-dai-cells = <0>;
-               dai-tdm-lane-slot-mask = <1 1 1 1>;
-               /* select tdm lr/bclk src, see aml_axg_tdm.c */
+               dai-tdm-lane-slot-mask-in = <1 0>;
+               dai-tdm-lane-slot-mask-out = <0 1>;
                dai-tdm-clk-sel = <0>;
                tdm_from_ddr = <0>;
                tdm_to_ddr = <0>;
@@ -773,7 +773,7 @@
                                GIC_SPI 88 IRQ_TYPE_EDGE_RISING>;
                interrupt-names = "tdmin", "tdmout";
                pinctrl-names = "tdm_pins";
-               pinctrl-0 = <&tdmin_a &tdmout_a>;
+               pinctrl-0 = <&tdmin_a &tdmout_a  &tdmout_a_data>;
        };
 
        aml_tdmb: tdmb {
@@ -891,19 +891,25 @@
 &pinctrl_periphs {
        tdmout_a: tdmout_a {
                mux {
-                       pins = "GPIOX_12", "GPIOX_13", "GPIOX_15";
-                               //pins = "GPIOX_15";//slave
-                               function = "tdma_out";
+                       pins = "GPIOX_12", "GPIOX_13";
+                       function = "tdma_out";
+               };
+       };
+
+       tdmout_a_data: tdmout_a_data {
+               mux {
+                       pins = "GPIOX_15";
+                       function = "tdma_out1";
                };
        };
 
        tdmin_a: tdmin_a {
                mux {
                        pins = "GPIOX_14";
-                       //pins = "GPIOX_12", "GPIOX_13", "GPIOX_14";//slave
-                               function = "tdma_in";
-                       };
+                       function = "tdma_in";
+               };
        };
+
        tdmb_mclk: tdmb_mclk {
                mux {
                        pins = "GPIOA_1";
diff --git a/arch/arm64/boot/dts/amlogic/axg_s420_128m.dts b/arch/arm64/boot/dts/amlogic/axg_s420_128m.dts
index 620a96a..066b12d 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/axg_s420_128m.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s420_128m.dts
@@ -755,7 +755,8 @@
        aml_tdma: tdma {
                compatible = "amlogic, snd-tdma";
                #sound-dai-cells = <0>;
-               dai-tdm-lane-slot-mask = <1 1 1 1>;
+               dai-tdm-lane-slot-mask-in = <1 0>;
+               dai-tdm-lane-slot-mask-out = <0 1>;
                /* select tdm lr/bclk src, see aml_axg_tdm.c */
                dai-tdm-clk-sel = <0>;
                tdm_from_ddr = <0>;
@@ -769,7 +770,7 @@
                                GIC_SPI 88 IRQ_TYPE_EDGE_RISING>;
                interrupt-names = "tdmin", "tdmout";
                pinctrl-names = "tdm_pins";
-               pinctrl-0 = <&tdmin_a &tdmout_a>;
+               pinctrl-0 = <&tdmout_a &tdmin_a &tdmout_a_data>;
        };
 
        aml_tdmb: tdmb {
@@ -853,19 +854,25 @@
 &pinctrl_periphs {
        tdmout_a: tdmout_a {
                mux {
-                       pins = "GPIOX_12", "GPIOX_13", "GPIOX_15";
-                               //pins = "GPIOX_15";//slave
-                               function = "tdma_out";
+                       pins = "GPIOX_12", "GPIOX_13";
+                       function = "tdma_out";
+               };
+       };
+
+       tdmout_a_data: tdmout_a_data {
+               mux {
+                       pins = "GPIOX_15";
+                       function = "tdma_out1";
                };
        };
 
        tdmin_a: tdmin_a {
                mux {
                        pins = "GPIOX_14";
-                       //pins = "GPIOX_12", "GPIOX_13", "GPIOX_14";//slave
-                               function = "tdma_in";
-                       };
+                       function = "tdma_in";
+               };
        };
+
        tdmb_mclk: tdmb_mclk {
                mux {
                        pins = "GPIOA_1";
diff --git a/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts
index 71e3635..c50b050 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts
@@ -758,7 +758,8 @@
        aml_tdma: tdma {
                compatible = "amlogic, snd-tdma";
                #sound-dai-cells = <0>;
-               dai-tdm-lane-slot-mask = <1 1 1 1>;
+               dai-tdm-lane-slot-mask-in = <1 0>;
+               dai-tdm-lane-slot-mask-out = <0 1>;
                /* select tdm lr/bclk src, see aml_axg_tdm.c */
                dai-tdm-clk-sel = <0>;
                tdm_from_ddr = <0>;
@@ -772,7 +773,7 @@
                                GIC_SPI 88 IRQ_TYPE_EDGE_RISING>;
                interrupt-names = "tdmin", "tdmout";
                pinctrl-names = "tdm_pins";
-               pinctrl-0 = <&tdmin_a &tdmout_a>;
+               pinctrl-0 = <&tdmout_a &tdmin_a &tdmout_a_data>;
        };
 
        aml_tdmb: tdmb {
@@ -856,18 +857,23 @@
 &pinctrl_periphs {
        tdmout_a: tdmout_a {
                mux {
-                       pins = "GPIOX_12", "GPIOX_13", "GPIOX_15";
-                               //pins = "GPIOX_15";//slave
-                               function = "tdma_out";
+                       pins = "GPIOX_12", "GPIOX_13";
+                       function = "tdma_out";
+               };
+       };
+
+       tdmout_a_data: tdmout_a_data {
+               mux {
+                       pins = "GPIOX_15";
+                       function = "tdma_out1";
                };
        };
 
        tdmin_a: tdmin_a {
                mux {
                        pins = "GPIOX_14";
-                       //pins = "GPIOX_12", "GPIOX_13", "GPIOX_14";//slave
-                               function = "tdma_in";
-                       };
+                       function = "tdma_in";
+               };
        };
        tdmb_mclk: tdmb_mclk {
                mux {
Domain: System / Kernel;