Commit f54440e4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'gemini-dts-v4.19' of... 

Merge tag 'gemini-dts-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt

Gemini DTS updates for v4.19:
- Add Vitesse switch chips
- Add a new DT for a reference design

* tag 'gemini-dts-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik

:
  ARM: dts: Add devicetree for Storlink/Storm SL93512R
  ARM: dts: Add Vitesse G5e switch to the Gemini SQ201
  ARM: dts: Add WAN ethernet port to the SQ201

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 64cc2c4e 41043ec4

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ dtb-$(CONFIG_ARCH_GEMINI) += \ 
	gemini-dlink-dns-313.dtb \

	gemini-nas4220b.dtb \

	gemini-rut1xx.dtb \

	gemini-sl93512r.dtb \

	gemini-sq201.dtb \

	gemini-wbd111.dtb \

	gemini-wbd222.dtb

arch/arm/boot/dts/gemini-sl93512r.dts

0 → 100644
+328 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Device Tree file for the Storm Semiconductor SL93512R_BRD

 * Gemini reference design, also initially called

 * "Gemini324 EV-Board" before Storm acquired Storlink Semiconductor.

 * The series were later acquired by Cortina Systems.

 */



/dts-v1/;



#include "gemini.dtsi"

#include <dt-bindings/input/input.h>



