From 8ea3c20b23d55fc17e6153044207f11a0f0cd33b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Fri, 5 Dec 2014 16:13:27 +0000 Subject: bcm53xx: rename patches that were not upstreamed to 3xx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki SVN-Revision: 43528 --- ...044-ARM-BCM5301X-fix-early-serial-console.patch | 33 ---------------------- ...5-ARM-BCM5301X-select-GPIOLIB-as-optional.patch | 29 ------------------- ...X-activate-early-printk-for-Netgear-R6250.patch | 23 --------------- ...301-ARM-BCM5301X-fix-early-serial-console.patch | 33 ++++++++++++++++++++++ ...2-ARM-BCM5301X-select-GPIOLIB-as-optional.patch | 29 +++++++++++++++++++ ...X-activate-early-printk-for-Netgear-R6250.patch | 23 +++++++++++++++ ...044-ARM-BCM5301X-fix-early-serial-console.patch | 33 ---------------------- ...5-ARM-BCM5301X-select-GPIOLIB-as-optional.patch | 29 ------------------- ...X-activate-early-printk-for-Netgear-R6250.patch | 23 --------------- .../049-ARM-BCM53XX-set-customized-AUXCTL.patch | 28 ------------------ .../131-ARM-BCM5301X-add-restart-support.patch | 4 +-- .../150-pci-do-not-probe-too-early.patch | 2 +- ...301-ARM-BCM5301X-fix-early-serial-console.patch | 33 ++++++++++++++++++++++ ...2-ARM-BCM5301X-select-GPIOLIB-as-optional.patch | 29 +++++++++++++++++++ ...X-activate-early-printk-for-Netgear-R6250.patch | 23 +++++++++++++++ .../305-ARM-BCM53XX-set-customized-AUXCTL.patch | 28 ++++++++++++++++++ 16 files changed, 201 insertions(+), 201 deletions(-) delete mode 100644 target/linux/bcm53xx/patches-3.14/044-ARM-BCM5301X-fix-early-serial-console.patch delete mode 100644 target/linux/bcm53xx/patches-3.14/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch delete mode 100644 target/linux/bcm53xx/patches-3.14/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch create mode 100644 target/linux/bcm53xx/patches-3.14/301-ARM-BCM5301X-fix-early-serial-console.patch create mode 100644 target/linux/bcm53xx/patches-3.14/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch create mode 100644 target/linux/bcm53xx/patches-3.14/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch delete mode 100644 target/linux/bcm53xx/patches-3.18/044-ARM-BCM5301X-fix-early-serial-console.patch delete mode 100644 target/linux/bcm53xx/patches-3.18/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch delete mode 100644 target/linux/bcm53xx/patches-3.18/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch delete mode 100644 target/linux/bcm53xx/patches-3.18/049-ARM-BCM53XX-set-customized-AUXCTL.patch create mode 100644 target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-fix-early-serial-console.patch create mode 100644 target/linux/bcm53xx/patches-3.18/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch create mode 100644 target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch create mode 100644 target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch diff --git a/target/linux/bcm53xx/patches-3.14/044-ARM-BCM5301X-fix-early-serial-console.patch b/target/linux/bcm53xx/patches-3.14/044-ARM-BCM5301X-fix-early-serial-console.patch deleted file mode 100644 index 5c6f6ec519..0000000000 --- a/target/linux/bcm53xx/patches-3.14/044-ARM-BCM5301X-fix-early-serial-console.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 310a267714f7565dba8934dd51cdead6adc3b630 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sun, 14 Sep 2014 21:02:35 +0200 -Subject: [PATCH 4/4] ARM: BCM5301X: fix early serial console - -This device actually has a 8250 serial with a shift of 0. -Tested this on a BCM4708. - -Signed-off-by: Hauke Mehrtens ---- - arch/arm/Kconfig.debug | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/arm/Kconfig.debug -+++ b/arch/arm/Kconfig.debug -@@ -109,7 +109,7 @@ choice - config DEBUG_BCM_5301X - bool "Kernel low-level debugging on BCM5301X UART1" - depends on ARCH_BCM_5301X -- select DEBUG_UART_PL01X -+ select DEBUG_UART_8250 - - config DEBUG_BCM_KONA_UART - bool "Kernel low-level debugging messages via BCM KONA UART" -@@ -1132,7 +1132,7 @@ config DEBUG_UART_VIRT - config DEBUG_UART_8250_SHIFT - int "Register offset shift for the 8250 debug UART" - depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250 -- default 0 if FOOTBRIDGE || ARCH_IOP32X -+ default 0 if FOOTBRIDGE || ARCH_IOP32X || DEBUG_BCM_5301X - default 2 - - config DEBUG_UART_8250_WORD diff --git a/target/linux/bcm53xx/patches-3.14/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch b/target/linux/bcm53xx/patches-3.14/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch deleted file mode 100644 index 887650e4f7..0000000000 --- a/target/linux/bcm53xx/patches-3.14/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e7b1065712e769eb4de7b9d4aa222a4531c2b8fd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Sat, 20 Sep 2014 18:21:19 +0200 -Subject: [PATCH V2] ARM: BCM5301X: select GPIOLIB as optional -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -All routers (or 99% of them) based on BCM5301X use GPIOs to control LEDs -and buttons. - -Signed-off-by: Rafał Miłecki ---- -V2: Don't select GPIOLIB. We may still think about making it default at - some point, but we dont' really require it to boot successfully. ---- - arch/arm/mach-bcm/Kconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/arch/arm/mach-bcm/Kconfig -+++ b/arch/arm/mach-bcm/Kconfig -@@ -35,6 +35,7 @@ config ARCH_BCM_MOBILE - config ARCH_BCM_5301X - bool "Broadcom BCM470X / BCM5301X ARM SoC" if ARCH_MULTI_V7 - depends on MMU -+ select ARCH_WANT_OPTIONAL_GPIOLIB - select ARM_GIC - select CACHE_L2X0 - select HAVE_ARM_SCU if SMP diff --git a/target/linux/bcm53xx/patches-3.14/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch b/target/linux/bcm53xx/patches-3.14/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch deleted file mode 100644 index 0dbb5ce4de..0000000000 --- a/target/linux/bcm53xx/patches-3.14/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 5e7384adfd587ded31a107f059ebf929acc105c3 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sat, 1 Nov 2014 12:48:45 +0100 -Subject: [PATCH] ARM: BCM5310X: activate early printk for Netgear R6250 - -This activates early printk on the Netgear R6250 by default. - -Signed-off-by: Hauke Mehrtens ---- - arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -@@ -16,7 +16,7 @@ - model = "Netgear R6250 V1 (BCM4708)"; - - chosen { -- bootargs = "console=ttyS0,115200"; -+ bootargs = "console=ttyS0,115200 earlyprintk"; - }; - - memory { diff --git a/target/linux/bcm53xx/patches-3.14/301-ARM-BCM5301X-fix-early-serial-console.patch b/target/linux/bcm53xx/patches-3.14/301-ARM-BCM5301X-fix-early-serial-console.patch new file mode 100644 index 0000000000..5c6f6ec519 --- /dev/null +++ b/target/linux/bcm53xx/patches-3.14/301-ARM-BCM5301X-fix-early-serial-console.patch @@ -0,0 +1,33 @@ +From 310a267714f7565dba8934dd51cdead6adc3b630 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Sun, 14 Sep 2014 21:02:35 +0200 +Subject: [PATCH 4/4] ARM: BCM5301X: fix early serial console + +This device actually has a 8250 serial with a shift of 0. +Tested this on a BCM4708. + +Signed-off-by: Hauke Mehrtens +--- + arch/arm/Kconfig.debug | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/arm/Kconfig.debug ++++ b/arch/arm/Kconfig.debug +@@ -109,7 +109,7 @@ choice + config DEBUG_BCM_5301X + bool "Kernel low-level debugging on BCM5301X UART1" + depends on ARCH_BCM_5301X +- select DEBUG_UART_PL01X ++ select DEBUG_UART_8250 + + config DEBUG_BCM_KONA_UART + bool "Kernel low-level debugging messages via BCM KONA UART" +@@ -1132,7 +1132,7 @@ config DEBUG_UART_VIRT + config DEBUG_UART_8250_SHIFT + int "Register offset shift for the 8250 debug UART" + depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250 +- default 0 if FOOTBRIDGE || ARCH_IOP32X ++ default 0 if FOOTBRIDGE || ARCH_IOP32X || DEBUG_BCM_5301X + default 2 + + config DEBUG_UART_8250_WORD diff --git a/target/linux/bcm53xx/patches-3.14/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch b/target/linux/bcm53xx/patches-3.14/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch new file mode 100644 index 0000000000..887650e4f7 --- /dev/null +++ b/target/linux/bcm53xx/patches-3.14/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch @@ -0,0 +1,29 @@ +From e7b1065712e769eb4de7b9d4aa222a4531c2b8fd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Sat, 20 Sep 2014 18:21:19 +0200 +Subject: [PATCH V2] ARM: BCM5301X: select GPIOLIB as optional +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +All routers (or 99% of them) based on BCM5301X use GPIOs to control LEDs +and buttons. + +Signed-off-by: Rafał Miłecki +--- +V2: Don't select GPIOLIB. We may still think about making it default at + some point, but we dont' really require it to boot successfully. +--- + arch/arm/mach-bcm/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/mach-bcm/Kconfig ++++ b/arch/arm/mach-bcm/Kconfig +@@ -35,6 +35,7 @@ config ARCH_BCM_MOBILE + config ARCH_BCM_5301X + bool "Broadcom BCM470X / BCM5301X ARM SoC" if ARCH_MULTI_V7 + depends on MMU ++ select ARCH_WANT_OPTIONAL_GPIOLIB + select ARM_GIC + select CACHE_L2X0 + select HAVE_ARM_SCU if SMP diff --git a/target/linux/bcm53xx/patches-3.14/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch b/target/linux/bcm53xx/patches-3.14/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch new file mode 100644 index 0000000000..0dbb5ce4de --- /dev/null +++ b/target/linux/bcm53xx/patches-3.14/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch @@ -0,0 +1,23 @@ +From 5e7384adfd587ded31a107f059ebf929acc105c3 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Sat, 1 Nov 2014 12:48:45 +0100 +Subject: [PATCH] ARM: BCM5310X: activate early printk for Netgear R6250 + +This activates early printk on the Netgear R6250 by default. + +Signed-off-by: Hauke Mehrtens +--- + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts ++++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +@@ -16,7 +16,7 @@ + model = "Netgear R6250 V1 (BCM4708)"; + + chosen { +- bootargs = "console=ttyS0,115200"; ++ bootargs = "console=ttyS0,115200 earlyprintk"; + }; + + memory { diff --git a/target/linux/bcm53xx/patches-3.18/044-ARM-BCM5301X-fix-early-serial-console.patch b/target/linux/bcm53xx/patches-3.18/044-ARM-BCM5301X-fix-early-serial-console.patch deleted file mode 100644 index 4d100dae33..0000000000 --- a/target/linux/bcm53xx/patches-3.18/044-ARM-BCM5301X-fix-early-serial-console.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 310a267714f7565dba8934dd51cdead6adc3b630 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sun, 14 Sep 2014 21:02:35 +0200 -Subject: [PATCH 4/4] ARM: BCM5301X: fix early serial console - -This device actually has a 8250 serial with a shift of 0. -Tested this on a BCM4708. - -Signed-off-by: Hauke Mehrtens ---- - arch/arm/Kconfig.debug | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/arm/Kconfig.debug -+++ b/arch/arm/Kconfig.debug -@@ -113,7 +113,7 @@ choice - config DEBUG_BCM_5301X - bool "Kernel low-level debugging on BCM5301X UART1" - depends on ARCH_BCM_5301X -- select DEBUG_UART_PL01X -+ select DEBUG_UART_8250 - - config DEBUG_BCM_KONA_UART - bool "Kernel low-level debugging messages via BCM KONA UART" -@@ -1249,7 +1249,7 @@ config DEBUG_UART_VIRT - config DEBUG_UART_8250_SHIFT - int "Register offset shift for the 8250 debug UART" - depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250 -- default 0 if FOOTBRIDGE || ARCH_IOP32X -+ default 0 if FOOTBRIDGE || ARCH_IOP32X || DEBUG_BCM_5301X - default 2 - - config DEBUG_UART_8250_WORD diff --git a/target/linux/bcm53xx/patches-3.18/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch b/target/linux/bcm53xx/patches-3.18/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch deleted file mode 100644 index da17347d3e..0000000000 --- a/target/linux/bcm53xx/patches-3.18/045-ARM-BCM5301X-select-GPIOLIB-as-optional.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e7b1065712e769eb4de7b9d4aa222a4531c2b8fd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Sat, 20 Sep 2014 18:21:19 +0200 -Subject: [PATCH V2] ARM: BCM5301X: select GPIOLIB as optional -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -All routers (or 99% of them) based on BCM5301X use GPIOs to control LEDs -and buttons. - -Signed-off-by: Rafał Miłecki ---- -V2: Don't select GPIOLIB. We may still think about making it default at - some point, but we dont' really require it to boot successfully. ---- - arch/arm/mach-bcm/Kconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/arch/arm/mach-bcm/Kconfig -+++ b/arch/arm/mach-bcm/Kconfig -@@ -119,6 +119,7 @@ config ARCH_BCM_63XX - config ARCH_BRCMSTB - bool "Broadcom BCM7XXX based boards" if ARCH_MULTI_V7 - depends on MMU -+ select ARCH_WANT_OPTIONAL_GPIOLIB - select ARM_GIC - select MIGHT_HAVE_PCI - select HAVE_SMP diff --git a/target/linux/bcm53xx/patches-3.18/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch b/target/linux/bcm53xx/patches-3.18/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch deleted file mode 100644 index 0dbb5ce4de..0000000000 --- a/target/linux/bcm53xx/patches-3.18/048-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 5e7384adfd587ded31a107f059ebf929acc105c3 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sat, 1 Nov 2014 12:48:45 +0100 -Subject: [PATCH] ARM: BCM5310X: activate early printk for Netgear R6250 - -This activates early printk on the Netgear R6250 by default. - -Signed-off-by: Hauke Mehrtens ---- - arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -@@ -16,7 +16,7 @@ - model = "Netgear R6250 V1 (BCM4708)"; - - chosen { -- bootargs = "console=ttyS0,115200"; -+ bootargs = "console=ttyS0,115200 earlyprintk"; - }; - - memory { diff --git a/target/linux/bcm53xx/patches-3.18/049-ARM-BCM53XX-set-customized-AUXCTL.patch b/target/linux/bcm53xx/patches-3.18/049-ARM-BCM53XX-set-customized-AUXCTL.patch deleted file mode 100644 index 4367b8b901..0000000000 --- a/target/linux/bcm53xx/patches-3.18/049-ARM-BCM53XX-set-customized-AUXCTL.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4a658590f83c1e916ab63ed7fe6f0841924247db Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Fri, 3 Oct 2014 18:37:33 +0200 -Subject: [PATCH 2/2] ARM: BCM53XX: set customized AUXCTL - -This activated some more features in the l310 cache. - -This is based on some vendor code - -Signed-off-by: Hauke Mehrtens ---- - arch/arm/mach-bcm/bcm_5301x.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/arch/arm/mach-bcm/bcm_5301x.c -+++ b/arch/arm/mach-bcm/bcm_5301x.c -@@ -49,7 +49,10 @@ static const char __initconst *bcm5301x_ - }; - - DT_MACHINE_START(BCM5301X, "BCM5301X") -- .l2c_aux_val = 0, -+ .l2c_aux_val = L310_AUX_CTRL_CACHE_REPLACE_RR | -+ L310_AUX_CTRL_DATA_PREFETCH | -+ L310_AUX_CTRL_INSTR_PREFETCH | -+ L310_AUX_CTRL_EARLY_BRESP, - .l2c_aux_mask = ~0, - .init_early = bcm5301x_init_early, - .dt_compat = bcm5301x_dt_compat, diff --git a/target/linux/bcm53xx/patches-3.18/131-ARM-BCM5301X-add-restart-support.patch b/target/linux/bcm53xx/patches-3.18/131-ARM-BCM5301X-add-restart-support.patch index 5948f8727e..a977116a53 100644 --- a/target/linux/bcm53xx/patches-3.18/131-ARM-BCM5301X-add-restart-support.patch +++ b/target/linux/bcm53xx/patches-3.18/131-ARM-BCM5301X-add-restart-support.patch @@ -60,8 +60,8 @@ Signed-off-by: Rafał Miłecki static const char __initconst *bcm5301x_dt_compat[] = { "brcm,bcm4708", NULL, -@@ -55,5 +85,6 @@ DT_MACHINE_START(BCM5301X, "BCM5301X") - L310_AUX_CTRL_EARLY_BRESP, +@@ -52,5 +82,6 @@ DT_MACHINE_START(BCM5301X, "BCM5301X") + .l2c_aux_val = 0, .l2c_aux_mask = ~0, .init_early = bcm5301x_init_early, + .restart = bcm5301x_restart, diff --git a/target/linux/bcm53xx/patches-3.18/150-pci-do-not-probe-too-early.patch b/target/linux/bcm53xx/patches-3.18/150-pci-do-not-probe-too-early.patch index b2e56f8e40..ffe46ec949 100644 --- a/target/linux/bcm53xx/patches-3.18/150-pci-do-not-probe-too-early.patch +++ b/target/linux/bcm53xx/patches-3.18/150-pci-do-not-probe-too-early.patch @@ -15,7 +15,7 @@ Signed-off-by: Hauke Mehrtens --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c -@@ -2093,7 +2093,10 @@ struct pci_bus *pci_scan_root_bus(struct +@@ -2097,7 +2097,10 @@ struct pci_bus *pci_scan_root_bus(struct if (!found) pci_bus_update_busn_res_end(b, max); diff --git a/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-fix-early-serial-console.patch b/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-fix-early-serial-console.patch new file mode 100644 index 0000000000..4d100dae33 --- /dev/null +++ b/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-fix-early-serial-console.patch @@ -0,0 +1,33 @@ +From 310a267714f7565dba8934dd51cdead6adc3b630 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Sun, 14 Sep 2014 21:02:35 +0200 +Subject: [PATCH 4/4] ARM: BCM5301X: fix early serial console + +This device actually has a 8250 serial with a shift of 0. +Tested this on a BCM4708. + +Signed-off-by: Hauke Mehrtens +--- + arch/arm/Kconfig.debug | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/arm/Kconfig.debug ++++ b/arch/arm/Kconfig.debug +@@ -113,7 +113,7 @@ choice + config DEBUG_BCM_5301X + bool "Kernel low-level debugging on BCM5301X UART1" + depends on ARCH_BCM_5301X +- select DEBUG_UART_PL01X ++ select DEBUG_UART_8250 + + config DEBUG_BCM_KONA_UART + bool "Kernel low-level debugging messages via BCM KONA UART" +@@ -1249,7 +1249,7 @@ config DEBUG_UART_VIRT + config DEBUG_UART_8250_SHIFT + int "Register offset shift for the 8250 debug UART" + depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250 +- default 0 if FOOTBRIDGE || ARCH_IOP32X ++ default 0 if FOOTBRIDGE || ARCH_IOP32X || DEBUG_BCM_5301X + default 2 + + config DEBUG_UART_8250_WORD diff --git a/target/linux/bcm53xx/patches-3.18/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch b/target/linux/bcm53xx/patches-3.18/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch new file mode 100644 index 0000000000..6b10c8bbf8 --- /dev/null +++ b/target/linux/bcm53xx/patches-3.18/302-ARM-BCM5301X-select-GPIOLIB-as-optional.patch @@ -0,0 +1,29 @@ +From e7b1065712e769eb4de7b9d4aa222a4531c2b8fd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Sat, 20 Sep 2014 18:21:19 +0200 +Subject: [PATCH V2] ARM: BCM5301X: select GPIOLIB as optional +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +All routers (or 99% of them) based on BCM5301X use GPIOs to control LEDs +and buttons. + +Signed-off-by: Rafał Miłecki +--- +V2: Don't select GPIOLIB. We may still think about making it default at + some point, but we dont' really require it to boot successfully. +--- + arch/arm/mach-bcm/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/mach-bcm/Kconfig ++++ b/arch/arm/mach-bcm/Kconfig +@@ -120,6 +120,7 @@ config ARCH_BCM_63XX + config ARCH_BRCMSTB + bool "Broadcom BCM7XXX based boards" if ARCH_MULTI_V7 + depends on MMU ++ select ARCH_WANT_OPTIONAL_GPIOLIB + select ARM_GIC + select MIGHT_HAVE_PCI + select HAVE_SMP diff --git a/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch b/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch new file mode 100644 index 0000000000..0dbb5ce4de --- /dev/null +++ b/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-activate-early-printk-for-Netgear-R6250.patch @@ -0,0 +1,23 @@ +From 5e7384adfd587ded31a107f059ebf929acc105c3 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Sat, 1 Nov 2014 12:48:45 +0100 +Subject: [PATCH] ARM: BCM5310X: activate early printk for Netgear R6250 + +This activates early printk on the Netgear R6250 by default. + +Signed-off-by: Hauke Mehrtens +--- + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts ++++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +@@ -16,7 +16,7 @@ + model = "Netgear R6250 V1 (BCM4708)"; + + chosen { +- bootargs = "console=ttyS0,115200"; ++ bootargs = "console=ttyS0,115200 earlyprintk"; + }; + + memory { diff --git a/target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch b/target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch new file mode 100644 index 0000000000..60ebbc75fa --- /dev/null +++ b/target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch @@ -0,0 +1,28 @@ +From 4a658590f83c1e916ab63ed7fe6f0841924247db Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Fri, 3 Oct 2014 18:37:33 +0200 +Subject: [PATCH 2/2] ARM: BCM53XX: set customized AUXCTL + +This activated some more features in the l310 cache. + +This is based on some vendor code + +Signed-off-by: Hauke Mehrtens +--- + arch/arm/mach-bcm/bcm_5301x.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/arch/arm/mach-bcm/bcm_5301x.c ++++ b/arch/arm/mach-bcm/bcm_5301x.c +@@ -80,7 +80,10 @@ static const char __initconst *bcm5301x_ + }; + + DT_MACHINE_START(BCM5301X, "BCM5301X") +- .l2c_aux_val = 0, ++ .l2c_aux_val = L310_AUX_CTRL_CACHE_REPLACE_RR | ++ L310_AUX_CTRL_DATA_PREFETCH | ++ L310_AUX_CTRL_INSTR_PREFETCH | ++ L310_AUX_CTRL_EARLY_BRESP, + .l2c_aux_mask = ~0, + .init_early = bcm5301x_init_early, + .restart = bcm5301x_restart, -- cgit v1.2.3