| Message ID | 20201216074540.30616-3-kostap@marvell.com |
|---|---|
| State | New |
| Headers | show |
| Series | update xenon controller properties in CN913X family | expand |
On Wed, 16 Dec 2020 at 08:46, <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 + Please split this patch, one for arm64 (for SoC maintainers) and one for mmc (which I will pick). Kind regards Uffe > 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 c67611fdaa8a..add1b4dcd5e5 100644 > --- a/drivers/mmc/host/sdhci-xenon.c > +++ b/drivers/mmc/host/sdhci-xenon.c > @@ -684,6 +684,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", .data = (void *)XENON_AP806}, > + { .compatible = "marvell,armada-ap807-sdhci", .data = (void *)XENON_AP807}, > { .compatible = "marvell,armada-cp110-sdhci", .data = (void *)XENON_CP110}, > { .compatible = "marvell,armada-3700-sdhci", .data = (void *)XENON_A3700}, > {} > -- > 2.17.1 >
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 c67611fdaa8a..add1b4dcd5e5 100644 --- a/drivers/mmc/host/sdhci-xenon.c +++ b/drivers/mmc/host/sdhci-xenon.c @@ -684,6 +684,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", .data = (void *)XENON_AP806}, + { .compatible = "marvell,armada-ap807-sdhci", .data = (void *)XENON_AP807}, { .compatible = "marvell,armada-cp110-sdhci", .data = (void *)XENON_CP110}, { .compatible = "marvell,armada-3700-sdhci", .data = (void *)XENON_A3700}, {}