Skip to content

Commit

Permalink
fix: add missing exclusives
Browse files Browse the repository at this point in the history 
Signed-off-by: ZHANG Yuntian <[email protected]>
  • Loading branch information
@RadxaYuntian
RadxaYuntian committed Dec 14, 2024
1 parent 975c14e commit 11900d1
Show file tree
Hide file tree
Showing 24 changed files with 62 additions and 23 deletions.
39 changes: 39 additions & 0 deletions arch/arm64/boot/dts/rockchip/overlays/rk3568-gpio-ir.dts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/dts-v1/;
/plugin/;

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/rockchip.h>

/ {
metadata {
title = "Enable IR receiver on GPIO3_A3";
compatible = "rockchip,rk3566", "rockchip,rk3568";
category = "misc";
exclusive = "GPIO3_A3";
description = "Enable IR receiver on GPIO3_A3.";
};
};

&{/} {
gpio_ir: gpio-ir {
compatible = "gpio-ir-receiver";
pinctrl-names = "default";
pinctrl-0 = <&gpio_ir_pins>;

// pin number, high or low
gpios = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>;

// parameter for keymap name
linux,rc-map-name = "rc-rc6-mce";

status = "okay";
};
};

&pinctrl {
gpio-ir {
gpio_ir_pins: gpio-ir-pins {
rockchip,pins = <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-i2c5-m1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable I2C5-M1";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO1_D5", "GPIO1_D4";
exclusive = "GPIO1_D5", "GPIO1_D4", "i2c5";
description = "Enable I2C5-M1.
On Radxa CM4-RPI-CM4-IO this is SDA pin 11 and SCL pin 12.
";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-i2c6-m3.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable I2C6-M3";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO4_C7", "GPIO4_C6";
exclusive = "GPIO4_C7", "GPIO4_C6", "i2c6";
description = "Enable I2C6-M3.
On Radxa CM4-RPI-CM4-IO this is SDA pin 27 and SCL pin 28.
";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-i2c8-m1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable I2C8-M1";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO1_C7", "GPIO1_C6";
exclusive = "GPIO1_C7", "GPIO1_C6", "i2c8";
description = "Enable I2C8-M1.
On Radxa CM4-RPI-CM4-IO this is SDA pin 3 and SCL pin 5.
";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-i2c8-m2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable I2C8-M2";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO2_B7", "GPIO2_B6";
exclusive = "GPIO2_B7", "GPIO2_B6", "i2c8";
description = "Enable I2C8-M2.
On Radxa CM4-RPI-CM4-IO this is SDA pin 18 and SCL pin 16.
";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-i2c9-m1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable I2C9-M1";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO1_B4", "GPIO1_B5";
exclusive = "GPIO1_B4", "GPIO1_B5", "i2c9";
description = "Enable I2C9-M1.
On Radxa CM4-RPI-CM4-IO this is SDA pin 23 and SCL pin 19.
";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-pwm0-ch0-m1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable PWM0-CH0-M1";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO1_C0";
exclusive = "GPIO1_C0", "pwm0_2ch_0";
description = "Enable PWM0-CH0-M1.
On Radxa CM4-RPI-CM4-IO this is pin 26.";
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-pwm1-ch0-m1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable PWM1-CH0-M1";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO1_B4";
exclusive = "GPIO1_B4", "pwm1_6ch_0";
description = "Enable PWM1-CH0-M1.
On Radxa CM4-RPI-CM4-IO this is pin 23.";
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-pwm1-ch0-m2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable PWM1-CH0-M2";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO2_C0";
exclusive = "GPIO2_C0", "pwm1_6ch_0";
description = "Enable PWM1-CH0-M2.
On Radxa CM4-RPI-CM4-IO this is pin 33.";
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-pwm1-ch1-m1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable PWM1-CH1-M1";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO1_B5";
exclusive = "GPIO1_B5", "pwm1_6ch_1";
description = "Enable PWM1-CH1-M1.
On Radxa CM4-RPI-CM4-IO this is pin 19.";
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-pwm1-ch2-m1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable PWM1-CH2-M1";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO1_C2";
exclusive = "GPIO1_C2", "pwm1_6ch_1";
description = "Enable PWM1-CH2-M1.
On Radxa CM4-RPI-CM4-IO this is pin 32.";
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-pwm1-ch3-m1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable PWM1-CH3-M1";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO1_D2";
exclusive = "GPIO1_D2", "pwm1_6ch_3";
description = "Enable PWM1-CH3-M1.
On Radxa CM4-RPI-CM4-IO this is pin 36.";
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-pwm1-ch4-m1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable PWM1-CH4-M1";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO1_D3";
exclusive = "GPIO1_D3", "pwm1_6ch_4";
description = "Enable PWM1-CH4-M1.
On Radxa CM4-RPI-CM4-IO this is pin 38.";
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-pwm2-ch2-m1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable PWM2-CH2-M1";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO4_C6";
exclusive = "GPIO4_C6", "pwm2_8ch_2";
description = "Enable PWM2-CH2-M1.
On Radxa CM4-RPI-CM4-IO this is pin 28.";
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-pwm2-ch3-m1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable PWM2-CH3-M1";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO4_C7";
exclusive = "GPIO4_C7", "pwm2_8ch_3";
description = "Enable PWM2-CH3-M1.
On Radxa CM4-RPI-CM4-IO this is pin 27.";
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-pwm2-ch7-m2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable PWM2-CH7-M2";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO2_D7";
exclusive = "GPIO2_D7", "pwm2_8ch_7";
description = "Enable PWM2-CH7-M2.
On Radxa CM4-RPI-CM4-IO this is pin 22.";
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-spi1-m0-cs0-spidev.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable spidev on SPI1-M0 over CS0";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO1_B7", "GPIO1_B4", "GPIO1_B5", "GPIO1_B6";
exclusive = "GPIO1_B7", "GPIO1_B4", "GPIO1_B5", "GPIO1_B6", "spi1";
description = "Enable spidev on SPI1-M0 over CS0.";
};
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-spi1-m0-cs1-spidev.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable spidev on SPI1-M0 over CS1";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO1_C0", "GPIO1_B4", "GPIO1_B5", "GPIO1_B6";
exclusive = "GPIO1_C0", "GPIO1_B4", "GPIO1_B5", "GPIO1_B6", "spi1";
description = "Enable spidev on SPI1-M0 over CS1.";
};
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-spi2-m1-cs0-spidev.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable spidev on SPI2-M1 over CS0";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO1_C3", "GPIO1_D5", "GPIO1_C4", "GPIO1_C5";
exclusive = "GPIO1_C3", "GPIO1_D5", "GPIO1_C4", "GPIO1_C5", "spi2";
description = "Enable spidev on SPI2-M1 over CS0.";
};
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-spi2-m1-cs1-spidev.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable spidev on SPI2-M1 over CS1";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO1_C2", "GPIO1_D5", "GPIO1_C4", "GPIO1_C5";
exclusive = "GPIO1_C2", "GPIO1_D5", "GPIO1_C4", "GPIO1_C5", "spi2";
description = "Enable spidev on SPI2-M1 over CS0.";
};
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-uart2-m0.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable UART2-M0";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO1_C7", "GPIO1_C6";
exclusive = "GPIO1_C7", "GPIO1_C6", "uart2";
description = "Enable UART2-M0.
On Radxa CM4 RPI CM4 IO this is TX pin 5 & RX pin 3.
";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-uart3-m2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable UART3-M2";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO1_C0", "GPIO1_C1";
exclusive = "GPIO1_C0", "GPIO1_C1", "uart3";
description = "Enable UART3-M2.
On Radxa CM4 RPI CM4 IO this is TX pin 26 & RX pin 31.
";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-uart4-m1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable UART4-M1";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO1_C4", "GPIO1_C5";
exclusive = "GPIO1_C4", "GPIO1_C5", "uart4";
description = "Enable UART4-M1.
On Radxa CM4 RPI CM4 IO this is TX pin 13 & RX pin 15.
";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/rockchip/overlays/rk3576-uart7-m0.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
title = "Enable UART7-M0";
compatible = "radxa,cm4-rpi-cm4-io";
category = "misc";
exclusive = "GPIO2_B6", "GPIO2_B7";
exclusive = "GPIO2_B6", "GPIO2_B7", "uart7";
description = "Enable UART7-M0.
On Radxa CM4 RPI CM4 IO this is TX pin 16 & RX pin 18.
";
Expand Down

0 comments on commit 11900d1

Please sign in to comment.