aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2008-02-19 08:53:35 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-02-20 20:11:49 -0500
commitc2bcbe65fc88d61f9a806367ff6eab76c9eabb3a (patch)
treec882d3016ed4a273b8e7e8fb9b86c1bcb6d6836a
parent42bfad4f71637c4eb4791aa8062063c4a8526522 (diff)
ssb: Fix the GPIO API
This fixes the GPIO API to be usable. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/ssb/driver_chipcommon.c35
-rw-r--r--drivers/ssb/driver_extif.c24
-rw-r--r--include/linux/ssb/ssb_driver_chipcommon.h10
-rw-r--r--include/linux/ssb/ssb_driver_extif.h9
4 files changed, 60 insertions, 18 deletions
diff --git a/drivers/ssb/driver_chipcommon.c b/drivers/ssb/driver_chipcommon.c
index 7cc03f2dd5a6..7ea0c0faa9ab 100644
--- a/drivers/ssb/driver_chipcommon.c
+++ b/drivers/ssb/driver_chipcommon.c
@@ -39,12 +39,14 @@ static inline void chipco_write32(struct ssb_chipcommon *cc,
39 ssb_write32(cc->dev, offset, value); 39 ssb_write32(cc->dev, offset, value);
40} 40}
41 41
42static inline void chipco_write32_masked(struct ssb_chipcommon *cc, u16 offset, 42static inline u32 chipco_write32_masked(struct ssb_chipcommon *cc, u16 offset,
43 u32 mask, u32 value) 43 u32 mask, u32 value)
44{ 44{
45 value &= mask; 45 value &= mask;
46 value |= chipco_read32(cc, offset) & ~mask; 46 value |= chipco_read32(cc, offset) & ~mask;
47 chipco_write32(cc, offset, value); 47 chipco_write32(cc, offset, value);
48
49 return value;
48} 50}
49 51
50void ssb_chipco_set_clockmode(struct ssb_chipcommon *cc, 52void ssb_chipco_set_clockmode(struct ssb_chipcommon *cc,
@@ -355,16 +357,37 @@ u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask)
355{ 357{
356 return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask; 358 return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask;
357} 359}
360EXPORT_SYMBOL(ssb_chipco_gpio_in);
361
362u32 ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value)
363{
364 return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUT, mask, value);
365}
366EXPORT_SYMBOL(ssb_chipco_gpio_out);
367
368u32 ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value)
369{
370 return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUTEN, mask, value);
371}
372EXPORT_SYMBOL(ssb_chipco_gpio_outen);
373
374u32 ssb_chipco_gpio_control(struct ssb_chipcommon *cc, u32 mask, u32 value)
375{
376 return chipco_write32_masked(cc, SSB_CHIPCO_GPIOCTL, mask, value);
377}
378EXPORT_SYMBOL(ssb_chipco_gpio_control);
358 379
359void ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value) 380u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value)
360{ 381{
361 chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUT, mask, value); 382 return chipco_write32_masked(cc, SSB_CHIPCO_GPIOIRQ, mask, value);
362} 383}
384EXPORT_SYMBOL(ssb_chipco_gpio_intmask);
363 385
364void ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value) 386u32 ssb_chipco_gpio_polarity(struct ssb_chipcommon *cc, u32 mask, u32 value)
365{ 387{
366 chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUTEN, mask, value); 388 return chipco_write32_masked(cc, SSB_CHIPCO_GPIOPOL, mask, value);
367} 389}
390EXPORT_SYMBOL(ssb_chipco_gpio_polarity);
368 391
369#ifdef CONFIG_SSB_SERIAL 392#ifdef CONFIG_SSB_SERIAL
370int ssb_chipco_serial_init(struct ssb_chipcommon *cc, 393int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
diff --git a/drivers/ssb/driver_extif.c b/drivers/ssb/driver_extif.c
index b1899f422a54..10c6b287f8bb 100644
--- a/drivers/ssb/driver_extif.c
+++ b/drivers/ssb/driver_extif.c
@@ -27,12 +27,14 @@ static inline void extif_write32(struct ssb_extif *extif, u16 offset, u32 value)
27 ssb_write32(extif->dev, offset, value); 27 ssb_write32(extif->dev, offset, value);
28} 28}
29 29
30static inline void extif_write32_masked(struct ssb_extif *extif, u16 offset, 30static inline u32 extif_write32_masked(struct ssb_extif *extif, u16 offset,
31 u32 mask, u32 value) 31 u32 mask, u32 value)
32{ 32{
33 value &= mask; 33 value &= mask;
34 value |= extif_read32(extif, offset) & ~mask; 34 value |= extif_read32(extif, offset) & ~mask;
35 extif_write32(extif, offset, value); 35 extif_write32(extif, offset, value);
36
37 return value;
36} 38}
37 39
38#ifdef CONFIG_SSB_SERIAL 40#ifdef CONFIG_SSB_SERIAL
@@ -120,16 +122,30 @@ u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask)
120{ 122{
121 return extif_read32(extif, SSB_EXTIF_GPIO_IN) & mask; 123 return extif_read32(extif, SSB_EXTIF_GPIO_IN) & mask;
122} 124}
125EXPORT_SYMBOL(ssb_extif_gpio_in);
123 126
124void ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value) 127u32 ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value)
125{ 128{
126 return extif_write32_masked(extif, SSB_EXTIF_GPIO_OUT(0), 129 return extif_write32_masked(extif, SSB_EXTIF_GPIO_OUT(0),
127 mask, value); 130 mask, value);
128} 131}
132EXPORT_SYMBOL(ssb_extif_gpio_out);
129 133
130void ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value) 134u32 ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value)
131{ 135{
132 return extif_write32_masked(extif, SSB_EXTIF_GPIO_OUTEN(0), 136 return extif_write32_masked(extif, SSB_EXTIF_GPIO_OUTEN(0),
133 mask, value); 137 mask, value);
134} 138}
139EXPORT_SYMBOL(ssb_extif_gpio_outen);
140
141u32 ssb_extif_gpio_polarity(struct ssb_extif *extif, u32 mask, u32 value)
142{
143 return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTPOL, mask, value);
144}
145EXPORT_SYMBOL(ssb_extif_gpio_polarity);
135 146
147u32 ssb_extif_gpio_intmask(struct ssb_extif *extif, u32 mask, u32 value)
148{
149 return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTMASK, mask, value);
150}
151EXPORT_SYMBOL(ssb_extif_gpio_intmask);
diff --git a/include/linux/ssb/ssb_driver_chipcommon.h b/include/linux/ssb/ssb_driver_chipcommon.h
index 89638153cbe1..536851b946f6 100644
--- a/include/linux/ssb/ssb_driver_chipcommon.h
+++ b/include/linux/ssb/ssb_driver_chipcommon.h
@@ -390,11 +390,13 @@ extern void ssb_chipco_set_clockmode(struct ssb_chipcommon *cc,
390extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, 390extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc,
391 u32 ticks); 391 u32 ticks);
392 392
393/* Chipcommon GPIO pin access. */
393u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask); 394u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask);
394 395u32 ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value);
395void ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value); 396u32 ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value);
396 397u32 ssb_chipco_gpio_control(struct ssb_chipcommon *cc, u32 mask, u32 value);
397void ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value); 398u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value);
399u32 ssb_chipco_gpio_polarity(struct ssb_chipcommon *cc, u32 mask, u32 value);
398 400
399#ifdef CONFIG_SSB_SERIAL 401#ifdef CONFIG_SSB_SERIAL
400extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc, 402extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
diff --git a/include/linux/ssb/ssb_driver_extif.h b/include/linux/ssb/ssb_driver_extif.h
index 0d7c9bfa965d..91161f0aa22b 100644
--- a/include/linux/ssb/ssb_driver_extif.h
+++ b/include/linux/ssb/ssb_driver_extif.h
@@ -174,11 +174,12 @@ extern void ssb_extif_timing_init(struct ssb_extif *extif,
174extern void ssb_extif_watchdog_timer_set(struct ssb_extif *extif, 174extern void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
175 u32 ticks); 175 u32 ticks);
176 176
177/* Extif GPIO pin access */
177u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask); 178u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask);
178 179u32 ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value);
179void ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value); 180u32 ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value);
180 181u32 ssb_extif_gpio_polarity(struct ssb_extif *extif, u32 mask, u32 value);
181void ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value); 182u32 ssb_extif_gpio_intmask(struct ssb_extif *extif, u32 mask, u32 value);
182 183
183#ifdef CONFIG_SSB_SERIAL 184#ifdef CONFIG_SSB_SERIAL
184extern int ssb_extif_serial_init(struct ssb_extif *extif, 185extern int ssb_extif_serial_init(struct ssb_extif *extif,