[adm5120] change switch register access macros

[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 b57f97a..9e46492 100644 (file)
--- a/target/linux/adm5120/files/drivers/leds/leds-adm5120.c
+++ b/target/linux/adm5120/files/drivers/leds/leds-adm5120.c
@@ -89,21 +89,20 @@ LED_ARRAY(np27g) { /* FIXME: untested */
 };
 #endif
 
-#if defined(CONFIG_LEDS_ADM5120_EXPERIMENTAL)
-LED_ARRAY(np28g) { /* FIXME: untested */
-       LED_STD(ADM5120_GPIO_xxxx, "lan1",      NULL),
-       LED_STD(ADM5120_GPIO_xxxx, "lan2",      NULL),
-       LED_STD(ADM5120_GPIO_xxxx, "lan3",      NULL),
-       LED_STD(ADM5120_GPIO_xxxx, "wan",       NULL),
-       LED_STD(ADM5120_GPIO_xxxx, "wlan",      NULL),
-       LED_STD(ADM5120_GPIO_xxxx, "usb1",      NULL),
-       LED_STD(ADM5120_GPIO_xxxx, "usb2",      NULL),
-       LED_STD(ADM5120_GPIO_xxxx, "usb3",      NULL),
-       LED_STD(ADM5120_GPIO_xxxx, "usb4",      NULL),
-       LED_INV(ADM5120_GPIO_PIN2, "power",     NULL),
-       LED_STD(ADM5120_GPIO_xxxx, "diag",      NULL),
+LED_ARRAY(np28g) {
+       LED_INV(ADM5120_GPIO_PIN2, "diag",      NULL),
+       LED_INV(ADM5120_GPIO_PIN3, "power",     NULL),
+       LED_INV(ADM5120_GPIO_PIN6, "wan_cond",  NULL),
+       LED_INV(ADM5120_GPIO_PIN7, "wifi",      NULL),
+       LED_INV(ADM5120_GPIO_P0L2, "usb1",      NULL),
+       LED_INV(ADM5120_GPIO_P1L0, "lan1",      NULL),
+       LED_INV(ADM5120_GPIO_P1L2, "usb2",      NULL),
+       LED_INV(ADM5120_GPIO_P2L0, "lan2",      NULL),
+       LED_INV(ADM5120_GPIO_P2L2, "usb3",      NULL),
+       LED_INV(ADM5120_GPIO_P3L0, "lan3",      NULL),
+       LED_INV(ADM5120_GPIO_P3L2, "usb4",      NULL),
+       LED_INV(ADM5120_GPIO_P4L0, "wan",       NULL),
 };
-#endif
 
 LED_ARRAY(wp54g) {
        LED_INV(ADM5120_GPIO_PIN2, "diag",      NULL),
@@ -240,6 +239,8 @@ LED_ARRAY(generic) {
 static struct mach_data machines[] __initdata = {
        MACH_DATA(MACH_ADM5120_GENERIC, generic),
        /* Compex */
+       MACH_DATA(MACH_ADM5120_NP28G,   np28g),
+       MACH_DATA(MACH_ADM5120_NP28GHS, np28g),
        MACH_DATA(MACH_ADM5120_WP54AG,  wp54g),
        MACH_DATA(MACH_ADM5120_WP54G,   wp54g),
        MACH_DATA(MACH_ADM5120_WP54G_WRT, wp54g),
@@ -260,8 +261,6 @@ static struct mach_data machines[] __initdata = {
        MACH_DATA(MACH_ADM5120_RB_111,  rb100),
        MACH_DATA(MACH_ADM5120_RB_112,  rb100),
        MACH_DATA(MACH_ADM5120_NP27G,   np27g),
-       MACH_DATA(MACH_ADM5120_NP28G,   np28g),
-       MACH_DATA(MACH_ADM5120_NP28GHS, np28g),
 #endif
 };