when changing the mac address of a bridge interface, keep member interface addresses...

[openwrt.git] / target / linux / rdc / patches-2.6.30 / 001-rdc321x_mfd_southbridge.patch

diff --git a/target/linux/rdc/patches-2.6.30/001-rdc321x_mfd_southbridge.patch b/target/linux/rdc/patches-2.6.30/001-rdc321x_mfd_southbridge.patch
index a5c6736..b4970cf 100644 (file)
--- a/target/linux/rdc/patches-2.6.30/001-rdc321x_mfd_southbridge.patch
+++ b/target/linux/rdc/patches-2.6.30/001-rdc321x_mfd_southbridge.patch
@@ -11,11 +11,9 @@ Changes from v2:
 - removed pci_dev accessors
 - use DEFINE_PCI_DEVICE_TABLE
 
 - removed pci_dev accessors
 - use DEFINE_PCI_DEVICE_TABLE
 

-Index: linux-2.6.30.10/drivers/mfd/Kconfig
-===================================================================
---- linux-2.6.30.10.orig/drivers/mfd/Kconfig   2010-04-28 10:48:54.000000000 +0200
-+++ linux-2.6.30.10/drivers/mfd/Kconfig        2010-04-28 10:49:44.000000000 +0200
-@@ -241,6 +241,15 @@
+--- a/drivers/mfd/Kconfig
++++ b/drivers/mfd/Kconfig
+@@ -241,6 +241,15 @@ config PCF50633_GPIO

         Say yes here if you want to include support GPIO for pins on
         the PCF50633 chip.
  
         Say yes here if you want to include support GPIO for pins on
         the PCF50633 chip.
  


@@ -31,11 +29,9 @@ Index: linux-2.6.30.10/drivers/mfd/Kconfig
  endmenu
  
  menu "Multimedia Capabilities Port drivers"
  endmenu
  
  menu "Multimedia Capabilities Port drivers"

-Index: linux-2.6.30.10/drivers/mfd/Makefile
-===================================================================
---- linux-2.6.30.10.orig/drivers/mfd/Makefile  2010-04-28 10:48:54.000000000 +0200
-+++ linux-2.6.30.10/drivers/mfd/Makefile       2010-04-28 10:49:02.000000000 +0200
-@@ -40,4 +40,6 @@
+--- a/drivers/mfd/Makefile
++++ b/drivers/mfd/Makefile
+@@ -40,4 +40,6 @@ obj-$(CONFIG_PMIC_DA903X)    += da903x.o

  
  obj-$(CONFIG_MFD_PCF50633)    += pcf50633-core.o
  obj-$(CONFIG_PCF50633_ADC)    += pcf50633-adc.o
  
  obj-$(CONFIG_MFD_PCF50633)    += pcf50633-core.o
  obj-$(CONFIG_PCF50633_ADC)    += pcf50633-adc.o


@@ -44,10 +40,8 @@ Index: linux-2.6.30.10/drivers/mfd/Makefile
 +obj-$(CONFIG_PCF50633_GPIO)   += pcf50633-gpio.o
 +
 +obj-$(CONFIG_MFD_RDC321X)     += rdc321x-southbridge.o
 +obj-$(CONFIG_PCF50633_GPIO)   += pcf50633-gpio.o
 +
 +obj-$(CONFIG_MFD_RDC321X)     += rdc321x-southbridge.o

-Index: linux-2.6.30.10/drivers/mfd/rdc321x-southbridge.c
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.10/drivers/mfd/rdc321x-southbridge.c  2010-04-28 10:49:02.000000000 +0200
+--- /dev/null
++++ b/drivers/mfd/rdc321x-southbridge.c

 @@ -0,0 +1,123 @@
 +/*
 + * RDC321x MFD southbrige driver
 @@ -0,0 +1,123 @@
 +/*
 + * RDC321x MFD southbrige driver


@@ -85,7 +79,7 @@ Index: linux-2.6.30.10/drivers/mfd/rdc321x-southbridge.c
 +              .name   = "wdt-reg",
 +              .start  = RDC321X_WDT_CTRL,
 +              .end    = RDC321X_WDT_CTRL + 0x3,
 +              .name   = "wdt-reg",
 +              .start  = RDC321X_WDT_CTRL,
 +              .end    = RDC321X_WDT_CTRL + 0x3,

-+              .flags  = IORESOURCE_MEM,
++              .flags  = IORESOURCE_IO,

 +      }
 +};
 +
 +      }
 +};
 +


@@ -98,12 +92,12 @@ Index: linux-2.6.30.10/drivers/mfd/rdc321x-southbridge.c
 +              .name   = "gpio-reg1",
 +              .start  = RDC321X_GPIO_CTRL_REG1,
 +              .end    = RDC321X_GPIO_CTRL_REG1 + 0x7,
 +              .name   = "gpio-reg1",
 +              .start  = RDC321X_GPIO_CTRL_REG1,
 +              .end    = RDC321X_GPIO_CTRL_REG1 + 0x7,

-+              .flags  = IORESOURCE_MEM,
++              .flags  = IORESOURCE_IO,

 +      }, {
 +              .name   = "gpio-reg2",
 +              .start  = RDC321X_GPIO_CTRL_REG2,
 +              .end    = RDC321X_GPIO_CTRL_REG2 + 0x7,
 +      }, {
 +              .name   = "gpio-reg2",
 +              .start  = RDC321X_GPIO_CTRL_REG2,
 +              .end    = RDC321X_GPIO_CTRL_REG2 + 0x7,

-+              .flags  = IORESOURCE_MEM,
++              .flags  = IORESOURCE_IO,

 +      }
 +};
 +
 +      }
 +};
 +


@@ -172,10 +166,8 @@ Index: linux-2.6.30.10/drivers/mfd/rdc321x-southbridge.c
 +MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("RDC R-321x MFD southbridge driver");
 +MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("RDC R-321x MFD southbridge driver");

-Index: linux-2.6.30.10/include/linux/mfd/rdc321x.h
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30.10/include/linux/mfd/rdc321x.h        2010-04-28 10:49:02.000000000 +0200
+--- /dev/null
++++ b/include/linux/mfd/rdc321x.h

 @@ -0,0 +1,26 @@
 +#ifndef __RDC321X_MFD_H
 +#define __RDC321X_MFD_H
 @@ -0,0 +1,26 @@
 +#ifndef __RDC321X_MFD_H
 +#define __RDC321X_MFD_H