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

Commit 1e64f48e authored by Tomasz Figa's avatar Tomasz Figa Committed by Greg Kroah-Hartman
Browse files

ARM: dts: SAMSUNG: Add aliases of UART nodes 



This patch adds alias entries for UART nodes of all SoCs using
samsung-uart compatible UART controllers, so that the dependency on
probe order is removed and deterministic device naming is assured.

Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 13a9f6c6

arch/arm/boot/dts/exynos3250.dtsi

+2 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,8 @@ 
		i2c5 = &i2c_5;

		i2c5 = &i2c_5;

		i2c6 = &i2c_6;

		i2c6 = &i2c_6;

		i2c7 = &i2c_7;

		i2c7 = &i2c_7;

		serial0 = &serial_0;

		serial1 = &serial_1;

	};

	};





	cpus {

	cpus {

arch/arm/boot/dts/exynos4.dtsi

+8 −4
Original line number Original line Diff line number Diff line
@@ -44,6 +44,10 @@ 
		fimc1 = &fimc_1;

		fimc1 = &fimc_1;

		fimc2 = &fimc_2;

		fimc2 = &fimc_2;

		fimc3 = &fimc_3;

		fimc3 = &fimc_3;

		serial0 = &serial_0;

		serial1 = &serial_1;

		serial2 = &serial_2;

		serial3 = &serial_3;

	};

	};





	clock_audss: clock-controller@03810000 {

	clock_audss: clock-controller@03810000 {
@@ -363,7 +367,7 @@ 
		status = "disabled";

		status = "disabled";

	};

	};





	serial@13800000 {

	serial_0: serial@13800000 {

		compatible = "samsung,exynos4210-uart";

		compatible = "samsung,exynos4210-uart";

		reg = <0x13800000 0x100>;

		reg = <0x13800000 0x100>;

		interrupts = <0 52 0>;

		interrupts = <0 52 0>;
@@ -372,7 +376,7 @@ 
		status = "disabled";

		status = "disabled";

	};

	};





	serial@13810000 {

	serial_1: serial@13810000 {

		compatible = "samsung,exynos4210-uart";

		compatible = "samsung,exynos4210-uart";

		reg = <0x13810000 0x100>;

		reg = <0x13810000 0x100>;

		interrupts = <0 53 0>;

		interrupts = <0 53 0>;
@@ -381,7 +385,7 @@ 
		status = "disabled";

		status = "disabled";

	};

	};





	serial@13820000 {

	serial_2: serial@13820000 {

		compatible = "samsung,exynos4210-uart";

		compatible = "samsung,exynos4210-uart";

		reg = <0x13820000 0x100>;

		reg = <0x13820000 0x100>;

		interrupts = <0 54 0>;

		interrupts = <0 54 0>;
@@ -390,7 +394,7 @@ 
		status = "disabled";

		status = "disabled";

	};

	};





	serial@13830000 {

	serial_3: serial@13830000 {

		compatible = "samsung,exynos4210-uart";

		compatible = "samsung,exynos4210-uart";

		reg = <0x13830000 0x100>;

		reg = <0x13830000 0x100>;

		interrupts = <0 55 0>;

		interrupts = <0 55 0>;

arch/arm/boot/dts/exynos5.dtsi

+11 −4
Original line number Original line Diff line number Diff line
@@ -18,6 +18,13 @@ 
/ {

/ {

	interrupt-parent = <&gic>;

	interrupt-parent = <&gic>;





	aliases {

		serial0 = &serial_0;

		serial1 = &serial_1;

		serial2 = &serial_2;

		serial3 = &serial_3;

	};



	chipid@10000000 {

	chipid@10000000 {

		compatible = "samsung,exynos4210-chipid";

		compatible = "samsung,exynos4210-chipid";

		reg = <0x10000000 0x100>;

		reg = <0x10000000 0x100>;
@@ -50,25 +57,25 @@ 
		interrupts = <1 9 0xf04>;

		interrupts = <1 9 0xf04>;

	};

	};





	serial@12C00000 {

	serial_0: serial@12C00000 {

		compatible = "samsung,exynos4210-uart";

		compatible = "samsung,exynos4210-uart";

		reg = <0x12C00000 0x100>;

		reg = <0x12C00000 0x100>;

		interrupts = <0 51 0>;

		interrupts = <0 51 0>;

	};

	};





	serial@12C10000 {

	serial_1: serial@12C10000 {

		compatible = "samsung,exynos4210-uart";

		compatible = "samsung,exynos4210-uart";

		reg = <0x12C10000 0x100>;

		reg = <0x12C10000 0x100>;

		interrupts = <0 52 0>;

		interrupts = <0 52 0>;

	};

	};





	serial@12C20000 {

	serial_2: serial@12C20000 {

		compatible = "samsung,exynos4210-uart";

		compatible = "samsung,exynos4210-uart";

		reg = <0x12C20000 0x100>;

		reg = <0x12C20000 0x100>;

		interrupts = <0 53 0>;

		interrupts = <0 53 0>;

	};

	};





	serial@12C30000 {

	serial_3: serial@12C30000 {

		compatible = "samsung,exynos4210-uart";

		compatible = "samsung,exynos4210-uart";

		reg = <0x12C30000 0x100>;

		reg = <0x12C30000 0x100>;

		interrupts = <0 54 0>;

		interrupts = <0 54 0>;

arch/arm/boot/dts/exynos5260.dtsi

+4 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,10 @@ 
		pinctrl0 = &pinctrl_0;

		pinctrl0 = &pinctrl_0;

		pinctrl1 = &pinctrl_1;

		pinctrl1 = &pinctrl_1;

		pinctrl2 = &pinctrl_2;

		pinctrl2 = &pinctrl_2;

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;

		serial3 = &uart3;

	};

	};





	cpus {

	cpus {

arch/arm/boot/dts/exynos5410.dtsi

+6 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,12 @@ 
	compatible = "samsung,exynos5410", "samsung,exynos5";

	compatible = "samsung,exynos5410", "samsung,exynos5";

	interrupt-parent = <&gic>;

	interrupt-parent = <&gic>;





	aliases {

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;

	};



	cpus {

	cpus {

		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <0>;

		#size-cells = <0>;