Merge pull request #283 from lsj123lsjlsj/main

RadxaYuntian · web-flow · commit 531d034da4bc · 2024-04-03T03:45:24.000Z
rock 2a: add more support and fix problems on some overlays
diff --git a/arch/arm64/boot/dts/rockchip/overlays/Makefile b/arch/arm64/boot/dts/rockchip/overlays/Makefile
@@ -107,17 +107,23 @@ dtb-$(CONFIG_CPU_RK3399) += \
 dtb-$(CONFIG_CLK_RK3528) += \
 	rk3528-dwc3-otg.dtbo \
 	rk3528-fiq-debugger-uart1m0.dtbo \
+	rk3528-fiq-debugger-uart2m1.dtbo \
 	rk3528-fiq-debugger-uart3m0.dtbo \
 	rk3528-fiq-debugger-uart3m1.dtbo \
 	rk3528-fiq-debugger-uart7m0.dtbo \
+	rk3528-i2c0-m1.dtbo \
+	rk3528-i2c1-m0.dtbo \
 	rk3528-pwm0-m0.dtbo \
 	rk3528-pwm3-m0.dtbo \
 	rk3528-pwm4-m0.dtbo \
 	rk3528-pwm5-m0.dtbo \
+	rk3528-pwm6-m0.dtbo \
+	rk3528-spi0-cs1-enc28j60.dtbo \
 	rk3528-spi0-cs1-mcp2515.dtbo \
 	rk3528-spi0-cs1-spidev.dtbo \
 	rk3528-uart0-m0.dtbo \
 	rk3528-uart1-m0.dtbo \
+	rk3528-uart2-m1.dtbo \
 	rk3528-uart3-m0.dtbo \
 	rk3528-uart3-m1.dtbo \
 	rk3528-uart7-m0.dtbo
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart1m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart1m0.dts
@@ -4,7 +4,7 @@
 / {
 	metadata {
 		title = "Enable FIQ Debugger on UART1-M0";
-		compatible = "radxa,rock-2a";
+		compatible = "unknown";
 		category = "misc";
 		exclusive = "GPIO4_A7", "GPIO4_A6";
 		description = "Enable FIQ Debugger on UART1-M0.";
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
@@ -0,0 +1,25 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	metadata {
+		title = "Enable FIQ Debugger on UART2-M1";
+		compatible = "radxa,rock-2a";
+		category = "misc";
+		exclusive = "GPIO1_B0", "GPIO1_B1";
+		description = "Enable FIQ Debugger on UART2-M1.\nOn Radxa 2A this is RX pin 31 and TX pin 33.";
+	};
+};
+
+&{/} {
+	fiq-debugger {
+		status = "okay";
+		rockchip,serial-id = <2>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&uart2m1_xfer>;
+	};
+};
+
+&uart2 {
+	status = "disabled";
+};
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
@@ -7,7 +7,7 @@
 		compatible = "radxa,rock-2a";
 		category = "misc";
 		exclusive = "GPIO4_B0", "GPIO4_B1";
-		description = "Enable FIQ Debugger on UART3-M0.";
+		description = "Enable FIQ Debugger on UART3-M0.\nOn Radxa 2A this is RX pin 16 and TX pin 18.";
 	};
 };
 
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
@@ -7,7 +7,7 @@
 		compatible = "radxa,rock-2a";
 		category = "misc";
 		exclusive = "GPIO4_B7", "GPIO4_C0";
