| Message ID | 20201215155636.28474-3-kostap@marvell.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | uodate xenon controller properties in CN913X family | expand |
On 15/12/20 5:56 pm, kostap@marvell.com wrote: > From: Marcin Wojtas <mw@semihalf.com> > > This patch adds new compatible string to differentiate > between the controllers versions included in the AP807 > north bridge. Thanks to this change, the SoCs which use > AP807 will not run unintentionally in the 'slow mode' > with disabled UHS modes. > > Signed-off-by: Marcin Wojtas <mw@semihalf.com> > --- > arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 4 ++++ > drivers/mmc/host/sdhci-xenon.c | 1 + > 2 files changed, 5 insertions(+) > > diff --git a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi > index 623010f3ca89..e9a740ec22cb 100644 > --- a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi > +++ b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi > @@ -27,3 +27,7 @@ > #clock-cells = <1>; > }; > }; > + > +&ap_sdhci0 { > + compatible = "marvell,armada-ap807-sdhci"; > +}; > diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c > index 24c978de2a3f..29f6bede9b96 100644 > --- a/drivers/mmc/host/sdhci-xenon.c > +++ b/drivers/mmc/host/sdhci-xenon.c > @@ -668,6 +668,7 @@ static const struct dev_pm_ops sdhci_xenon_dev_pm_ops = { > > static const struct of_device_id sdhci_xenon_dt_ids[] = { > { .compatible = "marvell,armada-ap806-sdhci",}, > + { .compatible = "marvell,armada-ap807-sdhci",}, Didn't you add match data here? Then it needs a re-base on Ulf's 'next' branch. > { .compatible = "marvell,armada-cp110-sdhci",}, > { .compatible = "marvell,armada-3700-sdhci",}, > {} >
> -----Original Message----- > From: Adrian Hunter <adrian.hunter@intel.com> > Sent: Tuesday, December 15, 2020 19:16 > To: Kostya Porotchkin <kostap@marvell.com>; linux-mmc@vger.kernel.org > Cc: huziji@marvell.com; ulf.hansson@linaro.org; andrew@lunn.ch; > gregory.clement@bootlin.com; sebastian.hesselbarth@gmail.com; > mw@semihalf.com; jaz@semihalf.com > Subject: [EXT] Re: [PATCH 2/3] mmc: xenon: add AP807 compatible string > > External Email > > ---------------------------------------------------------------------- > On 15/12/20 5:56 pm, kostap@marvell.com wrote: > > From: Marcin Wojtas <mw@semihalf.com> > > > > This patch adds new compatible string to differentiate between the > > controllers versions included in the AP807 north bridge. Thanks to > > this change, the SoCs which use > > AP807 will not run unintentionally in the 'slow mode' > > with disabled UHS modes. > > > > Signed-off-by: Marcin Wojtas <mw@semihalf.com> > > --- > > arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 4 ++++ > > drivers/mmc/host/sdhci-xenon.c | 1 + > > 2 files changed, 5 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi > > b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi > > index 623010f3ca89..e9a740ec22cb 100644 > > --- a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi > > +++ b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi > > @@ -27,3 +27,7 @@ > > #clock-cells = <1>; > > }; > > }; > > + > > +&ap_sdhci0 { > > + compatible = "marvell,armada-ap807-sdhci"; }; > > diff --git a/drivers/mmc/host/sdhci-xenon.c > > b/drivers/mmc/host/sdhci-xenon.c index 24c978de2a3f..29f6bede9b96 > > 100644 > > --- a/drivers/mmc/host/sdhci-xenon.c > > +++ b/drivers/mmc/host/sdhci-xenon.c > > @@ -668,6 +668,7 @@ static const struct dev_pm_ops > > sdhci_xenon_dev_pm_ops = { > > > > static const struct of_device_id sdhci_xenon_dt_ids[] = { > > { .compatible = "marvell,armada-ap806-sdhci",}, > > + { .compatible = "marvell,armada-ap807-sdhci",}, > > Didn't you add match data here? Then it needs a re-base on Ulf's 'next' > branch. [KP] Thank you, I will rebase on top of kernel/git/ulfh/mmc.git then, and re-submit as v2 > > > { .compatible = "marvell,armada-cp110-sdhci",}, > > { .compatible = "marvell,armada-3700-sdhci",}, > > {} > >
diff --git a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi index 623010f3ca89..e9a740ec22cb 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi @@ -27,3 +27,7 @@ #clock-cells = <1>; }; }; + +&ap_sdhci0 { + compatible = "marvell,armada-ap807-sdhci"; +}; diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c index 24c978de2a3f..29f6bede9b96 100644 --- a/drivers/mmc/host/sdhci-xenon.c +++ b/drivers/mmc/host/sdhci-xenon.c @@ -668,6 +668,7 @@ static const struct dev_pm_ops sdhci_xenon_dev_pm_ops = { static const struct of_device_id sdhci_xenon_dt_ids[] = { { .compatible = "marvell,armada-ap806-sdhci",}, + { .compatible = "marvell,armada-ap807-sdhci",}, { .compatible = "marvell,armada-cp110-sdhci",}, { .compatible = "marvell,armada-3700-sdhci",}, {}