dumalogiya
/
openwrt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel: rename B53 symbols to avoid upstream kernel conflict

Browse Source 
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>
Rafał Miłecki 8 years ago
parent 1aca291214
commit cf6d9d97fb
13 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File

8
target/linux/bcm53xx/config-4.4
Unescape Escape View File

@ -54,10 +54,10 @@ CONFIG_ARM_THUMB=y
CONFIG_ARM_VIRT_EXT=y CONFIG_ARM_VIRT_EXT=y
CONFIG_ATAGS=y CONFIG_ATAGS=y
CONFIG_AUTO_ZRELADDR=y CONFIG_AUTO_ZRELADDR=y
CONFIG_B53=y CONFIG_SWCONFIG_B53=y
# CONFIG_B53_MMAP_DRIVER is not set # CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
# CONFIG_B53_PHY_DRIVER is not set # CONFIG_SWCONFIG_B53_PHY_DRIVER is not set
CONFIG_B53_SRAB_DRIVER=y CONFIG_SWCONFIG_B53_SRAB_DRIVER=y
CONFIG_BCM47XX_NVRAM=y CONFIG_BCM47XX_NVRAM=y
CONFIG_BCM47XX_SPROM=y CONFIG_BCM47XX_SPROM=y
CONFIG_BCM47XX_WDT=y CONFIG_BCM47XX_WDT=y

10
target/linux/brcm47xx/config-4.1
Unescape Escape View File

@ -12,11 +12,11 @@ CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_B53=y CONFIG_SWCONFIG_B53=y
# CONFIG_B53_MMAP_DRIVER is not set # CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
CONFIG_B53_PHY_DRIVER=y CONFIG_SWCONFIG_B53_PHY_DRIVER=y
CONFIG_B53_PHY_FIXUP=y CONFIG_SWCONFIG_B53_PHY_FIXUP=y
# CONFIG_B53_SRAB_DRIVER is not set # CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set
CONFIG_BCM47XX=y CONFIG_BCM47XX=y
CONFIG_BCM47XX_BCMA=y CONFIG_BCM47XX_BCMA=y
CONFIG_BCM47XX_SSB=y CONFIG_BCM47XX_SSB=y

10
target/linux/brcm47xx/config-4.4
Unescape Escape View File

@ -14,11 +14,11 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_B53=y CONFIG_SWCONFIG_B53=y
# CONFIG_B53_MMAP_DRIVER is not set # CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
CONFIG_B53_PHY_DRIVER=y CONFIG_SWCONFIG_B53_PHY_DRIVER=y
CONFIG_B53_PHY_FIXUP=y CONFIG_SWCONFIG_B53_PHY_FIXUP=y
# CONFIG_B53_SRAB_DRIVER is not set # CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set
CONFIG_BCM47XX=y CONFIG_BCM47XX=y
CONFIG_BCM47XX_BCMA=y CONFIG_BCM47XX_BCMA=y
CONFIG_BCM47XX_NVRAM=y CONFIG_BCM47XX_NVRAM=y

12
target/linux/brcm63xx/config-4.4
Unescape Escape View File

@ -13,12 +13,12 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_B53=y CONFIG_SWCONFIG_B53=y
CONFIG_B53_MMAP_DRIVER=y CONFIG_SWCONFIG_B53_MMAP_DRIVER=y
CONFIG_B53_PHY_DRIVER=y CONFIG_SWCONFIG_B53_PHY_DRIVER=y
CONFIG_B53_PHY_FIXUP=y CONFIG_SWCONFIG_B53_PHY_FIXUP=y
CONFIG_B53_SPI_DRIVER=y CONFIG_SWCONFIG_B53_SPI_DRIVER=y
# CONFIG_B53_SRAB_DRIVER is not set # CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set
CONFIG_BCM6345_EXT_IRQ=y CONFIG_BCM6345_EXT_IRQ=y
CONFIG_BCM6345_PERIPH_IRQ=y CONFIG_BCM6345_PERIPH_IRQ=y
CONFIG_BCM63XX=y CONFIG_BCM63XX=y

