mfd: sta2x11-mfd: Use defines for platform devices' names
Since there are now many sta2x11-mfd platform devices, using defines for their names looks like a better solution. Signed-off-by: Davide Ciminaghi <ciminaghi@gnudd.com> Acked-by: Alessandro Rubini <rubini@gnudd.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
parent
29f5b5a326
commit
b18adafccd
|
@ -174,9 +174,9 @@ static void sta2x11_regmap_unlock(void *__lock)
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *sta2x11_mfd_names[sta2x11_n_mfd_plat_devs] = {
|
static const char *sta2x11_mfd_names[sta2x11_n_mfd_plat_devs] = {
|
||||||
[sta2x11_sctl] = "sta2x11-sctl",
|
[sta2x11_sctl] = STA2X11_MFD_SCTL_NAME,
|
||||||
[sta2x11_apbreg] = "sta2x11-apbreg",
|
[sta2x11_apbreg] = STA2X11_MFD_APBREG_NAME,
|
||||||
[sta2x11_apb_soc_regs] = "sta2x11-apb-soc-regs",
|
[sta2x11_apb_soc_regs] = STA2X11_MFD_APB_SOC_REGS_NAME,
|
||||||
};
|
};
|
||||||
|
|
||||||
static bool sta2x11_sctl_writeable_reg(struct device *dev, unsigned int reg)
|
static bool sta2x11_sctl_writeable_reg(struct device *dev, unsigned int reg)
|
||||||
|
@ -340,7 +340,7 @@ static int sta2x11_apb_soc_regs_probe(struct platform_device *dev)
|
||||||
/* The three platform drivers */
|
/* The three platform drivers */
|
||||||
static struct platform_driver sta2x11_sctl_platform_driver = {
|
static struct platform_driver sta2x11_sctl_platform_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "sta2x11-sctl",
|
.name = STA2X11_MFD_SCTL_NAME,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
},
|
},
|
||||||
.probe = sta2x11_sctl_probe,
|
.probe = sta2x11_sctl_probe,
|
||||||
|
@ -354,7 +354,7 @@ static int __init sta2x11_sctl_init(void)
|
||||||
|
|
||||||
static struct platform_driver sta2x11_platform_driver = {
|
static struct platform_driver sta2x11_platform_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "sta2x11-apbreg",
|
.name = STA2X11_MFD_APBREG_NAME,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
},
|
},
|
||||||
.probe = sta2x11_apbreg_probe,
|
.probe = sta2x11_apbreg_probe,
|
||||||
|
@ -368,7 +368,7 @@ static int __init sta2x11_apbreg_init(void)
|
||||||
|
|
||||||
static struct platform_driver sta2x11_apb_soc_regs_platform_driver = {
|
static struct platform_driver sta2x11_apb_soc_regs_platform_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "sta2x11-apb-soc-regs",
|
.name = STA2X11_MFD_APB_SOC_REGS_NAME,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
},
|
},
|
||||||
.probe = sta2x11_apb_soc_regs_probe,
|
.probe = sta2x11_apb_soc_regs_probe,
|
||||||
|
@ -409,38 +409,40 @@ enum mfd0_bar1_cells {
|
||||||
|
|
||||||
static const __devinitconst struct resource gpio_resources[] = {
|
static const __devinitconst struct resource gpio_resources[] = {
|
||||||
{
|
{
|
||||||
.name = "sta2x11_gpio", /* 4 consecutive cells, 1 driver */
|
/* 4 consecutive cells, 1 driver */
|
||||||
|
.name = STA2X11_MFD_GPIO_NAME,
|
||||||
.start = 0,
|
.start = 0,
|
||||||
.end = (4 * 4096) - 1,
|
.end = (4 * 4096) - 1,
|
||||||
.flags = IORESOURCE_MEM,
|
.flags = IORESOURCE_MEM,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
static const __devinitconst struct resource sctl_resources[] = {
|
static const __devinitconst struct resource sctl_resources[] = {
|
||||||
CELL_4K("sta2x11-sctl", STA2X11_SCTL),
|
CELL_4K(STA2X11_MFD_SCTL_NAME, STA2X11_SCTL),
|
||||||
};
|
};
|
||||||
static const __devinitconst struct resource scr_resources[] = {
|
static const __devinitconst struct resource scr_resources[] = {
|
||||||
CELL_4K("sta2x11-scr", STA2X11_SCR),
|
CELL_4K(STA2X11_MFD_SCR_NAME, STA2X11_SCR),
|
||||||
};
|
};
|
||||||
static const __devinitconst struct resource time_resources[] = {
|
static const __devinitconst struct resource time_resources[] = {
|
||||||
CELL_4K("sta2x11-time", STA2X11_TIME),
|
CELL_4K(STA2X11_MFD_TIME_NAME, STA2X11_TIME),
|
||||||
};
|
};
|
||||||
|
|
||||||
static const __devinitconst struct resource apbreg_resources[] = {
|
static const __devinitconst struct resource apbreg_resources[] = {
|
||||||
CELL_4K("sta2x11-apbreg", STA2X11_APBREG),
|
CELL_4K(STA2X11_MFD_APBREG_NAME, STA2X11_APBREG),
|
||||||
};
|
};
|
||||||
|
|
||||||
#define DEV(_name, _r) \
|
#define DEV(_name, _r) \
|
||||||
{ .name = _name, .num_resources = ARRAY_SIZE(_r), .resources = _r, }
|
{ .name = _name, .num_resources = ARRAY_SIZE(_r), .resources = _r, }
|
||||||
|
|
||||||
static __devinitdata struct mfd_cell sta2x11_mfd0_bar0[] = {
|
static __devinitdata struct mfd_cell sta2x11_mfd0_bar0[] = {
|
||||||
DEV("sta2x11-gpio", gpio_resources), /* offset 0: we add pdata later */
|
/* offset 0: we add pdata later */
|
||||||
DEV("sta2x11-sctl", sctl_resources),
|
DEV(STA2X11_MFD_GPIO_NAME, gpio_resources),
|
||||||
DEV("sta2x11-scr", scr_resources),
|
DEV(STA2X11_MFD_SCTL_NAME, sctl_resources),
|
||||||
DEV("sta2x11-time", time_resources),
|
DEV(STA2X11_MFD_SCR_NAME, scr_resources),
|
||||||
|
DEV(STA2X11_MFD_TIME_NAME, time_resources),
|
||||||
};
|
};
|
||||||
|
|
||||||
static __devinitdata struct mfd_cell sta2x11_mfd0_bar1[] = {
|
static __devinitdata struct mfd_cell sta2x11_mfd0_bar1[] = {
|
||||||
DEV("sta2x11-apbreg", apbreg_resources),
|
DEV(STA2X11_MFD_APBREG_NAME, apbreg_resources),
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Mfd 1 devices */
|
/* Mfd 1 devices */
|
||||||
|
@ -456,19 +458,19 @@ enum mfd1_bar1_cells {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const __devinitconst struct resource vic_resources[] = {
|
static const __devinitconst struct resource vic_resources[] = {
|
||||||
CELL_4K("sta2x11-vic", STA2X11_VIC),
|
CELL_4K(STA2X11_MFD_VIC_NAME, STA2X11_VIC),
|
||||||
};
|
};
|
||||||
|
|
||||||
static const __devinitconst struct resource apb_soc_regs_resources[] = {
|
static const __devinitconst struct resource apb_soc_regs_resources[] = {
|
||||||
CELL_4K("sta2x11-apb-soc-regs", STA2X11_APB_SOC_REGS),
|
CELL_4K(STA2X11_MFD_APB_SOC_REGS_NAME, STA2X11_APB_SOC_REGS),
|
||||||
};
|
};
|
||||||
|
|
||||||
static __devinitdata struct mfd_cell sta2x11_mfd1_bar0[] = {
|
static __devinitdata struct mfd_cell sta2x11_mfd1_bar0[] = {
|
||||||
DEV("sta2x11-vic", vic_resources),
|
DEV(STA2X11_MFD_VIC_NAME, vic_resources),
|
||||||
};
|
};
|
||||||
|
|
||||||
static __devinitdata struct mfd_cell sta2x11_mfd1_bar1[] = {
|
static __devinitdata struct mfd_cell sta2x11_mfd1_bar1[] = {
|
||||||
DEV("sta2x11-apb-soc-regs", apb_soc_regs_resources),
|
DEV(STA2X11_MFD_APB_SOC_REGS_NAME, apb_soc_regs_resources),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -37,6 +37,14 @@ enum sta2x11_mfd_plat_dev {
|
||||||
sta2x11_n_mfd_plat_devs,
|
sta2x11_n_mfd_plat_devs,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define STA2X11_MFD_SCTL_NAME "sta2x11-sctl"
|
||||||
|
#define STA2X11_MFD_GPIO_NAME "sta2x11-gpio"
|
||||||
|
#define STA2X11_MFD_SCR_NAME "sta2x11-scr"
|
||||||
|
#define STA2X11_MFD_TIME_NAME "sta2x11-time"
|
||||||
|
#define STA2X11_MFD_APBREG_NAME "sta2x11-apbreg"
|
||||||
|
#define STA2X11_MFD_APB_SOC_REGS_NAME "sta2x11-apb-soc-regs"
|
||||||
|
#define STA2X11_MFD_VIC_NAME "sta2x11-vic"
|
||||||
|
|
||||||
extern u32
|
extern u32
|
||||||
__sta2x11_mfd_mask(struct pci_dev *, u32, u32, u32, enum sta2x11_mfd_plat_dev);
|
__sta2x11_mfd_mask(struct pci_dev *, u32, u32, u32, enum sta2x11_mfd_plat_dev);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue