arm64: dts: qcom: msm8916: Move aliases to boards

MSM8939 has the aliases defined separately for each board (because
there could be (theoretically) a board where the slots are numbered
differently. To make MSM8916 and MSM8939 more consistent do the same
for all MSM8916 boards and move aliases there.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230525-msm8916-labels-v1-6-bec0f5fb46fb@gerhold.net

arch/arm64/boot/dts/qcom/apq8016-sbc.dts

@@ -18,6 +18,8 @@
 	compatible = "qcom,apq8016-sbc", "qcom,apq8016";
 
 	aliases {
+		mmc0 = &sdhc_1; /* eMMC */
+		mmc1 = &sdhc_2; /* SD card */
 		serial0 = &blsp_uart2;
 		serial1 = &blsp_uart1;
 		usid0 = &pm8916_0;

arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts

@@ -22,6 +22,8 @@
 	chassis-type = "tablet";
 
 	aliases {
+		mmc0 = &sdhc_1; /* eMMC */
+		mmc1 = &sdhc_2; /* SD card */
 		serial0 = &blsp_uart2;
 	};
 

arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts

@@ -13,6 +13,8 @@
 	chassis-type = "handset";
 
 	aliases {
+		mmc0 = &sdhc_1; /* eMMC */
+		mmc1 = &sdhc_2; /* SD card */
 		serial0 = &blsp_uart2;
 	};
 

arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts

@@ -13,6 +13,8 @@
 	chassis-type = "handset";
 
 	aliases {
+		mmc0 = &sdhc_1; /* eMMC */
+		mmc1 = &sdhc_2; /* SD card */
 		serial0 = &blsp_uart2;
 	};
 

arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts

@@ -14,6 +14,8 @@
 	chassis-type = "tablet";
 
 	aliases {
+		mmc0 = &sdhc_1; /* eMMC */
+		mmc1 = &sdhc_2; /* SD card */
 		serial0 = &blsp_uart2;
 	};
 

arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts

@@ -26,6 +26,8 @@
 	chassis-type = "handset";
 
 	aliases {
+		mmc0 = &sdhc_1; /* eMMC */
+		mmc1 = &sdhc_2; /* SD card */
 		serial0 = &blsp_uart2;
 	};
 

arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts

@@ -14,6 +14,8 @@
 	chassis-type = "handset";
 
 	aliases {
+		mmc0 = &sdhc_1; /* eMMC */
+		mmc1 = &sdhc_2; /* SD card */
 		serial0 = &blsp_uart2;
 	};
 

arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts

@@ -13,6 +13,8 @@
 	chassis-type = "handset";
 
 	aliases {
+		mmc0 = &sdhc_1; /* eMMC */
+		mmc1 = &sdhc_2; /* SD card */
 		serial0 = &blsp_uart2;
 	};
 

arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi

@@ -8,6 +8,8 @@
 
 / {
 	aliases {
+		mmc0 = &sdhc_1; /* eMMC */
+		mmc1 = &sdhc_2; /* SD card */
 		serial0 = &blsp_uart2;
 	};
 

arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi

@@ -9,6 +9,8 @@
 
 / {
 	aliases {
+		mmc0 = &sdhc_1; /* eMMC */
+		mmc1 = &sdhc_2; /* SD card */
 		serial0 = &blsp_uart2;
 	};
 

arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi

@@ -7,6 +7,8 @@
 
 / {
 	aliases {
+		mmc0 = &sdhc_1; /* eMMC */
+		mmc1 = &sdhc_2; /* SD card */
 		serial0 = &blsp_uart2;
 	};
 

arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts

@@ -28,6 +28,8 @@
 	chassis-type = "handset";
 
 	aliases {
+		mmc0 = &sdhc_1; /* eMMC */
+		mmc1 = &sdhc_2; /* SD card */
 		serial0 = &blsp_uart2;
 	};
 

arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi

@@ -9,6 +9,7 @@
 	chassis-type = "embedded";
 
 	aliases {
+		mmc0 = &sdhc_1; /* eMMC */
 		serial0 = &blsp_uart2;
 	};
 

arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts

@@ -16,6 +16,8 @@
 	chassis-type = "handset";
 
 	aliases {
+		mmc0 = &sdhc_1; /* eMMC */
+		mmc1 = &sdhc_2; /* SD card */
 		serial0 = &blsp_uart2;
 	};
 

arch/arm64/boot/dts/qcom/msm8916.dtsi

@@ -18,11 +18,6 @@
 	#address-cells = <2>;
 	#size-cells = <2>;
 
-	aliases {
-		mmc0 = &sdhc_1; /* SDC1 eMMC slot */
-		mmc1 = &sdhc_2; /* SDC2 SD card slot */
-	};
-
 	chosen { };
 
 	memory@80000000 {