Commit 2daf6430 authored by Victor Shih's avatar Victor Shih Committed by Ulf Hansson
Browse files

mmc: sdhci-pci: add UHS-II support framework 



This patch prepares for adding UHS-II support at a specific UHS-II
capable sdhci-pci controller, GL9755 for now.

Signed-off-by: default avatarBen Chuang <ben.chuang@genesyslogic.com.tw>
Signed-off-by: default avatarAKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: default avatarVictor Shih <victor.shih@genesyslogic.com.tw>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Message-ID: <20241018105333.4569-15-victorshihgli@gmail.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 379e4dc5

drivers/mmc/host/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ config MMC_SDHCI_PCI 
	tristate "SDHCI support on PCI bus"

	depends on MMC_SDHCI && PCI

	select MMC_CQHCI

	select MMC_SDHCI_UHS2

	select IOSF_MBI if X86

	select MMC_SDHCI_IO_ACCESSORS

	help

drivers/mmc/host/sdhci-pci-core.c

+15 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "sdhci.h"

#include "sdhci-cqhci.h"

#include "sdhci-pci.h"

#include "sdhci-uhs2.h"



static void sdhci_pci_hw_reset(struct sdhci_host *host);
@@ -2181,6 +2182,9 @@ static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot) 
	if (scratch == (u32)-1)

		dead = 1;



	if (slot->chip->fixes && slot->chip->fixes->remove_host)

		slot->chip->fixes->remove_host(slot, dead);

	else

		sdhci_remove_host(slot->host, dead);



	if (slot->chip->fixes && slot->chip->fixes->remove_slot)
@@ -2189,6 +2193,16 @@ static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot) 
	sdhci_free_host(slot->host);

}



int sdhci_pci_uhs2_add_host(struct sdhci_pci_slot *slot)

{

	return sdhci_uhs2_add_host(slot->host);

}



void sdhci_pci_uhs2_remove_host(struct sdhci_pci_slot *slot, int dead)

{

	sdhci_uhs2_remove_host(slot->host, dead);

}



static void sdhci_pci_runtime_pm_allow(struct device *dev)

{

	pm_suspend_ignore_children(dev, 1);

drivers/mmc/host/sdhci-pci.h

+3 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ struct sdhci_pci_fixes { 
	int			(*probe_slot) (struct sdhci_pci_slot *);

	int			(*add_host) (struct sdhci_pci_slot *);

	void			(*remove_slot) (struct sdhci_pci_slot *, int);

	void			(*remove_host) (struct sdhci_pci_slot *, int);



#ifdef CONFIG_PM_SLEEP

	int			(*suspend) (struct sdhci_pci_chip *);
@@ -189,6 +190,8 @@ static inline void *sdhci_pci_priv(struct sdhci_pci_slot *slot) 
	return (void *)slot->private;

}



int sdhci_pci_uhs2_add_host(struct sdhci_pci_slot *slot);

void sdhci_pci_uhs2_remove_host(struct sdhci_pci_slot *slot, int dead);

#ifdef CONFIG_PM_SLEEP

int sdhci_pci_resume_host(struct sdhci_pci_chip *chip);

#endif