Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 983d7c45 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'uniphier-dt-v4.14-2' of... 

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

UniPhier ARM SoC DT updates for v4.14 (2nd)

- add AIDET irqchip device nodes
- fix size of sdctrl node
- add ethernet pinmux nodes

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

:
  ARM: dts: uniphier: add pinctrl groups of ethernet phy mode
  ARM: dts: uniphier: fix size of sdctrl nodes
  ARM: dts: uniphier: add AIDET nodes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 940bf1d6 8a7a516a

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

+7 −0
Original line number Diff line number Diff line
@@ -270,6 +270,13 @@ 
			interrupt-controller;

		};



		aidet: aidet@61830000 {

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

			reg = <0x61830000 0x200>;

			interrupt-controller;

			#interrupt-cells = <2>;

		};



		sysctrl@61840000 {

			compatible = "socionext,uniphier-ld4-sysctrl",

				     "simple-mfd", "syscon";

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

+15 −0
Original line number Diff line number Diff line
@@ -18,6 +18,21 @@ 
		function = "emmc";

	};



	pinctrl_ether_mii: ether_mii_grp {

		groups = "ether_mii";

		function = "ether_mii";

	};



	pinctrl_ether_rgmii: ether_rgmii_grp {

		groups = "ether_rgmii";

		function = "ether_rgmii";

	};



	pinctrl_ether_rmii: ether_rmii_grp {

		groups = "ether_rmii";

		function = "ether_rmii";

	};



	pinctrl_i2c0: i2c0_grp {

		groups = "i2c0";

		function = "i2c0";

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

+7 −0
Original line number Diff line number Diff line
@@ -268,6 +268,13 @@ 
			};

		};



		aidet: aidet@5fc20000 {

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

			reg = <0x5fc20000 0x200>;

			interrupt-controller;

			#interrupt-cells = <2>;

		};



		timer@60000200 {

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

			reg = <0x60000200 0x20>;

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

+8 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ 
		sdctrl@59810000 {

			compatible = "socionext,uniphier-pro5-sdctrl",

				     "simple-mfd", "syscon";

			reg = <0x59810000 0x800>;

			reg = <0x59810000 0x400>;



			sd_clk: clock {

				compatible = "socionext,uniphier-pro5-sd-clock";
@@ -331,6 +331,13 @@ 
			};

		};



		aidet: aidet@5fc20000 {

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

			reg = <0x5fc20000 0x200>;

			interrupt-controller;

			#interrupt-cells = <2>;

		};



		timer@60000200 {

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

			reg = <0x60000200 0x20>;

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

+8 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ 
		sdctrl@59810000 {

			compatible = "socionext,uniphier-pxs2-sdctrl",

				     "simple-mfd", "syscon";

			reg = <0x59810000 0x800>;

			reg = <0x59810000 0x400>;



			sd_clk: clock {

				compatible = "socionext,uniphier-pxs2-sd-clock";
@@ -315,6 +315,13 @@ 
			};

		};



		aidet: aidet@5fc20000 {

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

			reg = <0x5fc20000 0x200>;

			interrupt-controller;

			#interrupt-cells = <2>;

		};



		timer@60000200 {

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

			reg = <0x60000200 0x20>;