iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qualcomm ARM32 DTS fix for 6.2

Browse Source 
This fixes a regression on Inforce 6540, as the sdhci nodes no longer
 overrides the platform's mmc nodes.
 -----BEGIN PGP SIGNATURE-----
 
 iQJJBAABCAAzFiEEBd4DzF816k8JZtUlCx85Pw2ZrcUFAmO92AUVHGFuZGVyc3Nv
 bkBrZXJuZWwub3JnAAoJEAsfOT8Nma3FriYQANc9lZJeI+HK8H1NR5BQzJZtVIcR
 ecRlSm8pN5uYvPEP9Y4mtF60ukn1+A+CydekkZlxUCJnpeDas2YxbZyGBe7ua3Gy
 xeneYabETxpZo9+6p73TNEiAv+g3ahN4A3uMg9i9BTi3nfVbl27icUxJlXklUXrb
 WR+KfVOlcpLD8Vpy9VuvTjFfnlf6HnpQ/G2IzEbnJ8fCjtV7QYEExvi0Nb8K1k3K
 gLPRCE69o8TCOQ2o0feW0If4MnUK4wQ2U0zLM6JuZ03QaW198tL84/u39NygVLzy
 fR4P/NG7J79f7pQPKW+Mx2nwn86lpQeB9faMSHKZFCosmWBvQs9H2s37NE3TKENx
 fe9xjIF9/r4LUQM4xBJt6T9z03gUl5Jag+h1/+bj+EMDNFyPf4uPjMtwU5xV9kBs
 Ok+FD8PH1Hf7T2PcDK4FJYJ89zb1XdyOHKVCM3YFcR4xbUHyuM/DIxpfNeBVIp1Y
 nB1d0F8UhKK+Ms3f8/PQn8/esjb46OHkx/NWgycelFfLJ/m2jmtUrw7OqKPd9DCp
 cxemXQC30DbZG6tC1GjmQ9sT4pVaqfWvoHSxUiJIj8QHzhCpmBPDimPTXJM6sIuA
 TONwnYmj3KagkR6FOzdaEHo2fR4QMVmh5cSTGXHxa2xDANbDd8CCZbG314NOr823
 OV8EgZjw5frs5EeV
 =T96m
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmO94fIACgkQmmx57+YA
 GNkXURAAqydSqp0/vgFKt9qoghxzuasNMlEnKXR2mjQUwzM6sn2sExMMBel7lwZX
 qXW3p1hq78iHT3Ed7gbhTakIQr0X6c6nWXpT3yKBM+Yk8u68lfqex/wY+vvqd6pj
 dm0vlKJcNEztW3z3WlaGM4Bgjhv/9GwXCVNmFr7Qcm5j2D9Nwt8/pMCaRmsTJvsm
 VDz19Ci33NT074fcaeBxzggZE8REnvrP/lYcaQyLua5KU2usq0jwSK+FBx60rGaU
 79NyIVMBRLL5I8QrAUDVULQ2ScfuNpDcACrH0Hj8jAMXzuz22Jfv/30tUEpll+ol
 SqqaAjit7dvwqkTpCS9nMwz/qpH7wJoYaLOzzMRrAsAW6p7wJVPfieBapzsrZ/tq
 DQshXEOr92Z4x9yIAfzg//dL4o4xEVcBFsDftXHoTlPHJVy6k1gJId2WLCYKC76r
 41IOp7oGKnkt5+9CRQ1H5ZAs/kGSo6j/bs8m4UdbybPhHWJlIRHkKHpjufjMneRo
 Ul3KXcW6cZAMx0XezPiK/2hL+a1SKrXIeCu0DRJ7cu+al+eaSykXIY1dgP1OdKwd
 YXn0mJYGeJhHcoiWg6lJB0SXuZIPghUPsu9qGIMW8+2ryLRpW+spd6Mg3U7Y2QQo
 QE7ileuEfg5OxiH65UgWz4d7Ewf0h31CxQt1B0z+W91t1HkH8ZI=
 =h9fR
 -----END PGP SIGNATURE-----

Merge tag 'qcom-dts-fixes-for-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes

Qualcomm ARM32 DTS fix for 6.2

This fixes a regression on Inforce 6540, as the sdhci nodes no longer
overrides the platform's mmc nodes.

* tag 'qcom-dts-fixes-for-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: dts: qcom: apq8084-ifc6540: fix overriding SDHCI

Link: https://lore.kernel.org/r/20230110212750.2182904-1-andersson@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-01-10 23:08:49 +01:00
commit 985d7fef11
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
View File

@ -19,16 +19,16 @@
serial@f995e000 {
status = "okay";
};
sdhci@f9824900 {
bus-width = <8>;
non-removable;
status = "okay";
};
sdhci@f98a4900 {
cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>;
bus-width = <4>;
};
};
};
&sdhc_1 {
bus-width = <8>;
non-removable;
status = "okay";
};
&sdhc_2 {
cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>;
bus-width = <4>;
};

4
arch/arm/boot/dts/qcom-apq8084.dtsi
View File

@ -421,7 +421,7 @@
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 @@
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";