lua: Fixed some cross-platform issues for PPC (and probably other architectures)

[openwrt.git] / target / linux / adm5120 / files / drivers / leds / leds-adm5120.c

diff --git a/target/linux/adm5120/files/drivers/leds/leds-adm5120.c b/target/linux/adm5120/files/drivers/leds/leds-adm5120.c
index 95b90fa..538b200 100644 (file)
--- a/target/linux/adm5120/files/drivers/leds/leds-adm5120.c
+++ b/target/linux/adm5120/files/drivers/leds/leds-adm5120.c
@@ -26,9 +26,10 @@
 
 #include <adm5120_info.h>
 
 
 #include <adm5120_info.h>
 

-#define NUM_LEDS_MAX   23

 #define DRV_DESC       "LED driver for the ADM5120 based boards"
 #define DRV_DESC       "LED driver for the ADM5120 based boards"

+#define DRV_VERSION    "0.2.0"

 
 

+#define NUM_LEDS_MAX   23

 #define ADM5120_GPIO_xxxx      0x100   /* an unknown pin */
 
 struct mach_data {
 #define ADM5120_GPIO_xxxx      0x100   /* an unknown pin */
 
 struct mach_data {


@@ -59,6 +60,18 @@ static struct gpio_led n ## _leds [] __initdata =
 #define LED_STD(g, n, t)       LED_DATA((n), (t), (g), 0)
 #define LED_INV(g, n, t)       LED_DATA((n), (t), (g), 1)
 
 #define LED_STD(g, n, t)       LED_DATA((n), (t), (g), 0)
 #define LED_INV(g, n, t)       LED_DATA((n), (t), (g), 1)
 

+/*
+ * Cellvision boards
+ */
+
+LED_ARRAY(cas771) {
+       LED_STD(ADM5120_GPIO_PIN0, "cam_flash", NULL),
+       /* GPIO PIN3 is the reset */
+       LED_STD(ADM5120_GPIO_PIN6, "access",    NULL),
+       LED_STD(ADM5120_GPIO_P0L1, "status",    NULL),
+       LED_STD(ADM5120_GPIO_P0L2, "diag",      NULL),
+};
+

 /*
  * Compex boards
  */
 /*
  * Compex boards
  */


@@ -133,6 +146,22 @@ LED_ARRAY(br61x4wg) {
        LED_INV(ADM5120_GPIO_P4L0, "lan4_lnkact",       NULL),
 };
 
        LED_INV(ADM5120_GPIO_P4L0, "lan4_lnkact",       NULL),
 };
 

+/*
+ * Infineon boards
+ */
+LED_ARRAY(easy5120rt) {
+       LED_INV(ADM5120_GPIO_PIN6, "user",              NULL),
+       LED_INV(ADM5120_GPIO_P0L0, "lan0_led1",         NULL),
+       LED_INV(ADM5120_GPIO_P0L1, "lan0_led2",         NULL),
+       LED_INV(ADM5120_GPIO_P1L0, "lan1_led1",         NULL),
+       LED_INV(ADM5120_GPIO_P1L1, "lan1_led2",         NULL),
+       LED_INV(ADM5120_GPIO_P2L0, "lan2_led1",         NULL),
+       LED_INV(ADM5120_GPIO_P2L1, "lan2_led2",         NULL),
+       LED_INV(ADM5120_GPIO_P3L0, "lan3_led1",         NULL),
+       LED_INV(ADM5120_GPIO_P3L1, "lan3_led2",         NULL),
+       LED_INV(ADM5120_GPIO_P4L0, "wan",               NULL),
+};
+

 /*
  * Mikrotik boards
  */
 /*
  * Mikrotik boards
  */


@@ -160,18 +189,32 @@ LED_ARRAY(rb133c) {
         LED_INV(ADM5120_GPIO_P0L0, "lan3_lnkact",      NULL), /* untested */
 };
 
         LED_INV(ADM5120_GPIO_P0L0, "lan3_lnkact",      NULL), /* untested */
 };
 

