While changing node names of APQ8084 SDHCI, the ones in IFC6540 board
were not updated leading to disabled and misconfigured SDHCI.
Cc: <[email protected]>
Fixes: 2477d81901a2 ("ARM: dts: qcom: Fix sdhci node names - use 'mmc@'")
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm/boot/dts/qcom-apq8084-ifc6540.dts | 20 ++++++++++----------
arch/arm/boot/dts/qcom-apq8084.dtsi | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts b/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
index 44cd72f1b1be..116e59a3b76d 100644
--- a/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
+++ b/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
@@ -19,16 +19,16 @@ soc {
serial@f995e000 {
status = "okay";
};
+ };
+};
- sdhci@f9824900 {
- bus-width = <8>;
- non-removable;
- status = "okay";
- };
+&sdhc_1 {
+ bus-width = <8>;
+ non-removable;
+ status = "okay";
+};
- sdhci@f98a4900 {
- cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>;
- bus-width = <4>;
- };
- };
+&sdhc_2 {
+ cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>;
+ bus-width = <4>;
};
diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi
index fe30abfff90a..4b0d2b4f4b6a 100644
--- a/arch/arm/boot/dts/qcom-apq8084.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8084.dtsi
@@ -421,7 +421,7 @@ blsp2_uart2: serial@f995e000 {
status = "disabled";
};
- mmc@f9824900 {
+ sdhc_1: mmc@f9824900 {
compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4";
reg = <0xf9824900 0x11c>, <0xf9824000 0x800>;
reg-names = "hc", "core";
@@ -434,7 +434,7 @@ mmc@f9824900 {
status = "disabled";
};
- mmc@f98a4900 {
+ sdhc_2: mmc@f98a4900 {
compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4";
reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>;
reg-names = "hc", "core";
--
2.34.1
On Sun, 4 Dec 2022 at 10:46, Krzysztof Kozlowski
<[email protected]> wrote:
>
> While changing node names of APQ8084 SDHCI, the ones in IFC6540 board
> were not updated leading to disabled and misconfigured SDHCI.
>
> Cc: <[email protected]>
> Fixes: 2477d81901a2 ("ARM: dts: qcom: Fix sdhci node names - use 'mmc@'")
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
Reviewed-by: Dmitry Baryshkov <[email protected]>
Minor nit below.
> ---
> arch/arm/boot/dts/qcom-apq8084-ifc6540.dts | 20 ++++++++++----------
> arch/arm/boot/dts/qcom-apq8084.dtsi | 4 ++--
> 2 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts b/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
> index 44cd72f1b1be..116e59a3b76d 100644
> --- a/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
> +++ b/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
> @@ -19,16 +19,16 @@ soc {
> serial@f995e000 {
> status = "okay";
> };
> + };
> +};
>
> - sdhci@f9824900 {
> - bus-width = <8>;
> - non-removable;
> - status = "okay";
> - };
> +&sdhc_1 {
> + bus-width = <8>;
> + non-removable;
> + status = "okay";
> +};
>
> - sdhci@f98a4900 {
> - cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>;
> - bus-width = <4>;
> - };
> - };
> +&sdhc_2 {
> + cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>;
> + bus-width = <4>;
Technically this will still be disabled, as there is no 'status = "okay";' here.
> };
> diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi
> index fe30abfff90a..4b0d2b4f4b6a 100644
> --- a/arch/arm/boot/dts/qcom-apq8084.dtsi
> +++ b/arch/arm/boot/dts/qcom-apq8084.dtsi
> @@ -421,7 +421,7 @@ blsp2_uart2: serial@f995e000 {
> status = "disabled";
> };
>
> - mmc@f9824900 {
> + sdhc_1: mmc@f9824900 {
> compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4";
> reg = <0xf9824900 0x11c>, <0xf9824000 0x800>;
> reg-names = "hc", "core";
> @@ -434,7 +434,7 @@ mmc@f9824900 {
> status = "disabled";
> };
>
> - mmc@f98a4900 {
> + sdhc_2: mmc@f98a4900 {
> compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4";
> reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>;
> reg-names = "hc", "core";
> --
> 2.34.1
>
--
With best wishes
Dmitry
On 04/12/2022 12:11, Dmitry Baryshkov wrote:
> On Sun, 4 Dec 2022 at 10:46, Krzysztof Kozlowski
> <[email protected]> wrote:
>>
>> While changing node names of APQ8084 SDHCI, the ones in IFC6540 board
>> were not updated leading to disabled and misconfigured SDHCI.
>>
>> Cc: <[email protected]>
>> Fixes: 2477d81901a2 ("ARM: dts: qcom: Fix sdhci node names - use 'mmc@'")
>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>
> Reviewed-by: Dmitry Baryshkov <[email protected]>
>
> Minor nit below.
>
>> ---
>> arch/arm/boot/dts/qcom-apq8084-ifc6540.dts | 20 ++++++++++----------
>> arch/arm/boot/dts/qcom-apq8084.dtsi | 4 ++--
>> 2 files changed, 12 insertions(+), 12 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts b/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
>> index 44cd72f1b1be..116e59a3b76d 100644
>> --- a/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
>> +++ b/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
>> @@ -19,16 +19,16 @@ soc {
>> serial@f995e000 {
>> status = "okay";
>> };
>> + };
>> +};
>>
>> - sdhci@f9824900 {
>> - bus-width = <8>;
>> - non-removable;
>> - status = "okay";
>> - };
>> +&sdhc_1 {
>> + bus-width = <8>;
>> + non-removable;
>> + status = "okay";
>> +};
>>
>> - sdhci@f98a4900 {
>> - cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>;
>> - bus-width = <4>;
>> - };
>> - };
>> +&sdhc_2 {
>> + cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>;
>> + bus-width = <4>;
>
> Technically this will still be disabled, as there is no 'status = "okay";' here.
>
Yes, but I think this is separate issue, not related to node renaming.
The initial patch which added these said:
"required for enabling the serial port and eMMC."
so I assume SD card controller was meant to stay disabled.
Best regards,
Krzysztof
On Sun, 4 Dec 2022 09:46:14 +0100, Krzysztof Kozlowski wrote:
> While changing node names of APQ8084 SDHCI, the ones in IFC6540 board
> were not updated leading to disabled and misconfigured SDHCI.
>
>
Applied, thanks!
[1/1] ARM: dts: qcom: apq8084-ifc6540: fix overriding SDHCI
commit: 0154252a3b87f77db1e44516d1ed2e82e2d29c30
Best regards,
--
Bjorn Andersson <[email protected]>