Commit 13719d8d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'sparx5-next' of https://github.com/microchip-ung/linux-upstream into arm/dt 

* 'sparx5-next' of https://github.com/microchip-ung/linux-upstream:
  arm64: dts: sparx5: Add SGPIO devices
  arm64: dts: sparx5: Add reset support

Link: https://lore.kernel.org/r/87ft4dq2q8.fsf@microchip.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2bf39ddd 7e1f91cb

arch/arm64/boot/dts/microchip/sparx5.dtsi

+96 −0
Original line number Diff line number Diff line
@@ -135,6 +135,11 @@ 
			};

		};



		reset@611010008 {

			compatible = "microchip,sparx5-chip-reset";

			reg = <0x6 0x11010008 0x4>;

		};



		uart0: serial@600100000 {

			pinctrl-0 = <&uart_pins>;

			pinctrl-names = "default";
@@ -226,6 +231,22 @@ 
				function = "si2";

			};



			sgpio0_pins: sgpio-pins {

				pins = "GPIO_0", "GPIO_1", "GPIO_2", "GPIO_3";

				function = "sg0";

			};



			sgpio1_pins: sgpio1-pins {

				pins = "GPIO_4", "GPIO_5", "GPIO_12", "GPIO_13";

				function = "sg1";

			};



			sgpio2_pins: sgpio2-pins {

				pins = "GPIO_30", "GPIO_31", "GPIO_32",

				       "GPIO_33";

				function = "sg2";

			};



			uart_pins: uart-pins {

				pins = "GPIO_10", "GPIO_11";

				function = "uart";
@@ -256,6 +277,81 @@ 
			};

		};



		sgpio0: gpio@61101036c {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "microchip,sparx5-sgpio";

			status = "disabled";

			clocks = <&sys_clk>;

			pinctrl-0 = <&sgpio0_pins>;

			pinctrl-names = "default";

			reg = <0x6 0x1101036c 0x100>;

			sgpio_in0: gpio@0 {

				compatible = "microchip,sparx5-sgpio-bank";

				reg = <0>;

				gpio-controller;

				#gpio-cells = <3>;

				ngpios = <96>;

			};

			sgpio_out0: gpio@1 {

				compatible = "microchip,sparx5-sgpio-bank";

				reg = <1>;

				gpio-controller;

				#gpio-cells = <3>;

				ngpios = <96>;

			};

		};



		sgpio1: gpio@611010484 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "microchip,sparx5-sgpio";

			status = "disabled";

			clocks = <&sys_clk>;

			pinctrl-0 = <&sgpio1_pins>;

			pinctrl-names = "default";

			reg = <0x6 0x11010484 0x100>;

			sgpio_in1: gpio@0 {

				compatible = "microchip,sparx5-sgpio-bank";

				reg = <0>;

				gpio-controller;

				#gpio-cells = <3>;

				ngpios = <96>;

			};

			sgpio_out1: gpio@1 {

				compatible = "microchip,sparx5-sgpio-bank";

				reg = <1>;

				gpio-controller;

				#gpio-cells = <3>;

				ngpios = <96>;

			};

		};



		sgpio2: gpio@61101059c {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "microchip,sparx5-sgpio";

			status = "disabled";

			clocks = <&sys_clk>;

			pinctrl-0 = <&sgpio2_pins>;

			pinctrl-names = "default";

			reg = <0x6 0x1101059c 0x100>;

			sgpio_in2: gpio@0 {

				reg = <0>;

				compatible = "microchip,sparx5-sgpio-bank";

				gpio-controller;

				#gpio-cells = <3>;

				ngpios = <96>;

			};

			sgpio_out2: gpio@1 {

				compatible = "microchip,sparx5-sgpio-bank";

				reg = <1>;

				gpio-controller;

				#gpio-cells = <3>;

				ngpios = <96>;

			};

		};



		i2c0: i2c@600101000 {

			compatible = "snps,designware-i2c";

			status = "disabled";

arch/arm64/boot/dts/microchip/sparx5_pcb125.dts

+5 −0
Original line number Diff line number Diff line
@@ -69,6 +69,11 @@ 
	};

};



&sgpio0 {

	status = "okay";

	microchip,sgpio-port-ranges = <0 23>;

};



&i2c1 {

	status = "okay";

};

arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi

+258 −0
Original line number Diff line number Diff line
@@ -36,6 +36,264 @@ 
		gpios = <&gpio 37 GPIO_ACTIVE_LOW>;

		priority = <200>;

	};



	leds {

		compatible = "gpio-leds";

		led@0 {

			label = "twr0:green";

			gpios = <&sgpio_out0 8 0 GPIO_ACTIVE_LOW>;

		};

		led@1 {

			label = "twr0:yellow";

			gpios = <&sgpio_out0 8 1 GPIO_ACTIVE_LOW>;

		};

		led@2 {

			label = "twr1:green";

			gpios = <&sgpio_out0 9 0 GPIO_ACTIVE_LOW>;

		};

		led@3 {

			label = "twr1:yellow";

			gpios = <&sgpio_out0 9 1 GPIO_ACTIVE_LOW>;

		};

		led@4 {

			label = "twr2:green";

			gpios = <&sgpio_out0 10 0 GPIO_ACTIVE_LOW>;

		};

		led@5 {

			label = "twr2:yellow";

			gpios = <&sgpio_out0 10 1 GPIO_ACTIVE_LOW>;

		};

		led@6 {

			label = "twr3:green";

			gpios = <&sgpio_out0 11 0 GPIO_ACTIVE_LOW>;

		};

		led@7 {

			label = "twr3:yellow";

			gpios = <&sgpio_out0 11 1 GPIO_ACTIVE_LOW>;

		};

		led@8 {

			label = "eth12:green";

			gpios = <&sgpio_out0 12 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@9 {

			label = "eth12:yellow";

			gpios = <&sgpio_out0 12 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@10 {

			label = "eth13:green";

			gpios = <&sgpio_out0 13 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@11 {

			label = "eth13:yellow";

			gpios = <&sgpio_out0 13 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@12 {

			label = "eth14:green";

			gpios = <&sgpio_out0 14 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@13 {

			label = "eth14:yellow";

			gpios = <&sgpio_out0 14 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@14 {

			label = "eth15:green";

			gpios = <&sgpio_out0 15 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@15 {

			label = "eth15:yellow";

			gpios = <&sgpio_out0 15 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@16 {

			label = "eth48:green";

			gpios = <&sgpio_out1 16 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@17 {

			label = "eth48:yellow";

			gpios = <&sgpio_out1 16 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@18 {

			label = "eth49:green";

			gpios = <&sgpio_out1 17 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@19 {

			label = "eth49:yellow";

			gpios = <&sgpio_out1 17 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@20 {

			label = "eth50:green";

			gpios = <&sgpio_out1 18 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@21 {

			label = "eth50:yellow";

			gpios = <&sgpio_out1 18 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@22 {

			label = "eth51:green";

			gpios = <&sgpio_out1 19 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@23 {

			label = "eth51:yellow";

			gpios = <&sgpio_out1 19 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@24 {

			label = "eth52:green";

			gpios = <&sgpio_out1 20 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@25 {

			label = "eth52:yellow";

			gpios = <&sgpio_out1 20 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@26 {

			label = "eth53:green";

			gpios = <&sgpio_out1 21 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@27 {

			label = "eth53:yellow";

			gpios = <&sgpio_out1 21 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@28 {

			label = "eth54:green";

			gpios = <&sgpio_out1 22 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@29 {

			label = "eth54:yellow";

			gpios = <&sgpio_out1 22 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@30 {

			label = "eth55:green";

			gpios = <&sgpio_out1 23 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@31 {

			label = "eth55:yellow";

			gpios = <&sgpio_out1 23 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@32 {

			label = "eth56:green";

			gpios = <&sgpio_out1 24 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@33 {

			label = "eth56:yellow";

			gpios = <&sgpio_out1 24 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@34 {

			label = "eth57:green";

			gpios = <&sgpio_out1 25 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@35 {

			label = "eth57:yellow";

			gpios = <&sgpio_out1 25 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@36 {

			label = "eth58:green";

			gpios = <&sgpio_out1 26 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@37 {

			label = "eth58:yellow";

			gpios = <&sgpio_out1 26 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@38 {

			label = "eth59:green";

			gpios = <&sgpio_out1 27 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@39 {

			label = "eth59:yellow";

			gpios = <&sgpio_out1 27 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@40 {

			label = "eth60:green";

			gpios = <&sgpio_out1 28 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@41 {

			label = "eth60:yellow";

			gpios = <&sgpio_out1 28 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@42 {

			label = "eth61:green";

			gpios = <&sgpio_out1 29 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@43 {

			label = "eth61:yellow";

			gpios = <&sgpio_out1 29 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@44 {

			label = "eth62:green";

			gpios = <&sgpio_out1 30 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@45 {

			label = "eth62:yellow";

			gpios = <&sgpio_out1 30 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@46 {

			label = "eth63:green";

			gpios = <&sgpio_out1 31 0 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		led@47 {

			label = "eth63:yellow";

			gpios = <&sgpio_out1 31 1 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

	};

};



&sgpio0 {

	status = "okay";

	microchip,sgpio-port-ranges = <8 15>;

	gpio@0 {

		ngpios = <64>;

	};

	gpio@1 {

		ngpios = <64>;

	};

};



&sgpio1 {

	status = "okay";

	microchip,sgpio-port-ranges = <24 31>;

	gpio@0 {

		ngpios = <64>;

	};

	gpio@1 {

		ngpios = <64>;

	};

};



&spi0 {

arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi

+55 −0
Original line number Diff line number Diff line
@@ -20,6 +20,50 @@ 
		gpios = <&gpio 37 GPIO_ACTIVE_LOW>;

		priority = <200>;

	};



	leds {

		compatible = "gpio-leds";

		led@0 {

			label = "eth60:yellow";

			gpios = <&sgpio_out1 28 0 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

		led@1 {

			label = "eth60:green";

			gpios = <&sgpio_out1 28 1 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

		led@2 {

			label = "eth61:yellow";

			gpios = <&sgpio_out1 29 0 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

		led@3 {

			label = "eth61:green";

			gpios = <&sgpio_out1 29 1 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

		led@4 {

			label = "eth62:yellow";

			gpios = <&sgpio_out1 30 0 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

		led@5 {

			label = "eth62:green";

			gpios = <&sgpio_out1 30 1 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

		led@6 {

			label = "eth63:yellow";

			gpios = <&sgpio_out1 31 0 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

		led@7 {

			label = "eth63:green";

			gpios = <&sgpio_out1 31 1 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

	};

};



&gpio {
@@ -83,6 +127,17 @@ 
	};

};



&sgpio1 {

	status = "okay";

	microchip,sgpio-port-ranges = <24 31>;

	gpio@0 {

		ngpios = <64>;

	};

	gpio@1 {

		ngpios = <64>;

	};

};



&axi {

	i2c0_imux: i2c0-imux@0 {

		compatible = "i2c-mux-pinctrl";

CRA Git | Maintained and supported by SUSTech CRA and CCSE