aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/broadcom-diag/src/gpio.h29
-rw-r--r--package/switch/src/gpio-bcm947xx.h29
2 files changed, 14 insertions, 44 deletions
diff --git a/package/broadcom-diag/src/gpio.h b/package/broadcom-diag/src/gpio.h
index 22f20c99b2..2284e9801e 100644
--- a/package/broadcom-diag/src/gpio.h
+++ b/package/broadcom-diag/src/gpio.h
@@ -3,54 +3,39 @@
#include <linux/interrupt.h>
#ifndef BCMDRIVER
-#include <linux/ssb/ssb.h>
-#include <linux/ssb/ssb_driver_chipcommon.h>
-#include <linux/ssb/ssb_driver_extif.h>
+#include <linux/ssb/ssb_embedded.h>
extern struct ssb_bus ssb;
-#define gpio_op(op, param...) \
- do { \
- if (ssb.chipco.dev) \
- return ssb_chipco_gpio_##op(&ssb.chipco, param); \
- else if (ssb.extif.dev) \
- return ssb_extif_gpio_##op(&ssb.extif, param); \
- else \
- return 0; \
- } while (0);
-
static inline u32 gpio_in(void)
{
- gpio_op(in, ~0);
+ return ssb_gpio_in(&ssb, ~0);
}
static inline u32 gpio_out(u32 mask, u32 value)
{
- gpio_op(out, mask, value);
+ return ssb_gpio_out(&ssb, mask, value);
}
static inline u32 gpio_outen(u32 mask, u32 value)
{
- gpio_op(outen, mask, value);
+ return ssb_gpio_outen(&ssb, mask, value);
}
static inline u32 gpio_control(u32 mask, u32 value)
{
- if (ssb.chipco.dev)
- return ssb_chipco_gpio_control(&ssb.chipco, mask, value);
- else
- return 0;
+ return ssb_gpio_control(&ssb, mask, value);
}
static inline u32 gpio_intmask(u32 mask, u32 value)
{
- gpio_op(intmask, mask, value);
+ return ssb_gpio_intmask(&ssb, mask, value);
}
static inline u32 gpio_intpolarity(u32 mask, u32 value)
{
- gpio_op(polarity, mask, value);
+ return ssb_gpio_polarity(&ssb, mask, value);
}
static inline u32 __ssb_write32_masked(struct ssb_device *dev, u16 offset,
diff --git a/package/switch/src/gpio-bcm947xx.h b/package/switch/src/gpio-bcm947xx.h
index 384ea3ea18..9417bce2a1 100644
--- a/package/switch/src/gpio-bcm947xx.h
+++ b/package/switch/src/gpio-bcm947xx.h
@@ -3,54 +3,39 @@
#include <linux/interrupt.h>
#ifndef BCMDRIVER
-#include <linux/ssb/ssb.h>
-#include <linux/ssb/ssb_driver_chipcommon.h>
-#include <linux/ssb/ssb_driver_extif.h>
+#include <linux/ssb/ssb_embedded.h>
extern struct ssb_bus ssb;
-#define gpio_op(op, param...) \
- do { \
- if (ssb.chipco.dev) \
- return ssb_chipco_gpio_##op(&ssb.chipco, param); \
- else if (ssb.extif.dev) \
- return ssb_extif_gpio_##op(&ssb.extif, param); \
- else \
- return 0; \
- } while (0);
-
static inline u32 gpio_in(void)
{
- gpio_op(in, ~0);
+ return ssb_gpio_in(&ssb, ~0);
}
static inline u32 gpio_out(u32 mask, u32 value)
{
- gpio_op(out, mask, value);
+ return ssb_gpio_out(&ssb, mask, value);
}
static inline u32 gpio_outen(u32 mask, u32 value)
{
- gpio_op(outen, mask, value);
+ return ssb_gpio_outen(&ssb, mask, value);
}
static inline u32 gpio_control(u32 mask, u32 value)
{
- if (ssb.chipco.dev)
- return ssb_chipco_gpio_control(&ssb.chipco, mask, value);
- else
- return 0;
+ return ssb_gpio_control(&ssb, mask, value);
}
static inline u32 gpio_intmask(u32 mask, u32 value)
{
- gpio_op(intmask, mask, value);
+ return ssb_gpio_intmask(&ssb, mask, value);
}
static inline u32 gpio_intpolarity(u32 mask, u32 value)
{
- gpio_op(polarity, mask, value);
+ return ssb_gpio_polarity(&ssb, mask, value);
}
#else