[adm5120] more license cleanups

[openwrt.git] / target / linux / adm5120 / files / arch / mips / adm5120 / gpio.c

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/gpio.c b/target/linux/adm5120/files/arch/mips/adm5120/gpio.c
index 01d5a87..bf25267 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/gpio.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/gpio.c
@@ -6,20 +6,9 @@
  *  Copyright (C) 2007 OpenWrt.org
  *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the
- *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA  02110-1301, USA.
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
  *
  */
 
@@ -343,7 +332,7 @@ EXPORT_SYMBOL(adm5120_irq_to_gpio);
 void __init adm5120_gpio_csx0_enable(void)
 {
        gpio_conf2 |= GPIO_CONF2_CSX0;
-       SW_WRITE_REG(GPIO_CONF2, gpio_conf2);
+       SW_WRITE_REG(SWITCH_REG_GPIO_CONF2, gpio_conf2);
 
        adm5120_gpio_map[ADM5120_GPIO_PIN1].flags &= ~GPIO_FLAG_VALID;
        adm5120_gpio_map[ADM5120_GPIO_PIN2].irq = ADM5120_IRQ_GPIO2;
@@ -352,7 +341,7 @@ void __init adm5120_gpio_csx0_enable(void)
 void __init adm5120_gpio_csx1_enable(void)
 {
        gpio_conf2 |= GPIO_CONF2_CSX1;
-       SW_WRITE_REG(GPIO_CONF2, gpio_conf2);
+       SW_WRITE_REG(SWITCH_REG_GPIO_CONF2, gpio_conf2);
 
        adm5120_gpio_map[ADM5120_GPIO_PIN3].flags &= ~GPIO_FLAG_VALID;
        if (adm5120_package_bga())
@@ -362,7 +351,7 @@ void __init adm5120_gpio_csx1_enable(void)
 void __init adm5120_gpio_ew_enable(void)
 {
        gpio_conf2 |= GPIO_CONF2_EW;
-       SW_WRITE_REG(GPIO_CONF2, gpio_conf2);
+       SW_WRITE_REG(SWITCH_REG_GPIO_CONF2, gpio_conf2);
 
        adm5120_gpio_map[ADM5120_GPIO_PIN0].flags &= ~GPIO_FLAG_VALID;
 }
@@ -372,7 +361,7 @@ void __init adm5120_gpio_init(void)
        int i;
 
        gpio_conf2 = 0;
-       SW_WRITE_REG(GPIO_CONF2, gpio_conf2);
+       SW_WRITE_REG(SWITCH_REG_GPIO_CONF2, gpio_conf2);
 
        for (i = 0; i < ADM5120_GPIO_COUNT; i++)
                adm5120_gpio_map[i].flags = GPIO_FLAG_VALID;