4
target/linux/generic/config-3.18
Unescape Escape View File

@ -330,8 +330,8 @@ CONFIG_ATM_CLIP_NO_ICMP=y
# CONFIG_B43 is not set # CONFIG_B43 is not set
# CONFIG_B43LEGACY is not set # CONFIG_B43LEGACY is not set
# CONFIG_B44 is not set # CONFIG_B44 is not set
# CONFIG_B53 is not set # CONFIG_SWCONFIG_B53 is not set
# CONFIG_B53_SPI_DRIVER is not set # CONFIG_SWCONFIG_B53_SPI_DRIVER is not set
# CONFIG_BACKLIGHT_BD6107 is not set # CONFIG_BACKLIGHT_BD6107 is not set
# CONFIG_BACKLIGHT_GPIO is not set # CONFIG_BACKLIGHT_GPIO is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set

4
target/linux/generic/config-4.1
Unescape Escape View File

@ -344,8 +344,8 @@ CONFIG_ATM_CLIP_NO_ICMP=y
# CONFIG_B43 is not set # CONFIG_B43 is not set
# CONFIG_B43LEGACY is not set # CONFIG_B43LEGACY is not set
# CONFIG_B44 is not set # CONFIG_B44 is not set
# CONFIG_B53 is not set # CONFIG_SWCONFIG_B53 is not set
# CONFIG_B53_SPI_DRIVER is not set # CONFIG_SWCONFIG_B53_SPI_DRIVER is not set
# CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set # CONFIG_BACKLIGHT_ADP8870 is not set
# CONFIG_BACKLIGHT_BD6107 is not set # CONFIG_BACKLIGHT_BD6107 is not set

4
target/linux/generic/config-4.4
Unescape Escape View File

@ -321,8 +321,8 @@ CONFIG_ATM_CLIP_NO_ICMP=y
# CONFIG_B43 is not set # CONFIG_B43 is not set
# CONFIG_B43LEGACY is not set # CONFIG_B43LEGACY is not set
# CONFIG_B44 is not set # CONFIG_B44 is not set
# CONFIG_B53 is not set # CONFIG_SWCONFIG_B53 is not set
# CONFIG_B53_SPI_DRIVER is not set # CONFIG_SWCONFIG_B53_SPI_DRIVER is not set
# CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set # CONFIG_BACKLIGHT_ADP8870 is not set
# CONFIG_BACKLIGHT_BD6107 is not set # CONFIG_BACKLIGHT_BD6107 is not set

22
target/linux/generic/files/drivers/net/phy/b53/Kconfig
Unescape Escape View File

@ -1,4 +1,4 @@
menuconfig B53 menuconfig SWCONFIG_B53
tristate "Broadcom bcm53xx managed switch support" tristate "Broadcom bcm53xx managed switch support"
depends on SWCONFIG depends on SWCONFIG
help help
@ -6,32 +6,32 @@ menuconfig B53
BCM5325E, BCM5365, BCM539x, BCM53115 and BCM53125 as well as BCM63XX BCM5325E, BCM5365, BCM539x, BCM53115 and BCM53125 as well as BCM63XX
integrated switches. integrated switches.
config B53_SPI_DRIVER config SWCONFIG_B53_SPI_DRIVER
tristate "B53 SPI connected switch driver" tristate "B53 SPI connected switch driver"
depends on B53 && SPI depends on SWCONFIG_B53 && SPI
help help
Select to enable support for registering switches configured through SPI. 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" tristate "B53 MDIO connected switch driver"
depends on B53 depends on SWCONFIG_B53
select B53_PHY_FIXUP select SWCONFIG_B53_PHY_FIXUP
help help
Select to enable support for registering switches configured through MDIO. 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" tristate "B53 MMAP connected switch driver"
depends on B53 depends on SWCONFIG_B53
help help
Select to enable support for memory-mapped switches like the BCM63XX Select to enable support for memory-mapped switches like the BCM63XX
integrated switches. integrated switches.
config B53_SRAB_DRIVER config SWCONFIG_B53_SRAB_DRIVER
tristate "B53 SRAB connected switch driver" tristate "B53 SRAB connected switch driver"
depends on B53 depends on SWCONFIG_B53
help help
Select to enable support for memory-mapped Switch Register Access Select to enable support for memory-mapped Switch Register Access
Bridge Registers (SRAB) like it is found on the BCM53010 Bridge Registers (SRAB) like it is found on the BCM53010
config B53_PHY_FIXUP config SWCONFIG_B53_PHY_FIXUP
bool bool

