From a9ed267b409ea726ec7e5b062ad3a5a079353fc9 Mon Sep 17 00:00:00 2001 From: Lee Seungcheol Date: Tue, 15 Feb 2022 12:26:12 +0900 Subject: [PATCH 1/2] ODROID: arm64/dts: remotectl: add remotectl to dts Change-Id: If1eb3c51f454b0fab14df98a57f8b9fe22c72747 Signed-off-by: Lee Seungcheol Signed-off-by: YoungSoo Shin --- .../boot/dts/rockchip/rk3568-odroid.dtsi | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-odroid.dtsi index 50df475e7fc4..6659b82b9537 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-odroid.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid.dtsi @@ -157,6 +157,38 @@ status = "okay"; }; +&pwm3 { + status = "okay"; + + compatible = "rockchip,remotectl-pwm"; + remote_pwm_id = <3>; + handle_cpu_id = <1>; + remote_support_psci = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&pwm3_pins>; + + ir_key1 { + rockchip,usercode = <0x4db2>; + rockchip,key_table = + <0x23 KEY_POWER>, + <0x77 KEY_MUTE>, + <0x7d KEY_HOME>, + <0x31 KEY_ENTER>, + <0x35 KEY_UP>, + <0x66 KEY_LEFT>, + <0x3e KEY_RIGHT>, + <0x2d KEY_DOWN>, + <0x3a KEY_MENU>, + <0x65 KEY_BACK>, + <0x7e KEY_VOLUMEDOWN>, + <0x7f KEY_VOLUMEUP>; + }; +}; + +&pwm7 { + status = "disabled"; +}; + &rknpu_mmu { status = "disabled"; }; From 6c25ce2f556279135d218fd328c889b08788e8db Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Tue, 15 Feb 2022 13:06:03 +0900 Subject: [PATCH 2/2] ODROID-M1: arm64/dts: switch PWM7 to generic pwm port not IR port This commit is to fix the commit that change the IR remote port from PWM7 to PWM3, switch the PWM7 to generic pwm port by deleting the device nodes and properties defined in 'rk3568-evb.dtis'. "88ebfa42893a ODROID: arm64/dts: remotectl: add remotectl to dts" Signed-off-by: Dongjin Kim Change-Id: I109120f1105afbf36541fcae2fec7f2caf92cdbe --- arch/arm64/boot/dts/rockchip/rk3568-odroid.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-odroid.dtsi index 6659b82b9537..ce4607c46eed 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-odroid.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid.dtsi @@ -186,7 +186,18 @@ }; &pwm7 { + compatible = "rockchip,rk3568-pwm", "rockchip,rk3328-pwm"; + pinctrl-names = "active"; + pinctrl-0 = <&pwm7_pins>; + status = "disabled"; + + /delete-property/ remote_pwm_id; + /delete-property/ handle_cpu_id; + /delete-property/ remote_support_psci; + /delete-node/ ir_key1; + /delete-node/ ir_key2; + /delete-node/ ir_key3; }; &rknpu_mmu {