diff --git a/arch/arm64/boot/dts/rockchip/overlays/Makefile b/arch/arm64/boot/dts/rockchip/overlays/Makefile index 4beab11b..dee2236b 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/Makefile +++ b/arch/arm64/boot/dts/rockchip/overlays/Makefile @@ -447,7 +447,18 @@ dtb-$(CONFIG_CLK_RK3588) += \ rock-5b-radxa-display-10hd.dtbo \ rock-5b-radxa-display-8hd.dtbo \ rock-5b-rpi-camera-v2.dtbo \ - rock-5b-sata.dtbo + rock-5b-sata.dtbo \ + rock-5d-rpi-camera-v1p3.dtbo \ + rock-5d-rpi-camera-v2.dtbo \ + rock-5d-okdo-camera-5mp.dtbo \ + rock-5d-okdo-camera-5mp-mipi-rx0.dtbo \ + rock-5d-okdo-camera-5mp-mipi-rx1.dtbo \ + rock-5d-radxa-camera-8mp-mipi-rx0.dtbo \ + rock-5d-radxa-camera-8mp-mipi-rx1.dtbo \ + rock-5d-rpi-camera-v1p3-mipi-rx0.dtbo \ + rock-5d-rpi-camera-v1p3-mipi-rx1.dtbo \ + rock-5d-rpi-camera-v2-mipi-rx0.dtbo \ + rock-5d-rpi-camera-v2-mipi-rx1.dtbo dtb-$(CONFIG_CPU_RK3588) += \ radxa-cm5-io-okdo-5mp.dtbo \ @@ -509,7 +520,8 @@ dtb-$(CONFIG_CPU_RK3588) += \ rock-5b-plus-hdmi1-8k.dtbo \ rock-5b-plus-radxa-display-8hd.dtbo \ rock-5b-plus-radxa-display-10fhd.dtbo \ - rock-5b-plus-radxa-display-10hd.dtbo + rock-5b-plus-radxa-display-10hd.dtbo \ + rock-5d-radxa-camera-4k.dtbo dtb-$(CONFIG_ARCH_ROCKCHIP) += rockchip-watchdog.dtbo diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-can1-m1.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-can1-m1.dts index 4921194b..e4c59106 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-can1-m1.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-can1-m1.dts @@ -6,13 +6,14 @@ / { metadata { title = "Enable CAN1-M1"; - compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,rock-5d"; category = "misc"; exclusive = "GPIO4_B2", "GPIO4_B3"; description = "Enable CAN1-M0. On Radxa ROCK 5A this is RX pin 13 & TX pin 11. On Radxa ROCK 5B this is RX pin 5 & TX pin 3. On Radxa ROCK 5C this is RX pin 13 & TX pin 11. +On Radxa ROCK 5D this is RX pin 13 & TX pin 11. "; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-disable-fiq-debugger.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-disable-fiq-debugger.dts index eec57498..e445d96b 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-disable-fiq-debugger.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-disable-fiq-debugger.dts @@ -6,7 +6,7 @@ / { metadata { title = "Disable FIQ Debugger"; - compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,nx5-io", "radxa,cm5-io", "radxa,cm5-rpi-cm4-io"; + compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,rock-5d", "radxa,nx5-io", "radxa,cm5-io", "radxa,cm5-rpi-cm4-io"; category = "misc"; exclusive = "GPIO0_B5", "GPIO0_B6", "fiq_debugger"; description = "Disable FIQ Debugger."; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-dwc3-host.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-dwc3-host.dts index 345d6d1a..34c8eb54 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-dwc3-host.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-dwc3-host.dts @@ -4,7 +4,7 @@ / { metadata { title = "Set OTG port 0 to Host mode"; - compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5c", "radxa,nx5-io"; + compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5c", "radxa,rock-5d", "radxa,nx5-io"; category = "misc"; exclusive = "usbdrd_dwc3-dr_mode"; description = "Set OTG port 0 to Host mode. diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-dwc3-peripheral.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-dwc3-peripheral.dts index 56b68cd4..4aa7d760 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-dwc3-peripheral.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-dwc3-peripheral.dts @@ -4,7 +4,7 @@ / { metadata { title = "Set OTG port 0 to Peripheral mode"; - compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5c", "radxa,nx5-io"; + compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5c", "radxa,rock-5d", "radxa,nx5-io"; category = "misc"; exclusive = "usbdrd_dwc3-dr_mode"; description = "Set OTG port 0 to Peripheral mode. diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart4m2.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart4m2.dts index 6dd1f684..80fccf1e 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart4m2.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart4m2.dts @@ -4,13 +4,14 @@ / { metadata { title = "Enable FIQ Debugger on UART4-M2"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "misc"; exclusive = "GPIO1_B3", "GPIO1_B2"; description = "Enable FIQ Debugger on UART4-M2. On Radxa ROCK 5A this is TX pin 7 and RX pin 29. On Radxa ROCK 5B this is TX pin 7 & RX pin 29. On Radxa ROCK 5C this is TX pin 7 and RX pin 29. +On Radxa ROCK 5D this is TX pin 7 and RX pin 29. "; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart6m1.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart6m1.dts index 01db4dda..aa441e48 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart6m1.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart6m1.dts @@ -4,12 +4,13 @@ / { metadata { title = "Enable FIQ Debugger on UART6-M1"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "misc"; exclusive = "GPIO1_A1", "GPIO1_A0"; description = "Enable FIQ Debugger on UART6-M1. On Radxa ROCK 5A this is TX pin 19 and RX pin 21. On Radxa ROCK 5C this is TX pin 19 and RX pin 21. +On Radxa ROCK 5D this is TX pin 19 and RX pin 21. "; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart7m2.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart7m2.dts index 743ca621..586b4b09 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart7m2.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart7m2.dts @@ -4,7 +4,7 @@ / { metadata { title = "Enable FIQ Debugger on UART7-M2"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "misc"; exclusive = "GPIO1_B5", "GPIO1_B4"; description = "Enable FIQ Debugger on UART7-M2. @@ -12,6 +12,7 @@ On Radxa ROCK 5A this is TX pin 22 and RX pin 33. On Radxa ROCK 5B this is TX pin 26 & RX pin 24. On Radxa ROCK 5B+ this is TX pin 26 & RX pin 24. On Radxa ROCK 5C this is TX pin 22 and RX pin 33. +On Radxa ROCK 5D this is TX pin 22 and RX pin 33. "; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart8m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart8m0.dts index bcbb87f8..8b045c19 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart8m0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart8m0.dts @@ -4,7 +4,7 @@ / { metadata { title = "Enable FIQ Debugger on UART8-M0"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "misc"; exclusive = "GPIO4_B0", "GPIO4_B1"; description = "Enable FIQ Debugger on UART8-M0. diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c1-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c1-m0.dts index ae1c1fe8..b30f33c5 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c1-m0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c1-m0.dts @@ -4,7 +4,7 @@ / { metadata { title = "Enable I2C1-M0"; - compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,nx5-io", "radxa,cm5-io", "radxa,cm5-rpi-cm4-io"; + compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,rock-5d", "radxa,nx5-io", "radxa,cm5-io", "radxa,cm5-rpi-cm4-io"; category = "misc"; exclusive = "GPIO0_B5", "GPIO0_B6"; description = "Enable I2C1-M0. @@ -12,6 +12,7 @@ On Radxa ROCK 5A this is SDA pin 10 & SCL pin 8. On Radxa ROCK 5B this is SDA pin 10 & SCL pin 8. On Radxa ROCK 5B+ this is SDA pin 10 & SCL pin 8. On Radxa ROCK 5C this is SDA pin 10 & SCL pin 8. +On Radxa ROCK 5D this is SDA pin 10 & SCL pin 8. On Radxa NX5 IO this is SDA pin 10 & SCL pin 8. On Radxa CM5 IO this is SDA pin 10 & SCL pin 8. On Radxa CM5 IO this is SDA pin 10 & SCL pin 8. diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c2-m4.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c2-m4.dts index d12a1746..62384b1c 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c2-m4.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c2-m4.dts @@ -4,12 +4,13 @@ / { metadata { title = "Enable I2C2-M4"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "misc"; exclusive = "GPIO1_A0", "GPIO1_A1"; description = "Enable I2C2-M4. On Radxa ROCK 5A this is SDA pin 21 and SCL pin 19. On Radxa ROCK 5C this is SDA pin 21 and SCL pin 19. +On Radxa ROCK 5D this is SDA pin 21 and SCL pin 19. "; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c4-m3.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c4-m3.dts index 9d770959..418db918 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c4-m3.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c4-m3.dts @@ -4,13 +4,14 @@ / { metadata { title = "Enable I2C4-M3"; - compatible = "radxa,rock-5a", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,cm5-rpi-cm4-io"; + compatible = "radxa,rock-5a", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,rock-5d", "radxa,cm5-rpi-cm4-io"; category = "misc"; exclusive = "GPIO1_A2", "GPIO1_A3"; description = "Enable I2C4-M3. On Radxa ROCK 5A this is SDA pin 23 and SCL pin 24. On Radxa ROCK 5B+ this is SDA pin 31 and SCL pin 29. On Radxa ROCK 5C this is SDA pin 23 and SCL pin 24. +On Radxa ROCK 5D this is SDA pin 23 and SCL pin 24. On Radxa CM5-RPI-CM4-IO this is SDA pin 40 and SCL pin 12. "; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c6-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c6-m0.dts index 8072cbed..4e900d66 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c6-m0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c6-m0.dts @@ -6,12 +6,13 @@ / { metadata { title = "Enable I2C6-M0"; - compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,cm5-rpi-cm4-io"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d", "radxa,cm5-rpi-cm4-io"; category = "misc"; exclusive = "GPIO0_C7", "GPIO0_D0"; description = "Enable I2C6-M0. On Radxa ROCK 5A this is SDA pin 27 and SCL pin 28. On Radxa ROCK 5C this is SDA pin 27 and SCL pin 28. +On Radxa ROCK 5D this is SDA pin 27 and SCL pin 28. On Radxa CM5-RPI-CM4-IO this is SDA pin 3 and SCL pin 5. "; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c6-m3.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c6-m3.dts index 4be72d27..9767340a 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c6-m3.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c6-m3.dts @@ -4,12 +4,13 @@ / { metadata { title = "Enable I2C6-M3"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "misc"; exclusive = "GPIO4_B0", "GPIO4_B1"; description = "Enable I2C6-M3. On Radxa ROCK 5A this is SDA pin 32 and SCL pin 40. On Radxa ROCK 5C this is SDA pin 32 and SCL pin 40. +On Radxa ROCK 5D this is SDA pin 32 and SCL pin 40. "; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c8-m2.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c8-m2.dts index 9ef449e3..fcab2112 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c8-m2.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-i2c8-m2.dts @@ -4,12 +4,13 @@ / { metadata { title = "Enable I2C8-M2"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "misc"; exclusive = "GPIO1_D6", "GPIO1_D7"; description = "Enable I2C8-M2. On Radxa ROCK 5A this is SDA pin 3 and SCL pin 5. On Radxa ROCK 5C this is SDA pin 3 and SCL pin 5. +On Radxa ROCK 5D this is SDA pin 3 and SCL pin 5. "; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm0-m2.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm0-m2.dts index c695ba40..b6c4c7f9 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm0-m2.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm0-m2.dts @@ -4,13 +4,14 @@ / { metadata { title = "Enable PWM0-M2"; - compatible = "radxa,rock-5a", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,cm5-rpi-cm4-io"; + compatible = "radxa,rock-5a", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,rock-5d", "radxa,cm5-rpi-cm4-io"; category = "misc"; exclusive = "GPIO1_A2"; description = "Enable PWM0-M2. On Radxa ROCK 5A this is pin 23. On Radxa ROCK 5B+ this is pin 31. On Radxa ROCK 5C this is pin 23. +On Radxa ROCK 5D this is pin 23. On Radxa CM5-RPI-CM4-IO this is pin 40. "; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm1-m2.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm1-m2.dts index fd7a1e55..2d7bcc63 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm1-m2.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm1-m2.dts @@ -4,12 +4,13 @@ / { metadata { title = "Enable PWM1-M2"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "misc"; exclusive = "GPIO1_A3"; description = "Enable PWM1-M2. On Radxa ROCK 5A this is pin 24. On Radxa ROCK 5C this is pin 24. +On Radxa ROCK 5D this is pin 24. "; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm11-m1.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm11-m1.dts index f5fe83b7..582cfaa4 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm11-m1.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm11-m1.dts @@ -4,12 +4,13 @@ / { metadata { title = "Enable PWM11-M1"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "misc"; exclusive = "GPIO4_B4"; description = "Enable PWM11-M1. On Radxa ROCK 5A this is pin 15. On Radxa ROCK 5C this is pin 15. +On Radxa ROCK 5D this is pin 15. "; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm14-m1.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm14-m1.dts index aec340d0..556f08e0 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm14-m1.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm14-m1.dts @@ -4,7 +4,7 @@ / { metadata { title = "Enable PWM14-M1"; - compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,cm5-io", "radxa,cm5-rpi-cm4-io"; + compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,rock-5d", "radxa,cm5-io", "radxa,cm5-rpi-cm4-io"; category = "misc"; exclusive = "GPIO4_B2"; description = "Enable PWM14-M1. @@ -12,6 +12,7 @@ On Radxa ROCK 5A this is pin 13. On Radxa ROCK 5B this is pin 5. On Radxa ROCK 5B+ this is pin 5. On Radxa ROCK 5C this is pin 13. +On Radxa ROCK 5D this is pin 13. On Radxa CM5 IO this is pin 24. On Radxa CM5 RPI CM4 IO this is pin 32. "; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm14-m2.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm14-m2.dts index 4e61bc7f..7b9d82b5 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm14-m2.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm14-m2.dts @@ -4,12 +4,13 @@ / { metadata { title = "Enable PWM14-M2"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "misc"; exclusive = "GPIO1_D6"; description = "Enable PWM14-M2. On Radxa ROCK 5A this is pin 5. On Radxa ROCK 5C this is pin 5. +On Radxa ROCK 5D this is pin 5. "; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm15-m1.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm15-m1.dts index ad02aa31..97db448e 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm15-m1.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm15-m1.dts @@ -4,7 +4,7 @@ / { metadata { title = "Enable PWM15-M1"; - compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,nx5-io"; + compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,rock-5d", "radxa,nx5-io"; category = "misc"; exclusive = "GPIO4_B3"; description = "Enable PWM15-M1. @@ -12,6 +12,7 @@ On Radxa ROCK 5A this is pin 11. On Radxa ROCK 5B this is pin 3. On Radxa ROCK 5B+ this is pin 3. On Radxa ROCK 5C this is pin 11. +On Radxa ROCK 5D this is pin 11. On Radxa NX5 IO this is pin 32. "; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm15-m3.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm15-m3.dts index f82efca7..7efa4972 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm15-m3.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm15-m3.dts @@ -4,13 +4,14 @@ / { metadata { title = "Enable PWM15-M3"; - compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5c", "radxa,cm5-rpi-cm4-io"; + compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5c", "radxa,rock-5d", "radxa,cm5-rpi-cm4-io"; category = "misc"; exclusive = "GPIO1_D7"; description = "Enable PWM15-M3. On Radxa ROCK 5A this is pin 3. On Radxa ROCK 5B this is pin 29. On Radxa ROCK 5C this is pin 3. +On Radxa ROCK 5D this is pin 3. On Radxa CM5-RPI-CM4-IO this is pin 27. "; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm6-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm6-m0.dts index 8ffc1de2..48e550f4 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm6-m0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm6-m0.dts @@ -4,12 +4,13 @@ / { metadata { title = "Enable PWM6-M0"; - compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,cm5-io", "radxa,cm5-rpi-cm4-io"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d", "radxa,cm5-io", "radxa,cm5-rpi-cm4-io"; category = "misc"; exclusive = "GPIO0_C7"; description = "Enable PWM6-M0. On Radxa ROCK 5A this is pin 27. On Radxa ROCK 5C this is pin 27. +On Radxa ROCK 5D this is pin 27. On Radxa CM5 IO this is pin 31. On Radxa CM5 RPI CM4 IO this is pin 5. "; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm7-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm7-m0.dts index 6d09af62..4cf78191 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm7-m0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm7-m0.dts @@ -4,12 +4,13 @@ / { metadata { title = "Enable PWM7-M0"; - compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,cm5-io", "radxa,cm5-rpi-cm4-io"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d", "radxa,cm5-io", "radxa,cm5-rpi-cm4-io"; category = "misc"; exclusive = "GPIO0_D0"; description = "Enable PWM7-M0. On Radxa ROCK 5A this is pin 28. On Radxa ROCK 5C this is pin 28. +On Radxa ROCK 5D this is pin 28. On Radxa CM5 IO this is pin 29. On Radxa CM5 RPI CM4 IO this is pin 3. "; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m1-cs0-mcp2515-8mhz.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m1-cs0-mcp2515-8mhz.dts index 8e203c2c..e6fc4cfd 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m1-cs0-mcp2515-8mhz.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m1-cs0-mcp2515-8mhz.dts @@ -8,13 +8,14 @@ / { metadata { title = "Enable MCP2515 with 8MHz external clock on SPI0-M1 over CS0"; - compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,cm5-io"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d", "radxa,cm5-io"; exclusive = "GPIO4_A2", "GPIO4_A1", "GPIO4_A0", "GPIO4_B2", "GPIO0_C7"; description = "Enable MCP2515 with 8MHz external clock on SPI0-M1 over CS0. MCP2515 is a SPI CAN controller from Microchip. On Radxa CM5 IO, the interrupt pin is pin 31. On Radxa ROCK 5A, the interrupt pin is pin 27. On Radxa ROCK 5C, the interrupt pin is pin 27. +On Radxa ROCK 5D, the interrupt pin is pin 27. "; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m1-cs0-spidev.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m1-cs0-spidev.dts index 1525f932..f764dde7 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m1-cs0-spidev.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m1-cs0-spidev.dts @@ -4,7 +4,7 @@ / { metadata { title = "Enable spidev on SPI0-M1 over CS0"; - compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,cm5-io"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d", "radxa,cm5-io"; category = "misc"; exclusive = "GPIO4_A2", "GPIO4_A1", "GPIO4_A0", "GPIO4_B2"; description = "Enable spidev on SPI0-M1 over CS0."; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m1-cs1-spidev.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m1-cs1-spidev.dts index 87f250cb..d1e210f0 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m1-cs1-spidev.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m1-cs1-spidev.dts @@ -4,7 +4,7 @@ / { metadata { title = "Enable spidev on SPI0-M1 over CS1"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "misc"; exclusive = "GPIO4_A2", "GPIO4_A1", "GPIO4_A0", "GPIO4_B1"; description = "Enable spidev on SPI0-M1 over CS1."; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m2-cs0-spidev.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m2-cs0-spidev.dts index f117569a..1215b176 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m2-cs0-spidev.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m2-cs0-spidev.dts @@ -4,7 +4,7 @@ / { metadata { title = "Enable spidev on SPI0-M2 over CS0"; - compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,nx5-io", "radxa,cm5-rpi-cm4-io"; + compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,rock-5d", "radxa,nx5-io", "radxa,cm5-rpi-cm4-io"; category = "misc"; exclusive = "GPIO1_B3", "GPIO1_B2", "GPIO1_B1", "GPIO1_B4"; description = "Enable spidev on SPI0-M2 over CS0."; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m2-cs1-spidev.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m2-cs1-spidev.dts index ea6f08c6..0d684778 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m2-cs1-spidev.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi0-m2-cs1-spidev.dts @@ -4,7 +4,7 @@ / { metadata { title = "Enable spidev on SPI0-M2 over CS1"; - compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,nx5-io", "radxa,cm5-rpi-cm4-io"; + compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,rock-5d", "radxa,nx5-io", "radxa,cm5-rpi-cm4-io"; category = "misc"; exclusive = "GPIO1_B2", "GPIO1_B1", "GPIO1_B3", "GPIO1_B5"; description = "Enable spidev on SPI0-M2 over CS1."; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi4-m2-cs0-spidev.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi4-m2-cs0-spidev.dts index 517174a6..4b2009da 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi4-m2-cs0-spidev.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-spi4-m2-cs0-spidev.dts @@ -4,7 +4,7 @@ / { metadata { title = "Enable spidev on SPI4-M2 over CS0"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "misc"; exclusive = "GPIO1_A2", "GPIO1_A0", "GPIO1_A1", "GPIO1_A3"; description = "Enable spidev on SPI4-M2 over CS0."; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart2-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart2-m0.dts index 7b12e3de..f364a241 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart2-m0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart2-m0.dts @@ -4,7 +4,7 @@ / { metadata { title = "Enable UART2-M0"; - compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,nx5-io", "radxa,cm5-io", "radxa,cm5-rpi-cm4-io"; + compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,rock-5d", "radxa,nx5-io", "radxa,cm5-io", "radxa,cm5-rpi-cm4-io"; category = "misc"; exclusive = "GPIO0_B5", "GPIO0_B6"; description = "Enable UART2-M0. @@ -12,6 +12,7 @@ On Radxa ROCK 5A this is TX pin 8 & RX pin 10. On Radxa ROCK 5B this is TX pin 8 & RX pin 10. On Radxa ROCK 5B+ this is TX pin 8 & RX pin 10. On Radxa ROCK 5C this is TX pin 8 & RX pin 10. +On Radxa ROCK 5D this is TX pin 8 & RX pin 10. On Radxa NX5 IO this is TX pin 8 & RX pin 10. On Radxa CM5 IO this is TX pin 8 & RX pin 10. On Radxa CM5 RPI CM4 IO this is TX pin 8 & RX pin 10. diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart4-m2.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart4-m2.dts index 6c49ee85..ee4e643b 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart4-m2.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart4-m2.dts @@ -4,13 +4,14 @@ / { metadata { title = "Enable UART4-M2"; - compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5c", "radxa,nx5-io", "radxa,cm5-rpi-cm4-io"; + compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5c", "radxa,rock-5d", "radxa,nx5-io", "radxa,cm5-rpi-cm4-io"; category = "misc"; exclusive= "GPIO1_B3", "GPIO1_B2"; description = "Enable UART4-M2. On Radxa ROCK 5A this is TX pin 7 & RX pin 29. On Radxa ROCK 5B this is TX pin 23 & RX pin 19. On Radxa ROCK 5C this is TX pin 7 & RX pin 29. +On Radxa ROCK 5D this is TX pin 7 & RX pin 29. On Radxa NX5 IO this is TX pin 23 & RX pin 19. On Radxa CM5 RPI CM4 IO this is TX pin 23 & RX pin 19. "; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart6-m1.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart6-m1.dts index 2fd8e6bd..d8cd4010 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart6-m1.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart6-m1.dts @@ -4,12 +4,13 @@ / { metadata { title = "Enable UART6-M1"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "misc"; exclusive= "GPIO1_A1", "GPIO1_A0"; description = "Enable UART6-M1. On Radxa ROCK 5A this is TX pin 19 and RX pin 21. On Radxa ROCK 5C this is TX pin 19 and RX pin 21. +On Radxa ROCK 5D this is TX pin 19 and RX pin 21. "; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart7-m2.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart7-m2.dts index 569283bd..28200ddc 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart7-m2.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart7-m2.dts @@ -4,13 +4,14 @@ / { metadata { title = "Enable UART7-M2"; - compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5c", "radxa,nx5-io", "radxa,cm5-rpi-cm4-io"; + compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5c", "radxa,rock-5d", "radxa,nx5-io", "radxa,cm5-rpi-cm4-io"; category = "misc"; exclusive= "GPIO1_B5", "GPIO1_B4"; description = "Enable UART7-M2. On Radxa ROCK 5A this is TX pin 22 and RX pin 33. On Radxa ROCK 5B this is TX pin 26 & RX pin 24. On Radxa ROCK 5C this is TX pin 22 and RX pin 33. +On Radxa ROCK 5D this is TX pin 22 and RX pin 33. On Radxa NX5 IO this is TX pin 26 & RX pin 24. On Radxa CM5 RPI CM4 IO this is TX pin 26 & RX pin 24. "; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart8-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart8-m0.dts index 8489ad0f..e5b6664f 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart8-m0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-uart8-m0.dts @@ -4,12 +4,13 @@ / { metadata { title = "Enable UART8-M0"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "misc"; exclusive= "GPIO4_B0", "GPIO4_B1"; description = "Enable UART8-M0. On Radxa ROCK 5A this is TX pin 32 and RX pin 40. On Radxa ROCK 5C this is TX pin 32 and RX pin 40. +On Radxa ROCK 5D this is TX pin 32 and RX pin 40. "; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-w1-gpio4-b1.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-w1-gpio4-b1.dts index 1c4d6a50..d942b877 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-w1-gpio4-b1.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3588-w1-gpio4-b1.dts @@ -7,12 +7,13 @@ / { metadata { title = "Enable 1-Wire on GPIO4_B1"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "misc"; exclusive = "GPIO4_B1"; description = "Enable 1-Wire on GPIO4_B1. On Radxa ROCK 5A this is pin 40. On Radxa ROCK 5C this is pin 40. +On Radxa ROCK 5D this is pin 40. "; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-allnet-5inch-display.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-allnet-5inch-display.dts index 9941f183..bee98c96 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-allnet-5inch-display.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-allnet-5inch-display.dts @@ -8,7 +8,7 @@ / { metadata { title = "Enable ALLNET 5inch DSI Display"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "display"; exclusive = "dsi0"; description = "Enable ALLNET 5inch DSI Display"; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-i2c7-m3.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-i2c7-m3.dts index 4e7fd53e..0d7a2b42 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-i2c7-m3.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-i2c7-m3.dts @@ -3,12 +3,13 @@ / { metadata { title = "Enable I2C7-M3 and Disable onboard Audio Jack"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; description = "Enable I2C7-M3 and Disable onboard Audio Jack. Onboard audio jack has to be disabled, as the codec is connected to I2C7 on different pins. Once I2C signal is routed to 40-pin header, the codec is disconnected, thus unusable. On Radxa ROCK 5A this is SDA pin 11 & SCL pin 13. On Radxa ROCK 5C this is SDA pin 11 & SCL pin 13. +On Radxa ROCK 5D this is SDA pin 11 & SCL pin 13. "; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-25w-poe.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-25w-poe.dts index 97bf1385..6c8f1e8b 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-25w-poe.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-25w-poe.dts @@ -10,7 +10,7 @@ metadata { title = "Enable Radxa 25W PoE+ HAT"; category = "misc"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; description = "Enable Radxa 25W PoE+ HAT."; exclusive = "GPIO1_B3", "GPIO1_B4"; package = "rsetup-config-thermal-governor-step-wise"; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10fhd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10fhd.dts index e84ec766..5fdca04b 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10fhd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10fhd.dts @@ -10,7 +10,7 @@ / { metadata { title ="Enable Radxa Display 10FHD"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "display"; exclusive = "dsi0"; description = "Enable Radxa Display 10FHD."; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10hd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10hd.dts index 2a422d2f..d6f22b51 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10hd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10hd.dts @@ -9,7 +9,7 @@ / { metadata { title ="Enable Radxa Display 10HD"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "display"; exclusive = "dsi0"; description = "Enable Radxa Display 10HD."; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-8hd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-8hd.dts index ef12e59e..e22d4fe2 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-8hd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-8hd.dts @@ -9,7 +9,7 @@ / { metadata { title ="Enable Radxa Display 8HD"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "display"; exclusive = "dsi0"; description = "Enable Radxa Display 8HD."; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-raspi-7inch-touchscreen.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-raspi-7inch-touchscreen.dts index c77e6b7f..e4cc88b5 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-raspi-7inch-touchscreen.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-raspi-7inch-touchscreen.dts @@ -8,7 +8,7 @@ / { metadata { title = "Enable Raspberry Pi 7-inch Touchscreen"; - compatible = "radxa,rock-5a", "radxa,rock-5c"; + compatible = "radxa,rock-5a", "radxa,rock-5c", "radxa,rock-5d"; category = "display"; exclusive = "dsi0"; description = "Enable Raspberry Pi 7-inch Touchscreen"; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5d-okdo-camera-5mp-mipi-rx0.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-okdo-camera-5mp-mipi-rx0.dts new file mode 100644 index 00000000..206e8626 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-okdo-camera-5mp-mipi-rx0.dts @@ -0,0 +1,182 @@ +/dts-v1/; +/plugin/; + +#include +#include + +/ { + metadata { + title ="Enable OKDO 5MP Camera on the MIPI-RX0 connector"; + compatible = "radxa,rock-5d"; + category = "camera"; + exclusive = "csi2_dcphy0"; + description = "Enable OKDO 5MP Camera on the MIPI-RX0 connector."; + }; +}; + +&{/} { + camera0_pwdn_gpio: camera0-pwdn-gpio { + compatible = "regulator-fixed"; + regulator-name = "camera0_pwdn_gpio"; + regulator-always-on; + regulator-boot-on; + enable-active-high; + gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&cam0_pwdn_gpio>; + }; + + clk_cam0_24m: external-camera-clock-24m { + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "clk_cam0_24m"; + #clock-cells = <0>; + }; + +}; + +&i2c2 { + status = "okay"; + camera0_imx219: camera0-imx219@10 { + compatible = "sony,imx219"; + reg = <0x10>; + + clocks = <&clk_cam0_24m>; + clock-names = "xvclk"; + + rockchip,camera-module-index = <1>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "rpi-camera-v2"; + rockchip,camera-module-lens-name = "default"; + + port { + imx219_out0: endpoint { + remote-endpoint = <&mipidcphy0_in_ucam0>; + data-lanes = <1 2>; + }; + }; + }; +}; + +&mipi_dcphy0 { + status = "okay"; +}; + +&csi2_dcphy0 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipidcphy0_in_ucam0: endpoint@2 { + reg = <2>; + remote-endpoint = <&imx219_out0>; + data-lanes = <1 2>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + csidcphy0_out: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi0_csi2_input>; + }; + }; + }; +}; + +&mipi0_csi2 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipi0_csi2_input: endpoint@1 { + reg = <1>; + remote-endpoint = <&csidcphy0_out>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + mipi0_csi2_output: endpoint@0 { + reg = <0>; + remote-endpoint = <&cif_mipi0_in0>; + }; + }; + }; +}; + +&rkcif { + status = "okay"; +}; + +&rkcif_mipi_lvds { + status = "okay"; + port { + cif_mipi0_in0: endpoint { + remote-endpoint = <&mipi0_csi2_output>; + }; + }; +}; + +&rkcif_mipi_lvds_sditf { + status = "okay"; + port { + mipi_lvds_sditf: endpoint { + remote-endpoint = <&isp1_vir0>; + }; + }; +}; + +&rkcif_mmu { + status = "okay"; +}; + +&isp1_mmu { + status = "okay"; +}; + +&rkisp1 { + status = "okay"; +}; + +&rkisp1_vir0 { + status = "okay"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + isp1_vir0: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi_lvds_sditf>; + }; + }; +}; + +&pinctrl { + camera { + cam0_pwdn_gpio: cam0-pwdn-gpio { + rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5d-okdo-camera-5mp-mipi-rx1.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-okdo-camera-5mp-mipi-rx1.dts new file mode 100644 index 00000000..b0e5dede --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-okdo-camera-5mp-mipi-rx1.dts @@ -0,0 +1,186 @@ +/dts-v1/; +/plugin/; + +#include +#include + +/ { + metadata { + title ="Enable OKDO 5MP Camera on the MIPI-RX1 connector"; + compatible = "radxa,rock-5d"; + category = "camera"; + exclusive = "csi2_dcphy1"; + description = "Enable OKDO 5MP Camera on the MIPI-RX1 connector."; + }; +}; + +&{/} { + camera0_pwdn_gpio: camera0-pwdn-gpio { + compatible = "regulator-fixed"; + regulator-name = "camera0_pwdn_gpio"; + regulator-always-on; + regulator-boot-on; + enable-active-high; + gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&cam0_pwdn_gpio>; + }; + + clk_cam0_24m: external-camera-clock-24m { + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "clk_cam0_24m"; + #clock-cells = <0>; + }; +}; + +&i2c6 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c6m0_xfer>; + + camera0_imx219: camera0-imx219@10 { + compatible = "sony,imx219"; + reg = <0x10>; + + clocks = <&clk_cam0_24m>; + clock-names = "xvclk"; + + rockchip,camera-module-index = <1>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "rpi-camera-v2"; + rockchip,camera-module-lens-name = "default"; + + port { + imx219_out0: endpoint { + remote-endpoint = <&mipidcphy0_in_ucam0>; + data-lanes = <1 2>; + }; + }; + }; +}; + +&mipi_dcphy1 { + status = "okay"; +}; + +&csi2_dcphy1 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipidcphy0_in_ucam0: endpoint@2 { + reg = <2>; + remote-endpoint = <&imx219_out0>; + data-lanes = <1 2>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + csidcphy0_out: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi0_csi2_input>; + }; + }; + }; +}; + +&mipi1_csi2 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipi0_csi2_input: endpoint@1 { + reg = <1>; + remote-endpoint = <&csidcphy0_out>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + mipi0_csi2_output: endpoint@0 { + reg = <0>; + remote-endpoint = <&cif_mipi0_in0>; + }; + }; + }; +}; + +&rkcif { + status = "okay"; +}; + +&rkcif_mipi_lvds1 { + status = "okay"; + + port { + cif_mipi0_in0: endpoint { + remote-endpoint = <&mipi0_csi2_output>; + }; + }; +}; + +&rkcif_mipi_lvds1_sditf { + status = "okay"; + + port { + mipi_lvds_sditf: endpoint { + remote-endpoint = <&isp1_vir0>; + }; + }; +}; + +&rkcif_mmu { + status = "okay"; +}; + +&isp1_mmu { + status = "okay"; +}; + +&rkisp1 { + status = "okay"; +}; + +&rkisp1_vir0 { + status = "okay"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + isp1_vir0: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi_lvds_sditf>; + }; + }; +}; + +&pinctrl { + camera { + cam0_pwdn_gpio: cam0-pwdn-gpio { + rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5d-okdo-camera-5mp.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-okdo-camera-5mp.dts new file mode 100644 index 00000000..0b608792 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-okdo-camera-5mp.dts @@ -0,0 +1,12 @@ +#include "rock-5a-okdo-5mp-camera.dts" + +/ { + metadata { + title ="Enable OKDO 5MP Camera on the Camera connector"; + compatible = "radxa,rock-5d"; + description = "Enable OKDO 5MP Camera on the Camera connector. +The Camera connector is located on the bottom of the board. +This is not the top MIPI-RX* connectors. +"; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5d-radxa-camera-4k.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-radxa-camera-4k.dts new file mode 100644 index 00000000..861ae64a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-radxa-camera-4k.dts @@ -0,0 +1,13 @@ +#include "rock-5a-radxa-camera-4k.dts" + +/ { + metadata { + title ="Enable Radxa Camera 4K on the Camera connector"; + compatible = "radxa,rock-5d"; + description = "Enable Radxa Camera 4K on the Camera connector. +The Camera connector is located on the bottom of the board. +This is not the top MIPI-RX* connectors. +"; + }; +}; + diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5d-radxa-camera-8mp-mipi-rx0.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-radxa-camera-8mp-mipi-rx0.dts new file mode 100644 index 00000000..ed39d53e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-radxa-camera-8mp-mipi-rx0.dts @@ -0,0 +1,184 @@ +/dts-v1/; +/plugin/; + +#include +#include + +/ { + metadata { + title ="Enable Radxa Camera 8MP on the MIPI-RX0 connector"; + compatible = "radxa,rock-5d"; + category = "camera"; + exclusive = "csi2_dcphy0"; + description = "Enable Radxa Camera 8MP on the MIPI-RX0 connector."; + }; +}; + +&{/} { + camera0_pwdn_gpio: camera0-pwdn-gpio { + compatible = "regulator-fixed"; + regulator-name = "camera0_pwdn_gpio"; + regulator-always-on; + regulator-boot-on; + enable-active-high; + gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&cam0_pwdn_gpio>; + }; + + clk_cam0_24m: external-camera-clock-24m { + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "clk_cam0_24m"; + #clock-cells = <0>; + }; +}; + +&i2c2 { + status = "okay"; + + camera0_imx219: camera0-imx219@10 { + compatible = "sony,imx219"; + reg = <0x10>; + + clocks = <&clk_cam0_24m>; + clock-names = "xvclk"; + + rockchip,camera-module-index = <1>; + rockchip,camera-module-facing = "front"; + rockchip,camera-module-name = "RADXA-CAMERA-8M"; + rockchip,camera-module-lens-name = "default"; + + port { + imx219_out0: endpoint { + remote-endpoint = <&mipidcphy0_in_ucam0>; + data-lanes = <1 2>; + }; + }; + }; +}; + +&mipi_dcphy0 { + status = "okay"; +}; + +&csi2_dcphy0 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipidcphy0_in_ucam0: endpoint@2 { + reg = <2>; + remote-endpoint = <&imx219_out0>; + data-lanes = <1 2>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + csidcphy0_out: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi0_csi2_input>; + }; + }; + }; +}; + +&mipi0_csi2 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipi0_csi2_input: endpoint@1 { + reg = <1>; + remote-endpoint = <&csidcphy0_out>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + mipi0_csi2_output: endpoint@0 { + reg = <0>; + remote-endpoint = <&cif_mipi0_in0>; + }; + }; + }; +}; + +&rkcif { + status = "okay"; +}; + +&rkcif_mipi_lvds { + status = "okay"; + + port { + cif_mipi0_in0: endpoint { + remote-endpoint = <&mipi0_csi2_output>; + }; + }; +}; + +&rkcif_mipi_lvds_sditf { + status = "okay"; + + port { + mipi_lvds_sditf: endpoint { + remote-endpoint = <&isp1_vir0>; + }; + }; +}; + +&rkcif_mmu { + status = "okay"; +}; + +&isp1_mmu { + status = "okay"; +}; + +&rkisp1 { + status = "okay"; +}; + +&rkisp1_vir0 { + status = "okay"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + isp1_vir0: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi_lvds_sditf>; + }; + }; +}; + +&pinctrl { + camera { + cam0_pwdn_gpio: cam0-pwdn-gpio { + rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5d-radxa-camera-8mp-mipi-rx1.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-radxa-camera-8mp-mipi-rx1.dts new file mode 100644 index 00000000..765cb075 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-radxa-camera-8mp-mipi-rx1.dts @@ -0,0 +1,186 @@ +/dts-v1/; +/plugin/; + +#include +#include + +/ { + metadata { + title ="Enable Radxa Camera 8MP on the MIPI-RX1 connector"; + compatible = "radxa,rock-5d"; + category = "camera"; + exclusive = "csi2_dcphy1"; + description = "Enable Radxa Camera 8MP on the MIPI-RX1 connector."; + }; +}; + +&{/} { + camera0_pwdn_gpio: camera0-pwdn-gpio { + compatible = "regulator-fixed"; + regulator-name = "camera0_pwdn_gpio"; + regulator-always-on; + regulator-boot-on; + enable-active-high; + gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&cam0_pwdn_gpio>; + }; + + clk_cam0_24m: external-camera-clock-24m { + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "clk_cam0_24m"; + #clock-cells = <0>; + }; +}; + +&i2c6 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c6m0_xfer>; + + camera0_imx219: camera0-imx219@10 { + compatible = "sony,imx219"; + reg = <0x10>; + + clocks = <&clk_cam0_24m>; + clock-names = "xvclk"; + + rockchip,camera-module-index = <1>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "RADXA-CAMERA-8M"; + rockchip,camera-module-lens-name = "default"; + + port { + imx219_out0: endpoint { + remote-endpoint = <&mipidcphy0_in_ucam0>; + data-lanes = <1 2>; + }; + }; + }; +}; + +&mipi_dcphy1 { + status = "okay"; +}; + +&csi2_dcphy1 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipidcphy0_in_ucam0: endpoint@2 { + reg = <2>; + remote-endpoint = <&imx219_out0>; + data-lanes = <1 2>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + csidcphy0_out: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi0_csi2_input>; + }; + }; + }; +}; + +&mipi1_csi2 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipi0_csi2_input: endpoint@1 { + reg = <1>; + remote-endpoint = <&csidcphy0_out>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + mipi0_csi2_output: endpoint@0 { + reg = <0>; + remote-endpoint = <&cif_mipi0_in0>; + }; + }; + }; +}; + +&rkcif { + status = "okay"; +}; + +&rkcif_mipi_lvds1 { + status = "okay"; + + port { + cif_mipi0_in0: endpoint { + remote-endpoint = <&mipi0_csi2_output>; + }; + }; +}; + +&rkcif_mipi_lvds1_sditf { + status = "okay"; + + port { + mipi_lvds_sditf: endpoint { + remote-endpoint = <&isp1_vir0>; + }; + }; +}; + +&rkcif_mmu { + status = "okay"; +}; + +&isp1_mmu { + status = "okay"; +}; + +&rkisp1 { + status = "okay"; +}; + +&rkisp1_vir0 { + status = "okay"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + isp1_vir0: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi_lvds_sditf>; + }; + }; +}; + +&pinctrl { + camera { + cam0_pwdn_gpio: cam0-pwdn-gpio { + rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v1p3-mipi-rx0.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v1p3-mipi-rx0.dts new file mode 100644 index 00000000..08dba06e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v1p3-mipi-rx0.dts @@ -0,0 +1,165 @@ +/dts-v1/; +/plugin/; + +#include +#include + +/ { + metadata { + title ="Enable Raspberry Pi Camera v1.3 on the MIPI-RX0 connector"; + compatible = "radxa,rock-5d"; + category = "camera"; + exclusive = "csi2_dcphy0"; + description = "Enable Raspberry Pi Camera v1.3 on the MIPI-RX0 connector."; + }; +}; + +&{/} { + clk_cam0_25m: external-camera-clock-25m { + compatible = "fixed-clock"; + clock-frequency = <25000000>; + clock-output-names = "clk_cam0_25m"; + #clock-cells = <0>; + }; +}; + +&i2c2 { + status = "okay"; + + ov5647: ov5647@36 { + status = "okay"; + compatible = "ovti,ov5647"; + reg = <0x36>; + clocks = <&clk_cam0_25m>; + pwdn-gpios = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>; + clock-names = "ext_cam_clk"; + rockchip,camera-module-index = <1>; + rockchip,camera-module-facing = "front"; + rockchip,camera-module-name = "rpi-camera-v1p3"; + rockchip,camera-module-lens-name = "default"; + + port { + ov5647_out0: endpoint { + remote-endpoint = <&mipidcphy0_in_ucam0>; + data-lanes = <1 2>; + }; + }; + }; +}; + +&mipi_dcphy0 { + status = "okay"; +}; + +&csi2_dcphy0 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipidcphy0_in_ucam0: endpoint@2 { + reg = <2>; + remote-endpoint = <&ov5647_out0>; + data-lanes = <1 2>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + csidcphy0_out: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi0_csi2_input>; + }; + }; + }; +}; + +&mipi0_csi2 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipi0_csi2_input: endpoint@1 { + reg = <1>; + remote-endpoint = <&csidcphy0_out>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + mipi0_csi2_output: endpoint@0 { + reg = <0>; + remote-endpoint = <&cif_mipi0_in0>; + }; + }; + }; +}; + +&rkcif { + status = "okay"; +}; + +&rkcif_mipi_lvds { + status = "okay"; + + port { + cif_mipi0_in0: endpoint { + remote-endpoint = <&mipi0_csi2_output>; + }; + }; +}; + +&rkcif_mipi_lvds_sditf { + status = "okay"; + + port { + mipi_lvds_sditf: endpoint { + remote-endpoint = <&isp1_vir0>; + }; + }; +}; + +&rkcif_mmu { + status = "okay"; +}; + +&isp1_mmu { + status = "okay"; +}; + +&rkisp1 { + status = "okay"; +}; + +&rkisp1_vir0 { + status = "okay"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + isp1_vir0: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi_lvds_sditf>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v1p3-mipi-rx1.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v1p3-mipi-rx1.dts new file mode 100644 index 00000000..649e8773 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v1p3-mipi-rx1.dts @@ -0,0 +1,167 @@ +/dts-v1/; +/plugin/; + +#include +#include + +/ { + metadata { + title ="Enable Raspberry Pi Camera v1.3 on the MIPI-RX1 connector"; + compatible = "radxa,rock-5d"; + category = "camera"; + exclusive = "csi2_dcphy1"; + description = "Enable Raspberry Pi Camera v1.3 on the MIPI-RX1 connector."; + }; +}; + +&{/} { + clk_cam1_25m: external-camera-clock-25m { + compatible = "fixed-clock"; + clock-frequency = <25000000>; + clock-output-names = "clk_cam1_25m"; + #clock-cells = <0>; + }; +}; + +&i2c6 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c6m0_xfer>; + + ov5647: ov5647@36 { + status = "okay"; + compatible = "ovti,ov5647"; + reg = <0x36>; + clocks = <&clk_cam1_25m>; + pwdn-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_LOW>; + clock-names = "ext_cam_clk"; + rockchip,camera-module-index = <1>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "rpi-camera-v1p3"; + rockchip,camera-module-lens-name = "default"; + + port { + ov5647_out1: endpoint { + remote-endpoint = <&mipidcphy0_in_ucam1>; + data-lanes = <1 2>; + }; + }; + }; +}; + +&mipi_dcphy1 { + status = "okay"; +}; + +&csi2_dcphy1 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipidcphy0_in_ucam1: endpoint@2 { + reg = <2>; + remote-endpoint = <&ov5647_out1>; + data-lanes = <1 2>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + csidcphy0_out: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi0_csi2_input>; + }; + }; + }; +}; + +&mipi1_csi2 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipi0_csi2_input: endpoint@1 { + reg = <1>; + remote-endpoint = <&csidcphy0_out>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + mipi0_csi2_output: endpoint@0 { + reg = <0>; + remote-endpoint = <&cif_mipi0_in0>; + }; + }; + }; +}; + +&rkcif { + status = "okay"; +}; + +&rkcif_mipi_lvds1 { + status = "okay"; + + port { + cif_mipi0_in0: endpoint { + remote-endpoint = <&mipi0_csi2_output>; + }; + }; +}; + +&rkcif_mipi_lvds1_sditf { + status = "okay"; + + port { + mipi_lvds_sditf: endpoint { + remote-endpoint = <&isp1_vir0>; + }; + }; +}; + +&rkcif_mmu { + status = "okay"; +}; + +&isp1_mmu { + status = "okay"; +}; + +&rkisp1 { + status = "okay"; +}; + +&rkisp1_vir0 { + status = "okay"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + isp1_vir0: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi_lvds_sditf>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v1p3.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v1p3.dts new file mode 100644 index 00000000..aa7a796f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v1p3.dts @@ -0,0 +1,12 @@ +#include "rock-5a-rpi-camera-v1_3.dts" + +/ { + metadata { + title ="Enable Raspberry Pi Camera v1.3 on the Camera connector"; + compatible = "radxa,rock-5d"; + description = "Enable Raspberry Pi Camera v1.3 on the Camera connector. +The Camera connector is located on the bottom of the board. +This is not the top MIPI-RX* connectors. +"; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v2-mipi-rx0.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v2-mipi-rx0.dts new file mode 100644 index 00000000..0b72cc68 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v2-mipi-rx0.dts @@ -0,0 +1,184 @@ +/dts-v1/; +/plugin/; + +#include +#include + +/ { + metadata { + title ="Enable Raspberry Pi Camera v2 on the MIPI-RX0 connector"; + compatible = "radxa,rock-5d"; + category = "camera"; + exclusive = "csi2_dcphy0"; + description = "Enable Raspberry Pi Camera v2 on the MIPI-RX0 connector."; + }; +}; + +&{/} { + camera0_pwdn_gpio: camera0-pwdn-gpio { + compatible = "regulator-fixed"; + regulator-name = "camera0_pwdn_gpio"; + regulator-always-on; + regulator-boot-on; + enable-active-high; + gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&cam0_pwdn_gpio>; + }; + + clk_cam0_24m: external-camera-clock-24m { + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "clk_cam0_24m"; + #clock-cells = <0>; + }; +}; + +&i2c2 { + status = "okay"; + + camera0_imx219: camera0-imx219@10 { + compatible = "sony,imx219"; + reg = <0x10>; + + clocks = <&clk_cam0_24m>; + clock-names = "xvclk"; + + rockchip,camera-module-index = <1>; + rockchip,camera-module-facing = "front"; + rockchip,camera-module-name = "rpi-camera-v2"; + rockchip,camera-module-lens-name = "default"; + + port { + imx219_out0: endpoint { + remote-endpoint = <&mipidcphy0_in_ucam0>; + data-lanes = <1 2>; + }; + }; + }; +}; + +&mipi_dcphy0 { + status = "okay"; +}; + +&csi2_dcphy0 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipidcphy0_in_ucam0: endpoint@2 { + reg = <2>; + remote-endpoint = <&imx219_out0>; + data-lanes = <1 2>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + csidcphy0_out: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi0_csi2_input>; + }; + }; + }; +}; + +&mipi0_csi2 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipi0_csi2_input: endpoint@1 { + reg = <1>; + remote-endpoint = <&csidcphy0_out>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + mipi0_csi2_output: endpoint@0 { + reg = <0>; + remote-endpoint = <&cif_mipi0_in0>; + }; + }; + }; +}; + +&rkcif { + status = "okay"; +}; + +&rkcif_mipi_lvds { + status = "okay"; + + port { + cif_mipi0_in0: endpoint { + remote-endpoint = <&mipi0_csi2_output>; + }; + }; +}; + +&rkcif_mipi_lvds_sditf { + status = "okay"; + + port { + mipi_lvds_sditf: endpoint { + remote-endpoint = <&isp1_vir0>; + }; + }; +}; + +&rkcif_mmu { + status = "okay"; +}; + +&isp1_mmu { + status = "okay"; +}; + +&rkisp1 { + status = "okay"; +}; + +&rkisp1_vir0 { + status = "okay"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + isp1_vir0: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi_lvds_sditf>; + }; + }; +}; + +&pinctrl { + camera { + cam0_pwdn_gpio: cam0-pwdn-gpio { + rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v2-mipi-rx1.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v2-mipi-rx1.dts new file mode 100644 index 00000000..6fecf7a6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v2-mipi-rx1.dts @@ -0,0 +1,186 @@ +/dts-v1/; +/plugin/; + +#include +#include + +/ { + metadata { + title ="Enable Raspberry Pi Camera v2 on the MIPI-RX1 connector"; + compatible = "radxa,rock-5d"; + category = "camera"; + exclusive = "csi2_dcphy1"; + description = "Enable Raspberry Pi Camera v2 on the MIPI-RX1 connector."; + }; +}; + +&{/} { + camera0_pwdn_gpio: camera0-pwdn-gpio { + compatible = "regulator-fixed"; + regulator-name = "camera0_pwdn_gpio"; + regulator-always-on; + regulator-boot-on; + enable-active-high; + gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&cam0_pwdn_gpio>; + }; + + clk_cam0_24m: external-camera-clock-24m { + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "clk_cam0_24m"; + #clock-cells = <0>; + }; +}; + +&i2c6 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c6m0_xfer>; + + camera0_imx219: camera0-imx219@10 { + compatible = "sony,imx219"; + reg = <0x10>; + + clocks = <&clk_cam0_24m>; + clock-names = "xvclk"; + + rockchip,camera-module-index = <1>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "rpi-camera-v2"; + rockchip,camera-module-lens-name = "default"; + + port { + imx219_out0: endpoint { + remote-endpoint = <&mipidcphy0_in_ucam0>; + data-lanes = <1 2>; + }; + }; + }; +}; + +&mipi_dcphy1 { + status = "okay"; +}; + +&csi2_dcphy1 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipidcphy0_in_ucam0: endpoint@2 { + reg = <2>; + remote-endpoint = <&imx219_out0>; + data-lanes = <1 2>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + csidcphy0_out: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi0_csi2_input>; + }; + }; + }; +}; + +&mipi1_csi2 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipi0_csi2_input: endpoint@1 { + reg = <1>; + remote-endpoint = <&csidcphy0_out>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + mipi0_csi2_output: endpoint@0 { + reg = <0>; + remote-endpoint = <&cif_mipi0_in0>; + }; + }; + }; +}; + +&rkcif { + status = "okay"; +}; + +&rkcif_mipi_lvds1 { + status = "okay"; + + port { + cif_mipi0_in0: endpoint { + remote-endpoint = <&mipi0_csi2_output>; + }; + }; +}; + +&rkcif_mipi_lvds1_sditf { + status = "okay"; + + port { + mipi_lvds_sditf: endpoint { + remote-endpoint = <&isp1_vir0>; + }; + }; +}; + +&rkcif_mmu { + status = "okay"; +}; + +&isp1_mmu { + status = "okay"; +}; + +&rkisp1 { + status = "okay"; +}; + +&rkisp1_vir0 { + status = "okay"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + isp1_vir0: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi_lvds_sditf>; + }; + }; +}; + +&pinctrl { + camera { + cam0_pwdn_gpio: cam0-pwdn-gpio { + rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v2.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v2.dts new file mode 100644 index 00000000..96617c39 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5d-rpi-camera-v2.dts @@ -0,0 +1,12 @@ +#include "rock-5a-rpi-camera-v2.dts" + +/ { + metadata { + title ="Enable Raspberry Pi Camera v2 on the Camera connector"; + compatible = "radxa,rock-5d"; + description = "Enable Raspberry Pi Camera v2 on the Camera connector. +The Camera connector is located on the bottom of the board. +This is not the top MIPI-RX* connectors. +"; + }; +};