From cf6d9d97fbaa7d85b0f972bdc7ad710e96125fd2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Tue, 14 Jun 2016 12:55:41 +0200 Subject: [PATCH] kernel: rename B53 symbols to avoid upstream kernel conflict MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Acked-by: Jonas Gorski --- target/linux/bcm53xx/config-4.4 | 8 +++---- target/linux/brcm47xx/config-4.1 | 10 ++++----- target/linux/brcm47xx/config-4.4 | 10 ++++----- target/linux/brcm63xx/config-4.4 | 12 +++++----- target/linux/generic/config-3.18 | 4 ++-- target/linux/generic/config-4.1 | 4 ++-- target/linux/generic/config-4.4 | 4 ++-- .../generic/files/drivers/net/phy/b53/Kconfig | 22 +++++++++---------- .../files/drivers/net/phy/b53/Makefile | 14 ++++++------ .../generic/patches-3.18/730-phy_b53.patch | 2 +- .../generic/patches-4.1/730-phy_b53.patch | 2 +- .../generic/patches-4.4/730-phy_b53.patch | 2 +- target/linux/sunxi/config-4.4 | 10 ++++----- 13 files changed, 52 insertions(+), 52 deletions(-) diff --git a/target/linux/bcm53xx/config-4.4 b/target/linux/bcm53xx/config-4.4 index 634786177a2..5611cfe0d44 100644 --- a/target/linux/bcm53xx/config-4.4 +++ b/target/linux/bcm53xx/config-4.4 @@ -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 diff --git a/target/linux/brcm47xx/config-4.1 b/target/linux/brcm47xx/config-4.1 index 0b812d55a7b..5cf85500451 100644 --- a/target/linux/brcm47xx/config-4.1 +++ b/target/linux/brcm47xx/config-4.1 @@ -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 diff --git a/target/linux/brcm47xx/config-4.4 b/target/linux/brcm47xx/config-4.4 index b72a7248ffa..492b12b45a9 100644 --- a/target/linux/brcm47xx/config-4.4 +++ b/target/linux/brcm47xx/config-4.4 @@ -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 diff --git a/target/linux/brcm63xx/config-4.4 b/target/linux/brcm63xx/config-4.4 index a0ec048855f..99022b1b46d 100644 --- a/target/linux/brcm63xx/config-4.4 +++ b/target/linux/brcm63xx/config-4.4 @@ -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 diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18 index 9185255db06..a2c81c2b295 100644 --- a/target/linux/generic/config-3.18 +++ b/target/linux/generic/config-3.18 @@ -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 diff --git a/target/linux/generic/config-4.1 b/target/linux/generic/config-4.1 index bdc4f1392e9..fa95759a9c0 100644 --- a/target/linux/generic/config-4.1 +++ b/target/linux/generic/config-4.1 @@ -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 diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4 index 1199cb5febf..54c40624597 100644 --- a/target/linux/generic/config-4.4 +++ b/target/linux/generic/config-4.4 @@ -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 diff --git a/target/linux/generic/files/drivers/net/phy/b53/Kconfig b/target/linux/generic/files/drivers/net/phy/b53/Kconfig index 67e053ea0f5..08287e7adf7 100644 --- a/target/linux/generic/files/drivers/net/phy/b53/Kconfig +++ b/target/linux/generic/files/drivers/net/phy/b53/Kconfig @@ -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 diff --git a/target/linux/generic/files/drivers/net/phy/b53/Makefile b/target/linux/generic/files/drivers/net/phy/b53/Makefile index 7cc39c7628f..13ff366448d 100644 --- a/target/linux/generic/files/drivers/net/phy/b53/Makefile +++ b/target/linux/generic/files/drivers/net/phy/b53/Makefile @@ -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 diff --git a/target/linux/generic/patches-3.18/730-phy_b53.patch b/target/linux/generic/patches-3.18/730-phy_b53.patch index c2dfcfa5011..03fc369c9dd 100644 --- a/target/linux/generic/patches-3.18/730-phy_b53.patch +++ b/target/linux/generic/patches-3.18/730-phy_b53.patch @@ -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 diff --git a/target/linux/generic/patches-4.1/730-phy_b53.patch b/target/linux/generic/patches-4.1/730-phy_b53.patch index bdcfba6e86f..ff166890d4e 100644 --- a/target/linux/generic/patches-4.1/730-phy_b53.patch +++ b/target/linux/generic/patches-4.1/730-phy_b53.patch @@ -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 diff --git a/target/linux/generic/patches-4.4/730-phy_b53.patch b/target/linux/generic/patches-4.4/730-phy_b53.patch index 71a53fded44..1a6de967265 100644 --- a/target/linux/generic/patches-4.4/730-phy_b53.patch +++ b/target/linux/generic/patches-4.4/730-phy_b53.patch @@ -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 diff --git a/target/linux/sunxi/config-4.4 b/target/linux/sunxi/config-4.4 index 568bcb74b4e..b05446c6d2d 100644 --- a/target/linux/sunxi/config-4.4 +++ b/target/linux/sunxi/config-4.4 @@ -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 -- 2.30.2