+LED_ARRAY(rb150) {
+       LED_STD(ADM5120_GPIO_P0L2, "user",              NULL),
+       LED_INV(ADM5120_GPIO_P0L1, "lan1_led1",         NULL), /* untested */
+       LED_INV(ADM5120_GPIO_P0L0, "lan1_led2",         NULL), /* untested */
+       LED_INV(ADM5120_GPIO_P1L1, "lan5_led1",         NULL), /* untested */
+       LED_INV(ADM5120_GPIO_P1L0, "lan5_led2",         NULL), /* untested */
+       LED_INV(ADM5120_GPIO_P2L1, "lan4_led1",         NULL), /* untested */
+       LED_INV(ADM5120_GPIO_P2L0, "lan4_led2",         NULL), /* untested */
+       LED_INV(ADM5120_GPIO_P3L1, "lan3_led1",         NULL), /* untested */
+       LED_INV(ADM5120_GPIO_P3L0, "lan3_led2",         NULL), /* untested */
+       LED_INV(ADM5120_GPIO_P4L1, "lan2_led1",         NULL), /* untested */
+       LED_INV(ADM5120_GPIO_P4L0, "lan2_led2",         NULL), /* untested */
+};
+

 LED_ARRAY(rb153) {
 LED_ARRAY(rb153) {

-       LED_STD(ADM5120_GPIO_PIN5, "user",              NULL),
-        LED_INV(ADM5120_GPIO_P0L1, "lan1_speed",       NULL),
-        LED_INV(ADM5120_GPIO_P0L0, "lan1_lnkact",      NULL),
-        LED_INV(ADM5120_GPIO_P1L1, "lan5_speed",       NULL),
-        LED_INV(ADM5120_GPIO_P1L0, "lan5_lnkact",      NULL),
-        LED_INV(ADM5120_GPIO_P2L1, "lan4_speed",       NULL),
-        LED_INV(ADM5120_GPIO_P2L0, "lan4_lnkact",       NULL),
-        LED_INV(ADM5120_GPIO_P3L1, "lan3_speed",        NULL),
-        LED_INV(ADM5120_GPIO_P3L0, "lan3_lnkact",       NULL),
-        LED_INV(ADM5120_GPIO_P4L1, "lan2_speed",        NULL),
-        LED_INV(ADM5120_GPIO_P4L0, "lan2_lnkact",       NULL),
+       LED_STD(ADM5120_GPIO_PIN5, "user",              NULL),
+       LED_INV(ADM5120_GPIO_P0L1, "lan1_speed",        NULL),
+       LED_INV(ADM5120_GPIO_P0L0, "lan1_lnkact",       NULL),
+       LED_INV(ADM5120_GPIO_P1L1, "lan5_speed",        NULL),
+       LED_INV(ADM5120_GPIO_P1L0, "lan5_lnkact",       NULL),
+       LED_INV(ADM5120_GPIO_P2L1, "lan4_speed",        NULL),
+       LED_INV(ADM5120_GPIO_P2L0, "lan4_lnkact",       NULL),
+       LED_INV(ADM5120_GPIO_P3L1, "lan3_speed",        NULL),
+       LED_INV(ADM5120_GPIO_P3L0, "lan3_lnkact",       NULL),
+       LED_INV(ADM5120_GPIO_P4L1, "lan2_speed",        NULL),
+       LED_INV(ADM5120_GPIO_P4L0, "lan2_lnkact",       NULL),

 };
 
 /*
 };
 
 /*


@@ -253,6 +296,8 @@ LED_ARRAY(generic) {
 
 static struct mach_data machines[] __initdata = {
        MACH_DATA(MACH_ADM5120_GENERIC, generic),
 
 static struct mach_data machines[] __initdata = {
        MACH_DATA(MACH_ADM5120_GENERIC, generic),

+       /* Cellvision */
+       MACH_DATA(MACH_ADM5120_CAS771, cas771),

        /* Compex */
        MACH_DATA(MACH_ADM5120_NP28G,   np28g),
        MACH_DATA(MACH_ADM5120_NP28GHS, np28g),
        /* Compex */
        MACH_DATA(MACH_ADM5120_NP28G,   np28g),
        MACH_DATA(MACH_ADM5120_NP28GHS, np28g),


@@ -264,11 +309,14 @@ static struct mach_data machines[] __initdata = {
        /* Edimax */
        MACH_DATA(MACH_ADM5120_BR6104K, br6104k),
        MACH_DATA(MACH_ADM5120_BR61x4WG, br61x4wg),
        /* Edimax */
        MACH_DATA(MACH_ADM5120_BR6104K, br6104k),
        MACH_DATA(MACH_ADM5120_BR61x4WG, br61x4wg),

+       /* Infineon */
+       MACH_DATA(MACH_ADM5120_EASY5120RT, easy5120rt),

        /* Mikrotik */
        MACH_DATA(MACH_ADM5120_RB_111,  rb100),
        MACH_DATA(MACH_ADM5120_RB_112,  rb100),
        MACH_DATA(MACH_ADM5120_RB_133,  rb133),
        MACH_DATA(MACH_ADM5120_RB_133C, rb133c),
        /* Mikrotik */
        MACH_DATA(MACH_ADM5120_RB_111,  rb100),
        MACH_DATA(MACH_ADM5120_RB_112,  rb100),
        MACH_DATA(MACH_ADM5120_RB_133,  rb133),
        MACH_DATA(MACH_ADM5120_RB_133C, rb133c),

+       MACH_DATA(MACH_ADM5120_RB_150,  rb150),

        MACH_DATA(MACH_ADM5120_RB_153,  rb153),
        /* ZyXEL */
        MACH_DATA(MACH_ADM5120_P334WT,  p334wt),
        MACH_DATA(MACH_ADM5120_RB_153,  rb153),
        /* ZyXEL */
        MACH_DATA(MACH_ADM5120_P334WT,  p334wt),


@@ -327,11 +375,6 @@ adm5120_leds_init(void)
        struct mach_data *mach;
        int i, ret;
 
        struct mach_data *mach;
        int i, ret;
 

-       if (mips_machgroup != MACH_GROUP_ADM5120) {
-               ret = -EINVAL;
-               goto err;
-       }
-

        mach = adm5120_leds_findmach(mips_machtype);
        if (mach == NULL) {
                printk(KERN_ERR "leds-adm5120: unsupported board\n");
        mach = adm5120_leds_findmach(mips_machtype);
        if (mach == NULL) {
                printk(KERN_ERR "leds-adm5120: unsupported board\n");


@@ -384,4 +427,5 @@ module_exit(adm5120_leds_exit);
 MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
 MODULE_DESCRIPTION(DRV_DESC);
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
 MODULE_DESCRIPTION(DRV_DESC);
 MODULE_LICENSE("GPL v2");

+MODULE_VERSION(DRV_VERSION);