Merge "dts: unable to wake up lcd after sleep, lcd io is used by other mode [1/1]" into odroidg12-4.9.y-android

2026-06-08 11:50:43 +09:00 · 2020-06-11 17:43:44 +09:00
parent 5d5533e0e3 1d10f5c5dd
commit 35136bd113
8 changed files with 4 additions and 8 deletions
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
@@ -1028,7 +1028,7 @@
 		interrupt-names = "irq_spdifin";
 		pinctrl-names = "spdif_pins",
 					"spdif_pins_mute";
-		pinctrl-0 = <&spdifout &spdifin>;
+		pinctrl-0 = <&spdifout>;
 		pinctrl-1 = <&spdifout_a_mute>;
 		status = "okay";
 	};
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
@@ -1002,7 +1002,7 @@
 		interrupt-names = "irq_spdifin";
 		pinctrl-names = "spdif_pins",
 				"spdif_pins_mute";
-		pinctrl-0 = <&spdifout &spdifin>;
+		pinctrl-0 = <&spdifout>;
 		pinctrl-1 = <&spdifout_a_mute>;
 		status = "okay";
 	};
--- a/arch/arm/boot/dts/amlogic/mesong12b.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesong12b.dtsi
@@ -2608,7 +2608,6 @@
 			"eth_rxd2_rgmii",
 			"eth_rxd3_rgmii",
 			"eth_rgmii_tx_clk",
-			"eth_txen",
 			"eth_txd0",
 			"eth_txd1",
 			"eth_txd2_rgmii",
--- a/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi
@@ -2545,7 +2545,6 @@
 			"eth_rxd2_rgmii",
 			"eth_rxd3_rgmii",
 			"eth_rgmii_tx_clk",
-			"eth_txen",
 			"eth_txd0",
 			"eth_txd1",
 			"eth_txd2_rgmii",
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
@@ -1029,7 +1029,7 @@
 		interrupt-names = "irq_spdifin";
 		pinctrl-names = "spdif_pins",
 					"spdif_pins_mute";
-		pinctrl-0 = <&spdifout &spdifin>;
+		pinctrl-0 = <&spdifout>;
 		pinctrl-1 = <&spdifout_a_mute>;
 		status = "okay";
 	};
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
@@ -1003,7 +1003,7 @@
 		interrupt-names = "irq_spdifin";
 		pinctrl-names = "spdif_pins",
 				"spdif_pins_mute";
-		pinctrl-0 = <&spdifout &spdifin>;
+		pinctrl-0 = <&spdifout>;
 		pinctrl-1 = <&spdifout_a_mute>;
 		status = "okay";
 	};
--- a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
@@ -2593,7 +2593,6 @@
 			"eth_rxd2_rgmii",
 			"eth_rxd3_rgmii",
 			"eth_rgmii_tx_clk",
-			"eth_txen",
 			"eth_txd0",
 			"eth_txd1",
 			"eth_txd2_rgmii",
--- a/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi
@@ -2545,7 +2545,6 @@
 			"eth_rxd2_rgmii",
 			"eth_rxd3_rgmii",
 			"eth_rgmii_tx_clk",
-			"eth_txen",
 			"eth_txd0",
 			"eth_txd1",
 			"eth_txd2_rgmii",