mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-19 23:10:14 +03:00
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34651 3c298f89-4303-0410-b956-a3cf2f4a3e73
141 lines
4.3 KiB
Diff
141 lines
4.3 KiB
Diff
--- a/drivers/bcma/driver_chipcommon.c
|
|
+++ b/drivers/bcma/driver_chipcommon.c
|
|
@@ -158,6 +158,8 @@ void bcma_core_chipcommon_init(struct bc
|
|
}
|
|
cc->ticks_per_ms = bcma_chipco_watchdog_ticks_per_ms(cc);
|
|
|
|
+ spin_lock_init(&cc->gpio_lock);
|
|
+
|
|
cc->setup_done = true;
|
|
}
|
|
|
|
@@ -197,34 +199,81 @@ u32 bcma_chipco_irq_status(struct bcma_d
|
|
|
|
u32 bcma_chipco_gpio_in(struct bcma_drv_cc *cc, u32 mask)
|
|
{
|
|
- return bcma_cc_read32(cc, BCMA_CC_GPIOIN) & mask;
|
|
+ unsigned long flags;
|
|
+ u32 res;
|
|
+
|
|
+ spin_lock_irqsave(&cc->gpio_lock, flags);
|
|
+ res = bcma_cc_read32(cc, BCMA_CC_GPIOIN) & mask;
|
|
+ spin_unlock_irqrestore(&cc->gpio_lock, flags);
|
|
+
|
|
+ return res;
|
|
}
|
|
+EXPORT_SYMBOL_GPL(bcma_chipco_gpio_in);
|
|
|
|
u32 bcma_chipco_gpio_out(struct bcma_drv_cc *cc, u32 mask, u32 value)
|
|
{
|
|
- return bcma_cc_write32_masked(cc, BCMA_CC_GPIOOUT, mask, value);
|
|
+ unsigned long flags;
|
|
+ u32 res;
|
|
+
|
|
+ spin_lock_irqsave(&cc->gpio_lock, flags);
|
|
+ res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOOUT, mask, value);
|
|
+ spin_unlock_irqrestore(&cc->gpio_lock, flags);
|
|
+
|
|
+ return res;
|
|
}
|
|
+EXPORT_SYMBOL_GPL(bcma_chipco_gpio_out);
|
|
|
|
u32 bcma_chipco_gpio_outen(struct bcma_drv_cc *cc, u32 mask, u32 value)
|
|
{
|
|
- return bcma_cc_write32_masked(cc, BCMA_CC_GPIOOUTEN, mask, value);
|
|
+ unsigned long flags;
|
|
+ u32 res;
|
|
+
|
|
+ spin_lock_irqsave(&cc->gpio_lock, flags);
|
|
+ res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOOUTEN, mask, value);
|
|
+ spin_unlock_irqrestore(&cc->gpio_lock, flags);
|
|
+
|
|
+ return res;
|
|
}
|
|
+EXPORT_SYMBOL_GPL(bcma_chipco_gpio_outen);
|
|
|
|
u32 bcma_chipco_gpio_control(struct bcma_drv_cc *cc, u32 mask, u32 value)
|
|
{
|
|
- return bcma_cc_write32_masked(cc, BCMA_CC_GPIOCTL, mask, value);
|
|
+ unsigned long flags;
|
|
+ u32 res;
|
|
+
|
|
+ spin_lock_irqsave(&cc->gpio_lock, flags);
|
|
+ res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOCTL, mask, value);
|
|
+ spin_unlock_irqrestore(&cc->gpio_lock, flags);
|
|
+
|
|
+ return res;
|
|
}
|
|
EXPORT_SYMBOL_GPL(bcma_chipco_gpio_control);
|
|
|
|
u32 bcma_chipco_gpio_intmask(struct bcma_drv_cc *cc, u32 mask, u32 value)
|
|
{
|
|
- return bcma_cc_write32_masked(cc, BCMA_CC_GPIOIRQ, mask, value);
|
|
+ unsigned long flags;
|
|
+ u32 res;
|
|
+
|
|
+ spin_lock_irqsave(&cc->gpio_lock, flags);
|
|
+ res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOIRQ, mask, value);
|
|
+ spin_unlock_irqrestore(&cc->gpio_lock, flags);
|
|
+
|
|
+ return res;
|
|
}
|
|
+EXPORT_SYMBOL_GPL(bcma_chipco_gpio_intmask);
|
|
|
|
u32 bcma_chipco_gpio_polarity(struct bcma_drv_cc *cc, u32 mask, u32 value)
|
|
{
|
|
- return bcma_cc_write32_masked(cc, BCMA_CC_GPIOPOL, mask, value);
|
|
+ unsigned long flags;
|
|
+ u32 res;
|
|
+
|
|
+ spin_lock_irqsave(&cc->gpio_lock, flags);
|
|
+ res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOPOL, mask, value);
|
|
+ spin_unlock_irqrestore(&cc->gpio_lock, flags);
|
|
+
|
|
+ return res;
|
|
}
|
|
+EXPORT_SYMBOL_GPL(bcma_chipco_gpio_polarity);
|
|
|
|
#ifdef CONFIG_BCMA_DRIVER_MIPS
|
|
void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
|
|
--- a/include/linux/bcma/bcma_driver_chipcommon.h
|
|
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
|
|
@@ -555,6 +555,9 @@ struct bcma_drv_cc {
|
|
#endif /* CONFIG_BCMA_DRIVER_MIPS */
|
|
u32 ticks_per_ms;
|
|
struct platform_device *watchdog;
|
|
+
|
|
+ /* Lock for GPIO register access. */
|
|
+ spinlock_t gpio_lock;
|
|
};
|
|
|
|
/* Register access */
|
|
@@ -584,13 +587,22 @@ void bcma_chipco_irq_mask(struct bcma_dr
|
|
|
|
u32 bcma_chipco_irq_status(struct bcma_drv_cc *cc, u32 mask);
|
|
|
|
+#define BCMA_CC_GPIO_LINES 16
|
|
+
|
|
/* Chipcommon GPIO pin access. */
|
|
-u32 bcma_chipco_gpio_in(struct bcma_drv_cc *cc, u32 mask);
|
|
-u32 bcma_chipco_gpio_out(struct bcma_drv_cc *cc, u32 mask, u32 value);
|
|
-u32 bcma_chipco_gpio_outen(struct bcma_drv_cc *cc, u32 mask, u32 value);
|
|
-u32 bcma_chipco_gpio_control(struct bcma_drv_cc *cc, u32 mask, u32 value);
|
|
-u32 bcma_chipco_gpio_intmask(struct bcma_drv_cc *cc, u32 mask, u32 value);
|
|
-u32 bcma_chipco_gpio_polarity(struct bcma_drv_cc *cc, u32 mask, u32 value);
|
|
+extern u32 bcma_chipco_gpio_in(struct bcma_drv_cc *cc, u32 mask);
|
|
+extern u32 bcma_chipco_gpio_out(struct bcma_drv_cc *cc, u32 mask, u32 value);
|
|
+extern u32 bcma_chipco_gpio_outen(struct bcma_drv_cc *cc, u32 mask, u32 value);
|
|
+extern u32 bcma_chipco_gpio_control(struct bcma_drv_cc *cc, u32 mask,
|
|
+ u32 value);
|
|
+extern u32 bcma_chipco_gpio_intmask(struct bcma_drv_cc *cc, u32 mask,
|
|
+ u32 value);
|
|
+extern u32 bcma_chipco_gpio_polarity(struct bcma_drv_cc *cc, u32 mask,
|
|
+ u32 value);
|
|
+static inline int bcma_chipco_gpio_count(void)
|
|
+{
|
|
+ return BCMA_CC_GPIO_LINES;
|
|
+}
|
|
|
|
/* PMU support */
|
|
extern void bcma_pmu_init(struct bcma_drv_cc *cc);
|