| Message ID | 20230525-msm8916-labels-v1-6-bec0f5fb46fb@gerhold.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 154f23a8d70cd39158cfdcfb71c112f687352da4 |
| Headers | show |
| Series | arm64: dts: qcom: msm8916/39: Clean up labels | expand |
On 29/05/2023 13:47, Stephan Gerhold wrote: > 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>
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts index 923646766ef1..56dfca61253e 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts +++ b/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; diff --git a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts index c864ce12c1f1..5025c08e4817 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts +++ b/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; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts index 47580bd243eb..7b629243ef0d 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts +++ b/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; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts index ad71695652c2..b8c217b04a3b 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts +++ b/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; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts index a2be985052a5..56c42b0c9733 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts +++ b/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; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts index 1334bfcf3cee..175ca011998c 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts +++ b/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; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts index facb44892dd5..9560ba632c6f 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts +++ b/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; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts index 707288b7eca8..f23cfb2bf793 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts +++ b/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; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi index b1af9c5d07b2..895036fb6eb8 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi +++ b/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; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi index 82d94d62fbe6..94cfb3200496 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi +++ b/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; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi index 78935205ea9d..f2a5800f1605 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi +++ b/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; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts index bd1e1e1153c0..3637e7d80d0a 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts +++ b/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; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi index ac39ac6a21c1..dafa5bd82328 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi @@ -9,6 +9,7 @@ / { chassis-type = "embedded"; aliases { + mmc0 = &sdhc_1; /* eMMC */ serial0 = &blsp_uart2; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts index 930318a443a8..733917531218 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts +++ b/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; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 0028a405e3ec..9494b6512d87 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/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 {
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> --- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi | 2 ++ arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 2 ++ arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 2 ++ arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 1 + arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916.dtsi | 5 ----- 15 files changed, 27 insertions(+), 5 deletions(-)