Unverified Commit 7b27dc27 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'gemini-dts-for-v5.16' of... 

Merge tag 'gemini-dts-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/dt

Gemini changes for the v5.16 kernel cycle:

- Add device trees for Edimax NS2502 and SSI 1328

- Consolidate PCI interrupts

* tag 'gemini-dts-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: gemini: Consolidate PCI interrupt-map properties
  ARM: gemini: add device tree for ssi1328
  ARM: gemini: add device tree for edimax NS2502
  dt-bindings: add vendor prefix for ssi
  dt-bindings: add vendor prefix for edimax
  ARM: dts: gemini: add labels for USB, IDE, flash and ethernet

Link: https://lore.kernel.org/r/CACRpkdac5Sbt42CtuLMgCazfHdhcP98mEKGjeZ-DVcb=_N90Bg@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 804565cd 07a6602b

Documentation/devicetree/bindings/vendor-prefixes.yaml

+4 −0
Original line number Diff line number Diff line
@@ -337,6 +337,8 @@ patternProperties: 
    description: EBV Elektronik

  "^eckelmann,.*":

    description: Eckelmann AG

  "^edimax,.*":

    description: EDIMAX Technology Co., Ltd

  "^edt,.*":

    description: Emerging Display Technologies

  "^eeti,.*":
@@ -1108,6 +1110,8 @@ patternProperties: 
    description: SparkFun Electronics

  "^sprd,.*":

    description: Spreadtrum Communications Inc.

  "^ssi,.*":

    description: SSI Computer Corp

  "^sst,.*":

    description: Silicon Storage Technology, Inc.

  "^sstar,.*":

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -229,9 +229,11 @@ dtb-$(CONFIG_ARCH_GEMINI) += \ 
	gemini-dlink-dir-685.dtb \

	gemini-dlink-dns-313.dtb \

	gemini-nas4220b.dtb \

	gemini-ns2502.dtb \

	gemini-rut1xx.dtb \

	gemini-sl93512r.dtb \

	gemini-sq201.dtb \

	gemini-ssi1328.dtb \

	gemini-wbd111.dtb \

	gemini-wbd222.dtb

dtb-$(CONFIG_ARCH_HI3xxx) += \

arch/arm/boot/dts/gemini-dlink-dir-685.dts

+0 −18
Original line number Diff line number Diff line
@@ -439,24 +439,6 @@ gpio1: gpio@4e000000 { 


		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 {

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

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

/*

 * Copyright (C) 2021 Corentin Labbe <clabbe@baylibre.com>

 * Device Tree file for Edimax NS 2502

 */



/dts-v1/;



#include "gemini.dtsi"



/ {

	model = "Edimax NS-2502";

	compatible = "edimax,ns-2502", "cortina,gemini";

	#address-cells = <1>;

	#size-cells = <1>;



	memory@0 {

		/* 128 MB */

		device_type = "memory";

		reg = <0x00000000 0x8000000>;

	};



	aliases {

		mdio-gpio0 = &mdio0;

	};



	chosen {

		bootargs = "console=ttyS0,19200n8";

		stdout-path = &uart0;

	};



	mdio0: mdio {

		compatible = "virtual,mdio-gpio";

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

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

		#address-cells = <1>;

		#size-cells = <0>;



		phy0: ethernet-phy@1 {

			reg = <1>;

			device_type = "ethernet-phy";

			/* We lack the knowledge of necessary GPIO to achieve

			 * Gigabit

			 */

			max-speed = <100>;

		};

	};

};



&ethernet {

	status = "okay";

	ethernet-port@0 {

		phy-mode = "rgmii";

		phy-handle = <&phy0>;

	};

};



&flash {

	status = "okay";

	/* 8MB of flash */

	reg = <0x30000000 0x00800000>;



	pinctrl-names = "enabled", "disabled";

	pinctrl-0 = <&pflash_default_pins>;

	pinctrl-1 = <&pflash_disabled_pins>;



	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <1>;



		partition@0 {

			label = "RedBoot";

			reg = <0x00000000 0x00020000>;

		};

		partition@20000 {

			label = "kernel";

			reg = <0x00020000 0x00700000>;

		};

		partition@720000 {

			label = "VCTL";

			reg = <0x00720000 0x00020000>;

		};

		partition@740000 {

			label = "CurConf";

			reg = <0x00740000 0x000a0000>;

		};

		partition@7e0000 {

			label = "FIS";

			reg = <0x007e0000 0x00010000>;

		};

	};

};



&gpio0 {

	pinctrl-names = "default";

	pinctrl-0 = <&gpio0_default_pins>;

};



&ide0 {

	status = "okay";

};



&ide1 {

	status = "okay";

};



&sata {

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

	cortina,gemini-enable-sata-bridge;

	status = "okay";

};



&syscon {

	pinctrl {

		/*

		 * gpio0agrp cover line 0-4

		 * gpio0bgrp cover line 5

		 */

		gpio0_default_pins: pinctrl-gpio0 {

			    mux {

				    function = "gpio0";

				    groups = "gpio0agrp", "gpio0bgrp", "gpio0hgrp";

			    };

		};

		pflash_disabled_pins: pinctrl-pflash-disabled {

			mux {

				function = "gpio0";

				groups = "gpio0ggrp", "gpio0igrp", "gpio0jgrp",

					 "gpio0kgrp";

			};

		};

		pinctrl-gmii {

			mux {

				function = "gmii";

				groups = "gmii_gmac0_grp";

				};

		};

	};

};



&usb0 {

	status = "okay";

};



&usb1 {

	status = "okay";

};

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

+0 −18
Original line number Diff line number Diff line
@@ -256,24 +256,6 @@ gpio1: gpio@4e000000 { 


		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 {