diff options
Diffstat (limited to 'target/linux/brcm63xx/patches-4.14/391-MIPS-BCM63XX-do-not-register-uart.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-4.14/391-MIPS-BCM63XX-do-not-register-uart.patch | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/target/linux/brcm63xx/patches-4.14/391-MIPS-BCM63XX-do-not-register-uart.patch b/target/linux/brcm63xx/patches-4.14/391-MIPS-BCM63XX-do-not-register-uart.patch index f317d3b956..6f9f65e694 100644 --- a/target/linux/brcm63xx/patches-4.14/391-MIPS-BCM63XX-do-not-register-uart.patch +++ b/target/linux/brcm63xx/patches-4.14/391-MIPS-BCM63XX-do-not-register-uart.patch @@ -3,12 +3,12 @@ @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \ - setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \ -- dev-pcmcia.o dev-rng.o dev-uart.o \ -+ dev-pcmcia.o dev-rng.o \ - dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \ - usb-common.o sprom.o + setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \ +- dev-rng.o dev-uart.o dev-wdt.o dev-usb-ehci.o \ ++ dev-rng.o dev-wdt.o dev-usb-ehci.o \ + dev-usb-ohci.o dev-usb-usbd.o usb-common.o sprom.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o + --- a/arch/mips/bcm63xx/dev-uart.c +++ /dev/null @@ -1,76 +0,0 @@ @@ -98,17 +98,6 @@ -int bcm63xx_uart_register(unsigned int id); - -#endif /* BCM63XX_DEV_UART_H_ */ ---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -@@ -34,8 +34,6 @@ struct board_info { - unsigned int has_ehci0:1; - unsigned int has_usbd:1; - unsigned int has_dsp:1; -- unsigned int has_uart0:1; -- unsigned int has_uart1:1; - unsigned int use_fallback_sprom:1; - - /* ethernet config */ --- a/arch/mips/bcm63xx/boards/board_common.c +++ b/arch/mips/bcm63xx/boards/board_common.c @@ -20,7 +20,6 @@ @@ -193,7 +182,7 @@ .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, -@@ -323,7 +313,6 @@ static struct board_info __initdata boar +@@ -315,7 +305,6 @@ static struct board_info __initdata boar .name = "96348GW-11", .expected_cpu_id = 0x6348, @@ -201,7 +190,7 @@ .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, -@@ -378,7 +367,6 @@ static struct board_info __initdata boar +@@ -370,7 +359,6 @@ static struct board_info __initdata boar .name = "96348GW", .expected_cpu_id = 0x6348, @@ -209,7 +198,7 @@ .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, -@@ -437,7 +425,6 @@ static struct board_info __initdata boar +@@ -421,7 +409,6 @@ static struct board_info __initdata boar .name = "F@ST2404", .expected_cpu_id = 0x6348, @@ -217,7 +206,7 @@ .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, -@@ -482,7 +469,6 @@ static struct board_info __initdata boar +@@ -466,7 +453,6 @@ static struct board_info __initdata boar .name = "DV201AMR", .expected_cpu_id = 0x6348, @@ -225,7 +214,7 @@ .has_pci = 1, .use_fallback_sprom = 1, .has_ohci0 = 1, -@@ -503,7 +489,6 @@ static struct board_info __initdata boar +@@ -487,7 +473,6 @@ static struct board_info __initdata boar .name = "96348GW-A", .expected_cpu_id = 0x6348, @@ -233,7 +222,7 @@ .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, -@@ -530,7 +515,6 @@ static struct board_info __initdata boar +@@ -514,7 +499,6 @@ static struct board_info __initdata boar .name = "96358VW", .expected_cpu_id = 0x6358, @@ -241,7 +230,7 @@ .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, -@@ -583,7 +567,6 @@ static struct board_info __initdata boar +@@ -567,7 +551,6 @@ static struct board_info __initdata boar .name = "96358VW2", .expected_cpu_id = 0x6358, @@ -249,7 +238,7 @@ .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, -@@ -633,7 +616,6 @@ static struct board_info __initdata boar +@@ -617,7 +600,6 @@ static struct board_info __initdata boar .name = "AGPF-S0", .expected_cpu_id = 0x6358, @@ -257,3 +246,14 @@ .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, +--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h ++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +@@ -32,8 +32,6 @@ struct board_info { + unsigned int has_ohci0:1; + unsigned int has_ehci0:1; + unsigned int has_usbd:1; +- unsigned int has_uart0:1; +- unsigned int has_uart1:1; + unsigned int use_fallback_sprom:1; + + /* ethernet config */ |