mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-14 06:57:30 +02:00
284a2e1864
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12311 3c298f89-4303-0410-b956-a3cf2f4a3e73
153 lines
5.2 KiB
Diff
153 lines
5.2 KiB
Diff
--- a/drivers/ssb/driver_chipcommon.c
|
|
+++ b/drivers/ssb/driver_chipcommon.c
|
|
@@ -39,12 +39,14 @@
|
|
ssb_write32(cc->dev, offset, value);
|
|
}
|
|
|
|
-static inline void chipco_write32_masked(struct ssb_chipcommon *cc, u16 offset,
|
|
- u32 mask, u32 value)
|
|
+static inline u32 chipco_write32_masked(struct ssb_chipcommon *cc, u16 offset,
|
|
+ u32 mask, u32 value)
|
|
{
|
|
value &= mask;
|
|
value |= chipco_read32(cc, offset) & ~mask;
|
|
chipco_write32(cc, offset, value);
|
|
+
|
|
+ return value;
|
|
}
|
|
|
|
void ssb_chipco_set_clockmode(struct ssb_chipcommon *cc,
|
|
@@ -355,16 +357,37 @@
|
|
{
|
|
return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask;
|
|
}
|
|
+EXPORT_SYMBOL(ssb_chipco_gpio_in);
|
|
+
|
|
+u32 ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
|
+{
|
|
+ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUT, mask, value);
|
|
+}
|
|
+EXPORT_SYMBOL(ssb_chipco_gpio_out);
|
|
+
|
|
+u32 ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
|
+{
|
|
+ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUTEN, mask, value);
|
|
+}
|
|
+EXPORT_SYMBOL(ssb_chipco_gpio_outen);
|
|
+
|
|
+u32 ssb_chipco_gpio_control(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
|
+{
|
|
+ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOCTL, mask, value);
|
|
+}
|
|
+EXPORT_SYMBOL(ssb_chipco_gpio_control);
|
|
|
|
-void ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
|
+u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
|
{
|
|
- chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUT, mask, value);
|
|
+ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOIRQ, mask, value);
|
|
}
|
|
+EXPORT_SYMBOL(ssb_chipco_gpio_intmask);
|
|
|
|
-void ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
|
+u32 ssb_chipco_gpio_polarity(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
|
{
|
|
- chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUTEN, mask, value);
|
|
+ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOPOL, mask, value);
|
|
}
|
|
+EXPORT_SYMBOL(ssb_chipco_gpio_polarity);
|
|
|
|
#ifdef CONFIG_SSB_SERIAL
|
|
int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
|
|
--- a/drivers/ssb/driver_extif.c
|
|
+++ b/drivers/ssb/driver_extif.c
|
|
@@ -27,12 +27,14 @@
|
|
ssb_write32(extif->dev, offset, value);
|
|
}
|
|
|
|
-static inline void extif_write32_masked(struct ssb_extif *extif, u16 offset,
|
|
- u32 mask, u32 value)
|
|
+static inline u32 extif_write32_masked(struct ssb_extif *extif, u16 offset,
|
|
+ u32 mask, u32 value)
|
|
{
|
|
value &= mask;
|
|
value |= extif_read32(extif, offset) & ~mask;
|
|
extif_write32(extif, offset, value);
|
|
+
|
|
+ return value;
|
|
}
|
|
|
|
#ifdef CONFIG_SSB_SERIAL
|
|
@@ -114,16 +116,30 @@
|
|
{
|
|
return extif_read32(extif, SSB_EXTIF_GPIO_IN) & mask;
|
|
}
|
|
+EXPORT_SYMBOL(ssb_extif_gpio_in);
|
|
|
|
-void ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value)
|
|
+u32 ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value)
|
|
{
|
|
return extif_write32_masked(extif, SSB_EXTIF_GPIO_OUT(0),
|
|
mask, value);
|
|
}
|
|
+EXPORT_SYMBOL(ssb_extif_gpio_out);
|
|
|
|
-void ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value)
|
|
+u32 ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value)
|
|
{
|
|
return extif_write32_masked(extif, SSB_EXTIF_GPIO_OUTEN(0),
|
|
mask, value);
|
|
}
|
|
+EXPORT_SYMBOL(ssb_extif_gpio_outen);
|
|
+
|
|
+u32 ssb_extif_gpio_polarity(struct ssb_extif *extif, u32 mask, u32 value)
|
|
+{
|
|
+ return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTPOL, mask, value);
|
|
+}
|
|
+EXPORT_SYMBOL(ssb_extif_gpio_polarity);
|
|
|
|
+u32 ssb_extif_gpio_intmask(struct ssb_extif *extif, u32 mask, u32 value)
|
|
+{
|
|
+ return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTMASK, mask, value);
|
|
+}
|
|
+EXPORT_SYMBOL(ssb_extif_gpio_intmask);
|
|
--- a/include/linux/ssb/ssb_driver_chipcommon.h
|
|
+++ b/include/linux/ssb/ssb_driver_chipcommon.h
|
|
@@ -382,11 +382,13 @@
|
|
extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc,
|
|
u32 ticks);
|
|
|
|
+/* Chipcommon GPIO pin access. */
|
|
u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask);
|
|
-
|
|
-void ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value);
|
|
-
|
|
-void ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value);
|
|
+u32 ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value);
|
|
+u32 ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value);
|
|
+u32 ssb_chipco_gpio_control(struct ssb_chipcommon *cc, u32 mask, u32 value);
|
|
+u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value);
|
|
+u32 ssb_chipco_gpio_polarity(struct ssb_chipcommon *cc, u32 mask, u32 value);
|
|
|
|
#ifdef CONFIG_SSB_SERIAL
|
|
extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
|
|
--- a/include/linux/ssb/ssb_driver_extif.h
|
|
+++ b/include/linux/ssb/ssb_driver_extif.h
|
|
@@ -171,11 +171,12 @@
|
|
extern void ssb_extif_timing_init(struct ssb_extif *extif,
|
|
unsigned long ns);
|
|
|
|
+/* Extif GPIO pin access */
|
|
u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask);
|
|
-
|
|
-void ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value);
|
|
-
|
|
-void ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value);
|
|
+u32 ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value);
|
|
+u32 ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value);
|
|
+u32 ssb_extif_gpio_polarity(struct ssb_extif *extif, u32 mask, u32 value);
|
|
+u32 ssb_extif_gpio_intmask(struct ssb_extif *extif, u32 mask, u32 value);
|
|
|
|
#ifdef CONFIG_SSB_SERIAL
|
|
extern int ssb_extif_serial_init(struct ssb_extif *extif,
|