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..81299650de4f0 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"; @@ -107,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>; @@ -144,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>; @@ -341,6 +340,10 @@ status = "okay"; }; +&spdif_tx2 { + status = "okay"; +}; + &hdptxphy_hdmi0 { status = "okay"; }; @@ -394,7 +397,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>; }; }; @@ -532,5 +535,3 @@ pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_det>; status = "okay"; }; - - 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 {