Commit 328be8be authored by Ernest Zhang(WH)'s avatar Ernest Zhang(WH) Committed by Ulf Hansson
Browse files

mmc: sdhci: Moving sdhci_o2 into sdhci-pci-o2micro.c 



Moving sdhci_o2 into sdhci-pci-o2micro.c

Signed-off-by: default avatarErnest Zhang <ernest.zhang@bayhubtech.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent f6a3d9d9

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

+0 −10
Original line number Diff line number Diff line
@@ -1257,16 +1257,6 @@ static int jmicron_resume(struct sdhci_pci_chip *chip) 
}

#endif



static const struct sdhci_pci_fixes sdhci_o2 = {

	.probe = sdhci_pci_o2_probe,

	.quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,

	.quirks2 = SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD,

	.probe_slot = sdhci_pci_o2_probe_slot,

#ifdef CONFIG_PM_SLEEP

	.resume = sdhci_pci_o2_resume,

#endif

};



static const struct sdhci_pci_fixes sdhci_jmicron = {

	.probe		= jmicron_probe,

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

+10 −0
Original line number Diff line number Diff line
@@ -550,3 +550,13 @@ int sdhci_pci_o2_resume(struct sdhci_pci_chip *chip) 
	return sdhci_pci_resume_host(chip);

}

#endif



const struct sdhci_pci_fixes sdhci_o2 = {

	.probe = sdhci_pci_o2_probe,

	.quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,

	.quirks2 = SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD,

	.probe_slot = sdhci_pci_o2_probe_slot,

#ifdef CONFIG_PM_SLEEP

	.resume = sdhci_pci_o2_resume,

#endif

};

drivers/mmc/host/sdhci-pci.h

+1 −5
Original line number Diff line number Diff line
@@ -179,13 +179,9 @@ static inline void *sdhci_pci_priv(struct sdhci_pci_slot *slot) 
int sdhci_pci_resume_host(struct sdhci_pci_chip *chip);

#endif

int sdhci_pci_enable_dma(struct sdhci_host *host);

int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot);

int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip);

#ifdef CONFIG_PM_SLEEP

int sdhci_pci_o2_resume(struct sdhci_pci_chip *chip);

#endif



extern const struct sdhci_pci_fixes sdhci_arasan;

extern const struct sdhci_pci_fixes sdhci_snps;

extern const struct sdhci_pci_fixes sdhci_o2;



#endif /* __SDHCI_PCI_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE