diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts index ac7c3f7948378..1bf298e63938d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * Copyright (c) 2022 Rockchip Electronics Co., Ltd. - * Copyright (c) 2022 Radxa Limited + * Copyright (c) 2024 Rockchip Electronics Co., Ltd. + * Copyright (c) 2024 Radxa Computer (Shenzhen) Co., Ltd. * */ @@ -26,6 +26,21 @@ /delete-node/ chosen; + adc_keys: adc-keys { + compatible = "adc-keys"; + io-channels = <&saradc 0>; + io-channel-names = "buttons"; + keyup-threshold-microvolt = <1800000>; + poll-interval = <100>; + status = "okay"; + + maskrom-key { + label = "macro"; + linux,code = ; + press-threshold-microvolt = <1750>; + }; + }; + fan0: pwm-fan { compatible = "pwm-fan"; #cooling-cells = <2>; @@ -251,7 +266,13 @@ }; }; + hdmiin_dc: hdmiin-dc { + compatible = "rockchip,dummy-codec"; + #sound-dai-cells = <0>; + }; + hdmiin-sound { + status = "okay"; compatible = "rockchip,hdmi"; rockchip,mclk-fs = <128>; rockchip,format = "i2s"; @@ -604,7 +625,8 @@ status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&hdmim0_tx1_cec &hdmim0_tx1_hpd &hdmim1_tx1_scl &hdmim1_tx1_sda>; - cec-enable = "true"; + cec-enable = "true"; + enable-gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>; }; &hdmi1_in_vp0 { @@ -627,13 +649,13 @@ &hdmirx_ctrler { status = "okay"; - #sound-dai-cells = <1>; /* Effective level used to trigger HPD: 0-low, 1-high */ hpd-trigger-level = <1>; hdmirx-det-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>; pinctrl-0 = <&hdmim1_rx_cec &hdmim1_rx_hpdin &hdmim1_rx_scl &hdmim1_rx_sda &hdmirx_det>; pinctrl-names = "default"; + #sound-dai-cells = <1>; }; &hdptxphy_hdmi0 { @@ -671,22 +693,26 @@ /* vp0 & vp1 splice for 8K output */ &vp0 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0)>; - rockchip,primary-plane = ; + rockchip,primary-plane = ; + cursor-win-id = ; }; &vp1 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER1 | 1 << ROCKCHIP_VOP2_ESMART1)>; - rockchip,primary-plane = ; + rockchip,primary-plane = ; + cursor-win-id = ; }; &vp2 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER2 | 1 << ROCKCHIP_VOP2_ESMART2)>; - rockchip,primary-plane = ; + rockchip,primary-plane = ; + cursor-win-id = ; }; &vp3 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER3 | 1 << ROCKCHIP_VOP2_ESMART3)>; - rockchip,primary-plane = ; + rockchip,primary-plane = ; + cursor-win-id = ; }; &u2phy2 { @@ -984,13 +1010,13 @@ &soc_thermal { sustainable-power = <5000>; /* milliwatts */ cooling-maps { - map3 { + map4 { trip = <&target>; cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; contribution = <8192>; }; - map4 { + map5 { trip = <&threshold>; cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; @@ -1211,4 +1237,4 @@ rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; }; }; -}; +}; \ No newline at end of file