diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-dwc3-host.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-dwc3-host.dts index 135d53b8..02c5b395 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-dwc3-host.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-dwc3-host.dts @@ -4,7 +4,7 @@ / { metadata { title = "Set OTG port to Host mode"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; exclusive = "usbdrd_dwc3-dr_mode"; description = "Set OTG port to Host mode. diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-dwc3-otg.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-dwc3-otg.dts index 3e26fbb1..9d4af6ca 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-dwc3-otg.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-dwc3-otg.dts @@ -5,7 +5,7 @@ / { metadata { title = "Set OTG port to be controlled by hardware switch"; - compatible = "unknown"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; exclusive = "usbdrd_dwc3-dr_mode"; description = "Set OTG port to be controlled by hardware switch."; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-dwc3-peripheral.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-dwc3-peripheral.dts index aeb1638b..7223544c 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-dwc3-peripheral.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-dwc3-peripheral.dts @@ -4,7 +4,7 @@ / { metadata { title = "Set OTG port to Peripheral mode"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; exclusive = "usbdrd_dwc3-dr_mode"; description = "Set OTG port to Peripheral mode. diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-enable-tve.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-enable-tve.dts index 5dd46b5e..42adafa5 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-enable-tve.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-enable-tve.dts @@ -4,7 +4,7 @@ / { metadata { title = "Enable analog video output"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; exclusive = "tve"; description = "Enable analog video output. diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart2m1.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart2m1.dts index 1ba5678b..6c5b3594 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart2m1.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart2m1.dts @@ -4,11 +4,13 @@ / { metadata { title = "Enable FIQ Debugger on UART2-M1"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; - exclusive = "GPIO1_B0", "GPIO1_B1"; + exclusive = "GPIO1_B1", "GPIO1_B0"; description = "Enable FIQ Debugger on UART2-M1. -On Radxa 2A this is RX pin 31 and TX pin 33."; +On Radxa ROCK 2A this is TX pin 33 & RX pin 31. +On Radxa ROCK 2F this is TX pin 33 & RX pin 31. +"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart3m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart3m0.dts index 4a5bb11a..bb38cb14 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart3m0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart3m0.dts @@ -4,11 +4,13 @@ / { metadata { title = "Enable FIQ Debugger on UART3-M0"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; - exclusive = "GPIO4_B0", "GPIO4_B1"; + exclusive = "GPIO4_B1", "GPIO4_B0"; description = "Enable FIQ Debugger on UART3-M0. -On Radxa 2A this is RX pin 16 and TX pin 18."; +On Radxa ROCK 2A this is TX pin 18 & RX pin 16. +On Radxa ROCK 2F this is TX pin 18 & RX pin 16. +"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart3m1.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart3m1.dts index 978d8801..89f640df 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart3m1.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart3m1.dts @@ -4,11 +4,13 @@ / { metadata { title = "Enable FIQ Debugger on UART3-M1"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; - exclusive = "GPIO4_B7", "GPIO4_C0"; + exclusive = "GPIO4_C0", "GPIO4_B7"; description = "Enable FIQ Debugger on UART3-M1. -On Radxa 2A this is RX pin 11 and TX pin 13."; +On Radxa ROCK 2A this is TX pin 13 & RX pin 11. +On Radxa ROCK 2F this is TX pin 13 & RX pin 11. +"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-i2c0-m1.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-i2c0-m1.dts index bd06bf57..59d7939b 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-i2c0-m1.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-i2c0-m1.dts @@ -5,11 +5,13 @@ / { metadata { title = "Enable I2C0-M1"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; exclusive = "GPIO4_A0", "GPIO4_A1", "i2c0"; description = "Enable I2C0-M1. -On Radxa 2A this is SDA pin 3 and SCL pin 5."; +On Radxa 2A this is SDA pin 3 and SCL pin 5. +On Radxa 2A this is SDA pin 3 and SCL pin 5. +"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-i2c1-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-i2c1-m0.dts index a75bed75..dc116e91 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-i2c1-m0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-i2c1-m0.dts @@ -5,11 +5,13 @@ / { metadata { title = "Enable I2C1-M0"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; exclusive = "GPIO4_A2", "GPIO4_A3", "i2c1"; description = "Enable I2C1-M0. -On Radxa 2A this is SDA pin 27 and SCL pin 28."; +On Radxa 2A this is SDA pin 27 and SCL pin 28. +On Radxa 2A this is SDA pin 27 and SCL pin 28. +"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm0-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm0-m0.dts index fd37da52..db119ca7 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm0-m0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm0-m0.dts @@ -4,11 +4,13 @@ / { metadata { title = "Enable PWM0-M0"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; exclusive = "GPIO4_C3"; description = "Enable PWM0-M0. -On Radxa ROCK 2A this is pin 32."; +On Radxa ROCK 2A this is pin 32. +On Radxa ROCK 2F this is pin 32. +"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm3-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm3-m0.dts index 6d70bbe3..a0df52a2 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm3-m0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm3-m0.dts @@ -4,11 +4,13 @@ / { metadata { title = "Enable PWM3-M0"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; exclusive = "GPIO4_C6"; description = "Enable PWM3-M0. -On Radxa ROCK 2A this is pin 15."; +On Radxa ROCK 2A this is pin 15. +On Radxa ROCK 2F this is pin 15. +"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm4-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm4-m0.dts index 96ed2e1f..7908334f 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm4-m0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm4-m0.dts @@ -4,11 +4,13 @@ / { metadata { title = "Enable PWM4-M0"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; exclusive = "GPIO4_B7"; - description = "Enable PWM5-M0. -On Radxa ROCK 2A this is pin 11."; + description = "Enable PWM4-M0. +On Radxa ROCK 2A this is pin 11. +On Radxa ROCK 2F this is pin 11. +"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm5-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm5-m0.dts index 6d67812c..b5f0c192 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm5-m0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm5-m0.dts @@ -4,11 +4,13 @@ / { metadata { title = "Enable PWM5-M0"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; exclusive = "GPIO4_C0"; description = "Enable PWM5-M0. -On Radxa ROCK 2A this is pin 13."; +On Radxa ROCK 2A this is pin 13. +On Radxa ROCK 2F this is pin 13. +"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm6-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm6-m0.dts index ff34397c..90bf574a 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm6-m0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm6-m0.dts @@ -4,11 +4,13 @@ / { metadata { title = "Enable PWM6-M0"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; - exclusive = "GPIO4_C3"; - description = "Enable PWM0-M0. -On Radxa ROCK 2A this is pin 26."; + exclusive = "GPIO4_C1"; + description = "Enable PWM6-M0. +On Radxa ROCK 2A this is pin 26. +On Radxa ROCK 2F this is pin 26. +"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-spi0-cs1-enc28j60.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-spi0-cs1-enc28j60.dts index 905e049e..0204cf3b 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-spi0-cs1-enc28j60.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-spi0-cs1-enc28j60.dts @@ -8,7 +8,7 @@ / { metadata { title = "Enable ENC28J60 on SPI0 CS1"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; exclusive = "GPIO4_B2", "GPIO4_B3", "GPIO4_B4", "GPIO4_C1", "GPIO4_C6"; description = "Enable Microchip ENC28J60 SPI Ethernet controller on SPI0 CS1. diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-spi0-cs1-mcp2515.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-spi0-cs1-mcp2515.dts index 2e43caa0..22e34e77 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-spi0-cs1-mcp2515.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-spi0-cs1-mcp2515.dts @@ -9,7 +9,7 @@ metadata { title = "Enable MCP2515 on SPI0 CS1"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; exclusive = "GPIO4_B2", "GPIO4_B3", "GPIO4_B4", "GPIO4_C1", "GPIO4_C6"; description = "Enable MCP2515 on SPI0 CS1 with 12 MHz Crystal Oscillator. diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-spi0-cs1-spidev.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-spi0-cs1-spidev.dts index 3eb022a9..3e1d6b93 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-spi0-cs1-spidev.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-spi0-cs1-spidev.dts @@ -6,7 +6,7 @@ / { metadata { title = "Enable spidev on SPI0 over CS1"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; exclusive = "GPIO4_B2", "GPIO4_B3", "GPIO4_B4", "GPIO4_C1"; description = "Enable spidev on SPI0 over CS1."; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart0-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart0-m0.dts index fd247608..67124ee4 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart0-m0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart0-m0.dts @@ -4,11 +4,13 @@ / { metadata { title = "Enable UART0-M0"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; - exclusive = "GPIO4_C7", "GPIO4_D0"; + exclusive = "GPIO4_D0", "GPIO4_C7"; description = "Enable UART0-M0. -On Radxa ROCK 2A this is RX pin 10 & TX pin 8."; +On Radxa ROCK 2A this is TX pin 8 & RX pin 10. +On Radxa ROCK 2F this is TX pin 8 & RX pin 10. +"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart2-m1.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart2-m1.dts index e83b6a71..32f0697a 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart2-m1.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart2-m1.dts @@ -4,11 +4,13 @@ / { metadata { title = "Enable UART2-M1"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; - exclusive = "GPIO1_B0", "GPIO1_B1"; + exclusive = "GPIO1_B1", "GPIO1_B0"; description = "Enable UART2-M1. -On Radxa ROCK 2A this is RX pin 31 & TX pin 33."; +On Radxa ROCK 2A this is TX pin 33 & RX pin 31. +On Radxa ROCK 2F this is TX pin 33 & RX pin 31. +"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart3-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart3-m0.dts index 843034e1..727f7e4a 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart3-m0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart3-m0.dts @@ -4,11 +4,13 @@ / { metadata { title = "Enable UART3-M0"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; - exclusive = "GPIO4_B0", "GPIO4_B1"; + exclusive = "GPIO4_B1", "GPIO4_B0"; description = "Enable UART3-M0. -On Radxa ROCK 2A this is RX pin 16 & TX pin 18."; +On Radxa ROCK 2A this is TX pin 18 & RX pin 16. +On Radxa ROCK 2F this is TX pin 18 & RX pin 16. +"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart3-m1.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart3-m1.dts index 2c7d1430..d50faf20 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart3-m1.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart3-m1.dts @@ -4,11 +4,13 @@ / { metadata { title = "Enable UART3-M1"; - compatible = "radxa,rock-2a"; + compatible = "radxa,rock-2a", "radxa,rock-2f"; category = "misc"; - exclusive = "GPIO4_B7", "GPIO4_C0"; + exclusive = "GPIO4_C0", "GPIO4_B7"; description = "Enable UART3-M1. -On Radxa ROCK 2A this is RX pin 11 & TX pin 13."; +On Radxa ROCK 2A this is TX pin 13 & RX pin 11. +On Radxa ROCK 2F this is TX pin 13 & RX pin 11. +"; }; };