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

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

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

UniPhier ARM64 SoC DT updates for v4.16

- clean up gpios properties by macro
- add GPIO hog for PXs3 reference node
- add has-transaction-translator property to generic-ehci nodes
- enable more serial ports for PXs3 reference node

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

:
  arm64: dts: uniphier: enable more serial ports for PXs3 ref board
  arm64: dts: uniphier: add has-transaction-translator property to usb node for LD11
  arm64: dts: uniphier: add GPIO hog definition for PXs3
  arm64: dts: uniphier: use macros in dt-bindings header

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bed1f7d1 dbdae847

arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts

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

	xirq0 {

		gpio-hog;

		gpios = <120 0>;

		gpios = <UNIPHIER_GPIO_IRQ(0) 0>;

		input;

	};

};

arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi

+5 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



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

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



/memreserve/ 0x80000000 0x02000000;
@@ -100,7 +101,7 @@ 


	emmc_pwrseq: emmc-pwrseq {

		compatible = "mmc-pwrseq-emmc";

		reset-gpios = <&gpio 26 GPIO_ACTIVE_LOW>;

		reset-gpios = <&gpio UNIPHIER_GPIO_PORT(3, 2) GPIO_ACTIVE_LOW>;

	};



	timer {
@@ -347,6 +348,7 @@ 
				 <&mio_clk 12>;

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

				 <&mio_rst 12>;

			has-transaction-translator;

		};



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

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

				 <&mio_rst 13>;

			has-transaction-translator;

		};



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

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

				 <&mio_rst 14>;

			has-transaction-translator;

		};



		mioctrl@5b3e0000 {

arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts

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

	xirq0 {

		gpio-hog;

		gpios = <120 0>;

		gpios = <UNIPHIER_GPIO_IRQ(0) 0>;

		input;

	};

};

arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



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

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

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



/memreserve/ 0x80000000 0x02000000;
@@ -172,7 +173,7 @@ 


	emmc_pwrseq: emmc-pwrseq {

		compatible = "mmc-pwrseq-emmc";

		reset-gpios = <&gpio 26 GPIO_ACTIVE_LOW>;

		reset-gpios = <&gpio UNIPHIER_GPIO_PORT(3, 2) GPIO_ACTIVE_LOW>;

	};



	timer {

arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts

+16 −0
Original line number Diff line number Diff line
@@ -45,6 +45,22 @@ 
	status = "okay";

};



&serial2 {

	status = "okay";

};



&serial3 {

	status = "okay";

};



&gpio {

	xirq4 {

		gpio-hog;

		gpios = <UNIPHIER_GPIO_IRQ(4) 0>;

		input;

	};

};



&i2c0 {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE