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

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.netSigned-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 6b69c729
...@@ -25,6 +25,9 @@ aliases { ...@@ -25,6 +25,9 @@ aliases {
spi1 = &spi1; spi1 = &spi1;
spi2 = &spi2; spi2 = &spi2;
spi3 = &spi3; spi3 = &spi3;
serial0 = &ux500_serial0;
serial1 = &ux500_serial1;
serial2 = &ux500_serial2;
}; };
chosen { chosen {
......
...@@ -13,13 +13,6 @@ / { ...@@ -13,13 +13,6 @@ / {
model = "ST-Ericsson HREF (pre-v60) and ST UIB"; model = "ST-Ericsson HREF (pre-v60) and ST UIB";
compatible = "st-ericsson,mop500", "st-ericsson,u8500"; compatible = "st-ericsson,mop500", "st-ericsson,u8500";
/* This stablilizes the serial port enumeration */
aliases {
serial0 = &ux500_serial0;
serial1 = &ux500_serial1;
serial2 = &ux500_serial2;
};
soc { soc {
/* Reset line for the BU21013 touchscreen */ /* Reset line for the BU21013 touchscreen */
i2c@80110000 { i2c@80110000 {
......
...@@ -10,11 +10,4 @@ ...@@ -10,11 +10,4 @@
/ { / {
model = "ST-Ericsson HREF (pre-v60) and TVK1281618 UIB"; model = "ST-Ericsson HREF (pre-v60) and TVK1281618 UIB";
compatible = "st-ericsson,mop500", "st-ericsson,u8500"; compatible = "st-ericsson,mop500", "st-ericsson,u8500";
/* This stablilizes the serial port enumeration */
aliases {
serial0 = &ux500_serial0;
serial1 = &ux500_serial1;
serial2 = &ux500_serial2;
};
}; };
...@@ -15,13 +15,6 @@ / { ...@@ -15,13 +15,6 @@ / {
model = "ST-Ericsson HREF (v60+) and ST UIB"; model = "ST-Ericsson HREF (v60+) and ST UIB";
compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500"; compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";
/* This stablilizes the serial port enumeration */
aliases {
serial0 = &ux500_serial0;
serial1 = &ux500_serial1;
serial2 = &ux500_serial2;
};
soc { soc {
/* Reset line for the BU21013 touchscreen */ /* Reset line for the BU21013 touchscreen */
i2c@80110000 { i2c@80110000 {
......
...@@ -12,11 +12,4 @@ ...@@ -12,11 +12,4 @@
/ { / {
model = "ST-Ericsson HREF (v60+) and TVK1281618 UIB"; model = "ST-Ericsson HREF (v60+) and TVK1281618 UIB";
compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500"; compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";
/* This stablilizes the serial port enumeration */
aliases {
serial0 = &ux500_serial0;
serial1 = &ux500_serial1;
serial2 = &ux500_serial2;
};
}; };
...@@ -12,13 +12,6 @@ / { ...@@ -12,13 +12,6 @@ / {
model = "Calao Systems Snowball platform with device tree"; model = "Calao Systems Snowball platform with device tree";
compatible = "calaosystems,snowball-a9500", "st-ericsson,u9500"; compatible = "calaosystems,snowball-a9500", "st-ericsson,u9500";
/* This stablilizes the serial port enumeration */
aliases {
serial0 = &ux500_serial0;
serial1 = &ux500_serial1;
serial2 = &ux500_serial2;
};
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x20000000>; reg = <0x00000000 0x20000000>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment