shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

dts: axg: fix bluetooth pinmux problems

Browse Source 
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>
This commit is contained in:
Peipeng Zhao
2017-08-22 15:06:29 +08:00
committed by Jianxin Pan
parent 0a5e4639e4
commit fae3bc0f1d
5 changed files with 62 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm64/boot/dts/amlogic/axg_s400.dts
View File

@@ -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";
};
};

13
arch/arm64/boot/dts/amlogic/axg_s400_v03.dts
View File

@@ -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";
};
};

24
arch/arm64/boot/dts/amlogic/axg_s420.dts
View File

@@ -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";

23
arch/arm64/boot/dts/amlogic/axg_s420_128m.dts
View File

@@ -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";

22
arch/arm64/boot/dts/amlogic/axg_s420_v03.dts
View File

@@ -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 {