Skip to content

L
linux
Commit 1cd15986 authored by David Heidelberg's avatar David Heidelberg Committed by Bjorn Andersson
Browse files
Options

ARM: dts: qcom: correct mmc node naming 

MMC nodes has to be named mmc@ to comply with dt-bindings.

Fix warnings as:
arch/arm/boot/dts/qcom-msm8660-surf.dt.yaml: sdcc@12400000: $nodename:0: 'sdcc@12400000' does not match '^mmc(@.*)?$'
	From schema: Documentation/devicetree/bindings/mmc/arm,pl18x.yaml
Signed-off-by: default avatarDavid Heidelberg <david@ixit.cz>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211020201440.229196-1-david@ixit.cz
parent 14a1f6c9
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
View file @ 1cd15986
......@@ -899,7 +899,7 @@ ncp {
};
amba {
/* Internal 3.69 GiB eMMC */
sdcc@12400000 {
mmc@12400000 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dragon_sdcc1_pins>;
......@@ -908,7 +908,7 @@ sdcc@12400000 {
};
/* External micro SD card, directly connected, pulled up to 2.85 V */
sdcc@12180000 {
mmc@12180000 {
status = "okay";
/* Enable SSBI GPIO 22 as input, use for card detect */
pinctrl-names = "default";
......@@ -922,7 +922,7 @@ sdcc@12180000 {
* Second external micro SD card, using two TXB104RGYR levelshifters
* to lift from 1.8 V to 2.85 V
*/
sdcc@12200000 {
mmc@12200000 {
status = "okay";
/* Enable SSBI GPIO 26 as input, use for card detect */
pinctrl-names = "default";
......
arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
View file @ 1cd15986
......@@ -335,7 +335,7 @@ phy {
amba {
/* eMMC */
sdcc@12400000 {
mmc@12400000 {
status = "okay";
vmmc-supply = <&pm8921_l5>;
vqmmc-supply = <&pm8921_s4>;
......
arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
View file @ 1cd15986
......@@ -220,14 +220,14 @@ pci@1b500000 {
amba {
/* eMMC */
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "okay";
vmmc-supply = <&pm8921_l5>;
vqmmc-supply = <&pm8921_s4>;
};
/* External micro SD card */
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
status = "okay";
vmmc-supply = <&v3p3_fixed>;
pinctrl-names = "default";
......@@ -235,7 +235,7 @@ sdcc3: sdcc@12180000 {
cd-gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>;
};
/* WLAN */
sdcc4: sdcc@121c0000 {
sdcc4: mmc@121c0000 {
status = "okay";
vmmc-supply = <&v3p3_fixed>;
vqmmc-supply = <&v3p3_fixed>;
......
arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
View file @ 1cd15986
......@@ -314,14 +314,14 @@ pios {
amba {
/* eMMC */
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "okay";
vmmc-supply = <&pm8921_l5>;
vqmmc-supply = <&pm8921_s4>;
};
/* External micro SD card */
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
status = "okay";
vmmc-supply = <&pm8921_l6>;
pinctrl-names = "default";
......@@ -329,7 +329,7 @@ sdcc3: sdcc@12180000 {
cd-gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>;
};
/* WLAN */
sdcc4: sdcc@121c0000 {
sdcc4: mmc@121c0000 {
status = "okay";
vmmc-supply = <&ext_3p3v>;
vqmmc-supply = <&pm8921_lvs1>;
......
arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts
View file @ 1cd15986
......@@ -374,14 +374,14 @@ serial@1a240000 {
};
amba {
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "okay";
vmmc-supply = <&pm8921_l5>;
vqmmc-supply = <&pm8921_s4>;
};
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
status = "okay";
vmmc-supply = <&pm8921_l6>;
......
arch/arm/boot/dts/qcom-apq8064.dtsi
View file @ 1cd15986
......@@ -1073,7 +1073,7 @@ amba {
#address-cells = <1>;
#size-cells = <1>;
ranges;
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "disabled";
compatible = "arm,pl18x", "arm,primecell";
pinctrl-names = "default";
......@@ -1093,7 +1093,7 @@ sdcc1: sdcc@12400000 {
dma-names = "tx", "rx";
};
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
status = "disabled";
......@@ -1111,7 +1111,7 @@ sdcc3: sdcc@12180000 {
dma-names = "tx", "rx";
};
sdcc4: sdcc@121c0000 {
sdcc4: mmc@121c0000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
status = "disabled";
......
arch/arm/boot/dts/qcom-ipq8064.dtsi
View file @ 1cd15986
......@@ -1181,7 +1181,7 @@ amba: amba {
#size-cells = <1>;
ranges;
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "disabled";
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
......@@ -1201,7 +1201,7 @@ sdcc1: sdcc@12400000 {
dma-names = "tx", "rx";
};
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
status = "disabled";
......
arch/arm/boot/dts/qcom-mdm9615.dtsi
View file @ 1cd15986
......@@ -354,7 +354,7 @@ amba {
#address-cells = <1>;
#size-cells = <1>;
ranges;
sdcc1: sdcc@12180000 {
sdcc1: mmc@12180000 {
status = "disabled";
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
......@@ -374,7 +374,7 @@ sdcc1: sdcc@12180000 {
assigned-clock-rates = <400000>;
};
sdcc2: sdcc@12140000 {
sdcc2: mmc@12140000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
status = "disabled";
......
arch/arm/boot/dts/qcom-msm8660-surf.dts
View file @ 1cd15986
......@@ -35,13 +35,13 @@ vsdcc_fixed: vsdcc-regulator {
amba {
/* eMMC */
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "okay";
vmmc-supply = <&vsdcc_fixed>;
};
/* External micro SD card */
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
status = "okay";
vmmc-supply = <&vsdcc_fixed>;
};
......
arch/arm/boot/dts/qcom-msm8660.dtsi
View file @ 1cd15986
......@@ -483,7 +483,7 @@ amba {
#address-cells = <1>;
#size-cells = <1>;
ranges;
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "disabled";
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
......@@ -499,7 +499,7 @@ sdcc1: sdcc@12400000 {
cap-mmc-highspeed;
};
sdcc2: sdcc@12140000 {
sdcc2: mmc@12140000 {
status = "disabled";
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
......@@ -514,7 +514,7 @@ sdcc2: sdcc@12140000 {
cap-mmc-highspeed;
};
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
status = "disabled";
......@@ -530,7 +530,7 @@ sdcc3: sdcc@12180000 {
no-1-8-v;
};
sdcc4: sdcc@121c0000 {
sdcc4: mmc@121c0000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
status = "disabled";
......@@ -545,7 +545,7 @@ sdcc4: sdcc@121c0000 {
cap-mmc-highspeed;
};
sdcc5: sdcc@12200000 {
sdcc5: mmc@12200000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
status = "disabled";
......
arch/arm/boot/dts/qcom-msm8960-cdp.dts
View file @ 1cd15986
......@@ -26,12 +26,12 @@ serial@16440000 {
amba {
/* eMMC */
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "okay";
};
/* External micro SD card */
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
status = "okay";
};
};
......
arch/arm/boot/dts/qcom-msm8960.dtsi
View file @ 1cd15986
......@@ -263,7 +263,7 @@ amba {
#address-cells = <1>;
#size-cells = <1>;
ranges;
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "disabled";
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
......@@ -280,7 +280,7 @@ sdcc1: sdcc@12400000 {
vmmc-supply = <&vsdcc_fixed>;
};
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
status = "disabled";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7