Commit 056a7ecf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'uniphier-dt-v5.9' of... 

Merge tag 'uniphier-dt-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into arm/dt

UniPhier ARM SoC DT updates for v5.9

- add missing interrupts property to support card serial

- fix node names to follow the DT schema

- add PCIe endpoint and PHY nodes for Pro5 SoC

- simplify device hierarchy of support-card.dtsi

* tag 'uniphier-dt-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  ARM: dts: uniphier: simplify support-card node structure
  ARM: dts: uniphier: Add PCIe endpoint and PHY node for Pro5
  ARM: dts: uniphier: Rename ethphy node to ethernet-phy
  ARM: dts: uniphier: give fixed port number to support card serial
  ARM: dts: uniphier: rename support card serial node to fix schema warning
  ARM: dts: uniphier: add interrupts to support card serial

Link: https://lore.kernel.org/r/CAK7LNARGDcCKxV3-H7WmuZAVe49n0QF+672-KN0tsP0och0a_A@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9f0d16eb 78186560

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

+5 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ chosen { 


	aliases {

		serial0 = &serial0;

		serial1 = &serial1;

		serial1 = &serialsc;

		serial2 = &serial2;

		serial3 = &serial3;

		i2c0 = &i2c0;
@@ -39,6 +39,10 @@ &ethsc { 
	interrupts = <1 8>;

};



&serialsc {

	interrupts = <1 8>;

};



&serial0 {

	status = "okay";

};

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

+6 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ aliases { 
		serial0 = &serial0;

		serial1 = &serial1;

		serial2 = &serial2;

		serial3 = &serialsc;

		i2c0 = &i2c0;

		i2c1 = &i2c1;

		i2c2 = &i2c2;
@@ -42,6 +43,10 @@ &ethsc { 
	interrupts = <4 8>;

};



&serialsc {

	interrupts = <4 8>;

};



&serial0 {

	status = "okay";

};
@@ -76,7 +81,7 @@ &eth { 
};



&mdio {

	ethphy: ethphy@0 {

	ethphy: ethernet-phy@0 {

		reg = <0>;

	};

};

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

+5 −0
Original line number Diff line number Diff line
@@ -126,6 +126,11 @@ pinctrl_nand2cs: nand2cs { 
		function = "nand";

	};



	pinctrl_pcie: pcie {

		groups = "pcie";

		function = "pcie";

	};



	pinctrl_sd: sd {

		groups = "sd";

		function = "sd";

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

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ &eth { 
};



&mdio {

	ethphy: ethphy@1 {

	ethphy: ethernet-phy@1 {

		reg = <1>;

	};

};

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

+6 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ aliases { 
		serial0 = &serial0;

		serial1 = &serial1;

		serial2 = &serial2;

		serial3 = &serial3;

		serial3 = &serialsc;

		i2c0 = &i2c0;

		i2c1 = &i2c1;

		i2c2 = &i2c2;
@@ -42,6 +42,10 @@ &ethsc { 
	interrupts = <2 8>;

};



&serialsc {

	interrupts = <2 8>;

};



&serial0 {

	status = "okay";

};
@@ -84,7 +88,7 @@ &eth { 
};



&mdio {

	ethphy: ethphy@0 {

	ethphy: ethernet-phy@0 {

		reg = <0>;

	};

};