Commit dfe2a4cf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

UniPhier ARM64 SoC DT updates for v5.9

- add missing interrupts property to support card serial

- fix node names to follow the DT schema

- add clock-names and reset-names to pcie-phy

* tag 'uniphier-dt64-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  arm64: dts: uniphier: Add missing clock-names and reset-names to pcie-phy
  arm64: dts: uniphier: Rename ethphy node to ethernet-phy
  arm64: dts: uniphier: give fixed port number to support card serial
  arm64: dts: uniphier: add interrupts to support card serial

Link: https://lore.kernel.org/r/CAK7LNARK4SKhSW-xwgc3vq7FO7N864jPgzm8NtsGOv8wVFVyBQ@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 056a7ecf e6bd81a2

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

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



&mdio {

	ethphy: ethphy@1 {

	ethphy: ethernet-phy@1 {

		reg = <1>;

	};

};

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

+6 −2
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;
@@ -42,6 +42,10 @@ &ethsc { 
	interrupts = <0 8>;

};



&serialsc {

	interrupts = <0 8>;

};



&serial0 {

	status = "okay";

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



&mdio {

	ethphy: ethphy@1 {

	ethphy: ethernet-phy@1 {

		reg = <1>;

	};

};

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

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



&mdio {

	ethphy: ethphy@0 {

	ethphy: ethernet-phy@0 {

		reg = <0>;

	};

};

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

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



&mdio {

	ethphy: ethphy@1 {

	ethphy: ethernet-phy@1 {

		reg = <1>;

	};

};

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

+6 −2
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;
@@ -42,6 +42,10 @@ &ethsc { 
	interrupts = <0 8>;

};



&serialsc {

	interrupts = <0 8>;

};



&serial0 {

	status = "okay";

};
@@ -64,7 +68,7 @@ &eth { 
};



&mdio {

	ethphy: ethphy@0 {

	ethphy: ethernet-phy@0 {

		reg = <0>;

	};

};