From 1d10f5c5dd7af4c5a8512392cebcb36f6c394a55 Mon Sep 17 00:00:00 2001 From: "shaochan.liu" Date: Tue, 24 Dec 2019 11:17:58 +0800 Subject: [PATCH] dts: unable to wake up lcd after sleep, lcd io is used by other mode [1/1] PD#SWPL-16900 Problem: unable to wake up lcd after sleep, lcd io is used by other mode Solution: 1,disable the mode and use the io for lcd Verify: axg s400 Change-Id: Ib2146f62a7dc8830eb46e8f0194f478abeab7cdf Signed-off-by: shaochan.liu --- arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts | 2 +- arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts | 2 +- arch/arm/boot/dts/amlogic/mesong12b.dtsi | 1 - arch/arm/boot/dts/amlogic/mesong12b_a.dtsi | 1 - arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts | 2 +- arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts | 2 +- arch/arm64/boot/dts/amlogic/mesong12b.dtsi | 1 - arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi | 1 - 8 files changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts index 6ee793c9dd84..7ab31e1c546f 100644 --- 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"; }; diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts index 1332451cf760..fccb383d4d1a 100644 --- 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"; }; diff --git a/arch/arm/boot/dts/amlogic/mesong12b.dtsi b/arch/arm/boot/dts/amlogic/mesong12b.dtsi index 227091db4a77..5ab499e022ce 100644 --- 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", diff --git a/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi b/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi index ec35f56ab379..0bff1d5c9fe9 100644 --- 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", diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts index 55895ef7c160..812dc47e63b8 100644 --- 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"; }; diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts index f285d1f9cce0..92e9202a84af 100644 --- 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"; }; diff --git a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi index 6a4a5f0435f2..6810bc021eae 100644 --- 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", diff --git a/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi index 8838802112b3..b0593015fa94 100644 --- 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",