-		description = "Enable FIQ Debugger on UART3-M1.";
+		description = "Enable FIQ Debugger on UART3-M1.\nOn Radxa 2A this is RX pin 11 and TX pin 13.";
 	};
 };
 
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart7m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart7m0.dts
@@ -4,7 +4,7 @@
 / {
 	metadata {
 		title = "Enable FIQ Debugger on UART7-M0";
-		compatible = "radxa,rock-2a";
+		compatible = "unknown";
 		category = "misc";
 		exclusive = "GPIO3_B3", "GPIO3_B2";
 		description = "Enable FIQ Debugger on UART7-M0.";
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-i2c0-m1.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-i2c0-m1.dts
@@ -0,0 +1,19 @@
+/dts-v1/;
+/plugin/;
+#include <dt-bindings/pinctrl/rockchip.h>
+
+/ {
+	metadata {
+		title = "Enable I2C0-M1";
+		compatible = "radxa,rock-2a";
+		category = "misc";
+		exclusive = "GPIO4_A0", "GPIO4_A1", "i2c0";
+		description = "Enable I2C0-M1.\nOn Radxa 2A this is SDA pin 3 and SCL pin 5.";
+	};
+};
+
+&i2c0 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c0m1_xfer>;
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-i2c1-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-i2c1-m0.dts
@@ -0,0 +1,19 @@
+/dts-v1/;
+/plugin/;
+#include <dt-bindings/pinctrl/rockchip.h>
+
+/ {
+	metadata {
+		title = "Enable I2C1-M0";
+		compatible = "radxa,rock-2a";
+		category = "misc";
+		exclusive = "GPIO4_A2", "GPIO4_A3", "i2c1";
+		description = "Enable I2C1-M0.\nOn Radxa 2A this is SDA pin 27 and SCL pin 28.";
+	};
+};
+
+&i2c1 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c1m0_xfer>;
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm0-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm0-m0.dts
@@ -12,7 +12,7 @@
 };
 
 &pwm0 {
-	status = "disabled";
+	status = "okay";
 	pinctrl-names = "active";
 	pinctrl-0 = <&pwm0m0_pins>;
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm3-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm3-m0.dts
@@ -12,7 +12,7 @@
 };
 
 &pwm3 {
-	status = "disabled";
+	status = "okay";
 	pinctrl-names = "active";
 	pinctrl-0 = <&pwm3m0_pins>;
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm4-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm4-m0.dts
@@ -12,7 +12,7 @@
 };
 
 &pwm4 {
-	status = "disabled";
+	status = "okay";
 	pinctrl-names = "active";
 	pinctrl-0 = <&pwm4m0_pins>;
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm5-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm5-m0.dts
@@ -12,7 +12,7 @@
 };
 
 &pwm5 {
-	status = "disabled";
+	status = "okay";
 	pinctrl-names = "active";
 	pinctrl-0 = <&pwm5m0_pins>;
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm6-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm6-m0.dts
@@ -0,0 +1,18 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	metadata {
+		title = "Enable PWM6-M0";
+		compatible = "radxa,rock-2a";
+		category = "misc";
+		exclusive = "GPIO4_C3";
+		description = "Enable PWM0-M0.\nOn Radxa ROCK 2A this is pin 26.";
+	};
+};
+
+&pwm6 {
+	status = "okay";
+	pinctrl-names = "active";
+	pinctrl-0 = <&pwm6m0_pins>;
+};
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
@@ -0,0 +1,47 @@
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+	metadata {
+		title = "Enable ENC28J60 on SPI0 CS1";
+		compatible = "radxa,rock-2a";
+		category = "misc";
+		exclusive = "GPIO4_B2", "GPIO4_B3", "GPIO4_B4", "GPIO4_C1", "GPIO4_C6";
+		description = "Enable Microchip ENC28J60 SPI Ethernet controller on SPI0 CS1.\nINT=15";
+	};
+};
+
+&spi0 {
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	pinctrl-names = "default";
+	max-freq = <50000000>;
+	pinctrl-0 = <&spi0_csn1 &spi0_pins>;
+	num-cs = <2>;
+	cs-gpios = <&gpio4 RK_PC1 GPIO_ACTIVE_LOW>;
+
+	ethernet: enc28j60@0 {
+		compatible = "microchip,enc28j60";
+		reg = <1>;
+		spi-max-frequency = <20000000>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&enc28j60_int_pins>;
+
+		interrupt-parent = <&gpio4>;
+		interrupts = <RK_PC6 IRQ_TYPE_EDGE_FALLING>;
+	};
+};
+
+&pinctrl {
+	enc28j60 {
+		enc28j60_int_pins: enc28j60-int-pins {
+			rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+};
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
@@ -14,12 +14,6 @@
 		exclusive = "GPIO4_B2", "GPIO4_B3", "GPIO4_B4", "GPIO4_C1", "GPIO4_C6";
 		description = "Enable MCP2515 on SPI0 CS1 with 12 MHz Crystal Oscillator.\nINT=15";
 	};
-
-	can_mcp2515_osc: can-mcp2515-osc {
-		compatible = "fixed-clock";
-		clock-frequency = <12000000>;
-		#clock-cells = <0>;
-	};
 };
 
 &pinctrl {
@@ -30,6 +24,14 @@
 	};
 };
 
+&{/} {
+	can_mcp2515_osc: can-mcp2515-osc {
+		compatible = "fixed-clock";
+		clock-frequency = <12000000>;
+		#clock-cells = <0>;
+	};
+};
+
 &spi0 {
 	status = "okay";
 	max-freq = <10000000>;
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart1-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart1-m0.dts
@@ -4,10 +4,10 @@
 / {
 	metadata {
 		title = "Enable UART1-M0";
-		compatible = "radxa,rock-2a";
+		compatible = "unknown";
 		category = "misc";
 		exclusive = "GPIO4_A7", "GPIO4_A6";
-		description = "Enable UART1-M0.\nOn Radxa ROCK 2A this is RX pin 40 & TX pin 36.";
+		description = "Enable UART1-M0.";
 	};
 };
 
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart2-m1.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart2-m1.dts
@@ -0,0 +1,18 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	metadata {
+		title = "Enable UART2-M1";
+		compatible = "radxa,rock-2a";
+		category = "misc";
+		exclusive = "GPIO1_B0", "GPIO1_B1";
+		description = "Enable UART2-M1.\nOn Radxa ROCK 2A this is RX pin 31 & TX pin 33.";
+	};
+};
+
+&uart2 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart2m1_xfer>;
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart7-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart7-m0.dts
@@ -4,10 +4,10 @@
 / {
 	metadata {
 		title = "Enable UART7-M0";
-		compatible = "radxa,rock-2a";
+		compatible = "unknown";
 		category = "misc";
 		exclusive = "GPIO3_B3", "GPIO3_B2";
-		description = "Enable UART7-M0.\nOn Radxa ROCK 2A this is RX pin 27 & TX pin 28.";
+		description = "Enable UART7-M0.";
 	};
 };
 
