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

Merge tag 'uniphier-dt-v4.16' of... 

Merge tag 'uniphier-dt-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt

UniPhier ARM SoC DT updates for v4.16

- clean up gpios properties by macro
- add efuse nodes
- add has-transaction-translator property to generic-ehci nodes

* tag 'uniphier-dt-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier

:
  ARM: dts: uniphier: add has-transaction-translator property to usb node for LD4, sLD8 and Pro4
  ARM: dts: uniphier: add efuse node for UniPhier 32bit SoC
  ARM: dts: uniphier: use macros in dt-bindings header

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2943d853 6fa9b025

arch/arm/boot/dts/uniphier-ld4-ref.dts

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
&gpio {

	xirq1 {

		gpio-hog;

		gpios = <121 0>;

		gpios = <UNIPHIER_GPIO_IRQ(1) 0>;

		input;

	};

};

arch/arm/boot/dts/uniphier-ld4.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)

 */



#include <dt-bindings/gpio/uniphier-gpio.h>



/ {

	compatible = "socionext,uniphier-ld4";

	#address-cells = <1>;
@@ -235,6 +237,7 @@ 
				 <&mio_clk 12>;

			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,

				 <&mio_rst 12>;

			has-transaction-translator;

		};



		usb1: usb@5a810100 {
@@ -248,6 +251,7 @@ 
				 <&mio_clk 13>;

			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,

				 <&mio_rst 13>;

			has-transaction-translator;

		};



		usb2: usb@5a820100 {
@@ -261,6 +265,7 @@ 
				 <&mio_clk 14>;

			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,

				 <&mio_rst 14>;

			has-transaction-translator;

		};



		soc-glue@5f800000 {
@@ -273,6 +278,24 @@ 
			};

		};



		soc-glue@5f900000 {

			compatible = "socionext,uniphier-ld4-soc-glue-debug",

				     "simple-mfd";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x5f900000 0x2000>;



			efuse@100 {

				compatible = "socionext,uniphier-efuse";

				reg = <0x100 0x28>;

			};



			efuse@130 {

				compatible = "socionext,uniphier-efuse";

				reg = <0x130 0x8>;

			};

		};



		timer@60000200 {

			compatible = "arm,cortex-a9-global-timer";

			reg = <0x60000200 0x20>;

arch/arm/boot/dts/uniphier-ld6b-ref.dts

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
&gpio {

	xirq4 {

		gpio-hog;

		gpios = <124 0>;

		gpios = <UNIPHIER_GPIO_IRQ(4) 0>;

		input;

	};

};

arch/arm/boot/dts/uniphier-pro4-ref.dts

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
&gpio {

	xirq2 {

		gpio-hog;

		gpios = <122 0>;

		gpios = <UNIPHIER_GPIO_IRQ(2) 0>;

		input;

	};

};

arch/arm/boot/dts/uniphier-pro4.dtsi

+27 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)

 */



#include <dt-bindings/gpio/uniphier-gpio.h>



/ {

	compatible = "socionext,uniphier-pro4";

	#address-cells = <1>;
@@ -269,6 +271,7 @@ 
				 <&mio_clk 12>;

			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,

				 <&mio_rst 12>;

			has-transaction-translator;

		};



		usb3: usb@5a810100 {
@@ -282,6 +285,7 @@ 
				 <&mio_clk 13>;

			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,

				 <&mio_rst 13>;

			has-transaction-translator;

		};



		soc-glue@5f800000 {
@@ -294,6 +298,29 @@ 
			};

		};



		soc-glue@5f900000 {

			compatible = "socionext,uniphier-pro4-soc-glue-debug",

				     "simple-mfd";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x5f900000 0x2000>;



			efuse@100 {

				compatible = "socionext,uniphier-efuse";

				reg = <0x100 0x28>;

			};



			efuse@130 {

				compatible = "socionext,uniphier-efuse";

				reg = <0x130 0x8>;

			};



			efuse@200 {

				compatible = "socionext,uniphier-efuse";

				reg = <0x200 0x14>;

			};

		};



		aidet: aidet@5fc20000 {

			compatible = "socionext,uniphier-pro4-aidet";

			reg = <0x5fc20000 0x200>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE