kernel: rename B53 symbols to avoid upstream kernel conflict
authorRafał Miłecki <zajec5@gmail.com>
Tue, 14 Jun 2016 10:55:41 +0000 (12:55 +0200)
committerRafał Miłecki <zajec5@gmail.com>
Mon, 20 Jun 2016 06:00:14 +0000 (08:00 +0200)
In kernel 4.7 there is upstreamed b53 driver using (mostly?) the same
symbols as our b53 does. Change our symbols so both drivers can coexist
in kernel tree.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Acked-by: Jonas Gorski <jonas.gorski@gmail.com>
13 files changed:
target/linux/bcm53xx/config-4.4
target/linux/brcm47xx/config-4.1
target/linux/brcm47xx/config-4.4
target/linux/brcm63xx/config-4.4
target/linux/generic/config-3.18
target/linux/generic/config-4.1
target/linux/generic/config-4.4
target/linux/generic/files/drivers/net/phy/b53/Kconfig
target/linux/generic/files/drivers/net/phy/b53/Makefile
target/linux/generic/patches-3.18/730-phy_b53.patch
target/linux/generic/patches-4.1/730-phy_b53.patch
target/linux/generic/patches-4.4/730-phy_b53.patch
target/linux/sunxi/config-4.4

index 634786177a2dcf34af444a4b16431bd6bf305f50..5611cfe0d4463a5f9bf28dece3b10879f431c6b3 100644 (file)
@@ -54,10 +54,10 @@ CONFIG_ARM_THUMB=y
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_ATAGS=y
 CONFIG_AUTO_ZRELADDR=y
-CONFIG_B53=y
-# CONFIG_B53_MMAP_DRIVER is not set
-# CONFIG_B53_PHY_DRIVER is not set
-CONFIG_B53_SRAB_DRIVER=y
+CONFIG_SWCONFIG_B53=y
+# CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
+# CONFIG_SWCONFIG_B53_PHY_DRIVER is not set
+CONFIG_SWCONFIG_B53_SRAB_DRIVER=y
 CONFIG_BCM47XX_NVRAM=y
 CONFIG_BCM47XX_SPROM=y
 CONFIG_BCM47XX_WDT=y
index 0b812d55a7be7c1aa8c3fe113ff43100310a7824..5cf855004510b37102176ce22f5071f002982bc0 100644 (file)
@@ -12,11 +12,11 @@ CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_B53=y
-# CONFIG_B53_MMAP_DRIVER is not set
-CONFIG_B53_PHY_DRIVER=y
-CONFIG_B53_PHY_FIXUP=y
-# CONFIG_B53_SRAB_DRIVER is not set
+CONFIG_SWCONFIG_B53=y
+# CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
+CONFIG_SWCONFIG_B53_PHY_DRIVER=y
+CONFIG_SWCONFIG_B53_PHY_FIXUP=y
+# CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set
 CONFIG_BCM47XX=y
 CONFIG_BCM47XX_BCMA=y
 CONFIG_BCM47XX_SSB=y
index b72a7248ffae92c88be4de00e89c16a88ffd2ae8..492b12b45a962e0f9edd601ee91ec126d79b3e08 100644 (file)
@@ -14,11 +14,11 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_B53=y
-# CONFIG_B53_MMAP_DRIVER is not set
-CONFIG_B53_PHY_DRIVER=y
-CONFIG_B53_PHY_FIXUP=y
-# CONFIG_B53_SRAB_DRIVER is not set
+CONFIG_SWCONFIG_B53=y
+# CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
+CONFIG_SWCONFIG_B53_PHY_DRIVER=y
+CONFIG_SWCONFIG_B53_PHY_FIXUP=y
+# CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set
 CONFIG_BCM47XX=y
 CONFIG_BCM47XX_BCMA=y
 CONFIG_BCM47XX_NVRAM=y
index a0ec048855f610a48b9bb294657808ac3914fb3e..99022b1b46d4e8f54a5598f5d0d900a990382727 100644 (file)
@@ -13,12 +13,12 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_B53=y
-CONFIG_B53_MMAP_DRIVER=y
-CONFIG_B53_PHY_DRIVER=y
-CONFIG_B53_PHY_FIXUP=y
-CONFIG_B53_SPI_DRIVER=y
-# CONFIG_B53_SRAB_DRIVER is not set
+CONFIG_SWCONFIG_B53=y
+CONFIG_SWCONFIG_B53_MMAP_DRIVER=y
+CONFIG_SWCONFIG_B53_PHY_DRIVER=y
+CONFIG_SWCONFIG_B53_PHY_FIXUP=y
+CONFIG_SWCONFIG_B53_SPI_DRIVER=y
+# CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set
 CONFIG_BCM6345_EXT_IRQ=y
 CONFIG_BCM6345_PERIPH_IRQ=y
 CONFIG_BCM63XX=y
index 9185255db06831c55ef6cd056be9b46ea00501f2..a2c81c2b29564c16e6322f133cf6f77fbc084d0a 100644 (file)
@@ -330,8 +330,8 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
 # CONFIG_B44 is not set
-# CONFIG_B53 is not set
-# CONFIG_B53_SPI_DRIVER is not set
+# CONFIG_SWCONFIG_B53 is not set
+# CONFIG_SWCONFIG_B53_SPI_DRIVER is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
index bdc4f1392e92aa2a70f70aabf4bb8e657428ff42..fa95759a9c00d02e18212a74d7ead9fe33059052 100644 (file)
@@ -344,8 +344,8 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
 # CONFIG_B44 is not set
-# CONFIG_B53 is not set
-# CONFIG_B53_SPI_DRIVER is not set
+# CONFIG_SWCONFIG_B53 is not set
+# CONFIG_SWCONFIG_B53_SPI_DRIVER is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set 
 # CONFIG_BACKLIGHT_ADP8870 is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
index 1199cb5febf53f5926e8b0d1b230d296ec07b102..54c406245972186404f15e4167d3f2e8aa0c57ce 100644 (file)
@@ -321,8 +321,8 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
 # CONFIG_B44 is not set
-# CONFIG_B53 is not set
-# CONFIG_B53_SPI_DRIVER is not set
+# CONFIG_SWCONFIG_B53 is not set
+# CONFIG_SWCONFIG_B53_SPI_DRIVER is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
index 67e053ea0f51c657aeb8693f51635a527232b49c..08287e7adf79d4e768e2b54a92fff75830cb9068 100644 (file)
@@ -1,4 +1,4 @@
-menuconfig B53
+menuconfig SWCONFIG_B53
        tristate "Broadcom bcm53xx managed switch support"
        depends on SWCONFIG
        help
@@ -6,32 +6,32 @@ menuconfig B53
          BCM5325E, BCM5365, BCM539x, BCM53115 and BCM53125 as well as BCM63XX
          integrated switches.
 
-config B53_SPI_DRIVER
+config SWCONFIG_B53_SPI_DRIVER
        tristate "B53 SPI connected switch driver"
-       depends on B53 && SPI
+       depends on SWCONFIG_B53 && SPI
        help
          Select to enable support for registering switches configured through SPI.
 
-config B53_PHY_DRIVER
+config SWCONFIG_B53_PHY_DRIVER
        tristate "B53 MDIO connected switch driver"
-       depends on B53
-       select B53_PHY_FIXUP
+       depends on SWCONFIG_B53
+       select SWCONFIG_B53_PHY_FIXUP
        help
          Select to enable support for registering switches configured through MDIO.
 
-config B53_MMAP_DRIVER
+config SWCONFIG_B53_MMAP_DRIVER
        tristate "B53 MMAP connected switch driver"
-       depends on B53
+       depends on SWCONFIG_B53
        help
          Select to enable support for memory-mapped switches like the BCM63XX
          integrated switches.
 
-config B53_SRAB_DRIVER
+config SWCONFIG_B53_SRAB_DRIVER
        tristate "B53 SRAB connected switch driver"
-       depends on B53
+       depends on SWCONFIG_B53
        help
          Select to enable support for memory-mapped Switch Register Access
          Bridge Registers (SRAB) like it is found on the BCM53010
 
-config B53_PHY_FIXUP
+config SWCONFIG_B53_PHY_FIXUP
        bool
index 7cc39c7628fb3d137b765b2ebc79686f7ecb1efc..13ff366448dff15153dcfe527f7637a817df8780 100644 (file)
@@ -1,10 +1,10 @@
-obj-$(CONFIG_B53)              += b53_common.o
+obj-$(CONFIG_SWCONFIG_B53)             += b53_common.o
 
-obj-$(CONFIG_B53_PHY_FIXUP)    += b53_phy_fixup.o
+obj-$(CONFIG_SWCONFIG_B53_PHY_FIXUP)   += b53_phy_fixup.o
 
-obj-$(CONFIG_B53_MMAP_DRIVER)  += b53_mmap.o
-obj-$(CONFIG_B53_SRAB_DRIVER)  += b53_srab.o
-obj-$(CONFIG_B53_PHY_DRIVER)   += b53_mdio.o
-obj-$(CONFIG_B53_SPI_DRIVER)   += b53_spi.o
+obj-$(CONFIG_SWCONFIG_B53_MMAP_DRIVER) += b53_mmap.o
+obj-$(CONFIG_SWCONFIG_B53_SRAB_DRIVER) += b53_srab.o
+obj-$(CONFIG_SWCONFIG_B53_PHY_DRIVER)  += b53_mdio.o
+obj-$(CONFIG_SWCONFIG_B53_SPI_DRIVER)  += b53_spi.o
 
-ccflags-y                      += -Werror
+ccflags-y                              += -Werror
index c2dfcfa5011c3200ca507f9ae9ea9931f65d9f30..03fc369c9dd3f2351cd4f49f122315edd0a73447 100644 (file)
@@ -15,7 +15,7 @@
  obj-$(CONFIG_RTL8367B_PHY)    += rtl8367b.o
  obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
  obj-$(CONFIG_PSB6970_PHY)     += psb6970.o
-+obj-$(CONFIG_B53)             += b53/
++obj-$(CONFIG_SWCONFIG_B53)    += b53/
  obj-$(CONFIG_FIXED_PHY)               += fixed.o
  obj-$(CONFIG_MDIO_BITBANG)    += mdio-bitbang.o
  obj-$(CONFIG_MDIO_GPIO)               += mdio-gpio.o
index bdcfba6e86f34332cb7e0f744dd8a901480d9861..ff166890d4e3e643029b5db98b510406c159696d 100644 (file)
@@ -15,7 +15,7 @@
  obj-$(CONFIG_RTL8367B_PHY)    += rtl8367b.o
  obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
  obj-$(CONFIG_PSB6970_PHY)     += psb6970.o
-+obj-$(CONFIG_B53)             += b53/
++obj-$(CONFIG_SWCONFIG_B53)    += b53/
  obj-$(CONFIG_FIXED_PHY)               += fixed_phy.o
  obj-$(CONFIG_MDIO_BITBANG)    += mdio-bitbang.o
  obj-$(CONFIG_MDIO_GPIO)               += mdio-gpio.o
index 71a53fded4422d6e28a34f6d57eb48a26bbc9048..1a6de9672650f565f95869a214e627bd7b814cae 100644 (file)
@@ -15,7 +15,7 @@
  obj-$(CONFIG_RTL8367B_PHY)    += rtl8367b.o
  obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
  obj-$(CONFIG_PSB6970_PHY)     += psb6970.o
-+obj-$(CONFIG_B53)             += b53/
++obj-$(CONFIG_SWCONFIG_B53)    += b53/
  obj-$(CONFIG_FIXED_PHY)               += fixed_phy.o
  obj-$(CONFIG_MDIO_BITBANG)    += mdio-bitbang.o
  obj-$(CONFIG_MDIO_GPIO)               += mdio-gpio.o
index 568bcb74b4e942ace7bcd60c9f8085cbd920a8a9..b05446c6d2d4690757e6fe556c2b1018805ee3ee 100644 (file)
@@ -57,11 +57,11 @@ CONFIG_AUDIT=y
 CONFIG_AUDIT_GENERIC=y
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_AXP20X_POWER=y
-CONFIG_B53=y
-# CONFIG_B53_MMAP_DRIVER is not set
-CONFIG_B53_PHY_DRIVER=y
-CONFIG_B53_PHY_FIXUP=y
-# CONFIG_B53_SRAB_DRIVER is not set
+CONFIG_SWCONFIG_B53=y
+# CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
+CONFIG_SWCONFIG_B53_PHY_DRIVER=y
+CONFIG_SWCONFIG_B53_PHY_FIXUP=y
+# CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_PWM=y