From 283d7f38aea7922162f1d50e176b411f7ced9faf Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Thu, 21 Apr 2022 09:20:29 +0800 Subject: [PATCH] rockchip: rock-3a: remove unused nodes (#3700) --- .../rk3568-dts-radxa-rock3a-support.patch | 47 ++++--------------- .../rk3568-dts-radxa-rock3a-support.patch | 47 ++++--------------- 2 files changed, 20 insertions(+), 74 deletions(-) diff --git a/patch/kernel/archive/rk35xx-5.16/rk3568-dts-radxa-rock3a-support.patch b/patch/kernel/archive/rk35xx-5.16/rk3568-dts-radxa-rock3a-support.patch index db24f9520c..932d60a4c9 100644 --- a/patch/kernel/archive/rk35xx-5.16/rk3568-dts-radxa-rock3a-support.patch +++ b/patch/kernel/archive/rk35xx-5.16/rk3568-dts-radxa-rock3a-support.patch @@ -12,7 +12,7 @@ new file mode 100644 index 000000000000..9e9124dc6c59 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3-a.dts -@@ -0,0 +1,809 @@ +@@ -0,0 +1,782 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2021 Rockchip Electronics Co., Ltd. @@ -47,7 +47,7 @@ index 000000000000..9e9124dc6c59 + #clock-cells = <0>; + }; + -+ hdmi-con { ++ hdmi-con { + compatible = "hdmi-connector"; + type = "c"; + @@ -70,13 +70,6 @@ index 000000000000..9e9124dc6c59 + pinctrl-0 = <&user_led_enable_h>; + retain-state-suspended; + }; -+ -+ wifi-led { -+ gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "rfkill2"; -+ default-state = "on"; -+ pinctrl-0 = <&wifi_led>; -+ }; + }; + + rk809_sound: rk809-sound { @@ -223,8 +216,6 @@ index 000000000000..9e9124dc6c59 + regulator-off-in-suspend; + }; + }; -+ -+ +}; + +&combphy0 { @@ -273,16 +264,16 @@ index 000000000000..9e9124dc6c59 +}; + +&hdmi_in { -+ hdmi_in_vp0: endpoint@0 { -+ reg = <0>; -+ remote-endpoint = <&vp0_out_hdmi>; -+ }; ++ hdmi_in_vp0: endpoint@0 { ++ reg = <0>; ++ remote-endpoint = <&vp0_out_hdmi>; ++ }; +}; + +&hdmi_out { -+ hdmi_out_con: endpoint { -+ remote-endpoint = <&hdmi_con_in>; -+ }; ++ hdmi_out_con: endpoint { ++ remote-endpoint = <&hdmi_con_in>; ++ }; +}; + +&i2c0 { @@ -306,7 +297,6 @@ index 000000000000..9e9124dc6c59 + }; + }; + -+ + rk809: pmic@20 { + compatible = "rockchip,rk809"; + reg = <0x20>; @@ -586,7 +576,6 @@ index 000000000000..9e9124dc6c59 + }; +}; + -+ +&mdio1 { + rgmii_phy1: phy@0 { + compatible = "ethernet-phy-ieee802.3-c22"; @@ -599,10 +588,6 @@ index 000000000000..9e9124dc6c59 + user_led_enable_h: user-led-enable-h { + rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; + }; -+ -+ wifi_led: wifi-led { -+ rockchip,pins = <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; + }; + + sdio-pwrseq { @@ -645,18 +630,6 @@ index 000000000000..9e9124dc6c59 + }; + }; + -+ wireless-wlan { -+ wifi_host_wake_irq: wifi-host-wake-irq { -+ rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>; -+ }; -+ }; -+ -+ wireless-bluetooth { -+ uart1_gpios: uart1-gpios { -+ rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; -+ + headphone { + hp_det: hp-det { + rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>; @@ -708,7 +681,7 @@ index 000000000000..9e9124dc6c59 +}; + +&tsadc { -+ status = "okay"; ++ status = "okay"; +}; + +&uart2 { diff --git a/patch/kernel/archive/rk35xx-5.17/rk3568-dts-radxa-rock3a-support.patch b/patch/kernel/archive/rk35xx-5.17/rk3568-dts-radxa-rock3a-support.patch index dd2b921443..5acd26f313 100644 --- a/patch/kernel/archive/rk35xx-5.17/rk3568-dts-radxa-rock3a-support.patch +++ b/patch/kernel/archive/rk35xx-5.17/rk3568-dts-radxa-rock3a-support.patch @@ -12,7 +12,7 @@ new file mode 100644 index 000000000000..1b898aff9df8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3-a.dts -@@ -0,0 +1,808 @@ +@@ -0,0 +1,781 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2021 Rockchip Electronics Co., Ltd. @@ -47,7 +47,7 @@ index 000000000000..1b898aff9df8 + #clock-cells = <0>; + }; + -+ hdmi-con { ++ hdmi-con { + compatible = "hdmi-connector"; + type = "c"; + @@ -70,13 +70,6 @@ index 000000000000..1b898aff9df8 + pinctrl-0 = <&user_led_enable_h>; + retain-state-suspended; + }; -+ -+ wifi-led { -+ gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "rfkill2"; -+ default-state = "on"; -+ pinctrl-0 = <&wifi_led>; -+ }; + }; + + rk809-sound { @@ -222,8 +215,6 @@ index 000000000000..1b898aff9df8 + regulator-off-in-suspend; + }; + }; -+ -+ +}; + +&combphy0 { @@ -272,16 +263,16 @@ index 000000000000..1b898aff9df8 +}; + +&hdmi_in { -+ hdmi_in_vp0: endpoint@0 { -+ reg = <0>; -+ remote-endpoint = <&vp0_out_hdmi>; -+ }; ++ hdmi_in_vp0: endpoint@0 { ++ reg = <0>; ++ remote-endpoint = <&vp0_out_hdmi>; ++ }; +}; + +&hdmi_out { -+ hdmi_out_con: endpoint { -+ remote-endpoint = <&hdmi_con_in>; -+ }; ++ hdmi_out_con: endpoint { ++ remote-endpoint = <&hdmi_con_in>; ++ }; +}; + +&i2c0 { @@ -305,7 +296,6 @@ index 000000000000..1b898aff9df8 + }; + }; + -+ + rk809: pmic@20 { + compatible = "rockchip,rk809"; + reg = <0x20>; @@ -580,7 +570,6 @@ index 000000000000..1b898aff9df8 + }; +}; + -+ +&mdio1 { + rgmii_phy1: phy@0 { + compatible = "ethernet-phy-ieee802.3-c22"; @@ -593,10 +582,6 @@ index 000000000000..1b898aff9df8 + user_led_enable_h: user-led-enable-h { + rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; + }; -+ -+ wifi_led: wifi-led { -+ rockchip,pins = <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; + }; + + sdio-pwrseq { @@ -639,18 +624,6 @@ index 000000000000..1b898aff9df8 + }; + }; + -+ wireless-wlan { -+ wifi_host_wake_irq: wifi-host-wake-irq { -+ rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>; -+ }; -+ }; -+ -+ wireless-bluetooth { -+ uart1_gpios: uart1-gpios { -+ rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; -+ + headphone { + hp_det: hp-det { + rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>; @@ -707,7 +680,7 @@ index 000000000000..1b898aff9df8 +}; + +&tsadc { -+ status = "okay"; ++ status = "okay"; +}; + +&uart2 {