aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2009-06-04 14:12:31 -0400
committerPierre Ossman <pierre@ossman.eu>2009-06-13 16:42:59 -0400
commitf0e46cc4971f6be96010d9248e0fc076b229d989 (patch)
tree5fc0b80993c82337b8928f063df0749fadc9d13e /drivers/mfd
parentfdd858db7113ca64132de390188d7ca00701013d (diff)
MFD,mmc: tmio_mmc: make HCLK configurable
The Toshiba parts all have a 24 MHz HCLK, but HTC ASIC3 has a 24.576 MHz HCLK and AMD Imageon w228x's HCLK is 80 MHz. With this patch, the MFD driver provides the HCLK frequency to tmio_mmc via mfd_cell->driver_data. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Ian Molton <ian@mnementh.co.uk> Acked-by: Samuel Ortiz <sameo@openedhand.com> Signed-off-by: Pierre Ossman <pierre@ossman.eu>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/t7l66xb.c5
-rw-r--r--drivers/mfd/tc6387xb.c5
-rw-r--r--drivers/mfd/tc6393xb.c5
3 files changed, 15 insertions, 0 deletions
diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
index e9f4323dd2cb..875f7a875734 100644
--- a/drivers/mfd/t7l66xb.c
+++ b/drivers/mfd/t7l66xb.c
@@ -108,6 +108,10 @@ static int t7l66xb_mmc_disable(struct platform_device *mmc)
108 108
109/*--------------------------------------------------------------------------*/ 109/*--------------------------------------------------------------------------*/
110 110
111static const struct tmio_mmc_data t7166xb_mmc_data = {
112 .hclk = 24000000,
113};
114
111static const struct resource t7l66xb_mmc_resources[] = { 115static const struct resource t7l66xb_mmc_resources[] = {
112 { 116 {
113 .start = 0x800, 117 .start = 0x800,
@@ -149,6 +153,7 @@ static struct mfd_cell t7l66xb_cells[] = {
149 .name = "tmio-mmc", 153 .name = "tmio-mmc",
150 .enable = t7l66xb_mmc_enable, 154 .enable = t7l66xb_mmc_enable,
151 .disable = t7l66xb_mmc_disable, 155 .disable = t7l66xb_mmc_disable,
156 .driver_data = &t7166xb_mmc_data,
152 .num_resources = ARRAY_SIZE(t7l66xb_mmc_resources), 157 .num_resources = ARRAY_SIZE(t7l66xb_mmc_resources),
153 .resources = t7l66xb_mmc_resources, 158 .resources = t7l66xb_mmc_resources,
154 }, 159 },
diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c
index 43222c12fec1..c3993ac20542 100644
--- a/drivers/mfd/tc6387xb.c
+++ b/drivers/mfd/tc6387xb.c
@@ -75,6 +75,10 @@ static int tc6387xb_mmc_disable(struct platform_device *mmc)
75 75
76/*--------------------------------------------------------------------------*/ 76/*--------------------------------------------------------------------------*/
77 77
78const static struct tmio_mmc_data tc6387xb_mmc_data = {
79 .hclk = 24000000,
80};
81
78static struct resource tc6387xb_mmc_resources[] = { 82static struct resource tc6387xb_mmc_resources[] = {
79 { 83 {
80 .start = 0x800, 84 .start = 0x800,
@@ -98,6 +102,7 @@ static struct mfd_cell tc6387xb_cells[] = {
98 .name = "tmio-mmc", 102 .name = "tmio-mmc",
99 .enable = tc6387xb_mmc_enable, 103 .enable = tc6387xb_mmc_enable,
100 .disable = tc6387xb_mmc_disable, 104 .disable = tc6387xb_mmc_disable,
105 .driver_data = &tc6387xb_mmc_data,
101 .num_resources = ARRAY_SIZE(tc6387xb_mmc_resources), 106 .num_resources = ARRAY_SIZE(tc6387xb_mmc_resources),
102 .resources = tc6387xb_mmc_resources, 107 .resources = tc6387xb_mmc_resources,
103 }, 108 },
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 77a12fc8045e..9d2abb5d6e2c 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -136,6 +136,10 @@ static int tc6393xb_nand_enable(struct platform_device *nand)
136 return 0; 136 return 0;
137} 137}
138 138
139const static struct tmio_mmc_data tc6393xb_mmc_data = {
140 .hclk = 24000000,
141};
142
139static struct resource __devinitdata tc6393xb_nand_resources[] = { 143static struct resource __devinitdata tc6393xb_nand_resources[] = {
140 { 144 {
141 .start = 0x1000, 145 .start = 0x1000,
@@ -351,6 +355,7 @@ static struct mfd_cell __devinitdata tc6393xb_cells[] = {
351 }, 355 },
352 [TC6393XB_CELL_MMC] = { 356 [TC6393XB_CELL_MMC] = {
353 .name = "tmio-mmc", 357 .name = "tmio-mmc",
358 .driver_data = &tc6393xb_mmc_data,
354 .num_resources = ARRAY_SIZE(tc6393xb_mmc_resources), 359 .num_resources = ARRAY_SIZE(tc6393xb_mmc_resources),
355 .resources = tc6393xb_mmc_resources, 360 .resources = tc6393xb_mmc_resources,
356 }, 361 },