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

Merge tag 'gemini-dts-v5.14-1' of... 

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

Gemini device tree updates for the v5.14 kernel:
- MAINTAINERS fix for the DTS files
- Drop a duplicate ethernet node on the RUT1xx DTS
- Add device_type to the PCI node
- Fix up some DTS syntax so it agrees with the schemas merged
  for the v5.14 merge window

* tag 'gemini-dts-v5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: gemini: remove xxx-cells from display
  ARM: dts: gemini-dlink-dir-685: Remove address from display port
  ARM: dts: gemini-dlink-dir-685: rename gpio-i2c to i2c
  ARM: dts: gemini-dlink-dns-313: rename gpio-i2c to i2c
  ARM: dts: gemini: convert obsolete SPI properties
  ARM: dts: gemini: use the right rtc compatible
  ARM: dts: gemini: add device_type on pci
  ARM: dts: gemini-rut1xx: remove duplicate ethernet node
  ARM: dts: gemini: rename mdio to the right name
  MAINTAINERS: gemini: add missing dts pattern

Link: https://lore.kernel.org/r/CACRpkdZWpLAcAStq8dEyGL_d9Bvp-WNPu-2EuJw1eTL4kyvgig@mail.gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3b0898f9 78924664

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1810,6 +1810,7 @@ F: Documentation/devicetree/bindings/arm/gemini.txt 
F:	Documentation/devicetree/bindings/net/cortina,gemini-ethernet.txt

F:	Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt

F:	Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt

F:	arch/arm/boot/dts/gemini*

F:	arch/arm/mach-gemini/

F:	drivers/net/ethernet/cortina/

F:	drivers/pinctrl/pinctrl-gemini.c

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

+5 −6
Original line number Diff line number Diff line
@@ -61,9 +61,9 @@ spi { 
		#size-cells = <0>;



		/* Collides with IDE pins, that's cool (we do not use them) */

		gpio-sck = <&gpio1 5 GPIO_ACTIVE_HIGH>;

		gpio-miso = <&gpio1 8 GPIO_ACTIVE_HIGH>;

		gpio-mosi = <&gpio1 7 GPIO_ACTIVE_HIGH>;

		sck-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;

		miso-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;

		mosi-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;

		cs-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;

		num-chipselects = <1>;
@@ -169,7 +169,7 @@ map0 { 
	 * The touchpad input is connected to a GPIO bit-banged

	 * I2C bus.

	 */

	gpio-i2c {

	i2c {

		compatible = "i2c-gpio";

		/* Collides with ICE */

		sda-gpios = <&gpio0 5 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -492,8 +492,7 @@ drive0: ide-port@0 { 
		display-controller@6a000000 {

			status = "okay";



			port@0 {

				reg = <0>;

			port {

				display_out: endpoint {

					remote-endpoint = <&panel_in>;

				};

arch/arm/boot/dts/gemini-dlink-dns-313.dts

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ fan0: gpio-fan { 




	/* Global Mixed-Mode Technology G751 mounted on GPIO I2C */

	gpio-i2c {

	i2c {

		compatible = "i2c-gpio";

		sda-gpios = <&gpio0 15 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;

		scl-gpios = <&gpio0 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -140,7 +140,7 @@ map1 { 
		};

	};



	mdio0: ethernet-phy {

	mdio0: mdio {

		compatible = "virtual,mdio-gpio";

		/* Uses MDC and MDIO */

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

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

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ led-green-os { 
		};

	};



	mdio0: ethernet-phy {

	mdio0: mdio {

		compatible = "virtual,mdio-gpio";

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

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

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

+1 −13
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ led-power { 
		};

	};



	mdio0: ethernet-phy {

	mdio0: mdio {

		compatible = "virtual,mdio-gpio";

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

			<&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */
@@ -125,18 +125,6 @@ ethernet-port@1 { 
			};

		};



		ethernet@60000000 {

			status = "okay";



			ethernet-port@0 {

				phy-mode = "rgmii";

				phy-handle = <&phy0>;

			};

			ethernet-port@1 {

				/* Not used in this platform */

			};

		};



		usb@68000000 {

			status = "okay";

		};