From 3c81d12ec32844a731f37b011b30a3586731f98e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Sat, 12 May 2018 15:39:12 +0200 Subject: [PATCH] bcm53xx: backport the first bunch of 4.18 BCM5301X patches MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki --- ...-add-missing-LEDs-for-Buffalo-WZR-90.patch | 96 ++++ ...-Switch-Luxul-XWC-1000-to-the-new-fi.patch | 39 ++ ...-Relicense-most-DTS-files-to-the-GPL.patch | 440 ++++++++++++++++++ ...-Relicense-Buffalo-files-to-the-GPL-.patch | 79 ++++ ...CM5301X-Add-DT-for-Luxul-XWR-3150-V1.patch | 112 +++++ ...s-BCM5301X-Add-DT-for-Luxul-XAP-1610.patch | 90 ++++ ...-Relicense-Asus-RT-AC87U-file-to-the.patch | 48 ++ .../patches-4.4/101-use-part-parser.patch | 2 +- ...-BCM5301X-Add-serial-to-the-bootargs.patch | 28 +- ...power-button-for-Buffalo-WZR-1750DHP.patch | 2 +- 10 files changed, 931 insertions(+), 5 deletions(-) create mode 100644 target/linux/bcm53xx/patches-4.4/050-v4.17-0001-ARM-dts-BCM5301X-add-missing-LEDs-for-Buffalo-WZR-90.patch create mode 100644 target/linux/bcm53xx/patches-4.4/051-v4.18-0001-ARM-dts-BCM5301X-Switch-Luxul-XWC-1000-to-the-new-fi.patch create mode 100644 target/linux/bcm53xx/patches-4.4/051-v4.18-0002-ARM-dts-BCM5301X-Relicense-most-DTS-files-to-the-GPL.patch create mode 100644 target/linux/bcm53xx/patches-4.4/051-v4.18-0003-ARM-dts-BCM5301X-Relicense-Buffalo-files-to-the-GPL-.patch create mode 100644 target/linux/bcm53xx/patches-4.4/051-v4.18-0004-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWR-3150-V1.patch create mode 100644 target/linux/bcm53xx/patches-4.4/051-v4.18-0005-ARM-dts-BCM5301X-Add-DT-for-Luxul-XAP-1610.patch create mode 100644 target/linux/bcm53xx/patches-4.4/051-v4.18-0006-ARM-dts-BCM5301X-Relicense-Asus-RT-AC87U-file-to-the.patch diff --git a/target/linux/bcm53xx/patches-4.4/050-v4.17-0001-ARM-dts-BCM5301X-add-missing-LEDs-for-Buffalo-WZR-90.patch b/target/linux/bcm53xx/patches-4.4/050-v4.17-0001-ARM-dts-BCM5301X-add-missing-LEDs-for-Buffalo-WZR-90.patch new file mode 100644 index 0000000000..043d38b832 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.4/050-v4.17-0001-ARM-dts-BCM5301X-add-missing-LEDs-for-Buffalo-WZR-90.patch @@ -0,0 +1,96 @@ +From 811ae58e76da88106f6d28159d4ea7b163dfaa48 Mon Sep 17 00:00:00 2001 +From: INAGAKI Hiroshi +Date: Wed, 7 Mar 2018 20:33:56 +0900 +Subject: [PATCH] ARM: dts: BCM5301X: add missing LEDs for Buffalo WZR-900DHP +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Buffalo WZR-900DHP has 8 LEDs, but there is not LED definitions in the +dts and cannot configure these LEDs. +I Added missing LED definitions for WZR-900DHP. + +Signed-off-by: INAGAKI Hiroshi +Reviewed-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 68 +++++++++++++++++++++++ + 1 file changed, 68 insertions(+) + +--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts ++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts +@@ -35,6 +35,74 @@ + 0x88000000 0x08000000>; + }; + ++ spi { ++ compatible = "spi-gpio"; ++ num-chipselects = <1>; ++ gpio-sck = <&chipcommon 7 0>; ++ gpio-mosi = <&chipcommon 4 0>; ++ cs-gpios = <&chipcommon 6 0>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ hc595: gpio_spi@0 { ++ compatible = "fairchild,74hc595"; ++ reg = <0>; ++ registers-number = <1>; ++ spi-max-frequency = <100000>; ++ ++ gpio-controller; ++ #gpio-cells = <2>; ++ ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ usb { ++ label = "bcm53xx:green:usb"; ++ gpios = <&hc595 0 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ power0 { ++ label = "bcm53xx:green:power"; ++ gpios = <&hc595 1 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "default-on"; ++ }; ++ ++ power1 { ++ label = "bcm53xx:red:power"; ++ gpios = <&hc595 2 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ router0 { ++ label = "bcm53xx:green:router"; ++ gpios = <&hc595 3 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "default-on"; ++ }; ++ ++ router1 { ++ label = "bcm53xx:amber:router"; ++ gpios = <&hc595 4 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ wan { ++ label = "bcm53xx:green:wan"; ++ gpios = <&hc595 5 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "default-on"; ++ }; ++ ++ wireless0 { ++ label = "bcm53xx:green:wireless"; ++ gpios = <&hc595 6 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ wireless1 { ++ label = "bcm53xx:amber:wireless"; ++ gpios = <&hc595 7 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ + gpio-keys { + compatible = "gpio-keys"; + #address-cells = <1>; diff --git a/target/linux/bcm53xx/patches-4.4/051-v4.18-0001-ARM-dts-BCM5301X-Switch-Luxul-XWC-1000-to-the-new-fi.patch b/target/linux/bcm53xx/patches-4.4/051-v4.18-0001-ARM-dts-BCM5301X-Switch-Luxul-XWC-1000-to-the-new-fi.patch new file mode 100644 index 0000000000..e2fe0be909 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.4/051-v4.18-0001-ARM-dts-BCM5301X-Switch-Luxul-XWC-1000-to-the-new-fi.patch @@ -0,0 +1,39 @@ +From 0c0d1c90ddc44df70401b7cfff178c41b2f83ffa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Wed, 4 Apr 2018 15:14:21 +0200 +Subject: [PATCH] ARM: dts: BCM5301X: Switch Luxul XWC-1000 to the new fixed + partitions syntax +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This new syntax is slightly better designed & uses "compatible" string. +For details see Documentation/devicetree/bindings/mtd/partition.txt . + +Signed-off-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts ++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +@@ -26,9 +26,15 @@ + + nand: nand@18028000 { + nandcs@0 { +- partition@0 { +- label = "ubi"; +- reg = <0x00000000 0x08000000>; ++ partitions { ++ compatible = "fixed-partitions"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ++ partition@0 { ++ label = "ubi"; ++ reg = <0x00000000 0x08000000>; ++ }; + }; + }; + }; diff --git a/target/linux/bcm53xx/patches-4.4/051-v4.18-0002-ARM-dts-BCM5301X-Relicense-most-DTS-files-to-the-GPL.patch b/target/linux/bcm53xx/patches-4.4/051-v4.18-0002-ARM-dts-BCM5301X-Relicense-most-DTS-files-to-the-GPL.patch new file mode 100644 index 0000000000..6599520b92 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.4/051-v4.18-0002-ARM-dts-BCM5301X-Relicense-most-DTS-files-to-the-GPL.patch @@ -0,0 +1,440 @@ +From 2b3db67ce4bc4d1d8556e87a17df7765da8dbdc5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Wed, 2 May 2018 16:11:02 +0200 +Subject: [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ + / MIT +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +These files were created and ever touched by a group of three people +only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC. + +Introducing and discussing SPDX-License-Identifier resulted in a +conclusion that ISC is a not recommended license (see also a +license-rules.rst). Moveover an old e-mail from Alan Cox was pointed +which explained that dual licensing is a safer solution than depending +on a common compatibility belief. + +This commit switches most of BCM5301X DTS files to dual licensing using: +1) GPL 2.0+ to make sure they are compatible with Linux kernel +2) MIT to allow sharing with more permissive projects +Both licenses belong to the preferred ones (see LICENSES/preferred/). + +An attempt to relicense remaining files will be made separately and will +require approve from more/other developers. + +Signed-off-by: Rafał Miłecki +Reviewed-by: Greg Kroah-Hartman +Acked-by: Hauke Mehrtens +Acked-by: Dan Haab +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 13 +------------ + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 13 +------------ + arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 3 +-- + arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 +-- + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 3 +-- + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 13 +------------ + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 +-- + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 13 +------------ + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 13 +------------ + arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 +-- + arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 +-- + arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 3 +-- + arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 3 +-- + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 13 +------------ + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 3 +-- + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 13 +------------ + arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 +-- + arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 3 +-- + arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 3 +-- + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 +-- + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 3 +-- + arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi | 3 +-- + arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi | 3 +-- + arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 3 +-- + arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 3 +-- + 25 files changed, 25 insertions(+), 120 deletions(-) + +--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts ++++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Asus RT-AC56U + * + * Copyright (C) 2015 Rafał Miłecki +- * +- * Permission to use, copy, modify, and/or distribute this software for any +- * purpose with or without fee is hereby granted, provided that the above +- * copyright notice and this permission notice appear in all copies. +- * +- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +- * PERFORMANCE OF THIS SOFTWARE. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts ++++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Asus RT-AC68U + * + * Copyright (C) 2015 Rafał Miłecki +- * +- * Permission to use, copy, modify, and/or distribute this software for any +- * purpose with or without fee is hereby granted, provided that the above +- * copyright notice and this permission notice appear in all copies. +- * +- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +- * PERFORMANCE OF THIS SOFTWARE. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts ++++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright (C) 2017 Rafał Miłecki +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts ++++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright 2016 Luxul Inc. +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts ++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +@@ -1,10 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Luxul XWC-1000 + * + * Copyright 2014 Luxul Inc. +- * +- * Licensed under the GNU/GPL. See COPYING for details. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts ++++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Netgear R6300 V2 + * + * Copyright (C) 2014 Rafał Miłecki +- * +- * Permission to use, copy, modify, and/or distribute this software for any +- * purpose with or without fee is hereby granted, provided that the above +- * copyright notice and this permission notice appear in all copies. +- * +- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +- * PERFORMANCE OF THIS SOFTWARE. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts ++++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts +@@ -1,10 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X arm platform code. + * DTS for SmartRG SR400ac + * + * Copyright (C) 2015 Rafał Miłecki +- * +- * Licensed under the GNU/GPL. See COPYING for details. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts ++++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Asus RT-N18U + * + * Copyright (C) 2014 Rafał Miłecki +- * +- * Permission to use, copy, modify, and/or distribute this software for any +- * purpose with or without fee is hereby granted, provided that the above +- * copyright notice and this permission notice appear in all copies. +- * +- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +- * PERFORMANCE OF THIS SOFTWARE. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts ++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Buffalo WZR-600DHP2 + * + * Copyright (C) 2014 Rafał Miłecki +- * +- * Permission to use, copy, modify, and/or distribute this software for any +- * purpose with or without fee is hereby granted, provided that the above +- * copyright notice and this permission notice appear in all copies. +- * +- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +- * PERFORMANCE OF THIS SOFTWARE. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts ++++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright 2017 Luxul Inc. +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts ++++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright 2017 Luxul Inc. +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts ++++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright (C) 2017 Rafał Miłecki +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts ++++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright (C) 2017 Rafał Miłecki +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts ++++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Netgear R7000 + * + * Copyright (C) 2015 Rafał Miłecki +- * +- * Permission to use, copy, modify, and/or distribute this software for any +- * purpose with or without fee is hereby granted, provided that the above +- * copyright notice and this permission notice appear in all copies. +- * +- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +- * PERFORMANCE OF THIS SOFTWARE. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts ++++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright (C) 2016 Rafał Miłecki +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts ++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for D-Link DIR-885L + * + * Copyright (C) 2016 Rafał Miłecki +- * +- * Permission to use, copy, modify, and/or distribute this software for any +- * purpose with or without fee is hereby granted, provided that the above +- * copyright notice and this permission notice appear in all copies. +- * +- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +- * PERFORMANCE OF THIS SOFTWARE. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts ++++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright (C) 2017 Rafał Miłecki +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright (C) 2017 Luxul Inc. +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright (C) 2017 Luxul Inc. +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright 2016 Luxul Inc. +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts ++++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright (C) 2016 Rafał Miłecki +- * +- * Licensed under the ISC license. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi ++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi +@@ -1,9 +1,8 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom Northstar NAND. + * + * Copyright (C) 2016 Rafał Miłecki +- * +- * Licensed under the ISC license. + */ + + #include "bcm5301x-nand-cs0.dtsi" +--- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi ++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi +@@ -1,7 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Copyright 2016 Luxul Inc. +- * +- * Licensed under the ISC license. + */ + + #include "bcm5301x-nand-cs0.dtsi" +--- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi ++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi +@@ -1,3 +1,4 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X Nand chip defaults. + * +@@ -5,8 +6,6 @@ + * and uses 8 bit ECC. + * + * Copyright (C) 2015 Hauke Mehrtens +- * +- * Licensed under the GNU/GPL. See COPYING for details. + */ + + #include "bcm5301x-nand-cs0.dtsi" +--- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi ++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi +@@ -1,9 +1,8 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom Northstar NAND. + * + * Copyright (C) 2015 Hauke Mehrtens +- * +- * Licensed under the GNU/GPL. See COPYING for details. + */ + + / { diff --git a/target/linux/bcm53xx/patches-4.4/051-v4.18-0003-ARM-dts-BCM5301X-Relicense-Buffalo-files-to-the-GPL-.patch b/target/linux/bcm53xx/patches-4.4/051-v4.18-0003-ARM-dts-BCM5301X-Relicense-Buffalo-files-to-the-GPL-.patch new file mode 100644 index 0000000000..cc7ff8552a --- /dev/null +++ b/target/linux/bcm53xx/patches-4.4/051-v4.18-0003-ARM-dts-BCM5301X-Relicense-Buffalo-files-to-the-GPL-.patch @@ -0,0 +1,79 @@ +From fd0ab539d185a828f2071ee5f311bf101c7fea08 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Fri, 4 May 2018 11:54:45 +0200 +Subject: [PATCH] ARM: dts: BCM5301X: Relicense Buffalo files to the GPL 2.0+ / + MIT +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This matches licensing used by other BCM5301X files and is preferred as: +1) GPL 2.0+ makes is clearly compatible with Linux kernel +2) MIT is also permissive but preferred over ISC + +These files were created and ever touched by a group of four people +only: Felix, INAGAKI, Hauke and me. + +Signed-off-by: Rafał Miłecki +Acked-by: Felix Fietkau +Acked-by: INAGAKI Hiroshi +Acked-by: Hauke Mehrtens +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 3 +-- + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 13 +------------ + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 3 +-- + 3 files changed, 3 insertions(+), 16 deletions(-) + +--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts ++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +@@ -1,10 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Buffalo WZR-1750DHP + * + * Copyright (C) 2014 Rafał Miłecki +- * +- * Licensed under the GNU/GPL. See COPYING for details. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts ++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Buffalo WZR-900DHP + * + * Copyright (C) 2015 Rafał Miłecki +- * +- * Permission to use, copy, modify, and/or distribute this software for any +- * purpose with or without fee is hereby granted, provided that the above +- * copyright notice and this permission notice appear in all copies. +- * +- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +- * PERFORMANCE OF THIS SOFTWARE. + */ + + /dts-v1/; +--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts ++++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts +@@ -1,10 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Buffalo WXR-1900DHP + * + * Copyright (C) 2015 Felix Fietkau +- * +- * Licensed under the GNU/GPL. See COPYING for details. + */ + + /dts-v1/; diff --git a/target/linux/bcm53xx/patches-4.4/051-v4.18-0004-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWR-3150-V1.patch b/target/linux/bcm53xx/patches-4.4/051-v4.18-0004-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWR-3150-V1.patch new file mode 100644 index 0000000000..6cd7b67897 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.4/051-v4.18-0004-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWR-3150-V1.patch @@ -0,0 +1,112 @@ +From 2e2105a1578172eaf61e3b59a2c10c4fe04c21b9 Mon Sep 17 00:00:00 2001 +From: Dan Haab +Date: Fri, 4 May 2018 10:08:43 -0600 +Subject: [PATCH] ARM: dts: BCM5301X: Add DT for Luxul XWR-3150 V1 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Luxul XWR-3150 is a wireless router similar to the XWR-3100 except: +1) It has more RAM +2) Its NAND controller in running in BCH8 mode +3) LAN ports LEDs are hardware controlled + +Signed-off-by: Dan Haab +Acked-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 77 ++++++++++++++++++++++++ + 2 files changed, 78 insertions(+) + create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -88,6 +88,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm47094-luxul-abr-4500.dtb \ + bcm47094-luxul-xbr-4500.dtb \ + bcm47094-luxul-xwr-3100.dtb \ ++ bcm47094-luxul-xwr-3150-v1.dtb \ + bcm47094-netgear-r8500.dtb \ + bcm94708.dtb \ + bcm94709.dtb \ +--- /dev/null ++++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts +@@ -0,0 +1,77 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT ++/* ++ * Copyright 2018 Luxul Inc. ++ */ ++ ++/dts-v1/; ++ ++#include "bcm47094.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" ++ ++/ { ++ compatible = "luxul,xwr-3150-v1", "brcm,bcm47094", "brcm,bcm4708"; ++ model = "Luxul XWR-3150 V1"; ++ ++ chosen { ++ bootargs = "earlycon"; ++ }; ++ ++ memory { ++ reg = <0x00000000 0x08000000 ++ 0x88000000 0x18000000>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ power { ++ label = "bcm53xx:green:power"; ++ gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "default-on"; ++ }; ++ ++ usb3 { ++ label = "bcm53xx:green:usb3"; ++ gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>; ++ trigger-sources = <&ohci_port1>, <&ehci_port1>, ++ <&xhci_port1>; ++ linux,default-trigger = "usbport"; ++ }; ++ ++ status { ++ label = "bcm53xx:green:status"; ++ gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "timer"; ++ }; ++ ++ 2ghz { ++ label = "bcm53xx:green:2ghz"; ++ gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>; ++ }; ++ ++ 5ghz { ++ label = "bcm53xx:green:5ghz"; ++ gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ restart { ++ label = "Reset"; ++ linux,code = ; ++ gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; ++ ++&usb3 { ++ vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>; ++}; ++ ++&spi_nor { ++ status = "okay"; ++}; diff --git a/target/linux/bcm53xx/patches-4.4/051-v4.18-0005-ARM-dts-BCM5301X-Add-DT-for-Luxul-XAP-1610.patch b/target/linux/bcm53xx/patches-4.4/051-v4.18-0005-ARM-dts-BCM5301X-Add-DT-for-Luxul-XAP-1610.patch new file mode 100644 index 0000000000..a9db16042c --- /dev/null +++ b/target/linux/bcm53xx/patches-4.4/051-v4.18-0005-ARM-dts-BCM5301X-Add-DT-for-Luxul-XAP-1610.patch @@ -0,0 +1,90 @@ +From 6054cb5788072e214af582c42d9bd8c5ffa6e288 Mon Sep 17 00:00:00 2001 +From: Dan Haab +Date: Fri, 4 May 2018 10:08:44 -0600 +Subject: [PATCH] ARM: dts: BCM5301X: Add DT for Luxul XAP-1610 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It's an access point based on BCM47094 SoC with two BCM4366E wireless +chipsets. + +Signed-off-by: Dan Haab +Acked-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 57 +++++++++++++++++++++++++++ + 2 files changed, 58 insertions(+) + create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -86,6 +86,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm47094-dlink-dir-885l.dtb \ + bcm47094-linksys-panamera.dtb \ + bcm47094-luxul-abr-4500.dtb \ ++ bcm47094-luxul-xap-1610.dtb \ + bcm47094-luxul-xbr-4500.dtb \ + bcm47094-luxul-xwr-3100.dtb \ + bcm47094-luxul-xwr-3150-v1.dtb \ +--- /dev/null ++++ b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts +@@ -0,0 +1,57 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT ++/* ++ * Copyright 2018 Luxul Inc. ++ */ ++ ++/dts-v1/; ++ ++#include "bcm47094.dtsi" ++ ++/ { ++ compatible = "luxul,xap-1610-v1", "brcm,bcm47094", "brcm,bcm4708"; ++ model = "Luxul XAP-1610 V1"; ++ ++ chosen { ++ bootargs = "earlycon"; ++ }; ++ ++ memory { ++ reg = <0x00000000 0x08000000>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ status { ++ label = "bcm53xx:green:status"; ++ gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "timer"; ++ }; ++ ++ 2ghz { ++ label = "bcm53xx:blue:2ghz"; ++ gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>; ++ }; ++ ++ 5ghz { ++ label = "bcm53xx:blue:5ghz"; ++ gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ restart { ++ label = "Reset"; ++ linux,code = ; ++ gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; ++ ++&spi_nor { ++ status = "okay"; ++}; diff --git a/target/linux/bcm53xx/patches-4.4/051-v4.18-0006-ARM-dts-BCM5301X-Relicense-Asus-RT-AC87U-file-to-the.patch b/target/linux/bcm53xx/patches-4.4/051-v4.18-0006-ARM-dts-BCM5301X-Relicense-Asus-RT-AC87U-file-to-the.patch new file mode 100644 index 0000000000..f774bc6b82 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.4/051-v4.18-0006-ARM-dts-BCM5301X-Relicense-Asus-RT-AC87U-file-to-the.patch @@ -0,0 +1,48 @@ +From 9c281b5e129961b9940a27f8da24dddd1c0eba87 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Fri, 4 May 2018 12:03:24 +0200 +Subject: [PATCH] ARM: dts: BCM5301X: Relicense Asus RT-AC87U file to the GPL + 2.0+ / MIT +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This matches licensing used by other BCM5301X files and is preferred as: +1) GPL 2.0+ makes is clearly compatible with Linux kernel +2) MIT is also permissive but preferred over ISC + +This file were created and ever touched by a group of three people only: +Álvaro, Hauke and me. + +Signed-off-by: Rafał Miłecki +Acked-by: Hauke Mehrtens +Acked-by: Álvaro Fernández Rojas +Signed-off-by: Florian Fainelli +--- + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +--- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts ++++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts +@@ -1,20 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + /* + * Broadcom BCM470X / BCM5301X ARM platform code. + * DTS for Asus RT-AC87U + * + * Copyright (C) 2015 Rafał Miłecki +- * +- * Permission to use, copy, modify, and/or distribute this software for any +- * purpose with or without fee is hereby granted, provided that the above +- * copyright notice and this permission notice appear in all copies. +- * +- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +- * PERFORMANCE OF THIS SOFTWARE. + */ + + /dts-v1/; diff --git a/target/linux/bcm53xx/patches-4.4/101-use-part-parser.patch b/target/linux/bcm53xx/patches-4.4/101-use-part-parser.patch index 4ecb8dc693..f64778af37 100644 --- a/target/linux/bcm53xx/patches-4.4/101-use-part-parser.patch +++ b/target/linux/bcm53xx/patches-4.4/101-use-part-parser.patch @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi -@@ -13,6 +13,8 @@ +@@ -12,6 +12,8 @@ reg = <0>; #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/bcm53xx/patches-4.4/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch b/target/linux/bcm53xx/patches-4.4/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch index 710d94f6bc..545bccce30 100644 --- a/target/linux/bcm53xx/patches-4.4/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch +++ b/target/linux/bcm53xx/patches-4.4/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch @@ -15,7 +15,7 @@ Signed-off-by: Rafał Miłecki --- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts +++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts -@@ -13,7 +13,7 @@ +@@ -12,7 +12,7 @@ model = "TP-LINK Archer C5 V2"; chosen { @@ -26,7 +26,7 @@ Signed-off-by: Rafał Miłecki memory { --- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts +++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts -@@ -14,7 +14,7 @@ +@@ -13,7 +13,7 @@ model = "Luxul ABR-4500 V1"; chosen { @@ -37,7 +37,7 @@ Signed-off-by: Rafał Miłecki memory { --- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts +++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts -@@ -14,7 +14,7 @@ +@@ -13,7 +13,7 @@ model = "Luxul XBR-4500 V1"; chosen { @@ -67,4 +67,26 @@ Signed-off-by: Rafał Miłecki + bootargs = "console=ttyS0,115200 earlycon"; }; + memory { +--- a/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts +@@ -12,7 +12,7 @@ + model = "Luxul XAP-1610 V1"; + + chosen { +- bootargs = "earlycon"; ++ bootargs = "console=ttyS0,115200 earlycon"; + }; + + memory { +--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts +@@ -13,7 +13,7 @@ + model = "Luxul XWR-3150 V1"; + + chosen { +- bootargs = "earlycon"; ++ bootargs = "console=ttyS0,115200 earlycon"; + }; + memory { diff --git a/target/linux/bcm53xx/patches-4.4/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch b/target/linux/bcm53xx/patches-4.4/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch index 39034997fc..5ebc7f89f2 100644 --- a/target/linux/bcm53xx/patches-4.4/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch +++ b/target/linux/bcm53xx/patches-4.4/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch @@ -5,7 +5,7 @@ Signed-off-by: Felix Fietkau --- --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -@@ -102,6 +102,12 @@ +@@ -101,6 +101,12 @@ #address-cells = <1>; #size-cells = <0>; -- 2.25.1