Merge pull request radxa-pkg#358 from nascs/cm3-gpio3_c6

Cm3 gpio3 c6
nascs · Aug 9, 2024 · 7e31890 · 7e31890
2 parents dda166b + 33c76a2
commit 7e31890
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3568-spi3-m0-cs0-mcp2515.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3568-spi3-m0-cs0-mcp2515.dts
@@ -11,16 +11,16 @@
 		title = "Enable MCP2515 on SPI3-M0 CS0";
 		compatible = "radxa,cm3-io", "radxa,cm3-rpi-cm4-io";
 		category = "misc";
-		exclusive = "GPIO4_B0", "GPIO4_B2", "GPIO4_B3", "GPIO4_A6", "GPIO3_C6";
+		exclusive = "GPIO4_B0", "GPIO4_B2", "GPIO4_B3", "GPIO4_A6", "GPIO4_C5";
 		description = "Enable MCP2515 on SPI3-M0 CS0 with 12 MHz Crystal Oscillator.
-INT=22";
+INT=26";
 	};
 };
 
 &pinctrl {
 	mcp2515_int_pin {
 		mcp2515_int_pin: mcp2515_int_pin {
-			rockchip,pins = <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <4 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
@@ -46,8 +46,8 @@ INT=22";
 		status = "okay";
 		compatible = "microchip,mcp2515";
 		reg = <0>;
-		interrupt-parent = <&gpio3>;
-		interrupts = <RK_PC6 IRQ_TYPE_EDGE_FALLING>;
+		interrupt-parent = <&gpio4>;
+		interrupts = <RK_PC5 IRQ_TYPE_EDGE_FALLING>;
 		spi-max-frequency = <10000000>;
 		clocks = <&can_mcp2515_osc>;
 		vdd-supply = <&vcc3v3_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3568-spi3-m0-cs0-waveshare35.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3568-spi3-m0-cs0-waveshare35.dts
@@ -4,7 +4,7 @@
 / {
 	metadata {
 		title = "Enable Waveshare 3.5inch RPi LCD (C) on SPI3";
-		compatible = "radxa,cm3-io", "radxa,cm3-rpi-cm4-io";
+		compatible = "radxa,cm3-rpi-cm4-io";
 		category = "misc";
 		exclusive = "GPIO4_B0", "GPIO4_B2", "GPIO4_B3", "GPIO4_A6", "GPIO3_C6", "GPIO3_D3", "GPIO0_C7";
 		description = "Enable Waveshare 3.5inch RPi LCD (C) on SPI3.";