14
target/linux/generic/files/drivers/net/phy/b53/Makefile
Unescape Escape View 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_SWCONFIG_B53_MMAP_DRIVER) += b53_mmap.o
obj-$(CONFIG_B53_SRAB_DRIVER) += b53_srab.o obj-$(CONFIG_SWCONFIG_B53_SRAB_DRIVER) += b53_srab.o
obj-$(CONFIG_B53_PHY_DRIVER) += b53_mdio.o obj-$(CONFIG_SWCONFIG_B53_PHY_DRIVER) += b53_mdio.o
obj-$(CONFIG_B53_SPI_DRIVER) += b53_spi.o obj-$(CONFIG_SWCONFIG_B53_SPI_DRIVER) += b53_spi.o
ccflags-y += -Werror ccflags-y += -Werror

2
target/linux/generic/patches-3.18/730-phy_b53.patch
Unescape Escape View File

@ -15,7 +15,7 @@
obj-$(CONFIG_RTL8367B_PHY) += rtl8367b.o obj-$(CONFIG_RTL8367B_PHY) += rtl8367b.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_PSB6970_PHY) += psb6970.o obj-$(CONFIG_PSB6970_PHY) += psb6970.o
+obj-$(CONFIG_B53) += b53/ +obj-$(CONFIG_SWCONFIG_B53) += b53/
obj-$(CONFIG_FIXED_PHY) += fixed.o obj-$(CONFIG_FIXED_PHY) += fixed.o
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o

2
target/linux/generic/patches-4.1/730-phy_b53.patch
Unescape Escape View File

@ -15,7 +15,7 @@
obj-$(CONFIG_RTL8367B_PHY) += rtl8367b.o obj-$(CONFIG_RTL8367B_PHY) += rtl8367b.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_PSB6970_PHY) += psb6970.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_FIXED_PHY) += fixed_phy.o
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o

2
target/linux/generic/patches-4.4/730-phy_b53.patch
Unescape Escape View File

@ -15,7 +15,7 @@
obj-$(CONFIG_RTL8367B_PHY) += rtl8367b.o obj-$(CONFIG_RTL8367B_PHY) += rtl8367b.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_PSB6970_PHY) += psb6970.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_FIXED_PHY) += fixed_phy.o
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o

10
target/linux/sunxi/config-4.4
Unescape Escape View File

@ -57,11 +57,11 @@ CONFIG_AUDIT=y
CONFIG_AUDIT_GENERIC=y CONFIG_AUDIT_GENERIC=y
CONFIG_AUTO_ZRELADDR=y CONFIG_AUTO_ZRELADDR=y
CONFIG_AXP20X_POWER=y CONFIG_AXP20X_POWER=y
CONFIG_B53=y CONFIG_SWCONFIG_B53=y
# CONFIG_B53_MMAP_DRIVER is not set # CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
CONFIG_B53_PHY_DRIVER=y CONFIG_SWCONFIG_B53_PHY_DRIVER=y
CONFIG_B53_PHY_FIXUP=y CONFIG_SWCONFIG_B53_PHY_FIXUP=y
# CONFIG_B53_SRAB_DRIVER is not set # CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BACKLIGHT_PWM=y CONFIG_BACKLIGHT_PWM=y

Write Preview
Loading…
Cancel
Save