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

Commit 109978de authored by Linus Walleij's avatar Linus Walleij Committed by Olof Johansson
Browse files

ARM: ux500: define serial port aliases 



This enumerates the PL011 serial ports on the Ux500. This is
necessary to do if we want to remove one of the serial ports,
since userspace depends on console to be present on ttyAMA2
and we must not break userspace.

Cc: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent b2b9dc60

arch/arm/boot/dts/ste-ccu8540.dts

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,13 @@ 
	model = "ST-Ericsson U8540 platform with Device Tree";

	compatible = "st-ericsson,ccu8540", "st-ericsson,u8540";



	/* This stablilizes the serial port enumeration */

	aliases {

		serial0 = &ux500_serial0;

		serial1 = &ux500_serial1;

		serial2 = &ux500_serial2;

	};



	memory@0 {

		device_type = "memory";

		reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>;

arch/arm/boot/dts/ste-ccu9540.dts

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,13 @@ 
	model = "ST-Ericsson CCU9540 platform with Device Tree";

	compatible = "st-ericsson,ccu9540", "st-ericsson,u9540";



	/* This stablilizes the serial port enumeration */

	aliases {

		serial0 = &ux500_serial0;

		serial1 = &ux500_serial1;

		serial2 = &ux500_serial2;

	};



	memory {

		reg = <0x00000000 0x20000000>;

	};

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

+3 −3
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ 
			power-domains = <&pm_domains DOMAIN_VAPE>;

		};



		uart@80120000 {

		ux500_serial0: uart@80120000 {

			compatible = "arm,pl011", "arm,primecell";

			reg = <0x80120000 0x1000>;

			interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
@@ -986,7 +986,7 @@ 
			status = "disabled";

		};



		uart@80121000 {

		ux500_serial1: uart@80121000 {

			compatible = "arm,pl011", "arm,primecell";

			reg = <0x80121000 0x1000>;

			interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -1001,7 +1001,7 @@ 
			status = "disabled";

		};



		uart@80007000 {

		ux500_serial2: uart@80007000 {

			compatible = "arm,pl011", "arm,primecell";

			reg = <0x80007000 0x1000>;

			interrupts = <0 26 IRQ_TYPE_LEVEL_HIGH>;

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

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,13 @@ 
	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

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

	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;

	};

};