Commit 5195887a authored by Stephan Gerhold's avatar Stephan Gerhold Committed by Linus Walleij
Browse files

ARM: dts: ux500: Move serial aliases to ste-dbx5x0.dtsi 



Now that we have aliases for I2C and SPI in ste-dbx5x0.dtsi,
it does not make much sense to keep only the aliases for UART
separately in each board device tree.

Considering that all boards set the same aliases for the serial
ports there is no reason to keep them separated either.

Move them to ste-dbx5x0.dtsi and remove the aliases from the
board-specific device tree parts.

Signed-off-by: default avatarStephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20191125170428.76069-3-stephan@gerhold.net


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 6b69c729

arch/arm/boot/dts/ste-dbx5x0.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ aliases { 
		spi1 = &spi1;

		spi2 = &spi2;

		spi3 = &spi3;

		serial0 = &ux500_serial0;

		serial1 = &ux500_serial1;

		serial2 = &ux500_serial2;

	};



	chosen {

arch/arm/boot/dts/ste-hrefprev60-stuib.dts

+0 −7
Original line number Diff line number Diff line
@@ -13,13 +13,6 @@ / { 
	model = "ST-Ericsson HREF (pre-v60) and ST UIB";

	compatible = "st-ericsson,mop500", "st-ericsson,u8500";



	/* This stablilizes the serial port enumeration */

	aliases {

		serial0 = &ux500_serial0;

		serial1 = &ux500_serial1;

		serial2 = &ux500_serial2;

	};



	soc {

		/* Reset line for the BU21013 touchscreen */

		i2c@80110000 {

arch/arm/boot/dts/ste-hrefprev60-tvk.dts

+0 −7
Original line number Diff line number Diff line
@@ -10,11 +10,4 @@ 
/ {

	model = "ST-Ericsson HREF (pre-v60) and TVK1281618 UIB";

	compatible = "st-ericsson,mop500", "st-ericsson,u8500";



	/* This stablilizes the serial port enumeration */

	aliases {

		serial0 = &ux500_serial0;

		serial1 = &ux500_serial1;

		serial2 = &ux500_serial2;

	};

};

arch/arm/boot/dts/ste-hrefv60plus-stuib.dts

+0 −7
Original line number Diff line number Diff line
@@ -15,13 +15,6 @@ / { 
	model = "ST-Ericsson HREF (v60+) and ST UIB";

	compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";



	/* This stablilizes the serial port enumeration */

	aliases {

		serial0 = &ux500_serial0;

		serial1 = &ux500_serial1;

		serial2 = &ux500_serial2;

	};



	soc {

		/* Reset line for the BU21013 touchscreen */

		i2c@80110000 {

arch/arm/boot/dts/ste-hrefv60plus-tvk.dts

+0 −7
Original line number Diff line number Diff line
@@ -12,11 +12,4 @@ 
/ {

	model = "ST-Ericsson HREF (v60+) and TVK1281618 UIB";

	compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";



	/* This stablilizes the serial port enumeration */

	aliases {

		serial0 = &ux500_serial0;

		serial1 = &ux500_serial1;

		serial2 = &ux500_serial2;

	};

};