* [PATCH 1/2] ARM: dts: qcom: Add SoC-specific string for sdhci-msm-v4 nodes
@ 2018-11-05 21:09 Douglas Anderson
2018-11-05 21:09 ` [PATCH 2/2] arm64: " Douglas Anderson
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Douglas Anderson @ 2018-11-05 21:09 UTC (permalink / raw)
To: Andy Gross, Rob Herring
Cc: Douglas Anderson, devicetree, linux-arm-msm, linux-kernel,
David Brown, Mark Rutland, linux-soc
As per upstream discussion [1], we should have an SoC-specific
compatible string for Qualcomm's SDHCI nodes. Let's add it.
[1] https://lkml.kernel.org/r/20181105203657.GA32282@bogus
Signed-off-by: Douglas Anderson <dianders@chromium.org>
---
arch/arm/boot/dts/qcom-apq8084.dtsi | 4 ++--
arch/arm/boot/dts/qcom-msm8974.dtsi | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi
index 0e1e98707e3f..899f28533ed7 100644
--- a/arch/arm/boot/dts/qcom-apq8084.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8084.dtsi
@@ -412,7 +412,7 @@
};
sdhci@f9824900 {
- compatible = "qcom,sdhci-msm-v4";
+ compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4";
reg = <0xf9824900 0x11c>, <0xf9824000 0x800>;
reg-names = "hc_mem", "core_mem";
interrupts = <0 123 0>, <0 138 0>;
@@ -425,7 +425,7 @@
};
sdhci@f98a4900 {
- compatible = "qcom,sdhci-msm-v4";
+ compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4";
reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>;
reg-names = "hc_mem", "core_mem";
interrupts = <0 125 0>, <0 221 0>;
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index aba159d5a95a..891990c0d0b4 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -602,7 +602,7 @@
};
sdhci@f9824900 {
- compatible = "qcom,sdhci-msm-v4";
+ compatible = "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4";
reg = <0xf9824900 0x11c>, <0xf9824000 0x800>;
reg-names = "hc_mem", "core_mem";
interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
@@ -616,7 +616,7 @@
};
sdhci@f9864900 {
- compatible = "qcom,sdhci-msm-v4";
+ compatible = "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4";
reg = <0xf9864900 0x11c>, <0xf9864000 0x800>;
reg-names = "hc_mem", "core_mem";
interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>,
@@ -630,7 +630,7 @@
};
sdhci@f98a4900 {
- compatible = "qcom,sdhci-msm-v4";
+ compatible = "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4";
reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>;
reg-names = "hc_mem", "core_mem";
interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
--
2.19.1.930.g4563a0d9d0-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] arm64: dts: qcom: Add SoC-specific string for sdhci-msm-v4 nodes
2018-11-05 21:09 [PATCH 1/2] ARM: dts: qcom: Add SoC-specific string for sdhci-msm-v4 nodes Douglas Anderson
@ 2018-11-05 21:09 ` Douglas Anderson
2018-11-29 0:03 ` Bjorn Andersson
2018-11-20 23:12 ` [PATCH 1/2] ARM: " Doug Anderson
2018-11-29 0:03 ` Bjorn Andersson
2 siblings, 1 reply; 5+ messages in thread
From: Douglas Anderson @ 2018-11-05 21:09 UTC (permalink / raw)
To: Andy Gross, Rob Herring
Cc: Douglas Anderson, devicetree, linux-arm-msm, linux-kernel,
David Brown, Mark Rutland, linux-soc
As per upstream discussion [1], we should have an SoC-specific
compatible string for Qualcomm's SDHCI nodes. Let's add it.
[1] https://lkml.kernel.org/r/20181105203657.GA32282@bogus
Signed-off-by: Douglas Anderson <dianders@chromium.org>
---
arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/msm8992.dtsi | 2 +-
arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index d302d8d639a1..0a7335526063 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -587,7 +587,7 @@
};
sdhc_1: sdhci@7824000 {
- compatible = "qcom,sdhci-msm-v4";
+ compatible = "qcom,msm8916-sdhci", "qcom,sdhci-msm-v4";
reg = <0x07824900 0x11c>, <0x07824000 0x800>;
reg-names = "hc_mem", "core_mem";
@@ -604,7 +604,7 @@
};
sdhc_2: sdhci@7864000 {
- compatible = "qcom,sdhci-msm-v4";
+ compatible = "qcom,msm8916-sdhci", "qcom,sdhci-msm-v4";
reg = <0x07864900 0x11c>, <0x07864000 0x800>;
reg-names = "hc_mem", "core_mem";
diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qcom/msm8992.dtsi
index cf5cacdd624d..09d0234cfd99 100644
--- a/arch/arm64/boot/dts/qcom/msm8992.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi
@@ -203,7 +203,7 @@
};
sdhci1: mmc@f9824900 {
- compatible = "qcom,sdhci-msm-v4";
+ compatible = "qcom,msm8992-sdhci", "qcom,sdhci-msm-v4";
reg = <0xf9824900 0x1a0>, <0xf9824000 0x800>;
reg-names = "hc_mem", "core_mem";
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index b29fe80d7288..5e19f87df020 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -535,7 +535,7 @@
sdhc2: sdhci@74a4900 {
status = "disabled";
- compatible = "qcom,sdhci-msm-v4";
+ compatible = "qcom,msm8996-sdhci", "qcom,sdhci-msm-v4";
reg = <0x74a4900 0x314>, <0x74a4000 0x800>;
reg-names = "hc_mem", "core_mem";
--
2.19.1.930.g4563a0d9d0-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] arm64: dts: qcom: Add SoC-specific string for sdhci-msm-v4 nodes
2018-11-05 21:09 ` [PATCH 2/2] arm64: " Douglas Anderson
@ 2018-11-29 0:03 ` Bjorn Andersson
0 siblings, 0 replies; 5+ messages in thread
From: Bjorn Andersson @ 2018-11-29 0:03 UTC (permalink / raw)
To: Douglas Anderson
Cc: Andy Gross, Rob Herring, devicetree, linux-arm-msm, linux-kernel,
David Brown, Mark Rutland, linux-soc
On Mon 05 Nov 13:09 PST 2018, Douglas Anderson wrote:
> As per upstream discussion [1], we should have an SoC-specific
> compatible string for Qualcomm's SDHCI nodes. Let's add it.
>
> [1] https://lkml.kernel.org/r/20181105203657.GA32282@bogus
>
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> ---
>
> arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 ++--
> arch/arm64/boot/dts/qcom/msm8992.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
> index d302d8d639a1..0a7335526063 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
> @@ -587,7 +587,7 @@
> };
>
> sdhc_1: sdhci@7824000 {
> - compatible = "qcom,sdhci-msm-v4";
> + compatible = "qcom,msm8916-sdhci", "qcom,sdhci-msm-v4";
> reg = <0x07824900 0x11c>, <0x07824000 0x800>;
> reg-names = "hc_mem", "core_mem";
>
> @@ -604,7 +604,7 @@
> };
>
> sdhc_2: sdhci@7864000 {
> - compatible = "qcom,sdhci-msm-v4";
> + compatible = "qcom,msm8916-sdhci", "qcom,sdhci-msm-v4";
> reg = <0x07864900 0x11c>, <0x07864000 0x800>;
> reg-names = "hc_mem", "core_mem";
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qcom/msm8992.dtsi
> index cf5cacdd624d..09d0234cfd99 100644
> --- a/arch/arm64/boot/dts/qcom/msm8992.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi
> @@ -203,7 +203,7 @@
> };
>
> sdhci1: mmc@f9824900 {
> - compatible = "qcom,sdhci-msm-v4";
> + compatible = "qcom,msm8992-sdhci", "qcom,sdhci-msm-v4";
> reg = <0xf9824900 0x1a0>, <0xf9824000 0x800>;
> reg-names = "hc_mem", "core_mem";
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index b29fe80d7288..5e19f87df020 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -535,7 +535,7 @@
>
> sdhc2: sdhci@74a4900 {
> status = "disabled";
> - compatible = "qcom,sdhci-msm-v4";
> + compatible = "qcom,msm8996-sdhci", "qcom,sdhci-msm-v4";
> reg = <0x74a4900 0x314>, <0x74a4000 0x800>;
> reg-names = "hc_mem", "core_mem";
>
> --
> 2.19.1.930.g4563a0d9d0-goog
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ARM: dts: qcom: Add SoC-specific string for sdhci-msm-v4 nodes
2018-11-05 21:09 [PATCH 1/2] ARM: dts: qcom: Add SoC-specific string for sdhci-msm-v4 nodes Douglas Anderson
2018-11-05 21:09 ` [PATCH 2/2] arm64: " Douglas Anderson
@ 2018-11-20 23:12 ` Doug Anderson
2018-11-29 0:03 ` Bjorn Andersson
2 siblings, 0 replies; 5+ messages in thread
From: Doug Anderson @ 2018-11-20 23:12 UTC (permalink / raw)
To: Andy Gross, Rob Herring
Cc: devicetree, linux-arm-msm, LKML, David Brown, Mark Rutland,
open list:ARM/QUALCOMM SUPPORT
Andy,
On Mon, Nov 5, 2018 at 1:09 PM Douglas Anderson <dianders@chromium.org> wrote:
>
> As per upstream discussion [1], we should have an SoC-specific
> compatible string for Qualcomm's SDHCI nodes. Let's add it.
>
> [1] https://lkml.kernel.org/r/20181105203657.GA32282@bogus
>
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
> ---
>
> arch/arm/boot/dts/qcom-apq8084.dtsi | 4 ++--
> arch/arm/boot/dts/qcom-msm8974.dtsi | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
This patch and the 2nd patch in this series are ready to land. The
bindings change related to this has been Acked by Rob and can now be
found in Ulf's "next" branch. See:
https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git/commit/?h=next&id=c1f921e9b691d0110f46c55fdeb8762b85994fba
...everything here should be fully backward compatible so it can be
landed without concern for any dependencies.
-Doug
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ARM: dts: qcom: Add SoC-specific string for sdhci-msm-v4 nodes
2018-11-05 21:09 [PATCH 1/2] ARM: dts: qcom: Add SoC-specific string for sdhci-msm-v4 nodes Douglas Anderson
2018-11-05 21:09 ` [PATCH 2/2] arm64: " Douglas Anderson
2018-11-20 23:12 ` [PATCH 1/2] ARM: " Doug Anderson
@ 2018-11-29 0:03 ` Bjorn Andersson
2 siblings, 0 replies; 5+ messages in thread
From: Bjorn Andersson @ 2018-11-29 0:03 UTC (permalink / raw)
To: Douglas Anderson
Cc: Andy Gross, Rob Herring, devicetree, linux-arm-msm, linux-kernel,
David Brown, Mark Rutland, linux-soc
On Mon 05 Nov 13:09 PST 2018, Douglas Anderson wrote:
> As per upstream discussion [1], we should have an SoC-specific
> compatible string for Qualcomm's SDHCI nodes. Let's add it.
>
> [1] https://lkml.kernel.org/r/20181105203657.GA32282@bogus
>
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> ---
>
> arch/arm/boot/dts/qcom-apq8084.dtsi | 4 ++--
> arch/arm/boot/dts/qcom-msm8974.dtsi | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi
> index 0e1e98707e3f..899f28533ed7 100644
> --- a/arch/arm/boot/dts/qcom-apq8084.dtsi
> +++ b/arch/arm/boot/dts/qcom-apq8084.dtsi
> @@ -412,7 +412,7 @@
> };
>
> sdhci@f9824900 {
> - compatible = "qcom,sdhci-msm-v4";
> + compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4";
> reg = <0xf9824900 0x11c>, <0xf9824000 0x800>;
> reg-names = "hc_mem", "core_mem";
> interrupts = <0 123 0>, <0 138 0>;
> @@ -425,7 +425,7 @@
> };
>
> sdhci@f98a4900 {
> - compatible = "qcom,sdhci-msm-v4";
> + compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4";
> reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>;
> reg-names = "hc_mem", "core_mem";
> interrupts = <0 125 0>, <0 221 0>;
> diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
> index aba159d5a95a..891990c0d0b4 100644
> --- a/arch/arm/boot/dts/qcom-msm8974.dtsi
> +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
> @@ -602,7 +602,7 @@
> };
>
> sdhci@f9824900 {
> - compatible = "qcom,sdhci-msm-v4";
> + compatible = "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4";
> reg = <0xf9824900 0x11c>, <0xf9824000 0x800>;
> reg-names = "hc_mem", "core_mem";
> interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
> @@ -616,7 +616,7 @@
> };
>
> sdhci@f9864900 {
> - compatible = "qcom,sdhci-msm-v4";
> + compatible = "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4";
> reg = <0xf9864900 0x11c>, <0xf9864000 0x800>;
> reg-names = "hc_mem", "core_mem";
> interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>,
> @@ -630,7 +630,7 @@
> };
>
> sdhci@f98a4900 {
> - compatible = "qcom,sdhci-msm-v4";
> + compatible = "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4";
> reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>;
> reg-names = "hc_mem", "core_mem";
> interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
> --
> 2.19.1.930.g4563a0d9d0-goog
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-11-29 0:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-05 21:09 [PATCH 1/2] ARM: dts: qcom: Add SoC-specific string for sdhci-msm-v4 nodes Douglas Anderson
2018-11-05 21:09 ` [PATCH 2/2] arm64: " Douglas Anderson
2018-11-29 0:03 ` Bjorn Andersson
2018-11-20 23:12 ` [PATCH 1/2] ARM: " Doug Anderson
2018-11-29 0:03 ` Bjorn Andersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).