Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 522624f9 authored by Adam Lee's avatar Adam Lee Committed by Chris Ball
Browse files

mmc: sdhci-pci: break out definitions to header file 



Break out definitions in sdhci-pci.c to sdhci-pci.h, for introducing
module files like sdhci-pci-xxx.c

Signed-off-by: default avatarAdam Lee <adam.lee@canonical.com>
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent 1e0bf16c

drivers/mmc/host/sdhci-pci.c

+1 −73
Original line number Diff line number Diff line
@@ -27,79 +27,7 @@ 
#include <linux/mmc/sdhci-pci-data.h>



#include "sdhci.h"



/*

 * PCI device IDs

 */

#define PCI_DEVICE_ID_INTEL_PCH_SDIO0	0x8809

#define PCI_DEVICE_ID_INTEL_PCH_SDIO1	0x880a

#define PCI_DEVICE_ID_INTEL_BYT_EMMC	0x0f14

#define PCI_DEVICE_ID_INTEL_BYT_SDIO	0x0f15

#define PCI_DEVICE_ID_INTEL_BYT_SD	0x0f16

#define PCI_DEVICE_ID_INTEL_BYT_EMMC2	0x0f50

#define PCI_DEVICE_ID_INTEL_MRFL_MMC	0x1190

#define PCI_DEVICE_ID_INTEL_CLV_SDIO0	0x08f9

#define PCI_DEVICE_ID_INTEL_CLV_SDIO1	0x08fa

#define PCI_DEVICE_ID_INTEL_CLV_SDIO2	0x08fb

#define PCI_DEVICE_ID_INTEL_CLV_EMMC0	0x08e5

#define PCI_DEVICE_ID_INTEL_CLV_EMMC1	0x08e6



/*

 * PCI registers

 */



#define PCI_SDHCI_IFPIO			0x00

#define PCI_SDHCI_IFDMA			0x01

#define PCI_SDHCI_IFVENDOR		0x02



#define PCI_SLOT_INFO			0x40	/* 8 bits */

#define  PCI_SLOT_INFO_SLOTS(x)		((x >> 4) & 7)

#define  PCI_SLOT_INFO_FIRST_BAR_MASK	0x07



#define MAX_SLOTS			8



struct sdhci_pci_chip;

struct sdhci_pci_slot;



struct sdhci_pci_fixes {

	unsigned int		quirks;

	unsigned int		quirks2;

	bool			allow_runtime_pm;



	int			(*probe) (struct sdhci_pci_chip *);



	int			(*probe_slot) (struct sdhci_pci_slot *);

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



	int			(*suspend) (struct sdhci_pci_chip *);

	int			(*resume) (struct sdhci_pci_chip *);

};



struct sdhci_pci_slot {

	struct sdhci_pci_chip	*chip;

	struct sdhci_host	*host;

	struct sdhci_pci_data	*data;



	int			pci_bar;

	int			rst_n_gpio;

	int			cd_gpio;

	int			cd_irq;



	void (*hw_reset)(struct sdhci_host *host);

};



struct sdhci_pci_chip {

	struct pci_dev		*pdev;



	unsigned int		quirks;

	unsigned int		quirks2;

	bool			allow_runtime_pm;

	const struct sdhci_pci_fixes *fixes;



	int			num_slots;	/* Slots on controller */

	struct sdhci_pci_slot	*slots[MAX_SLOTS]; /* Pointers to host slots */

};



#include "sdhci-pci.h"



/*****************************************************************************\

 *                                                                           *

drivers/mmc/host/sdhci-pci.h

0 → 100644
+77 −0
Original line number Diff line number Diff line 
#ifndef __SDHCI_PCI_H

#define __SDHCI_PCI_H



/*

 * PCI device IDs

 */



#define PCI_DEVICE_ID_INTEL_PCH_SDIO0	0x8809

#define PCI_DEVICE_ID_INTEL_PCH_SDIO1	0x880a

#define PCI_DEVICE_ID_INTEL_BYT_EMMC	0x0f14

#define PCI_DEVICE_ID_INTEL_BYT_SDIO	0x0f15

#define PCI_DEVICE_ID_INTEL_BYT_SD	0x0f16

#define PCI_DEVICE_ID_INTEL_BYT_EMMC2	0x0f50

#define PCI_DEVICE_ID_INTEL_MRFL_MMC	0x1190

#define PCI_DEVICE_ID_INTEL_CLV_SDIO0	0x08f9

#define PCI_DEVICE_ID_INTEL_CLV_SDIO1	0x08fa

#define PCI_DEVICE_ID_INTEL_CLV_SDIO2	0x08fb

#define PCI_DEVICE_ID_INTEL_CLV_EMMC0	0x08e5

#define PCI_DEVICE_ID_INTEL_CLV_EMMC1	0x08e6



/*

 * PCI registers

 */



#define PCI_SDHCI_IFPIO			0x00

#define PCI_SDHCI_IFDMA			0x01

#define PCI_SDHCI_IFVENDOR		0x02



#define PCI_SLOT_INFO			0x40	/* 8 bits */

#define  PCI_SLOT_INFO_SLOTS(x)		((x >> 4) & 7)

#define  PCI_SLOT_INFO_FIRST_BAR_MASK	0x07



#define MAX_SLOTS			8



struct sdhci_pci_chip;

struct sdhci_pci_slot;



struct sdhci_pci_fixes {

	unsigned int		quirks;

	unsigned int		quirks2;

	bool			allow_runtime_pm;



	int			(*probe) (struct sdhci_pci_chip *);



	int			(*probe_slot) (struct sdhci_pci_slot *);

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



	int			(*suspend) (struct sdhci_pci_chip *);

	int			(*resume) (struct sdhci_pci_chip *);

};



struct sdhci_pci_slot {

	struct sdhci_pci_chip	*chip;

	struct sdhci_host	*host;

	struct sdhci_pci_data	*data;



	int			pci_bar;

	int			rst_n_gpio;

	int			cd_gpio;

	int			cd_irq;



	void (*hw_reset)(struct sdhci_host *host);

};



struct sdhci_pci_chip {

	struct pci_dev		*pdev;



	unsigned int		quirks;

	unsigned int		quirks2;

	bool			allow_runtime_pm;

	const struct sdhci_pci_fixes *fixes;



	int			num_slots;	/* Slots on controller */

	struct sdhci_pci_slot	*slots[MAX_SLOTS]; /* Pointers to host slots */

};



#endif /* __SDHCI_PCI_H */