From 1543e32f86b3ab3788f5fcb6e07ab66635e9051a Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Wed, 20 Sep 2023 18:22:09 +0800 Subject: [PATCH 1/4] arm64: dts: move status led configuration to radxa cm5 Signed-off-by: Ken Wang --- arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi index e9bec6fc3f405..38cecdff277c2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi @@ -27,6 +27,17 @@ mmc1 = &sdmmc; mmc2 = &sdio; }; + + gpio_leds: gpio-leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + + status-led-blue { + gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + default-state = "on"; + }; + }; }; &i2c0 { From 81ca4be2cb67a98835e5160aee54b3c4c36d7beb Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Mon, 31 Jul 2023 14:28:38 +0800 Subject: [PATCH 2/4] arm64: dts: cm5 io: add dp sound Signed-off-by: Ken Wang --- .../boot/dts/rockchip/rk3588s-radxa-cm5-io.dts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts index b19bbf190e1ad..a3fda333735ea 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts @@ -67,6 +67,16 @@ rockchip,jack-det; }; + dp0_sound: dp0-sound { + status = "okay"; + compatible = "rockchip,hdmi"; + rockchip,card-name= "rockchip-hdmi1"; + rockchip,mclk-fs = <512>; + rockchip,cpu = <&spdif_tx2>; + rockchip,codec = <&dp0 1>; + rockchip,jack-det; + }; + es8316_sound: es8316-sound { status = "okay"; compatible = "rockchip,multicodecs-card"; @@ -341,6 +351,10 @@ status = "okay"; }; +&spdif_tx2 { + status = "okay"; +}; + &hdptxphy_hdmi0 { status = "okay"; }; From 540b3099e29ad6eca2a2947a83b81a5b9b6a5a42 Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Mon, 4 Sep 2023 16:39:01 +0800 Subject: [PATCH 3/4] arm64: dts: cm5 io: modify vcc5v0_host gpio Signed-off-by: Ken Wang --- arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts index a3fda333735ea..ce077630759f3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts @@ -117,7 +117,7 @@ regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high; - gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; + gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_host_en>; vin-supply = <&vcc5v0_sys>; @@ -408,7 +408,7 @@ usb { vcc5v0_host_en: vcc5v0-host-en { - rockchip,pins = <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; }; }; From ace9b970158ec38339b5d716ad95f2d29841e615 Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Wed, 20 Sep 2023 19:22:02 +0800 Subject: [PATCH 4/4] arm64: dts: delete duplicate gpio-leds nodes The gpio-leds node is defined in cm5 dtsi Signed-off-by: Ken Wang --- .../boot/dts/rockchip/rk3588s-radxa-cm5-io.dts | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts index ce077630759f3..81299650de4f0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts @@ -154,17 +154,6 @@ regulator-always-on; }; - gpio-leds { - compatible = "gpio-leds"; - pinctrl-names = "default"; - - user-led1 { - gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "heartbeat"; - default-state = "on"; - }; - }; - fan0: pwm-fan { compatible = "pwm-fan"; #cooling-cells = <2>; @@ -546,5 +535,3 @@ pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_det>; status = "okay"; }; - -