arm64: dts: exynos: move aliases to board in Exynos850

The aliases for typical blocks which are disabled by default in DTSI
(like I2C, UART and MMC) should be defined in the board DTS.  The board
should add aliases only for enabled blocks according to its specific
order.

On Exynos850, move aliases of enabled blocks to E850-96 board and remove
unused ones.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220221075219.10827-1-krzysztof.kozlowski@canonical.com

diff --git a/arch/arm64/boot/dts/exynos/exynos850-e850-96.dts b/arch/arm64/boot/dts/exynos/exynos850-e850-96.dts
index 7b5a61d22cc536c65833575097e93276d9dccf43..f52a55f644f79d4b9848531f061945f7e517a01d 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos850-e850-96.dts
+++ b/arch/arm64/boot/dts/exynos/exynos850-e850-96.dts
@@ -20,6 +20,11 @@
        model = "WinLink E850-96 board";
        compatible = "winlink,e850-96", "samsung,exynos850";
 
+       aliases {
+               mmc0 = &mmc_0;
+               serial0 = &serial_0;
+       };
+
        chosen {
                stdout-path = &serial_0;
        };

diff --git a/arch/arm64/boot/dts/exynos/exynos850.dtsi b/arch/arm64/boot/dts/exynos/exynos850.dtsi
index d1700e96fee21b3dd8406a0d73007771ef9286ba..1c6d8fdf453cf4a6d126362b51719947abcee81d 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos850.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos850.dtsi
@@ -29,22 +29,6 @@
                pinctrl3 = &pinctrl_hsi;
                pinctrl4 = &pinctrl_core;
                pinctrl5 = &pinctrl_peri;
-               mmc0 = &mmc_0;
-               serial0 = &serial_0;
-               serial1 = &serial_1;
-               serial2 = &serial_2;
-               i2c0 = &i2c_0;
-               i2c1 = &i2c_1;
-               i2c2 = &i2c_2;
-               i2c3 = &i2c_3;
-               i2c4 = &i2c_4;
-               i2c5 = &i2c_5;
-               i2c6 = &i2c_6;
-               i2c7 = &hsi2c_0;
-               i2c8 = &hsi2c_1;
-               i2c9 = &hsi2c_2;
-               i2c10 = &hsi2c_3;
-               i2c11 = &hsi2c_4;
        };
 
        arm-pmu {