/ {

	model = "Storlink Semiconductor Gemini324 EV-Board / Storm Semiconductor SL93512R_BRD";

	compatible = "storlink,gemini324", "storm,sl93512r", "cortina,gemini";

	#address-cells = <1>;

	#size-cells = <1>;



	memory@0 {

		/* 64 MB Samsung K4H511638B */

		device_type = "memory";

		reg = <0x00000000 0x4000000>;

	};



	chosen {

		bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait";

		stdout-path = &uart0;

	};



	gpio_keys {

		compatible = "gpio-keys";



		button-wps {

			debounce-interval = <50>;

			wakeup-source;

			linux,code = <KEY_WPS_BUTTON>;

			label = "WPS";

			/* Conflict with NAND flash */

			gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;

		};



		button-setup {

			debounce-interval = <50>;

			wakeup-source;

			linux,code = <KEY_SETUP>;

			label = "factory reset";

			/* Conflict with NAND flash */

			gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;

		};

	};



	leds {

		compatible = "gpio-leds";

		led-green-harddisk {

			label = "sq201:green:harddisk";

			/* Conflict with LCD (no problem) */

			gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;

			default-state = "off";

			linux,default-trigger = "disk-activity";

		};

		led-green-wireless {

			label = "sq201:green:wireless";

			/* Conflict with NAND flash CE0 (no problem) */

			gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;

			default-state = "on";

			linux,default-trigger = "heartbeat";

		};

	};



	mdio0: mdio {

		compatible = "virtual,mdio-gpio";

		/* Uses MDC and MDIO */

		gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */

			<&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */

		#address-cells = <1>;

		#size-cells = <0>;



		/* This is a Marvell 88E1111 ethernet transciever */

		phy0: ethernet-phy@1 {

			reg = <1>;

		};

	};



	spi {

		compatible = "spi-gpio";

		#address-cells = <1>;

		#size-cells = <0>;

		/* Check pin collisions */

		gpio-sck = <&gpio1 28 GPIO_ACTIVE_HIGH>;

		gpio-miso = <&gpio1 30 GPIO_ACTIVE_HIGH>;

		gpio-mosi = <&gpio1 29 GPIO_ACTIVE_HIGH>;

		cs-gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>;

		num-chipselects = <1>;



		switch@0 {

			compatible = "vitesse,vsc7385";

			reg = <0>;

			/* Specified for 2.5 MHz or below */

			spi-max-frequency = <2500000>;

			gpio-controller;

			#gpio-cells = <2>;



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					label = "lan1";

				};

				port@1 {

					reg = <1>;

					label = "lan2";

				};

				port@2 {

					reg = <2>;

					label = "lan3";

				};

				port@3 {

					reg = <3>;

					label = "lan4";

				};

				vsc: port@6 {

					reg = <6>;

					label = "cpu";

					ethernet = <&gmac1>;

					phy-mode = "rgmii";

					fixed-link {

						speed = <1000>;

						full-duplex;

						pause;

					};

				};

			};

		};

	};





	soc {

		flash@30000000 {

			status = "okay";

			/* 16MB of flash */

			reg = <0x30000000 0x01000000>;



			partition@0 {

				label = "BOOT";

				reg = <0x00000000 0x00020000>;

				read-only;

			};

			partition@120000 {

				label = "Kern";

				reg = <0x00020000 0x00300000>;

			};

			partition@320000 {

				label = "Ramdisk";

				reg = <0x00320000 0x00600000>;

			};

			partition@920000 {

				label = "Application";

				reg = <0x00920000 0x00600000>;

			};

			partition@f20000 {

				label = "VCTL";

				reg = <0x00f20000 0x00020000>;

				read-only;

			};

			partition@f40000 {

				label = "CurConf";

				reg = <0x00f40000 0x000a0000>;

				read-only;

			};

			partition@fe0000 {

				label = "FIS directory";

				reg = <0x00fe0000 0x00020000>;

				read-only;

			};

		};



		syscon: syscon@40000000 {

			pinctrl {

				/*

				 * gpio0egrp cover line 16 used by HD LED

				 * gpio0fgrp cover line 17, 18 used by wireless LED and reset button

				 * gpio0hgrp cover line 21, 22 used by MDIO for Marvell PHY

				 * gpio0kgrp cover line 31 used by USB LED

				 */

				gpio0_default_pins: pinctrl-gpio0 {

					mux {

						function = "gpio0";

						groups = "gpio0egrp",

						"gpio0fgrp",

						"gpio0hgrp";

					};

				};

				/*

				 * gpio1dgrp cover lines used by SPI for

				 * the Vitesse chip (28-31)

				 */

				gpio1_default_pins: pinctrl-gpio1 {

					mux {

						function = "gpio1";

						groups = "gpio1dgrp";

					};

				};

				pinctrl-gmii {

					mux {

						function = "gmii";

						groups = "gmii_gmac0_grp", "gmii_gmac1_grp";

					};

					/* Control pad skew comes from sl_switch.c in the vendor code */

					conf0 {

						pins = "P10 GMAC1 TXC";

						skew-delay = <5>;

					};

					conf1 {

						pins = "V11 GMAC1 TXEN";

						skew-delay = <7>;

					};

					conf2 {

						pins = "T11 GMAC1 RXC";

						skew-delay = <8>;

					};

					conf3 {

						pins = "U11 GMAC1 RXDV";

						skew-delay = <7>;

					};

					conf4 {

						pins = "V7 GMAC0 TXC";

						skew-delay = <10>;

					};

					conf5 {

						pins = "P8 GMAC0 TXEN";

						skew-delay = <7>; /* 5 at another place? */

					};

					conf6 {

						pins = "T8 GMAC0 RXC";

						skew-delay = <15>;

					};

					conf7 {

						pins = "R8 GMAC0 RXDV";

						skew-delay = <0>;

					};

					conf8 {

						/* The data lines all have default skew */

						pins = "U8 GMAC0 RXD0", "V8 GMAC0 RXD1",

						       "P9 GMAC0 RXD2", "R9 GMAC0 RXD3",

						       "R11 GMAC1 RXD0", "P11 GMAC1 RXD1",

						       "V12 GMAC1 RXD2", "U12 GMAC1 RXD3",

						       "R10 GMAC1 TXD0", "T10 GMAC1 TXD1",

						       "U10 GMAC1 TXD2", "V10 GMAC1 TXD3";

						skew-delay = <7>;

					};

					/* Appears in sl351x_gmac.c in the vendor code */

					conf9 {

						pins = "U7 GMAC0 TXD0", "T7 GMAC0 TXD1",

						       "R7 GMAC0 TXD2", "P7 GMAC0 TXD3";

						skew-delay = <5>;

					};

				};

			};

		};



		/* Both interfaces brought out on SATA connectors */

		sata: sata@46000000 {

			cortina,gemini-ata-muxmode = <0>;

			cortina,gemini-enable-sata-bridge;

			status = "okay";

		};



		gpio0: gpio@4d000000 {

			pinctrl-names = "default";

			pinctrl-0 = <&gpio0_default_pins>;

		};



		gpio1: gpio@4e000000 {

			pinctrl-names = "default";

			pinctrl-0 = <&gpio1_default_pins>;

		};



		pci@50000000 {

			status = "okay";

			interrupt-map-mask = <0xf800 0 0 7>;

			interrupt-map =

				<0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */

				<0x4800 0 0 2 &pci_intc 1>,

				<0x4800 0 0 3 &pci_intc 2>,

				<0x4800 0 0 4 &pci_intc 3>,

				<0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */

				<0x5000 0 0 2 &pci_intc 2>,

				<0x5000 0 0 3 &pci_intc 3>,

				<0x5000 0 0 4 &pci_intc 0>,

				<0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */

				<0x5800 0 0 2 &pci_intc 3>,

				<0x5800 0 0 3 &pci_intc 0>,

				<0x5800 0 0 4 &pci_intc 1>,

				<0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */

				<0x6000 0 0 2 &pci_intc 0>,

				<0x6000 0 0 3 &pci_intc 1>,

				<0x6000 0 0 4 &pci_intc 2>;

		};



		ethernet@60000000 {

			status = "okay";



			ethernet-port@0 {

				phy-mode = "rgmii";

				phy-handle = <&phy0>;

			};

			ethernet-port@1 {

				phy-mode = "rgmii";

				fixed-link {

					speed = <1000>;

					full-duplex;

					pause;

				};

			};

		};



		ata@63000000 {

			status = "okay";

		};



		ata@63400000 {

			status = "okay";

		};

	};

};

arch/arm/boot/dts/gemini-sq201.dts

+159 −0
Original line number Diff line number Diff line
@@ -55,6 +55,75 @@ 
		};

	};



	mdio0: mdio {

		compatible = "virtual,mdio-gpio";

		/* Uses MDC and MDIO */

		gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */

			<&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */

		#address-cells = <1>;

		#size-cells = <0>;



		/* This is a Marvell 88E1111 ethernet transciever */

		phy0: ethernet-phy@1 {

			reg = <1>;

		};

	};



	spi {

		compatible = "spi-gpio";

		#address-cells = <1>;

		#size-cells = <0>;

		/* Check pin collisions */

		gpio-sck = <&gpio1 28 GPIO_ACTIVE_HIGH>;

		gpio-miso = <&gpio1 30 GPIO_ACTIVE_HIGH>;

		gpio-mosi = <&gpio1 29 GPIO_ACTIVE_HIGH>;

		cs-gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>;

		num-chipselects = <1>;



		switch@0 {

			compatible = "vitesse,vsc7395";

			reg = <0>;

			/* Specified for 2.5 MHz or below */

			spi-max-frequency = <2500000>;

			gpio-controller;

			#gpio-cells = <2>;



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					label = "lan1";

				};

				port@1 {

					reg = <1>;

					label = "lan2";

				};

				port@2 {

					reg = <2>;

					label = "lan3";

				};

				port@3 {

					reg = <3>;

					label = "lan4";

				};

				vsc: port@6 {

					reg = <6>;

					label = "cpu";

					ethernet = <&gmac1>;

					phy-mode = "rgmii";

					fixed-link {

						speed = <1000>;

						full-duplex;

						pause;

					};

				};

			};

		};

	};





	soc {

		flash@30000000 {

			/*
@@ -108,6 +177,7 @@ 
				/*

				 * gpio0fgrp cover line 18 used by reset button

				 * gpio0ggrp cover line 20 used by info LED

				 * gpio0hgrp cover line 21, 22 used by MDIO for Marvell PHY

				 * gpio0kgrp cover line 31 used by USB LED

				 */

				gpio0_default_pins: pinctrl-gpio0 {
@@ -115,9 +185,76 @@ 
						function = "gpio0";

						groups = "gpio0fgrp",

						"gpio0ggrp",

						"gpio0hgrp",

						"gpio0kgrp";

					};

				};

				/*

				 * gpio0dgrp cover lines used by the SPI

				 * to the Vitesse G5x chip.

				 */

				gpio1_default_pins: pinctrl-gpio1 {

					mux {

						function = "gpio1";

						groups = "gpio1dgrp";

					};

				};

				pinctrl-gmii {

					mux {

						function = "gmii";

						groups = "gmii_gmac0_grp", "gmii_gmac1_grp";

					};

					/* Settings come from memory dump in PLATO */

					conf0 {

						pins = "V8 GMAC0 RXDV";

						skew-delay = <0>;

					};

					conf1 {

						pins = "Y7 GMAC0 RXC";

						skew-delay = <15>;

					};

					conf2 {

						pins = "T8 GMAC0 TXEN";

						skew-delay = <7>;

					};

					conf3 {

						pins = "U8 GMAC0 TXC";

						skew-delay = <10>;

					};

					conf4 {

						pins = "T10 GMAC1 RXDV";

						skew-delay = <7>;

					};

					conf5 {

						pins = "Y11 GMAC1 RXC";

						skew-delay = <8>;

					};

					conf6 {

						pins = "W11 GMAC1 TXEN";

						skew-delay = <7>;

					};

					conf7 {

						pins = "V11 GMAC1 TXC";

						skew-delay = <5>;

					};

					conf8 {

						/* The data lines all have default skew */

						pins = "W8 GMAC0 RXD0", "V9 GMAC0 RXD1",

						       "Y8 GMAC0 RXD2", "U9 GMAC0 RXD3",

						       "T7 GMAC0 TXD0", "U6 GMAC0 TXD1",

						       "V7 GMAC0 TXD2", "U7 GMAC0 TXD3",

						       "Y12 GMAC1 RXD0", "V12 GMAC1 RXD1",

						       "T11 GMAC1 RXD2", "W12 GMAC1 RXD3",

						       "U10 GMAC1 TXD0", "Y10 GMAC1 TXD1",

						       "W10 GMAC1 TXD2", "T9 GMAC1 TXD3";

						skew-delay = <7>;

					};

					/* Set up drive strength on GMAC0 and GMAC1 to 16 mA */

					conf9 {

						groups = "gmii_gmac0_grp", "gmii_gmac1_grp";

						drive-strength = <16>;

					};

				};

			};

		};
@@ -132,6 +269,11 @@ 
			pinctrl-0 = <&gpio0_default_pins>;

		};



		gpio1: gpio@4e000000 {

			pinctrl-names = "default";

			pinctrl-0 = <&gpio1_default_pins>;

		};



		pci@50000000 {

			status = "okay";

			interrupt-map-mask = <0xf800 0 0 7>;
@@ -154,6 +296,23 @@ 
				<0x6000 0 0 4 &pci_intc 2>;

		};



		ethernet@60000000 {

			status = "okay";



			ethernet-port@0 {

				phy-mode = "rgmii";

				phy-handle = <&phy0>;

			};

			ethernet-port@1 {

				phy-mode = "rgmii";

				fixed-link {

					speed = <1000>;

					full-duplex;

					pause;

				};

			};

		};



		ata@63000000 {

			status = "okay";

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE