On 15/12/20 5:56 pm, kostap@xxxxxxxxxxx wrote:
> From: Marcin Wojtas <mw@xxxxxxxxxxxx>
>
> 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@xxxxxxxxxxxx>
> ---
> 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",},
> {}
>
