From 146e18af568a4339486ef58ee18b7d6ff6a46afa Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 11 May 2020 16:48:51 +0200 Subject: [PATCH 01/12] generic: add MikroTik hw bit description An e-mail response from MikroTik contained a minimal overview on hardware option bits which mentioned a currently unknown bit. While not being too detailed what it does, add it for documentation purposes. Signed-off-by: Koen Vandeputte --- .../generic/files/drivers/platform/mikrotik/rb_hardconfig.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c b/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c index ab78037a03..26218d6a7d 100644 --- a/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c +++ b/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c @@ -61,6 +61,7 @@ #define RB_HW_OPT_HAS_VOLTAGE BIT(1) #define RB_HW_OPT_HAS_USB BIT(2) #define RB_HW_OPT_HAS_ATTINY BIT(3) +#define RB_HW_OPT_PULSE_DUTY_CYCLE BIT(9) #define RB_HW_OPT_NO_NAND BIT(14) #define RB_HW_OPT_HAS_LCD BIT(15) #define RB_HW_OPT_HAS_POE_OUT BIT(16) From b181294b02499e41b6b6fa24163f59c9ee4988ed Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 12 May 2020 10:48:50 +0100 Subject: [PATCH 02/12] fstools: blockd: fix segfault triggered by non-autofs mounts Program received signal SIGSEGV, Segmentation fault. main_autofs (argv=, argc=) at fstools-2020-05-06-eec16e2f/block.c:1193 1193: if (!m->autofs && (mp = find_mount_point(pr->dev))) { Fixes: c3a43753b9 ("fstools: update to the latest version") Signed-off-by: Daniel Golle --- package/system/fstools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index 715c256720..d5f44893c2 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git -PKG_MIRROR_HASH:=988daefe649815d92055bcbe04db5fc0e386e44b3958c1300d8c327b4f04cadd -PKG_SOURCE_DATE:=2020-05-06 -PKG_SOURCE_VERSION:=eec16e2f275dc3dcf71e4a27dd608d3dc8f8df1a +PKG_MIRROR_HASH:=1b875efd7d675d74a56602f57dd27093e2feef8761ba28b567e2d2f43db14b48 +PKG_SOURCE_DATE:=2020-05-12 +PKG_SOURCE_VERSION:=84269037b75de93bdd4ea75b7f50ba77ba976377 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From 84646936a6480002b9a04e01ff05530126512bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Mon, 6 Apr 2020 16:56:19 +0200 Subject: [PATCH 03/12] bcm63xx: image: rename LOADADDR to KERNEL_LOADADDR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also remove KERNEL_ENTRY, since it's the same as KERNEL_LOADADDR Signed-off-by: Álvaro Fernández Rojas --- target/linux/bcm63xx/image/Makefile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/target/linux/bcm63xx/image/Makefile b/target/linux/bcm63xx/image/Makefile index cc1660aa25..f6d2bf4bbd 100644 --- a/target/linux/bcm63xx/image/Makefile +++ b/target/linux/bcm63xx/image/Makefile @@ -8,22 +8,21 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -LOADADDR = 0x80010000 # RAM start + 64K -KERNEL_ENTRY = $(LOADADDR) # Newer kernels add a jmp to the kernel_entry at the start of the binary -LOADER_ENTRY = 0x80a00000 # RAM start + 10M, for relocate -RAMSIZE = 0x02000000 # 32MB -LZMA_TEXT_START = 0x81800000 # 32MB - 8MB +KERNEL_LOADADDR = 0x80010000 # RAM start + 64K +LOADER_ENTRY = 0x80a00000 # RAM start + 10M, for relocate +RAMSIZE = 0x02000000 # 32MB +LZMA_TEXT_START = 0x81800000 # 32MB - 8MB LOADER_MAKEOPTS= \ KDIR=$(KDIR) \ - LOADADDR=$(LOADADDR) \ - KERNEL_ENTRY=$(KERNEL_ENTRY) \ + LOADADDR=$(KERNEL_LOADADDR) \ + KERNEL_ENTRY=$(KERNEL_LOADADDR) \ RAMSIZE=$(RAMSIZE) \ LZMA_TEXT_START=$(LZMA_TEXT_START) \ RELOCATE_MAKEOPTS= \ CACHELINE_SIZE=16 \ - KERNEL_ADDR=$(KERNEL_ENTRY) \ + KERNEL_ADDR=$(KERNEL_LOADADDR) \ CROSS_COMPILE=$(TARGET_CROSS) \ LZMA_TEXT_START=$(LOADER_ENTRY) @@ -37,7 +36,7 @@ endef define Build/hcs-initramfs $(STAGING_DIR_HOST)/bin/hcsmakeimage --magic_bytes=$(HCS_MAGIC_BYTES) \ --rev_maj=$(HCS_REV_MAJ) --rev_min=$(HCS_REV_MIN) --input_file=$@ \ - --output_file=$@.hcs --ldaddress=$(LOADADDR) + --output_file=$@.hcs --ldaddress=$(KERNEL_LOADADDR) mv $@.hcs $@ endef From a0081b19452d8f052757bbe356a6e037ff9afdd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Sun, 3 May 2020 17:19:03 +0200 Subject: [PATCH 04/12] bcm63xx: loader-lzma: use default lzma MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Specific CFE LZMA parameters aren't needed for LZMA Loader. Signed-off-by: Álvaro Fernández Rojas --- target/linux/bcm63xx/image/Makefile | 14 +++++--------- target/linux/bcm63xx/image/bcm63xx.mk | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/target/linux/bcm63xx/image/Makefile b/target/linux/bcm63xx/image/Makefile index f6d2bf4bbd..9ef7a91ce7 100644 --- a/target/linux/bcm63xx/image/Makefile +++ b/target/linux/bcm63xx/image/Makefile @@ -53,20 +53,16 @@ define Build/loader-lzma rm -rf $@.src endef -define Build/lzma +define Build/lzma-cfe # CFE is a LZMA nazi! It took me hours to find out the parameters! # Also I think lzma has a bug cause it generates different output depending on # if you use stdin / stdout or not. Use files instead of stdio here, cause # otherwise CFE will complain and not boot the image. - $(STAGING_DIR_HOST)/bin/lzma e $@ -d22 -fb64 -a1 $@.lzma - mv $@.lzma $@ -endef - -define Build/lzma-cfe + $(call Build/lzma-no-dict,-d22 -fb64 -a1) # Strip out the length, CFE doesn't like this - dd if=$@ of=$@.lzma.cfe bs=5 count=1 - dd if=$@ of=$@.lzma.cfe ibs=13 obs=5 skip=1 seek=1 conv=notrunc - mv $@.lzma.cfe $@ + dd if=$@ of=$@.new bs=5 count=1 + dd if=$@ of=$@.new ibs=13 obs=5 skip=1 seek=1 conv=notrunc + mv $@.new $@ endef define Build/relocate-kernel diff --git a/target/linux/bcm63xx/image/bcm63xx.mk b/target/linux/bcm63xx/image/bcm63xx.mk index 64ddb6374d..d5601e2c3c 100644 --- a/target/linux/bcm63xx/image/bcm63xx.mk +++ b/target/linux/bcm63xx/image/bcm63xx.mk @@ -19,7 +19,7 @@ endef define Device/bcm63xx FILESYSTEMS := squashfs jffs2-64k jffs2-128k - KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma | lzma-cfe + KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma-cfe KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-lzma elf IMAGES := cfe.bin IMAGE/cfe.bin := cfe-bin --pad $$$$(shell expr $$$$(FLASH_MB) / 2) From ef2d5a2ab46c44ad4145488913ac9d0bbb8c69df Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 11 May 2020 11:27:02 +0200 Subject: [PATCH 05/12] kernel: bump 4.14 to 4.14.180 Refreshed all patches. Fixes: - CVE-2020-12114 - CVE-2020-11669 Compile-tested on: pistachio Runtime-tested on: none Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 +-- ...mtd-cfi_cmdset_0002-force-word-write.patch | 4 +-- .../910-unaligned_access_hacks.patch | 2 +- ...move-imagetag-parsing-to-its-own-par.patch | 3 +- ...tree-gpio-hogs-on-dual-role-gpio-pin.patch | 4 +-- ...ddress-assignment-via-ifconfig-ioctl.patch | 4 +-- ...ipv6-make-ip6_dst_mtu_forward-inline.patch | 2 +- .../generic/hack-4.14/902-debloat_proc.patch | 4 +-- .../270-platform-mikrotik-build-bits.patch | 7 ---- ...mtd-add-routerbootpart-parser-config.patch | 7 ---- ...T-skip-GRO-for-foreign-MAC-addresses.patch | 10 +++--- .../202-core-linux-support-layerscape.patch | 16 +++++----- .../807-usb-support-layerscape.patch | 32 +++++++++---------- .../816-pcie-support-layerscape.patch | 4 +-- ...mtd-cfi-cmdset-0002-force-word-write.patch | 4 +-- 15 files changed, 47 insertions(+), 60 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 2e8c663063..21883edacd 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,11 +6,11 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.14 = .176 +LINUX_VERSION-4.14 = .180 LINUX_VERSION-4.19 = .115 LINUX_VERSION-5.4 = .39 -LINUX_KERNEL_HASH-4.14.176 = bcae0956baaeb55dab5bad0401873fbc5baaa7fbe957ea6d27a5ab241cec5ca2 +LINUX_KERNEL_HASH-4.14.180 = 444ef973d9b6a6ea174e4a9086f0aea980d8575d13302e431ad688f22e27ed0e LINUX_KERNEL_HASH-4.19.115 = 11b2d97c8ea5ceb40c5e1d0bb87ad5b2b8c84560181bc60c0d28ec3a3e3801c2 LINUX_KERNEL_HASH-5.4.39 = 5141965a61a7b1c538443782ec3ef25fe0c3f9cd4d70c4e9f969d16883f365c8 diff --git a/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch index bb013c6cf5..5a5320968f 100644 --- a/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch +++ b/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch @@ -43,7 +43,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, unsigned long adr, const u_char *buf, int len) -@@ -1926,7 +1931,6 @@ static int __xipram do_write_buffer(stru +@@ -1930,7 +1935,6 @@ static int __xipram do_write_buffer(stru return ret; } @@ -51,7 +51,7 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { -@@ -2001,6 +2005,7 @@ static int cfi_amdstd_write_buffers(stru +@@ -2005,6 +2009,7 @@ static int cfi_amdstd_write_buffers(stru return 0; } diff --git a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch index 2585bb10c1..b6d8348e18 100644 --- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch @@ -325,7 +325,7 @@ for (p = *head; p; p = p->next) { --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -466,7 +466,7 @@ static struct neighbour *ipv4_neigh_look +@@ -464,7 +464,7 @@ static struct neighbour *ipv4_neigh_look else if (skb) pkey = &ip_hdr(skb)->daddr; diff --git a/target/linux/bcm63xx/patches-4.14/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch b/target/linux/bcm63xx/patches-4.14/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch index 6a714eb91d..609e108b40 100644 --- a/target/linux/bcm63xx/patches-4.14/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch +++ b/target/linux/bcm63xx/patches-4.14/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch @@ -259,9 +259,10 @@ there. depends on MTD && (BCM47XX || ARCH_BCM_5301X || COMPILE_TEST) --- a/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile -@@ -1 +1,2 @@ +@@ -1,2 +1,3 @@ +obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o + obj-$(CONFIG_MTD_ROUTERBOOT_PARTS) += routerbootpart.o --- /dev/null +++ b/drivers/mtd/parsers/parser_imagetag.c @@ -0,0 +1,214 @@ diff --git a/target/linux/bcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch b/target/linux/bcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch index bbd39811c5..e1d43da87a 100644 --- a/target/linux/bcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch +++ b/target/linux/bcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch @@ -89,7 +89,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -1958,7 +1958,8 @@ int gpiochip_add_pingroup_range(struct g +@@ -1941,7 +1941,8 @@ int gpiochip_add_pingroup_range(struct g list_add_tail(&pin_range->node, &gdev->pin_ranges); @@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski } EXPORT_SYMBOL_GPL(gpiochip_add_pingroup_range); -@@ -2010,7 +2011,7 @@ int gpiochip_add_pin_range(struct gpio_c +@@ -1993,7 +1994,7 @@ int gpiochip_add_pin_range(struct gpio_c list_add_tail(&pin_range->node, &gdev->pin_ranges); diff --git a/target/linux/generic/backport-4.14/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch b/target/linux/generic/backport-4.14/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch index 1c501867a9..e3f77ab9da 100644 --- a/target/linux/generic/backport-4.14/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch +++ b/target/linux/generic/backport-4.14/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch @@ -48,7 +48,7 @@ Reviewed-by: John Gilmore #define INADDR_ANY ((unsigned long int) 0x00000000) --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c -@@ -929,7 +929,7 @@ static int inet_abc_len(__be32 addr) +@@ -934,7 +934,7 @@ static int inet_abc_len(__be32 addr) { int rc = -1; /* Something else, probably a multicast. */ @@ -57,7 +57,7 @@ Reviewed-by: John Gilmore rc = 0; else { __u32 haddr = ntohl(addr); -@@ -940,6 +940,8 @@ static int inet_abc_len(__be32 addr) +@@ -945,6 +945,8 @@ static int inet_abc_len(__be32 addr) rc = 16; else if (IN_CLASSC(haddr)) rc = 24; diff --git a/target/linux/generic/backport-4.14/350-v4.18-ipv6-make-ip6_dst_mtu_forward-inline.patch b/target/linux/generic/backport-4.14/350-v4.18-ipv6-make-ip6_dst_mtu_forward-inline.patch index dddc347436..bbc04555f7 100644 --- a/target/linux/generic/backport-4.14/350-v4.18-ipv6-make-ip6_dst_mtu_forward-inline.patch +++ b/target/linux/generic/backport-4.14/350-v4.18-ipv6-make-ip6_dst_mtu_forward-inline.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h -@@ -252,4 +252,26 @@ static inline bool rt6_duplicate_nexthop +@@ -253,4 +253,26 @@ static inline bool rt6_duplicate_nexthop ipv6_addr_equal(&a->rt6i_gateway, &b->rt6i_gateway) && !lwtunnel_cmp_encap(a->dst.lwtstate, b->dst.lwtstate); } diff --git a/target/linux/generic/hack-4.14/902-debloat_proc.patch b/target/linux/generic/hack-4.14/902-debloat_proc.patch index 30328b87d7..54c6b4d265 100644 --- a/target/linux/generic/hack-4.14/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.14/902-debloat_proc.patch @@ -232,7 +232,7 @@ Signed-off-by: Felix Fietkau return -ENOMEM; --- a/mm/vmalloc.c +++ b/mm/vmalloc.c -@@ -2786,6 +2786,8 @@ static const struct file_operations proc +@@ -2798,6 +2798,8 @@ static const struct file_operations proc static int __init proc_vmalloc_init(void) { @@ -393,7 +393,7 @@ Signed-off-by: Felix Fietkau --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -428,6 +428,9 @@ static struct pernet_operations ip_rt_pr +@@ -426,6 +426,9 @@ static struct pernet_operations ip_rt_pr static int __init ip_rt_proc_init(void) { diff --git a/target/linux/generic/pending-4.14/270-platform-mikrotik-build-bits.patch b/target/linux/generic/pending-4.14/270-platform-mikrotik-build-bits.patch index 5f1009bf31..15dfcb2eba 100644 --- a/target/linux/generic/pending-4.14/270-platform-mikrotik-build-bits.patch +++ b/target/linux/generic/pending-4.14/270-platform-mikrotik-build-bits.patch @@ -14,8 +14,6 @@ Signed-off-by: Thibaut VARÈNE drivers/platform/Makefile | 1 + 2 files changed, 3 insertions(+) -diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig -index c11db8b..0283f0b 100644 --- a/drivers/platform/Kconfig +++ b/drivers/platform/Kconfig @@ -8,3 +8,5 @@ endif @@ -24,8 +22,6 @@ index c11db8b..0283f0b 100644 source "drivers/platform/chrome/Kconfig" + +source "drivers/platform/mikrotik/Kconfig" -diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile -index d3a6630..ad290c3 100644 --- a/drivers/platform/Makefile +++ b/drivers/platform/Makefile @@ -8,3 +8,4 @@ obj-$(CONFIG_MIPS) += mips/ @@ -33,6 +29,3 @@ index d3a6630..ad290c3 100644 obj-$(CONFIG_GOLDFISH) += goldfish/ obj-$(CONFIG_CHROME_PLATFORMS) += chrome/ +obj-$(CONFIG_MIKROTIK) += mikrotik/ --- -2.11.0 - diff --git a/target/linux/generic/pending-4.14/435-mtd-add-routerbootpart-parser-config.patch b/target/linux/generic/pending-4.14/435-mtd-add-routerbootpart-parser-config.patch index 192886b102..946af76f5b 100644 --- a/target/linux/generic/pending-4.14/435-mtd-add-routerbootpart-parser-config.patch +++ b/target/linux/generic/pending-4.14/435-mtd-add-routerbootpart-parser-config.patch @@ -14,8 +14,6 @@ Signed-off-by: Thibaut VARÈNE drivers/mtd/parsers/Makefile | 1 + 2 files changed, 10 insertions(+) -diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig -index d206b3c..58cbdd6 100644 --- a/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig @@ -6,3 +6,12 @@ config MTD_PARSER_TRX @@ -31,13 +29,8 @@ index d206b3c..58cbdd6 100644 + flash, some of which are fixed and some of which are located at + variable offsets. This parser handles both cases via properly + formatted DTS. -diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile -index 4d9024e..41d363a 100644 --- a/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o +obj-$(CONFIG_MTD_ROUTERBOOT_PARTS) += routerbootpart.o --- -2.11.0 - diff --git a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 067de75f3c..286e98f5d5 100644 --- a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau __u16 tc_index; /* traffic control index */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4805,6 +4805,9 @@ static enum gro_result dev_gro_receive(s +@@ -4806,6 +4806,9 @@ static enum gro_result dev_gro_receive(s enum gro_result ret; int grow; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau if (netif_elide_gro(skb->dev)) goto normal; -@@ -6282,6 +6285,48 @@ static void __netdev_adjacent_dev_unlink +@@ -6283,6 +6286,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info) -@@ -6320,6 +6365,7 @@ static int __netdev_upper_dev_link(struc +@@ -6321,6 +6366,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -6397,6 +6443,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -6398,6 +6444,7 @@ void netdev_upper_dev_unlink(struct net_ __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); } -@@ -6961,6 +7008,7 @@ int dev_set_mac_address(struct net_devic +@@ -6962,6 +7009,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch index 784b10dd50..07fc71f0d4 100644 --- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch @@ -442,7 +442,7 @@ Signed-off-by: Yangbo Lu --- a/drivers/soc/imx/gpc.c +++ b/drivers/soc/imx/gpc.c -@@ -209,7 +209,7 @@ static int imx_pgc_power_domain_probe(st +@@ -210,7 +210,7 @@ static int imx_pgc_power_domain_probe(st goto genpd_err; } @@ -713,7 +713,7 @@ Signed-off-by: Yangbo Lu } #ifdef CONFIG_NET_INGRESS -@@ -6341,7 +6342,15 @@ static int __netdev_upper_dev_link(struc +@@ -6342,7 +6343,15 @@ static int __netdev_upper_dev_link(struc struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info) { @@ -730,7 +730,7 @@ Signed-off-by: Yangbo Lu int ret = 0; ASSERT_RTNL(); -@@ -6359,12 +6368,7 @@ static int __netdev_upper_dev_link(struc +@@ -6360,12 +6369,7 @@ static int __netdev_upper_dev_link(struc if (master && netdev_master_upper_dev_get(dev)) return -EBUSY; @@ -744,7 +744,7 @@ Signed-off-by: Yangbo Lu &changeupper_info.info); ret = notifier_to_errno(ret); if (ret) -@@ -6376,7 +6380,7 @@ static int __netdev_upper_dev_link(struc +@@ -6377,7 +6381,7 @@ static int __netdev_upper_dev_link(struc return ret; netdev_update_addr_mask(dev); @@ -753,7 +753,7 @@ Signed-off-by: Yangbo Lu &changeupper_info.info); ret = notifier_to_errno(ret); if (ret) -@@ -6440,21 +6444,25 @@ EXPORT_SYMBOL(netdev_master_upper_dev_li +@@ -6441,21 +6445,25 @@ EXPORT_SYMBOL(netdev_master_upper_dev_li void netdev_upper_dev_unlink(struct net_device *dev, struct net_device *upper_dev) { @@ -784,7 +784,7 @@ Signed-off-by: Yangbo Lu &changeupper_info.info); } EXPORT_SYMBOL(netdev_upper_dev_unlink); -@@ -6470,11 +6478,13 @@ EXPORT_SYMBOL(netdev_upper_dev_unlink); +@@ -6471,11 +6479,13 @@ EXPORT_SYMBOL(netdev_upper_dev_unlink); void netdev_bonding_info_change(struct net_device *dev, struct netdev_bonding_info *bonding_info) { @@ -800,7 +800,7 @@ Signed-off-by: Yangbo Lu &info.info); } EXPORT_SYMBOL(netdev_bonding_info_change); -@@ -6600,11 +6610,13 @@ EXPORT_SYMBOL(dev_get_nest_level); +@@ -6601,11 +6611,13 @@ EXPORT_SYMBOL(dev_get_nest_level); void netdev_lower_state_changed(struct net_device *lower_dev, void *lower_state_info) { @@ -816,7 +816,7 @@ Signed-off-by: Yangbo Lu &changelowerstate_info.info); } EXPORT_SYMBOL(netdev_lower_state_changed); -@@ -6895,11 +6907,14 @@ void __dev_notify_flags(struct net_devic +@@ -6896,11 +6908,14 @@ void __dev_notify_flags(struct net_devic if (dev->flags & IFF_UP && (changes & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI | IFF_VOLATILE))) { diff --git a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch index 47481cfa99..d0bee3b450 100644 --- a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch @@ -323,7 +323,7 @@ Signed-off-by: Zhao Chenhui usb_phy_set_suspend(dwc->usb2_phy, 0); usb_phy_set_suspend(dwc->usb3_phy, 0); ret = phy_power_on(dwc->usb2_generic_phy); -@@ -870,6 +1006,22 @@ static int dwc3_core_init(struct dwc3 *d +@@ -873,6 +1009,22 @@ static int dwc3_core_init(struct dwc3 *d dwc3_writel(dwc->regs, DWC3_GUCTL1, reg); } @@ -346,7 +346,7 @@ Signed-off-by: Zhao Chenhui return 0; err4: -@@ -1076,6 +1228,8 @@ static void dwc3_get_properties(struct d +@@ -1079,6 +1231,8 @@ static void dwc3_get_properties(struct d &hird_threshold); dwc->usb3_lpm_capable = device_property_read_bool(dev, "snps,usb3_lpm_capable"); @@ -355,9 +355,9 @@ Signed-off-by: Zhao Chenhui dwc->disable_scramble_quirk = device_property_read_bool(dev, "snps,disable_scramble_quirk"); -@@ -1108,8 +1262,16 @@ static void dwc3_get_properties(struct d - dwc->dis_tx_ipgap_linecheck_quirk = device_property_read_bool(dev, - "snps,dis-tx-ipgap-linecheck-quirk"); +@@ -1113,8 +1267,16 @@ static void dwc3_get_properties(struct d + dwc->parkmode_disable_ss_quirk = device_property_read_bool(dev, + "snps,parkmode-disable-ss-quirk"); + dwc->quirk_reverse_in_out = device_property_read_bool(dev, + "snps,quirk_reverse_in_out"); @@ -372,7 +372,7 @@ Signed-off-by: Zhao Chenhui device_property_read_u8(dev, "snps,tx_de_emphasis", &tx_de_emphasis); device_property_read_string(dev, "snps,hsphy_interface", -@@ -1120,6 +1282,9 @@ static void dwc3_get_properties(struct d +@@ -1125,6 +1287,9 @@ static void dwc3_get_properties(struct d dwc->dis_metastability_quirk = device_property_read_bool(dev, "snps,dis_metastability_quirk"); @@ -382,7 +382,7 @@ Signed-off-by: Zhao Chenhui dwc->lpm_nyet_threshold = lpm_nyet_threshold; dwc->tx_de_emphasis = tx_de_emphasis; -@@ -1371,12 +1536,14 @@ static int dwc3_resume_common(struct dwc +@@ -1376,12 +1541,14 @@ static int dwc3_resume_common(struct dwc switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: @@ -440,9 +440,9 @@ Signed-off-by: Zhao Chenhui +#define DWC3_GUCTL_HSTINAUTORETRY BIT(14) + /* Global User Control 1 Register */ + #define DWC3_GUCTL1_PARKMODE_DISABLE_SS BIT(17) #define DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS BIT(28) - #define DWC3_GUCTL1_DEV_L1_EXIT_BY_HW BIT(24) -@@ -477,6 +506,14 @@ +@@ -478,6 +507,14 @@ #define DWC3_DEV_IMOD_INTERVAL_SHIFT 0 #define DWC3_DEV_IMOD_INTERVAL_MASK (0xffff << 0) @@ -457,7 +457,7 @@ Signed-off-by: Zhao Chenhui /* Structures */ struct dwc3_trb; -@@ -788,6 +825,7 @@ struct dwc3_scratchpad_array { +@@ -789,6 +826,7 @@ struct dwc3_scratchpad_array { * @regs: base address for our registers * @regs_size: address space size * @fladj: frame length adjustment @@ -465,7 +465,7 @@ Signed-off-by: Zhao Chenhui * @irq_gadget: peripheral controller's IRQ number * @nr_scratch: number of scratch buffers * @u1u2: only used on revisions <1.83a for workaround -@@ -843,6 +881,7 @@ struct dwc3_scratchpad_array { +@@ -844,6 +882,7 @@ struct dwc3_scratchpad_array { * @setup_packet_pending: true when there's a Setup Packet in FIFO. Workaround * @three_stage_setup: set if we perform a three phase setup * @usb3_lpm_capable: set if hadrware supports Link Power Management @@ -473,7 +473,7 @@ Signed-off-by: Zhao Chenhui * @disable_scramble_quirk: set if we enable the disable scramble quirk * @u2exit_lfps_quirk: set if we enable u2exit lfps quirk * @u2ss_inp3_quirk: set if we enable P3 OK for U2/SS Inactive quirk -@@ -922,6 +961,12 @@ struct dwc3 { +@@ -925,6 +964,12 @@ struct dwc3 { enum usb_phy_interface hsphy_mode; u32 fladj; @@ -486,7 +486,7 @@ Signed-off-by: Zhao Chenhui u32 irq_gadget; u32 nr_scratch; u32 u1u2; -@@ -1006,6 +1051,7 @@ struct dwc3 { +@@ -1009,6 +1054,7 @@ struct dwc3 { unsigned setup_packet_pending:1; unsigned three_stage_setup:1; unsigned usb3_lpm_capable:1; @@ -494,7 +494,7 @@ Signed-off-by: Zhao Chenhui unsigned disable_scramble_quirk:1; unsigned u2exit_lfps_quirk:1; -@@ -1025,6 +1071,11 @@ struct dwc3 { +@@ -1029,6 +1075,11 @@ struct dwc3 { unsigned tx_de_emphasis_quirk:1; unsigned tx_de_emphasis:2; @@ -528,7 +528,7 @@ Signed-off-by: Zhao Chenhui reg &= ~DWC3_DCTL_INITU2ENA; --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c -@@ -3220,6 +3220,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -3216,6 +3216,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) { int ret; int irq; @@ -536,7 +536,7 @@ Signed-off-by: Zhao Chenhui irq = dwc3_gadget_get_irq(dwc); if (irq < 0) { -@@ -3298,6 +3299,12 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -3294,6 +3295,12 @@ int dwc3_gadget_init(struct dwc3 *dwc) dwc3_gadget_set_speed(&dwc->gadget, dwc->maximum_speed); diff --git a/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch b/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch index 6077f979cf..4362863b7b 100644 --- a/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch @@ -5715,7 +5715,7 @@ Signed-off-by: Yangbo Lu int (*start)(struct pci_epc *epc); void (*stop)(struct pci_epc *epc); struct module *owner; -@@ -91,8 +97,17 @@ struct pci_epc { +@@ -94,8 +100,17 @@ struct pci_epc { struct config_group *group; /* spinlock to protect against concurrent access of EP controller */ spinlock_t lock; @@ -5733,7 +5733,7 @@ Signed-off-by: Yangbo Lu #define to_pci_epc(device) container_of((device), struct pci_epc, dev) #define pci_epc_create(dev, ops) \ -@@ -124,17 +139,23 @@ void pci_epc_destroy(struct pci_epc *epc +@@ -127,17 +142,23 @@ void pci_epc_destroy(struct pci_epc *epc int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf); void pci_epc_linkup(struct pci_epc *epc); void pci_epc_remove_epf(struct pci_epc *epc, struct pci_epf *epf); diff --git a/target/linux/ramips/patches-4.14/0037-mtd-cfi-cmdset-0002-force-word-write.patch b/target/linux/ramips/patches-4.14/0037-mtd-cfi-cmdset-0002-force-word-write.patch index 478af4cbc9..39717bbad4 100644 --- a/target/linux/ramips/patches-4.14/0037-mtd-cfi-cmdset-0002-force-word-write.patch +++ b/target/linux/ramips/patches-4.14/0037-mtd-cfi-cmdset-0002-force-word-write.patch @@ -52,7 +52,7 @@ Subject: [PATCH 37/53] mtd: cfi cmdset 0002 force word write static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, unsigned long adr, const u_char *buf, int len) -@@ -1926,7 +1931,6 @@ static int __xipram do_write_buffer(stru +@@ -1930,7 +1935,6 @@ static int __xipram do_write_buffer(stru return ret; } @@ -60,7 +60,7 @@ Subject: [PATCH 37/53] mtd: cfi cmdset 0002 force word write static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { -@@ -2001,6 +2005,7 @@ static int cfi_amdstd_write_buffers(stru +@@ -2005,6 +2009,7 @@ static int cfi_amdstd_write_buffers(stru return 0; } From 7dd2d7289a06ac742cfce5dbc9c583146b2c4a9c Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 11 May 2020 12:07:06 +0200 Subject: [PATCH 06/12] kernel: bump 4.19 to 4.19.122 Refreshed all patches. Remove upstreamed: - 551-loop-Better-discard-support-for-block-devices.patch Fixed: - CVE-2020-11884 - CVE-2020-12114 - CVE-2019-3016 - CVE-2020-11669 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 +- .../404-mtd-cybertan-trx-parser.patch | 3 +- .../950-0039-Add-dwc_otg-driver.patch | 4 +- ...-DT-Add-CSI-nodes-to-the-device-tree.patch | 2 +- ...Better-coalescing-parameter-defaults.patch | 4 +- ...Move-BCM2835-6-7-specific-to-bcm2835.patch | 6 +- ...-for-updating-interrupt-endpoint-int.patch | 2 +- ...hci_fixup_endpoint-for-interval-adju.patch | 4 +- ...resent-but-empty-dmas-disables-audio.patch | 2 +- ...t-Workaround-2-for-Pi4-Ethernet-fail.patch | 2 +- .../bcm47xx/patches-4.19/159-cpu_fixes.patch | 4 +- ...ddress-assignment-via-ifconfig-ioctl.patch | 4 +- ...initial-support-for-Toshiba-TC58CVG2.patch | 2 +- ...dd-support-for-GigaDevice-GD5FxGQ4xA.patch | 2 +- ...-Add-support-for-two-byte-device-IDs.patch | 2 +- ...initial-support-for-Paragon-PN26G0xA.patch | 2 +- .../550-loop-Report-EOPNOTSUPP-properly.patch | 4 +- ...er-discard-support-for-block-devices.patch | 101 ------------------ .../generic/hack-4.19/902-debloat_proc.patch | 2 +- .../270-platform-mikrotik-build-bits.patch | 13 +-- ...mtd-add-routerbootpart-parser-config.patch | 6 +- ...T-skip-GRO-for-foreign-MAC-addresses.patch | 10 +- .../810-pci_disable_common_quirks.patch | 6 +- 23 files changed, 40 insertions(+), 151 deletions(-) delete mode 100644 target/linux/generic/hack-4.19/551-loop-Better-discard-support-for-block-devices.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 21883edacd..968743ef52 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,11 +7,11 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-4.14 = .180 -LINUX_VERSION-4.19 = .115 +LINUX_VERSION-4.19 = .122 LINUX_VERSION-5.4 = .39 LINUX_KERNEL_HASH-4.14.180 = 444ef973d9b6a6ea174e4a9086f0aea980d8575d13302e431ad688f22e27ed0e -LINUX_KERNEL_HASH-4.19.115 = 11b2d97c8ea5ceb40c5e1d0bb87ad5b2b8c84560181bc60c0d28ec3a3e3801c2 +LINUX_KERNEL_HASH-4.19.122 = 5050268ec5cf003d96366d1611ecfa4ab6974125d6fa26cea1ccb81dd4df00a5 LINUX_KERNEL_HASH-5.4.39 = 5141965a61a7b1c538443782ec3ef25fe0c3f9cd4d70c4e9f969d16883f365c8 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/ath79/patches-4.19/404-mtd-cybertan-trx-parser.patch b/target/linux/ath79/patches-4.19/404-mtd-cybertan-trx-parser.patch index 22e31db3fa..fcfe72e287 100644 --- a/target/linux/ath79/patches-4.19/404-mtd-cybertan-trx-parser.patch +++ b/target/linux/ath79/patches-4.19/404-mtd-cybertan-trx-parser.patch @@ -1,9 +1,10 @@ --- a/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile -@@ -1,2 +1,3 @@ +@@ -1,3 +1,4 @@ +obj-$(CONFIG_MTD_PARSER_CYBERTAN) += parser_cybertan.o obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o + obj-$(CONFIG_MTD_ROUTERBOOT_PARTS) += routerbootpart.o --- a/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig @@ -1,3 +1,11 @@ diff --git a/target/linux/bcm27xx/patches-4.19/950-0039-Add-dwc_otg-driver.patch b/target/linux/bcm27xx/patches-4.19/950-0039-Add-dwc_otg-driver.patch index 35eb49209e..ff062ffdf1 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0039-Add-dwc_otg-driver.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0039-Add-dwc_otg-driver.patch @@ -917,7 +917,7 @@ Fixes https://github.com/raspberrypi/linux/issues/2408 } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5232,7 +5232,7 @@ static void port_event(struct usb_hub *h +@@ -5246,7 +5246,7 @@ static void port_event(struct usb_hub *h u16 status = 0, unused; port_dev->over_current_count++; @@ -928,7 +928,7 @@ Fixes https://github.com/raspberrypi/linux/issues/2408 USB_PORT_FEAT_C_OVER_CURRENT); --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c -@@ -1993,6 +1993,85 @@ free_interfaces: +@@ -2000,6 +2000,85 @@ free_interfaces: if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) cp->string = usb_cache_string(dev, cp->desc.iConfiguration); diff --git a/target/linux/bcm27xx/patches-4.19/950-0179-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch b/target/linux/bcm27xx/patches-4.19/950-0179-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch index 551a60ce9e..cf59fff9ae 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0179-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0179-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch @@ -156,7 +156,7 @@ Signed-off-by: Dave Stevenson +}; --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi -@@ -565,6 +565,32 @@ +@@ -566,6 +566,32 @@ status = "disabled"; }; diff --git a/target/linux/bcm27xx/patches-4.19/950-0470-bcmgenet-Better-coalescing-parameter-defaults.patch b/target/linux/bcm27xx/patches-4.19/950-0470-bcmgenet-Better-coalescing-parameter-defaults.patch index e045886c78..43a8a698f4 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0470-bcmgenet-Better-coalescing-parameter-defaults.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0470-bcmgenet-Better-coalescing-parameter-defaults.patch @@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -2147,7 +2147,7 @@ static void bcmgenet_init_tx_ring(struct +@@ -2150,7 +2150,7 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX); bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX); @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell /* Disable rate control for now */ bcmgenet_tdma_ring_writel(priv, index, flow_period_val, TDMA_FLOW_PERIOD); -@@ -3576,9 +3576,12 @@ static int bcmgenet_probe(struct platfor +@@ -3580,9 +3580,12 @@ static int bcmgenet_probe(struct platfor netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1); /* Set default coalescing parameters */ diff --git a/target/linux/bcm27xx/patches-4.19/950-0556-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch b/target/linux/bcm27xx/patches-4.19/950-0556-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch index e3ee39abba..900bc4911c 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0556-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0556-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch @@ -159,8 +159,8 @@ Signed-off-by: Stefan Wahren jtag_gpio22: jtag_gpio22 { brcm,pins = <22 23 24 25 26 27>; brcm,function = ; -@@ -487,14 +460,6 @@ - +@@ -488,14 +461,6 @@ + status = "disabled"; }; - thermal: thermal@7e212000 { @@ -174,7 +174,7 @@ Signed-off-by: Stefan Wahren aux: aux@7e215000 { compatible = "brcm,bcm2835-aux"; #clock-cells = <1>; -@@ -660,12 +625,6 @@ +@@ -661,12 +626,6 @@ phy-names = "usb2-phy"; }; diff --git a/target/linux/bcm27xx/patches-4.19/950-0572-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch b/target/linux/bcm27xx/patches-4.19/950-0572-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch index 99c4e4df3f..07e0fbd144 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0572-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0572-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch @@ -46,7 +46,7 @@ Signed-off-by: Jonathan Bell * have been called previously. Use for set_configuration, set_interface, --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c -@@ -1113,6 +1113,21 @@ static void remove_intf_ep_devs(struct u +@@ -1120,6 +1120,21 @@ static void remove_intf_ep_devs(struct u intf->ep_devs_created = 0; } diff --git a/target/linux/bcm27xx/patches-4.19/950-0573-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/target/linux/bcm27xx/patches-4.19/950-0573-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch index d66b9716a1..5df9ceca9c 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0573-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0573-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch @@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1425,6 +1425,103 @@ command_cleanup: +@@ -1427,6 +1427,103 @@ command_cleanup: } /* @@ -119,7 +119,7 @@ Signed-off-by: Jonathan Bell * non-error returns are a promise to giveback() the urb later * we drop ownership so next owner (or urb unlink) can get it */ -@@ -5217,6 +5314,7 @@ static const struct hc_driver xhci_hc_dr +@@ -5219,6 +5316,7 @@ static const struct hc_driver xhci_hc_dr .endpoint_reset = xhci_endpoint_reset, .check_bandwidth = xhci_check_bandwidth, .reset_bandwidth = xhci_reset_bandwidth, diff --git a/target/linux/bcm27xx/patches-4.19/950-0630-drm-vc4-A-present-but-empty-dmas-disables-audio.patch b/target/linux/bcm27xx/patches-4.19/950-0630-drm-vc4-A-present-but-empty-dmas-disables-audio.patch index 2d38456ae6..080a7d991a 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0630-drm-vc4-A-present-but-empty-dmas-disables-audio.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0630-drm-vc4-A-present-but-empty-dmas-disables-audio.patch @@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1087,10 +1087,12 @@ static int vc4_hdmi_audio_init(struct vc +@@ -1099,10 +1099,12 @@ static int vc4_hdmi_audio_init(struct vc struct device *dev = &hdmi->pdev->dev; const __be32 *addr; int ret; diff --git a/target/linux/bcm27xx/patches-4.19/950-0658-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch b/target/linux/bcm27xx/patches-4.19/950-0658-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch index beeeb2f9f1..5b7f16cdb0 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0658-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0658-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch @@ -38,7 +38,7 @@ Signed-off-by: Phil Elwell static inline void bcmgenet_writel(u32 value, void __iomem *offset) { /* MIPS chips strapped for BE will automagically configure the -@@ -1993,6 +1997,11 @@ static void reset_umac(struct bcmgenet_p +@@ -1996,6 +2000,11 @@ static void reset_umac(struct bcmgenet_p bcmgenet_rbuf_ctrl_set(priv, 0); udelay(10); diff --git a/target/linux/bcm47xx/patches-4.19/159-cpu_fixes.patch b/target/linux/bcm47xx/patches-4.19/159-cpu_fixes.patch index 75e493b2dd..8ce76839c7 100644 --- a/target/linux/bcm47xx/patches-4.19/159-cpu_fixes.patch +++ b/target/linux/bcm47xx/patches-4.19/159-cpu_fixes.patch @@ -488,7 +488,7 @@ uasm_i_eret(&p); /* return from trap */ } #ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT -@@ -2046,6 +2055,9 @@ build_r4000_tlbchange_handler_head(u32 * +@@ -2049,6 +2058,9 @@ build_r4000_tlbchange_handler_head(u32 * #ifdef CONFIG_64BIT build_get_pmde64(p, l, r, wr.r1, wr.r2); /* get pmd in ptr */ #else @@ -498,7 +498,7 @@ build_get_pgde32(p, wr.r1, wr.r2); /* get pgd in ptr */ #endif -@@ -2092,6 +2104,9 @@ build_r4000_tlbchange_handler_tail(u32 * +@@ -2095,6 +2107,9 @@ build_r4000_tlbchange_handler_tail(u32 * build_tlb_write_entry(p, l, r, tlb_indexed); uasm_l_leave(l, *p); build_restore_work_registers(p); diff --git a/target/linux/generic/backport-4.19/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch b/target/linux/generic/backport-4.19/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch index bf6d9aca34..24f796dcfa 100644 --- a/target/linux/generic/backport-4.19/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch +++ b/target/linux/generic/backport-4.19/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch @@ -48,7 +48,7 @@ Reviewed-by: John Gilmore #define INADDR_ANY ((unsigned long int) 0x00000000) --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c -@@ -949,7 +949,7 @@ static int inet_abc_len(__be32 addr) +@@ -954,7 +954,7 @@ static int inet_abc_len(__be32 addr) { int rc = -1; /* Something else, probably a multicast. */ @@ -57,7 +57,7 @@ Reviewed-by: John Gilmore rc = 0; else { __u32 haddr = ntohl(addr); -@@ -960,6 +960,8 @@ static int inet_abc_len(__be32 addr) +@@ -965,6 +965,8 @@ static int inet_abc_len(__be32 addr) rc = 16; else if (IN_CLASSC(haddr)) rc = 24; diff --git a/target/linux/generic/backport-4.19/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch b/target/linux/generic/backport-4.19/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch index ed42f0024b..288fdbf267 100644 --- a/target/linux/generic/backport-4.19/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch +++ b/target/linux/generic/backport-4.19/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch @@ -28,7 +28,7 @@ Signed-off-by: Miquel Raynal obj-$(CONFIG_MTD_SPI_NAND) += spinand.o --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c -@@ -764,6 +764,7 @@ static const struct nand_ops spinand_ops +@@ -762,6 +762,7 @@ static const struct nand_ops spinand_ops static const struct spinand_manufacturer *spinand_manufacturers[] = { ¯onix_spinand_manufacturer, µn_spinand_manufacturer, diff --git a/target/linux/generic/backport-4.19/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch b/target/linux/generic/backport-4.19/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch index 4e6f18a4cb..d3ded95ccb 100644 --- a/target/linux/generic/backport-4.19/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch +++ b/target/linux/generic/backport-4.19/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch @@ -25,7 +25,7 @@ Signed-off-by: Miquel Raynal obj-$(CONFIG_MTD_SPI_NAND) += spinand.o --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c -@@ -762,6 +762,7 @@ static const struct nand_ops spinand_ops +@@ -760,6 +760,7 @@ static const struct nand_ops spinand_ops }; static const struct spinand_manufacturer *spinand_manufacturers[] = { diff --git a/target/linux/generic/backport-4.19/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch b/target/linux/generic/backport-4.19/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch index fcbecbb762..ee81f97f4e 100644 --- a/target/linux/generic/backport-4.19/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch +++ b/target/linux/generic/backport-4.19/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch @@ -17,7 +17,7 @@ Signed-off-by: Miquel Raynal --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c -@@ -853,7 +853,7 @@ spinand_select_op_variant(struct spinand +@@ -851,7 +851,7 @@ spinand_select_op_variant(struct spinand */ int spinand_match_and_init(struct spinand_device *spinand, const struct spinand_info *table, diff --git a/target/linux/generic/backport-4.19/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch b/target/linux/generic/backport-4.19/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch index 17b8e779bc..d30abdc143 100644 --- a/target/linux/generic/backport-4.19/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch +++ b/target/linux/generic/backport-4.19/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch @@ -33,7 +33,7 @@ ADOPTED FROM UPSTREAM due to upstream commit 377e517b5fa5 in Linux 5.2 obj-$(CONFIG_MTD_SPI_NAND) += spinand.o --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c -@@ -765,6 +765,7 @@ static const struct spinand_manufacturer +@@ -763,6 +763,7 @@ static const struct spinand_manufacturer &gigadevice_spinand_manufacturer, ¯onix_spinand_manufacturer, µn_spinand_manufacturer, diff --git a/target/linux/generic/hack-4.19/550-loop-Report-EOPNOTSUPP-properly.patch b/target/linux/generic/hack-4.19/550-loop-Report-EOPNOTSUPP-properly.patch index 023de0078d..c05297f45a 100644 --- a/target/linux/generic/hack-4.19/550-loop-Report-EOPNOTSUPP-properly.patch +++ b/target/linux/generic/hack-4.19/550-loop-Report-EOPNOTSUPP-properly.patch @@ -18,7 +18,7 @@ Reviewed-by: Bart Van Assche --- a/drivers/block/loop.c +++ b/drivers/block/loop.c -@@ -460,7 +460,7 @@ static void lo_complete_rq(struct reques +@@ -461,7 +461,7 @@ static void lo_complete_rq(struct reques if (!cmd->use_aio || cmd->ret < 0 || cmd->ret == blk_rq_bytes(rq) || req_op(rq) != REQ_OP_READ) { if (cmd->ret < 0) @@ -27,7 +27,7 @@ Reviewed-by: Bart Van Assche goto end_io; } -@@ -1904,7 +1904,10 @@ static void loop_handle_cmd(struct loop_ +@@ -1924,7 +1924,10 @@ static void loop_handle_cmd(struct loop_ failed: /* complete non-aio request */ if (!cmd->use_aio || ret) { diff --git a/target/linux/generic/hack-4.19/551-loop-Better-discard-support-for-block-devices.patch b/target/linux/generic/hack-4.19/551-loop-Better-discard-support-for-block-devices.patch deleted file mode 100644 index ac393e5f13..0000000000 --- a/target/linux/generic/hack-4.19/551-loop-Better-discard-support-for-block-devices.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 3117c3f45edbcc269baaebd3d13f39b7bf884aa6 Mon Sep 17 00:00:00 2001 -From: Evan Green -Date: Thu, 14 Nov 2019 15:50:08 -0800 -Subject: loop: Better discard support for block devices - -If the backing device for a loop device is itself a block device, -then mirror the "write zeroes" capabilities of the underlying -block device into the loop device. Copy this capability into both -max_write_zeroes_sectors and max_discard_sectors of the loop device. - -The reason for this is that REQ_OP_DISCARD on a loop device translates -into blkdev_issue_zeroout(), rather than blkdev_issue_discard(). This -presents a consistent interface for loop devices (that discarded data -is zeroed), regardless of the backing device type of the loop device. -There should be no behavior change for loop devices backed by regular -files. - -This change fixes blktest block/003, and removes an extraneous -error print in block/013 when testing on a loop device backed -by a block device that does not support discard. - -Signed-off-by: Evan Green -Reviewed-by: Gwendal Grignou -Reviewed-by: Chaitanya Kulkarni ---- - drivers/block/loop.c | 40 +++++++++++++++++++++++++++++----------- - 1 file changed, 29 insertions(+), 11 deletions(-) - ---- a/drivers/block/loop.c -+++ b/drivers/block/loop.c -@@ -426,11 +426,12 @@ static int lo_fallocate(struct loop_devi - * information. - */ - struct file *file = lo->lo_backing_file; -+ struct request_queue *q = lo->lo_queue; - int ret; - - mode |= FALLOC_FL_KEEP_SIZE; - -- if ((!file->f_op->fallocate) || lo->lo_encrypt_key_size) { -+ if (!blk_queue_discard(q)) { - ret = -EOPNOTSUPP; - goto out; - } -@@ -863,6 +864,21 @@ static void loop_config_discard(struct l - struct file *file = lo->lo_backing_file; - struct inode *inode = file->f_mapping->host; - struct request_queue *q = lo->lo_queue; -+ struct request_queue *backingq; -+ -+ /* -+ * If the backing device is a block device, mirror its zeroing -+ * capability. REQ_OP_DISCARD translates to a zero-out even when backed -+ * by block devices to keep consistent behavior with file-backed loop -+ * devices. -+ */ -+ if (S_ISBLK(inode->i_mode) && !lo->lo_encrypt_key_size) { -+ backingq = bdev_get_queue(inode->i_bdev); -+ blk_queue_max_discard_sectors(q, -+ backingq->limits.max_write_zeroes_sectors); -+ -+ blk_queue_max_write_zeroes_sectors(q, -+ backingq->limits.max_write_zeroes_sectors); - - /* - * We use punch hole to reclaim the free space used by the -@@ -870,22 +886,24 @@ static void loop_config_discard(struct l - * encryption is enabled, because it may give an attacker - * useful information. - */ -- if ((!file->f_op->fallocate) || -- lo->lo_encrypt_key_size) { -+ } else if ((!file->f_op->fallocate) || lo->lo_encrypt_key_size) { - q->limits.discard_granularity = 0; - q->limits.discard_alignment = 0; - blk_queue_max_discard_sectors(q, 0); - blk_queue_max_write_zeroes_sectors(q, 0); -- blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q); -- return; -- } - -- q->limits.discard_granularity = inode->i_sb->s_blocksize; -- q->limits.discard_alignment = 0; -+ } else { -+ q->limits.discard_granularity = inode->i_sb->s_blocksize; -+ q->limits.discard_alignment = 0; - -- blk_queue_max_discard_sectors(q, UINT_MAX >> 9); -- blk_queue_max_write_zeroes_sectors(q, UINT_MAX >> 9); -- blk_queue_flag_set(QUEUE_FLAG_DISCARD, q); -+ blk_queue_max_discard_sectors(q, UINT_MAX >> 9); -+ blk_queue_max_write_zeroes_sectors(q, UINT_MAX >> 9); -+ } -+ -+ if (q->limits.max_write_zeroes_sectors) -+ blk_queue_flag_set(QUEUE_FLAG_DISCARD, q); -+ else -+ blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q); - } - - static void loop_unprepare_queue(struct loop_device *lo) diff --git a/target/linux/generic/hack-4.19/902-debloat_proc.patch b/target/linux/generic/hack-4.19/902-debloat_proc.patch index dd390f39bd..800c32e10c 100644 --- a/target/linux/generic/hack-4.19/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.19/902-debloat_proc.patch @@ -232,7 +232,7 @@ Signed-off-by: Felix Fietkau if (!pe) --- a/mm/vmalloc.c +++ b/mm/vmalloc.c -@@ -2752,6 +2752,8 @@ static const struct seq_operations vmall +@@ -2764,6 +2764,8 @@ static const struct seq_operations vmall static int __init proc_vmalloc_init(void) { diff --git a/target/linux/generic/pending-4.19/270-platform-mikrotik-build-bits.patch b/target/linux/generic/pending-4.19/270-platform-mikrotik-build-bits.patch index e2e8fbfcff..c8c19f38a6 100644 --- a/target/linux/generic/pending-4.19/270-platform-mikrotik-build-bits.patch +++ b/target/linux/generic/pending-4.19/270-platform-mikrotik-build-bits.patch @@ -14,25 +14,18 @@ Signed-off-by: Thibaut VARÈNE drivers/platform/Makefile | 1 + 2 files changed, 3 insertions(+) -diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig -index c11db8b..0283f0b 100644 --- a/drivers/platform/Kconfig +++ b/drivers/platform/Kconfig -@@ -10,3 +10,5 @@ +@@ -10,3 +10,5 @@ source "drivers/platform/goldfish/Kconfi source "drivers/platform/chrome/Kconfig" - + source "drivers/platform/mellanox/Kconfig" + +source "drivers/platform/mikrotik/Kconfig" -diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile -index d3a6630..ad290c3 100644 --- a/drivers/platform/Makefile +++ b/drivers/platform/Makefile -@@ -9,3 +9,4 @@ +@@ -9,3 +9,4 @@ obj-$(CONFIG_MIPS) += mips/ obj-$(CONFIG_OLPC) += olpc/ obj-$(CONFIG_GOLDFISH) += goldfish/ obj-$(CONFIG_CHROME_PLATFORMS) += chrome/ +obj-$(CONFIG_MIKROTIK) += mikrotik/ --- -2.11.0 - diff --git a/target/linux/generic/pending-4.19/435-mtd-add-routerbootpart-parser-config.patch b/target/linux/generic/pending-4.19/435-mtd-add-routerbootpart-parser-config.patch index 678eaed4ce..5637cd54af 100644 --- a/target/linux/generic/pending-4.19/435-mtd-add-routerbootpart-parser-config.patch +++ b/target/linux/generic/pending-4.19/435-mtd-add-routerbootpart-parser-config.patch @@ -14,11 +14,9 @@ Signed-off-by: Thibaut VARÈNE drivers/mtd/parsers/Makefile | 1 + 2 files changed, 10 insertions(+) -diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig -index de6f5f8..0afa89c 100644 --- a/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig -@@ -22,3 +22,12 @@ config MTD_SHARPSL_PARTS +@@ -14,3 +14,12 @@ config MTD_SHARPSL_PARTS This provides the read-only FTL logic necessary to read the partition table from the NAND flash of Sharp SL Series (Zaurus) and the MTD partition parser using this code. @@ -31,8 +29,6 @@ index de6f5f8..0afa89c 100644 + flash, some of which are fixed and some of which are located at + variable offsets. This parser handles both cases via properly + formatted DTS. -diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile -index 44ff342..0543362 100644 --- a/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile @@ -1,2 +1,3 @@ diff --git a/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 75cc8d2f7d..ccfd89f703 100644 --- a/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau __u16 tc_index; /* traffic control index */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -5456,6 +5456,9 @@ static enum gro_result dev_gro_receive(s +@@ -5457,6 +5457,9 @@ static enum gro_result dev_gro_receive(s int same_flow; int grow; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau if (netif_elide_gro(skb->dev)) goto normal; -@@ -7114,6 +7117,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7115,6 +7118,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info, -@@ -7164,6 +7209,7 @@ static int __netdev_upper_dev_link(struc +@@ -7165,6 +7210,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -7256,6 +7302,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -7257,6 +7303,7 @@ void netdev_upper_dev_unlink(struct net_ __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); -@@ -7895,6 +7942,7 @@ int dev_set_mac_address(struct net_devic +@@ -7896,6 +7943,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/generic/pending-4.19/810-pci_disable_common_quirks.patch b/target/linux/generic/pending-4.19/810-pci_disable_common_quirks.patch index 738bbd71d1..669229c620 100644 --- a/target/linux/generic/pending-4.19/810-pci_disable_common_quirks.patch +++ b/target/linux/generic/pending-4.19/810-pci_disable_common_quirks.patch @@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos /* * The Mellanox Tavor device gives false positive parity errors. Mark this * device with a broken_parity_status to allow PCI scanning code to "skip" -@@ -3147,6 +3148,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I +@@ -3213,6 +3214,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata); @@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos /* * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum. * To work around this, query the size it should be configured to by the -@@ -3172,6 +3175,8 @@ static void quirk_intel_ntb(struct pci_d +@@ -3238,6 +3241,8 @@ static void quirk_intel_ntb(struct pci_d DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb); @@ -51,7 +51,7 @@ Signed-off-by: Gabor Juhos /* * Some BIOS implementations leave the Intel GPU interrupts enabled, even * though no one is handling them (e.g., if the i915 driver is never -@@ -3210,6 +3215,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN +@@ -3276,6 +3281,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq); From 0fed36dd484272eb546dd69f4dc84221ca5f01a5 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 11 May 2020 13:17:22 +0200 Subject: [PATCH 07/12] kernel: bump 5.4 to 5.4.40 Refreshed all patches. Compile-tested on: imx6 Runtime-tested on: imx6 Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- ...12-bcmgenet-Better-coalescing-parameter-defaults.patch | 4 ++-- ...-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch | 2 +- .../950-0341-drm-v3d-The-third-IRQ-is-optional.patch | 2 +- ...19801-2-crypto-caam-add-support-of-tagged-keys-i.patch | 4 ++-- ...20684-PCI-Disable-MSI-on-CYW4356-and-CYW4359-chi.patch | 2 +- ...-Disable-MSI-on-marvel-88w9098-and-88w8997-chips.patch | 2 +- ...akeup-Add-routine-to-help-fetch-wakeup-source-ob.patch | 2 +- ...sdhci-of-esdhc-poll-ESDHC_FLUSH_ASYNC_FIFO-bit-u.patch | 2 +- ...05-mmc-sdhci-of-esdhc-convert-to-use-esdhc_tunin.patch | 6 +++--- ...05-mmc-sdhci-of-esdhc-update-tuning-erratum-A-00.patch | 6 +++--- ...0-2-mtd-spi-nor-Use-1-bit-mode-of-spansion-s25fs.patch | 2 +- .../820-usb-0005-usb-dwc3-add-otg-properties-update.patch | 8 ++++---- ...dwc3-drd-add-usb-role-switch-class-support-for-d.patch | 2 +- ...dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch | 6 +++--- ...b-0010-MLK-22675-usb-dwc3-host-disable-park-mode.patch | 6 +++--- ...11-usb-dwc3-Add-cache-type-configuration-support.patch | 2 +- ...17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch | 8 ++++---- ...-0016-MLK-16735-usb-host-add-XHCI_CDNS_HOST-flag.patch | 2 +- ...19153-2-usb-host-xhci-do-not-return-error-status.patch | 2 +- ...-18794-1-usb-host-xhci-add-.bus_suspend-override.patch | 4 ++-- ...9829-usb-core-print-suggested-message-if-failed-.patch | 2 +- ...22099-usb-host-xhci-do-warm-reset-for-link-state.patch | 2 +- ...87-1-Revert-usb-dwc3-Add-cache-type-configuratio.patch | 2 +- ...87-4-usb-dwc3-Add-cache-type-configuration-suppo.patch | 2 +- 25 files changed, 43 insertions(+), 43 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 968743ef52..aea1d1a075 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.14 = .180 LINUX_VERSION-4.19 = .122 -LINUX_VERSION-5.4 = .39 +LINUX_VERSION-5.4 = .40 LINUX_KERNEL_HASH-4.14.180 = 444ef973d9b6a6ea174e4a9086f0aea980d8575d13302e431ad688f22e27ed0e LINUX_KERNEL_HASH-4.19.122 = 5050268ec5cf003d96366d1611ecfa4ab6974125d6fa26cea1ccb81dd4df00a5 -LINUX_KERNEL_HASH-5.4.39 = 5141965a61a7b1c538443782ec3ef25fe0c3f9cd4d70c4e9f969d16883f365c8 +LINUX_KERNEL_HASH-5.4.40 = 83563f027687ecaafb41d0d2d52056f40ec9822f8a9e43592e215349730020ab remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/bcm27xx/patches-5.4/950-0212-bcmgenet-Better-coalescing-parameter-defaults.patch b/target/linux/bcm27xx/patches-5.4/950-0212-bcmgenet-Better-coalescing-parameter-defaults.patch index 58418ce973..5b88f11070 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0212-bcmgenet-Better-coalescing-parameter-defaults.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0212-bcmgenet-Better-coalescing-parameter-defaults.patch @@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -2147,7 +2147,7 @@ static void bcmgenet_init_tx_ring(struct +@@ -2148,7 +2148,7 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX); bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX); @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell /* Disable rate control for now */ bcmgenet_tdma_ring_writel(priv, index, flow_period_val, TDMA_FLOW_PERIOD); -@@ -3570,9 +3570,12 @@ static int bcmgenet_probe(struct platfor +@@ -3571,9 +3571,12 @@ static int bcmgenet_probe(struct platfor netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1); /* Set default coalescing parameters */ diff --git a/target/linux/bcm27xx/patches-5.4/950-0296-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch b/target/linux/bcm27xx/patches-5.4/950-0296-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch index e52b4e9022..7370cfb44a 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0296-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0296-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch @@ -38,7 +38,7 @@ Signed-off-by: Phil Elwell static inline void bcmgenet_writel(u32 value, void __iomem *offset) { /* MIPS chips strapped for BE will automagically configure the -@@ -1993,6 +1997,11 @@ static void reset_umac(struct bcmgenet_p +@@ -1994,6 +1998,11 @@ static void reset_umac(struct bcmgenet_p bcmgenet_rbuf_ctrl_set(priv, 0); udelay(10); diff --git a/target/linux/bcm27xx/patches-5.4/950-0341-drm-v3d-The-third-IRQ-is-optional.patch b/target/linux/bcm27xx/patches-5.4/950-0341-drm-v3d-The-third-IRQ-is-optional.patch index e58d8af2d0..5dac72f9a2 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0341-drm-v3d-The-third-IRQ-is-optional.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0341-drm-v3d-The-third-IRQ-is-optional.patch @@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -3471,7 +3471,7 @@ static int bcmgenet_probe(struct platfor +@@ -3472,7 +3472,7 @@ static int bcmgenet_probe(struct platfor priv = netdev_priv(dev); priv->irq0 = platform_get_irq(pdev, 0); priv->irq1 = platform_get_irq(pdev, 1); diff --git a/target/linux/layerscape/patches-5.4/804-crypto-0022-MLK-19801-2-crypto-caam-add-support-of-tagged-keys-i.patch b/target/linux/layerscape/patches-5.4/804-crypto-0022-MLK-19801-2-crypto-caam-add-support-of-tagged-keys-i.patch index 915a2cdb47..cf982f8a58 100644 --- a/target/linux/layerscape/patches-5.4/804-crypto-0022-MLK-19801-2-crypto-caam-add-support-of-tagged-keys-i.patch +++ b/target/linux/layerscape/patches-5.4/804-crypto-0022-MLK-19801-2-crypto-caam-add-support-of-tagged-keys-i.patch @@ -205,7 +205,7 @@ Signed-off-by: Horia Geantă --- a/drivers/crypto/caam/caamalg_desc.c +++ b/drivers/crypto/caam/caamalg_desc.c -@@ -1386,8 +1386,14 @@ void cnstr_shdsc_skcipher_encap(u32 * co +@@ -1389,8 +1389,14 @@ void cnstr_shdsc_skcipher_encap(u32 * co JUMP_COND_SHRD); /* Load class1 key only */ @@ -222,7 +222,7 @@ Signed-off-by: Horia Geantă /* Load nonce into CONTEXT1 reg */ if (is_rfc3686) { -@@ -1458,8 +1464,14 @@ void cnstr_shdsc_skcipher_decap(u32 * co +@@ -1464,8 +1470,14 @@ void cnstr_shdsc_skcipher_decap(u32 * co JUMP_COND_SHRD); /* Load class1 key only */ diff --git a/target/linux/layerscape/patches-5.4/812-pcie-0005-MLK-20684-PCI-Disable-MSI-on-CYW4356-and-CYW4359-chi.patch b/target/linux/layerscape/patches-5.4/812-pcie-0005-MLK-20684-PCI-Disable-MSI-on-CYW4356-and-CYW4359-chi.patch index dfda1aa98b..eaedf8a9ec 100644 --- a/target/linux/layerscape/patches-5.4/812-pcie-0005-MLK-20684-PCI-Disable-MSI-on-CYW4356-and-CYW4359-chi.patch +++ b/target/linux/layerscape/patches-5.4/812-pcie-0005-MLK-20684-PCI-Disable-MSI-on-CYW4356-and-CYW4359-chi.patch @@ -19,7 +19,7 @@ Signed-off-by: Fugang Duan --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -2444,6 +2444,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VI +@@ -2510,6 +2510,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VI DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3364, quirk_disable_all_msi); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8380_0, quirk_disable_all_msi); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI, 0x0761, quirk_disable_all_msi); diff --git a/target/linux/layerscape/patches-5.4/812-pcie-0007-PCI-Disable-MSI-on-marvel-88w9098-and-88w8997-chips.patch b/target/linux/layerscape/patches-5.4/812-pcie-0007-PCI-Disable-MSI-on-marvel-88w9098-and-88w8997-chips.patch index 5b96b84b64..79e7ef9db5 100644 --- a/target/linux/layerscape/patches-5.4/812-pcie-0007-PCI-Disable-MSI-on-marvel-88w9098-and-88w8997-chips.patch +++ b/target/linux/layerscape/patches-5.4/812-pcie-0007-PCI-Disable-MSI-on-marvel-88w9098-and-88w8997-chips.patch @@ -14,7 +14,7 @@ Signed-off-by: Fugang Duan --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -2450,6 +2450,9 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VI +@@ -2516,6 +2516,9 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VI DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI, 0x0761, quirk_disable_all_msi); DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0x43ec, quirk_disable_all_msi); DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0x43ef, quirk_disable_all_msi); diff --git a/target/linux/layerscape/patches-5.4/813-pm-0004-PM-wakeup-Add-routine-to-help-fetch-wakeup-source-ob.patch b/target/linux/layerscape/patches-5.4/813-pm-0004-PM-wakeup-Add-routine-to-help-fetch-wakeup-source-ob.patch index 42514bbc4a..091588b1d7 100644 --- a/target/linux/layerscape/patches-5.4/813-pm-0004-PM-wakeup-Add-routine-to-help-fetch-wakeup-source-ob.patch +++ b/target/linux/layerscape/patches-5.4/813-pm-0004-PM-wakeup-Add-routine-to-help-fetch-wakeup-source-ob.patch @@ -20,7 +20,7 @@ Acked-by: Anson Huang --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c -@@ -248,6 +248,60 @@ void wakeup_source_unregister(struct wak +@@ -250,6 +250,60 @@ void wakeup_source_unregister(struct wak EXPORT_SYMBOL_GPL(wakeup_source_unregister); /** diff --git a/target/linux/layerscape/patches-5.4/816-sdhc-0001-mmc-sdhci-of-esdhc-poll-ESDHC_FLUSH_ASYNC_FIFO-bit-u.patch b/target/linux/layerscape/patches-5.4/816-sdhc-0001-mmc-sdhci-of-esdhc-poll-ESDHC_FLUSH_ASYNC_FIFO-bit-u.patch index 91d1f2ce6f..492ae99d02 100644 --- a/target/linux/layerscape/patches-5.4/816-sdhc-0001-mmc-sdhci-of-esdhc-poll-ESDHC_FLUSH_ASYNC_FIFO-bit-u.patch +++ b/target/linux/layerscape/patches-5.4/816-sdhc-0001-mmc-sdhci-of-esdhc-poll-ESDHC_FLUSH_ASYNC_FIFO-bit-u.patch @@ -58,7 +58,7 @@ Signed-off-by: Yangbo Lu } /* Wait max 20 ms */ -@@ -852,10 +876,7 @@ static void esdhc_tuning_block_enable(st +@@ -887,10 +911,7 @@ static void esdhc_tuning_block_enable(st u32 val; esdhc_clock_enable(host, false); diff --git a/target/linux/layerscape/patches-5.4/816-sdhc-0002-LF-605-mmc-sdhci-of-esdhc-convert-to-use-esdhc_tunin.patch b/target/linux/layerscape/patches-5.4/816-sdhc-0002-LF-605-mmc-sdhci-of-esdhc-convert-to-use-esdhc_tunin.patch index 74dd63d8e5..a80d5c91a4 100644 --- a/target/linux/layerscape/patches-5.4/816-sdhc-0002-LF-605-mmc-sdhci-of-esdhc-convert-to-use-esdhc_tunin.patch +++ b/target/linux/layerscape/patches-5.4/816-sdhc-0002-LF-605-mmc-sdhci-of-esdhc-convert-to-use-esdhc_tunin.patch @@ -15,7 +15,7 @@ Acked-by: Adrian Hunter --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c -@@ -888,20 +888,11 @@ static void esdhc_tuning_block_enable(st +@@ -923,20 +923,11 @@ static void esdhc_tuning_block_enable(st esdhc_clock_enable(host, true); } @@ -37,7 +37,7 @@ Acked-by: Adrian Hunter /* Write TBCTL[11:8]=4'h8 */ val = sdhci_readl(host, ESDHC_TBCTL); val &= ~(0xf << 8); -@@ -920,6 +911,25 @@ static void esdhc_prepare_sw_tuning(stru +@@ -955,6 +946,25 @@ static void esdhc_prepare_sw_tuning(stru val = sdhci_readl(host, ESDHC_TBSTAT); val = sdhci_readl(host, ESDHC_TBSTAT); @@ -63,7 +63,7 @@ Acked-by: Adrian Hunter /* Reset data lines by setting ESDHCCTL[RSTD] */ sdhci_reset(host, SDHCI_RESET_DATA); /* Write 32'hFFFF_FFFF to IRQSTAT register */ -@@ -930,10 +940,8 @@ static void esdhc_prepare_sw_tuning(stru +@@ -965,10 +975,8 @@ static void esdhc_prepare_sw_tuning(stru * then program TBPTR[TB_WNDW_END_PTR] = 4 * div_ratio * and program TBPTR[TB_WNDW_START_PTR] = 8 * div_ratio. */ diff --git a/target/linux/layerscape/patches-5.4/816-sdhc-0003-LF-605-mmc-sdhci-of-esdhc-update-tuning-erratum-A-00.patch b/target/linux/layerscape/patches-5.4/816-sdhc-0003-LF-605-mmc-sdhci-of-esdhc-update-tuning-erratum-A-00.patch index a391616cfb..fcdeb15d8f 100644 --- a/target/linux/layerscape/patches-5.4/816-sdhc-0003-LF-605-mmc-sdhci-of-esdhc-update-tuning-erratum-A-00.patch +++ b/target/linux/layerscape/patches-5.4/816-sdhc-0003-LF-605-mmc-sdhci-of-esdhc-update-tuning-erratum-A-00.patch @@ -20,7 +20,7 @@ Acked-by: Adrian Hunter --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c -@@ -854,20 +854,20 @@ static int esdhc_signal_voltage_switch(s +@@ -889,20 +889,20 @@ static int esdhc_signal_voltage_switch(s } static struct soc_device_attribute soc_tuning_erratum_type1[] = { @@ -51,7 +51,7 @@ Acked-by: Adrian Hunter { }, }; -@@ -935,13 +935,13 @@ static void esdhc_prepare_sw_tuning(stru +@@ -970,13 +970,13 @@ static void esdhc_prepare_sw_tuning(stru /* Write 32'hFFFF_FFFF to IRQSTAT register */ sdhci_writel(host, 0xFFFFFFFF, SDHCI_INT_STATUS); @@ -68,7 +68,7 @@ Acked-by: Adrian Hunter *window_start = 8 * esdhc->div_ratio; *window_end = 4 * esdhc->div_ratio; } else { -@@ -1014,6 +1014,19 @@ static int esdhc_execute_tuning(struct m +@@ -1049,6 +1049,19 @@ static int esdhc_execute_tuning(struct m if (ret) break; diff --git a/target/linux/layerscape/patches-5.4/817-spi-0006-LF-20-2-mtd-spi-nor-Use-1-bit-mode-of-spansion-s25fs.patch b/target/linux/layerscape/patches-5.4/817-spi-0006-LF-20-2-mtd-spi-nor-Use-1-bit-mode-of-spansion-s25fs.patch index ddf7db9a9d..f3df08048a 100644 --- a/target/linux/layerscape/patches-5.4/817-spi-0006-LF-20-2-mtd-spi-nor-Use-1-bit-mode-of-spansion-s25fs.patch +++ b/target/linux/layerscape/patches-5.4/817-spi-0006-LF-20-2-mtd-spi-nor-Use-1-bit-mode-of-spansion-s25fs.patch @@ -11,7 +11,7 @@ Signed-off-by: Kuldeep Singh --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -2352,7 +2352,7 @@ static const struct flash_info spi_nor_i +@@ -2410,7 +2410,7 @@ static const struct flash_info spi_nor_i { "s25fl512s", INFO6(0x010220, 0x4d0080, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | USE_CLSR) }, diff --git a/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch b/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch index 218797247d..f430d334c5 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch @@ -16,7 +16,7 @@ Signed-off-by: Peter Chen --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c -@@ -1260,6 +1260,17 @@ static void dwc3_get_properties(struct d +@@ -1263,6 +1263,17 @@ static void dwc3_get_properties(struct d dwc->maximum_speed = usb_get_maximum_speed(dev); dwc->dr_mode = usb_get_dr_mode(dev); @@ -36,7 +36,7 @@ Signed-off-by: Peter Chen dwc->sysdev_is_parent = device_property_read_bool(dev, --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h -@@ -944,6 +944,7 @@ struct dwc3_scratchpad_array { +@@ -949,6 +949,7 @@ struct dwc3_scratchpad_array { * @nr_scratch: number of scratch buffers * @u1u2: only used on revisions <1.83a for workaround * @maximum_speed: maximum speed requested (mainly for testing purposes) @@ -44,7 +44,7 @@ Signed-off-by: Peter Chen * @revision: revision register contents * @version_type: VERSIONTYPE register contents, a sub release of a revision * @dr_mode: requested mode of operation -@@ -1097,6 +1098,7 @@ struct dwc3 { +@@ -1104,6 +1105,7 @@ struct dwc3 { u32 nr_scratch; u32 u1u2; u32 maximum_speed; @@ -54,7 +54,7 @@ Signed-off-by: Peter Chen * All 3.1 IP version constants are greater than the 3.0 IP --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c -@@ -3376,6 +3376,10 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -3392,6 +3392,10 @@ int dwc3_gadget_init(struct dwc3 *dwc) dwc->gadget.sg_supported = true; dwc->gadget.name = "dwc3-gadget"; dwc->gadget.lpm_capable = true; diff --git a/target/linux/layerscape/patches-5.4/820-usb-0006-usb-dwc3-drd-add-usb-role-switch-class-support-for-d.patch b/target/linux/layerscape/patches-5.4/820-usb-0006-usb-dwc3-drd-add-usb-role-switch-class-support-for-d.patch index aece52c6a4..046b4fd2df 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0006-usb-dwc3-drd-add-usb-role-switch-class-support-for-d.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0006-usb-dwc3-drd-add-usb-role-switch-class-support-for-d.patch @@ -23,7 +23,7 @@ Signed-off-by: Li Jun #include #include -@@ -1082,6 +1083,7 @@ struct dwc3 { +@@ -1089,6 +1090,7 @@ struct dwc3 { void __iomem *regs; size_t regs_size; diff --git a/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch b/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch index 18fe69d53f..f72c6171a8 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch @@ -32,7 +32,7 @@ Reviewed-by: Peter Chen --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c -@@ -1350,6 +1350,9 @@ static void dwc3_get_properties(struct d +@@ -1355,6 +1355,9 @@ static void dwc3_get_properties(struct d dwc->dis_metastability_quirk = device_property_read_bool(dev, "snps,dis_metastability_quirk"); @@ -44,7 +44,7 @@ Reviewed-by: Peter Chen --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h -@@ -1034,6 +1034,8 @@ struct dwc3_scratchpad_array { +@@ -1041,6 +1041,8 @@ struct dwc3_scratchpad_array { * 2 - No de-emphasis * 3 - Reserved * @dis_metastability_quirk: set to disable metastability quirk. @@ -53,7 +53,7 @@ Reviewed-by: Peter Chen * @imod_interval: set the interrupt moderation interval in 250ns * increments or 0 to disable. */ -@@ -1225,6 +1227,7 @@ struct dwc3 { +@@ -1233,6 +1235,7 @@ struct dwc3 { unsigned tx_de_emphasis:2; unsigned dis_metastability_quirk:1; diff --git a/target/linux/layerscape/patches-5.4/820-usb-0010-MLK-22675-usb-dwc3-host-disable-park-mode.patch b/target/linux/layerscape/patches-5.4/820-usb-0010-MLK-22675-usb-dwc3-host-disable-park-mode.patch index bca63debf8..963f9df07c 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0010-MLK-22675-usb-dwc3-host-disable-park-mode.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0010-MLK-22675-usb-dwc3-host-disable-park-mode.patch @@ -54,7 +54,7 @@ Signed-off-by: Li Jun --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c -@@ -1030,6 +1030,21 @@ static int dwc3_core_init(struct dwc3 *d +@@ -1033,6 +1033,21 @@ static int dwc3_core_init(struct dwc3 *d reg |= DWC3_GUCTL_HSTINAUTORETRY; dwc3_writel(dwc->regs, DWC3_GUCTL, reg); @@ -78,8 +78,8 @@ Signed-off-by: Li Jun /* --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h -@@ -253,6 +253,7 @@ - /* Global User Control 1 Register */ +@@ -254,6 +254,7 @@ + #define DWC3_GUCTL1_PARKMODE_DISABLE_SS BIT(17) #define DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS BIT(28) #define DWC3_GUCTL1_DEV_L1_EXIT_BY_HW BIT(24) +#define DWC3_GUCTL1_PARKMODE_DISABLE_SS BIT(17) diff --git a/target/linux/layerscape/patches-5.4/820-usb-0011-usb-dwc3-Add-cache-type-configuration-support.patch b/target/linux/layerscape/patches-5.4/820-usb-0011-usb-dwc3-Add-cache-type-configuration-support.patch index b0d5c9c95a..3f9395f594 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0011-usb-dwc3-Add-cache-type-configuration-support.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0011-usb-dwc3-Add-cache-type-configuration-support.patch @@ -109,7 +109,7 @@ Reviewed-by: Jun Li usb_phy_set_suspend(dwc->usb2_phy, 0); usb_phy_set_suspend(dwc->usb3_phy, 0); ret = phy_power_on(dwc->usb2_generic_phy); -@@ -1890,12 +1942,9 @@ static const struct dev_pm_ops dwc3_dev_ +@@ -1895,12 +1947,9 @@ static const struct dev_pm_ops dwc3_dev_ #ifdef CONFIG_OF static const struct of_device_id of_dwc3_match[] = { diff --git a/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch b/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch index cec6a90682..f140f9d789 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch @@ -24,7 +24,7 @@ Signed-off-by: Peter Chen --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c -@@ -1378,6 +1378,15 @@ int xhci_hub_control(struct usb_hcd *hcd +@@ -1419,6 +1419,15 @@ int xhci_hub_control(struct usb_hcd *hcd /* 4.19.6 Port Test Modes (USB2 Test Mode) */ if (hcd->speed != HCD_USB2) goto error; @@ -42,7 +42,7 @@ Signed-off-by: Peter Chen retval = xhci_enter_test_mode(xhci, test_mode, wIndex, --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c -@@ -3545,6 +3545,129 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * +@@ -3580,6 +3580,129 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * return 0; } @@ -174,7 +174,7 @@ Signed-off-by: Peter Chen * bursts that are required to move all packets in this TD. Only SuperSpeed --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -5352,6 +5352,7 @@ static const struct hc_driver xhci_hc_dr +@@ -5354,6 +5354,7 @@ static const struct hc_driver xhci_hc_dr .disable_usb3_lpm_timeout = xhci_disable_usb3_lpm_timeout, .find_raw_port_number = xhci_find_raw_port_number, .clear_tt_buffer_complete = xhci_clear_tt_buffer_complete, @@ -184,7 +184,7 @@ Signed-off-by: Peter Chen void xhci_init_driver(struct hc_driver *drv, --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -2141,6 +2141,16 @@ int xhci_find_raw_port_number(struct usb +@@ -2143,6 +2143,16 @@ int xhci_find_raw_port_number(struct usb struct xhci_hub *xhci_get_rhub(struct usb_hcd *hcd); void xhci_hc_died(struct xhci_hcd *xhci); diff --git a/target/linux/layerscape/patches-5.4/820-usb-0016-MLK-16735-usb-host-add-XHCI_CDNS_HOST-flag.patch b/target/linux/layerscape/patches-5.4/820-usb-0016-MLK-16735-usb-host-add-XHCI_CDNS_HOST-flag.patch index f21f7009d5..23e5094707 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0016-MLK-16735-usb-host-add-XHCI_CDNS_HOST-flag.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0016-MLK-16735-usb-host-add-XHCI_CDNS_HOST-flag.patch @@ -32,7 +32,7 @@ Signed-off-by: Peter Chen ret = xhci_handshake(&xhci->op_regs->command, --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1872,6 +1872,7 @@ struct xhci_hcd { +@@ -1873,6 +1873,7 @@ struct xhci_hcd { #define XHCI_DEFAULT_PM_RUNTIME_ALLOW BIT_ULL(33) #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) diff --git a/target/linux/layerscape/patches-5.4/820-usb-0017-MLK-19153-2-usb-host-xhci-do-not-return-error-status.patch b/target/linux/layerscape/patches-5.4/820-usb-0017-MLK-19153-2-usb-host-xhci-do-not-return-error-status.patch index ba95233ea3..9081959484 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0017-MLK-19153-2-usb-host-xhci-do-not-return-error-status.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0017-MLK-19153-2-usb-host-xhci-do-not-return-error-status.patch @@ -22,7 +22,7 @@ Signed-off-by: Peter Chen --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c -@@ -2027,12 +2027,9 @@ static int process_ctrl_td(struct xhci_h +@@ -2053,12 +2053,9 @@ static int process_ctrl_td(struct xhci_h switch (trb_comp_code) { case COMP_SUCCESS: diff --git a/target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch b/target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch index c5f59a3915..c54b780cb1 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch @@ -24,7 +24,7 @@ Signed-off-by: Peter Chen --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -5369,6 +5369,8 @@ void xhci_init_driver(struct hc_driver * +@@ -5371,6 +5371,8 @@ void xhci_init_driver(struct hc_driver * drv->reset = over->reset; if (over->start) drv->start = over->start; @@ -35,7 +35,7 @@ Signed-off-by: Peter Chen EXPORT_SYMBOL_GPL(xhci_init_driver); --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1910,6 +1910,7 @@ struct xhci_driver_overrides { +@@ -1911,6 +1911,7 @@ struct xhci_driver_overrides { size_t extra_priv_size; int (*reset)(struct usb_hcd *hcd); int (*start)(struct usb_hcd *hcd); diff --git a/target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch b/target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch index 3f7d385515..fa23167c7e 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch @@ -20,7 +20,7 @@ Signed-off-by: Li Jun --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -4716,7 +4716,8 @@ hub_port_init(struct usb_hub *hub, struc +@@ -4728,7 +4728,8 @@ hub_port_init(struct usb_hub *hub, struc } if (r) { if (r != -ENODEV) diff --git a/target/linux/layerscape/patches-5.4/820-usb-0021-MLK-22099-usb-host-xhci-do-warm-reset-for-link-state.patch b/target/linux/layerscape/patches-5.4/820-usb-0021-MLK-22099-usb-host-xhci-do-warm-reset-for-link-state.patch index 18c9401ac1..9cbf4ee139 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0021-MLK-22099-usb-host-xhci-do-warm-reset-for-link-state.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0021-MLK-22099-usb-host-xhci-do-warm-reset-for-link-state.patch @@ -16,7 +16,7 @@ Signed-off-by: Li Jun --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c -@@ -1682,7 +1682,8 @@ static bool xhci_port_missing_cas_quirk( +@@ -1732,7 +1732,8 @@ static bool xhci_port_missing_cas_quirk( return false; if (((portsc & PORT_PLS_MASK) != XDEV_POLLING) && diff --git a/target/linux/layerscape/patches-5.4/820-usb-0024-LF-387-1-Revert-usb-dwc3-Add-cache-type-configuratio.patch b/target/linux/layerscape/patches-5.4/820-usb-0024-LF-387-1-Revert-usb-dwc3-Add-cache-type-configuratio.patch index 47e4bfc7ed..52c60b0690 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0024-LF-387-1-Revert-usb-dwc3-Add-cache-type-configuratio.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0024-LF-387-1-Revert-usb-dwc3-Add-cache-type-configuratio.patch @@ -81,7 +81,7 @@ Signed-off-by: Ran Wang usb_phy_set_suspend(dwc->usb2_phy, 0); usb_phy_set_suspend(dwc->usb3_phy, 0); ret = phy_power_on(dwc->usb2_generic_phy); -@@ -1942,9 +1890,12 @@ static const struct dev_pm_ops dwc3_dev_ +@@ -1947,9 +1895,12 @@ static const struct dev_pm_ops dwc3_dev_ #ifdef CONFIG_OF static const struct of_device_id of_dwc3_match[] = { diff --git a/target/linux/layerscape/patches-5.4/820-usb-0025-LF-387-4-usb-dwc3-Add-cache-type-configuration-suppo.patch b/target/linux/layerscape/patches-5.4/820-usb-0025-LF-387-4-usb-dwc3-Add-cache-type-configuration-suppo.patch index 4f6df78d0c..8971c6af61 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0025-LF-387-4-usb-dwc3-Add-cache-type-configuration-suppo.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0025-LF-387-4-usb-dwc3-Add-cache-type-configuration-suppo.patch @@ -108,7 +108,7 @@ Reviewed-by: Jun Li usb_phy_set_suspend(dwc->usb2_phy, 0); usb_phy_set_suspend(dwc->usb3_phy, 0); ret = phy_power_on(dwc->usb2_generic_phy); -@@ -1890,12 +1941,16 @@ static const struct dev_pm_ops dwc3_dev_ +@@ -1895,12 +1946,16 @@ static const struct dev_pm_ops dwc3_dev_ #ifdef CONFIG_OF static const struct of_device_id of_dwc3_match[] = { From 1c6990fe6d198718850b6a37998416cac69f6f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20VAR=C3=88NE?= Date: Fri, 8 May 2020 13:39:10 +0200 Subject: [PATCH 08/12] ar71xx: mikrotik: bypass id check in __rb_get_wlan_data() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The id parameter in __rb_get_wlan_data() was incorrectly used on the assumption that id "0" would always be tied to ath9k with RLE encoding and positive id (in fact, only id "1" was valid) would always be tied to ("external") ath10k with LZO encoding. Newer hardware revisions of supported devices prove this assumption to be invalid, with ath9k caldata being now wrapped in MAGIC_ERD and LZO compressed, so disable this check to allow newer hardware to correctly decode caldata for ath9k. Since ath10k caldata is no longer pulled from this implementation, this commit also disables the publication in sysfs to avoid wasting memory. Note: this patch assumes that ath9k caldata is never stored with the new "LZOR" encoding scheme found on some ath10k devices. Signed-off-by: Thibaut VARÈNE --- target/linux/ar71xx/files/arch/mips/ath79/routerboot.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/target/linux/ar71xx/files/arch/mips/ath79/routerboot.c b/target/linux/ar71xx/files/arch/mips/ath79/routerboot.c index 76776e1d84..4c0cd1314a 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/routerboot.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/routerboot.c @@ -206,10 +206,7 @@ __rb_get_wlan_data(u16 id) u8 *erd_data; u16 erd_len; - if (id == 0) - goto err_free; - - err = routerboot_find_tag(tag, tag_len, id, + err = routerboot_find_tag(tag, tag_len, 0x1, &erd_data, &erd_len); if (err) { pr_err("no ERD data found for id %u\n", id); @@ -224,9 +221,6 @@ __rb_get_wlan_data(u16 id) goto err_free; } } else { - if (id != 0) - goto err_free; - err = rle_decode((char *) tag, tag_len, buf, RB_ART_SIZE, &src_done, &dst_done); if (err) { @@ -300,6 +294,7 @@ rb_init_info(void *data, unsigned int size) return &rb_info; } +#if 0 static char *rb_ext_wlan_data; static ssize_t @@ -356,3 +351,4 @@ err_free_wlan_data: } late_initcall(rb_sysfs_init); +#endif From 96414047c957df8b217aaacd9f6b2316bcf20580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20VAR=C3=88NE?= Date: Fri, 8 May 2020 13:46:42 +0200 Subject: [PATCH 09/12] ar71xx: mikrotik: mach-rbspi.c remove wlan id MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Following on the previous commit, this patch removes useless id argument from rbspi_wlan_init(). Signed-off-by: Thibaut VARÈNE --- .../ar71xx/files/arch/mips/ath79/mach-rbspi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c index 6bb42c78e3..cb05c9142c 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c @@ -672,12 +672,12 @@ static struct spi_board_info rbspi_spi_info[] = { } }; -void __init rbspi_wlan_init(u16 id, int wmac_offset) +void __init rbspi_wlan_init(int wmac_offset) { char *art_buf; u8 wlan_mac[ETH_ALEN]; - art_buf = rb_get_ext_wlan_data(id); + art_buf = rb_get_wlan_data(); if (!art_buf) return; @@ -785,10 +785,10 @@ static void __init rbspi_network_setup(u32 flags, int gmac1_offset, ath79_register_eth(1); if (flags & RBSPI_HAS_WLAN0) - rbspi_wlan_init(0, wmac0_offset); + rbspi_wlan_init(wmac0_offset); if (flags & RBSPI_HAS_WLAN1) - rbspi_wlan_init(1, wmac1_offset); + rbspi_wlan_init(wmac1_offset); } static __init void rbspi_register_reset_button(int gpio) @@ -977,7 +977,7 @@ static void __init rb962_setup(void) ath79_register_eth(0); /* WLAN1 MAC is HW MAC + 7 */ - rbspi_wlan_init(1, 7); + rbspi_wlan_init(7); if (flags & RBSPI_HAS_USB) gpio_request_one(RB962_GPIO_USB_PWROFF, GPIOF_ACTIVE_LOW | @@ -1133,7 +1133,7 @@ static void __init rbwapgsc_setup(void) ath79_eth1_data.duplex = DUPLEX_FULL; ath79_register_eth(1); - rbspi_wlan_init(1, 2); + rbspi_wlan_init(2); rbspi_register_reset_button(RBWAPGSC_GPIO_BTN_RESET); @@ -1179,7 +1179,7 @@ static void __init rb911l_setup(void) ath79_register_eth(1); - rbspi_wlan_init(0, 1); + rbspi_wlan_init(1); rbspi_register_reset_button(RB911L_GPIO_BTN_RESET); From 026fe1308c4eea0b629bec617fc7c45ab48c1deb Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 12 May 2020 00:36:15 +0200 Subject: [PATCH 10/12] bcm63xx: use generic diag.sh This commit removes the target-specific diag.sh script. This way, the generic one is used for the target, which uses DT-aliases to specify the LEDs used. Though generic diag.sh allows to use different LEDs to indicate different states, this patch just moves the old assignment and does not try to "improve" the assignment by using additional colors. However, individual proposals to do so are welcome. For the few cases where status_led2 was used in old diag.sh, only the primary LED was migrated. Signed-off-by: Adrian Schmutzler --- target/linux/bcm63xx/base-files/etc/diag.sh | 167 ------------------ .../bcm63xx/dts/bcm3368-netgear-cvg834g.dts | 9 +- .../linux/bcm63xx/dts/bcm63168-sky-sr102.dts | 9 +- .../bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts | 9 +- .../dts/bcm6318-d-link-dsl-275xb-d1.dts | 9 +- .../bcm63xx/dts/bcm6318-sagem-fast-2704n.dts | 9 +- .../linux/bcm63xx/dts/bcm6328-adb-a4001n.dts | 9 +- .../linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts | 9 +- .../bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts | 9 +- .../bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts | 9 +- .../bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts | 9 +- .../dts/bcm6328-comtrend-ar-5387un.dts | 9 +- .../dts/bcm6328-d-link-dsl-274xb-f1.dts | 9 +- .../bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts | 10 +- .../dts/bcm6328-sagem-fast-2704-v2.dts | 9 +- .../dts/bcm6328-sercomm-ad1018-nor.dts | 9 +- .../bcm63xx/dts/bcm6345-dynalink-rta770bw.dts | 9 +- .../bcm63xx/dts/bcm6345-dynalink-rta770w.dts | 9 +- .../bcm63xx/dts/bcm6348-asmax-ar-1004g.dts | 9 +- .../dts/bcm6348-brcm-bcm96348gw-11.dts | 9 +- .../bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts | 9 +- .../bcm63xx/dts/bcm6348-bt-voyager-2110.dts | 9 +- .../dts/bcm6348-comtrend-ct-536plus.dts | 9 +- .../dts/bcm6348-d-link-dsl-2640b-b.dts | 9 +- .../dts/bcm6348-inventel-livebox-1.dts | 9 +- .../dts/bcm6348-t-com-speedport-w-500v.dts | 9 +- .../bcm63xx/dts/bcm6348-tecom-gw6200.dts | 9 +- .../bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts | 11 +- .../dts/bcm6358-d-link-dsl-274xb-c2.dts | 9 +- .../dts/bcm6358-huawei-echolife-hg553.dts | 9 +- .../dts/bcm6358-huawei-echolife-hg556a-a.dts | 9 +- .../dts/bcm6358-huawei-echolife-hg556a-b.dts | 9 +- .../dts/bcm6358-huawei-echolife-hg556a-c.dts | 9 +- .../dts/bcm6358-t-com-speedport-w-303v.dts | 9 +- .../bcm63xx/dts/bcm6358-telsey-cpva642.dts | 9 +- .../dts/bcm6359-huawei-echolife-hg520v.dts | 9 +- .../bcm63xx/dts/bcm6362-sagem-fast-2504n.dts | 9 +- .../bcm63xx/dts/bcm6368-actiontec-r1000h.dts | 9 +- .../linux/bcm63xx/dts/bcm6368-adb-av4202n.dts | 9 +- .../bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts | 9 +- .../dts/bcm6368-comtrend-vr-3025un.dts | 9 +- .../bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts | 9 +- .../dts/bcm6368-huawei-echolife-hg655b.dts | 9 +- .../dts/bcm6368-netgear-dgnd3700-v1.dts | 9 +- .../bcm63xx/dts/bcm6368-observa-vh4032n.dts | 9 +- .../dts/bcm6368-zyxel-p870hw-51a-v2.dts | 9 +- .../dts/bcm6369-comtrend-wap-5813n.dts | 9 +- .../bcm63xx/dts/bcm6369-netgear-evg2000.dts | 9 +- 48 files changed, 377 insertions(+), 216 deletions(-) delete mode 100644 target/linux/bcm63xx/base-files/etc/diag.sh diff --git a/target/linux/bcm63xx/base-files/etc/diag.sh b/target/linux/bcm63xx/base-files/etc/diag.sh deleted file mode 100644 index 4b6d8d6065..0000000000 --- a/target/linux/bcm63xx/base-files/etc/diag.sh +++ /dev/null @@ -1,167 +0,0 @@ -#!/bin/sh -# Copyright (C) 2007-2013 OpenWrt.org - -. /lib/functions.sh -. /lib/functions/leds.sh - -set_state() { - case "$(board_name)" in - actiontec,r1000h) - status_led="R1000H:green:power" - ;; - adb,a4001n) - status_led="A4001N:green:power" - ;; - adb,a4001n1) - status_led="A4001N1:green:power" - ;; - adb,av4202n) - status_led="AV4202N:white:power" - ;; - asmax,ar-1004g) - status_led="AR1004G:green:power" - ;; - brcm,bcm963281tan) - status_led="963281TAN::power" - ;; - brcm,bcm96328avng) - status_led="96328avng::power" - ;; - brcm,bcm96348gw) - status_led="96348GW:green:power" - ;; - brcm,bcm96348gw-11) - status_led="96348GW-11:green:power" - ;; - bt,home-hub-2-a) - status_led="HOMEHUB2A:green:upgrading" - status_led2="HOMEHUB2A:blue:upgrading" - ;; - bt,voyager-2110) - status_led="V2110:power:green" - ;; - comtrend,ar-5315u) - status_led="AR-5315u:green:power" - ;; - comtrend,ar-5381u) - status_led="AR-5381u:green:power" - ;; - comtrend,ar-5387un) - status_led="AR-5387un:green:power" - ;; - comtrend,ct-536plus) - status_led="CT536_CT5621:green:power" - ;; - comtrend,vr-3025u) - status_led="VR-3025u:green:power" - ;; - comtrend,vr-3025un) - status_led="VR-3025un:green:power" - ;; - comtrend,vr-3026e) - status_led="VR-3026e:green:power" - ;; - comtrend,wap-5813n) - status_led="WAP-5813n:green:power" - ;; - d-link,dsl-2640b-b) - status_led="D-4P-W:green:power" - ;; - d-link,dsl-274xb-c2|\ - d-link,dsl-274xb-f1) - status_led="dsl-274xb:green:power" - ;; - d-link,dsl-275xb-d1) - status_led="dsl-275xb:green:power" - ;; - dynalink,rta770bw) - status_led="RTA770BW:green:diag" - ;; - dynalink,rta770w) - status_led="RTA770W:green:diag" - ;; - huawei,echolife-hg520v) - status_led="HW520:green:net" - ;; - huawei,echolife-hg553) - status_led="HW553:blue:power" - ;; - huawei,echolife-hg556a-a|\ - huawei,echolife-hg556a-b|\ - huawei,echolife-hg556a-c) - status_led="HW556:red:power" - ;; - huawei,echolife-hg655b) - status_led="HW65x:green:power" - ;; - inventel,livebox-1) - status_led="Livebox1:red:adsl-fail-power" - ;; - netgear,cvg834g) - status_led="CVG834G:green:power" - ;; - netgear,dgnd3700-v1) - status_led="DGND3700v1_3800B:green:power" - ;; - netgear,evg2000) - status_led="EVG2000:green:power" - ;; - nucom,r5010un-v2) - status_led="R5010UNv2:green:power" - ;; - observa,vh4032n) - status_led="VH4032N:blue:power" - ;; - sagem,fast-2504n) - status_led="fast2504n:green:ok" - ;; - sagem,fast-2704n) - status_led2="F@ST2704N:red:power" - ;; - sagem,fast-2704-v2) - status_led="F@ST2704V2:green:power" - ;; - sercomm,ad1018-nor) - status_led="AD1018:green:power" - ;; - sky,sr102) - status_led="SR102:white:power" - status_led2="SR102:red:power" - ;; - t-com,speedport-w-303v) - status_led="spw303v:green:power+adsl" - ;; - t-com,speedport-w-500v) - status_led="SPW500V:green:power" - ;; - tecom,gw6200) - status_led="GW6200:green:line1" - status_led2="GW6200:green:tel" - ;; - telsey,cpva642) - status_led="CPVA642:green:power:" - ;; - zyxel,p870hw-51a-v2) - status_led="P870HW-51a:green:power" - ;; - esac - - case "$1" in - preinit) - status_led_blink_preinit - ;; - failsafe) - status_led_blink_failsafe - ;; - preinit_regular) - status_led_blink_preinit_regular - ;; - done) - if [ "${status_led/power}" != "$status_led" ]; then - status_led_on - else - status_led_off - fi - ;; - esac -} diff --git a/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts b/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts index 2b25d009b3..0cde89f7af 100644 --- a/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts +++ b/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts @@ -8,6 +8,13 @@ model = "Netgear CVG834G"; compatible = "netgear,cvg834g", "brcm,bcm3368"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -16,7 +23,7 @@ leds { compatible = "gpio-leds"; - power_green { + led_power_green: power_green { label = "CVG834G:green:power"; gpios = <&gpio1 5 0>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts b/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts index e47822af89..7f8cf1ae71 100644 --- a/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts +++ b/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts @@ -8,6 +8,13 @@ model = "SKY SR102"; compatible = "sky,sr102", "brcm,bcm63168", "brcm,bcm63268"; + aliases { + led-boot = &led_power_white; + led-failsafe = &led_power_white; + led-running = &led_power_white; + led-upgrade = &led_power_white; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -50,7 +57,7 @@ label = "SR102:white:inet"; gpios = <&pinctrl 5 0>; }; - power_white { + led_power_white: power_white { label = "SR102:white:power"; gpios = <&pinctrl 6 0>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts b/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts index d1085e7eed..c8e814526b 100644 --- a/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts +++ b/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts @@ -8,6 +8,13 @@ model = "Comtrend AR-5315u"; compatible = "comtrend,ar-5315u", "brcm,bcm6318"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -41,7 +48,7 @@ label = "AR-5315u:green:wps"; gpios = <&pinctrl 0 1>; }; - power_green { + led_power_green: power_green { label = "AR-5315u:green:power"; gpios = <&pinctrl 1 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts b/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts index cf5b296cb7..b22f5891cd 100644 --- a/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts +++ b/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts @@ -8,6 +8,13 @@ model = "D-Link DSL-2750B/DSL-2751 rev D1"; compatible = "d-link,dsl-275xb-d1", "brcm,bcm6318"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -44,7 +51,7 @@ leds { compatible = "gpio-leds"; - power_green { + led_power_green: power_green { label = "dsl-275xb:green:power"; gpios = <&pinctrl 3 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts b/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts index f09310e2bb..d4b0b31ef2 100644 --- a/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts +++ b/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts @@ -8,6 +8,13 @@ model = "Sagem F@st 2704N"; compatible = "sagem,fast-2704n", "brcm,bcm6318"; + aliases { + led-boot = &led_power_red; + led-failsafe = &led_power_red; + led-running = &led_power_red; + led-upgrade = &led_power_red; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -76,7 +83,7 @@ label = "F@ST2704N:green:dsl"; gpios = <&pinctrl 10 1>; }; - power_red { + led_power_red: power_red { label = "F@ST2704N:red:power"; gpios = <&pinctrl 11 1>; }; diff --git a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts index 814274b611..cc556372bf 100644 --- a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts +++ b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts @@ -8,6 +8,13 @@ model = "ADB P.DG A4001N"; compatible = "adb,a4001n", "brcm,bcm6328"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -45,7 +52,7 @@ label = "A4001N:red:power"; gpios = <&pinctrl 4 0>; }; - power_green { + led_power_green: power_green { label = "A4001N:green:power"; gpios = <&pinctrl 8 0>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts index e58f865589..8c8b4566a3 100644 --- a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts +++ b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts @@ -8,6 +8,13 @@ model = "ADB P.DG A4001N1"; compatible = "adb,a4001n1", "brcm,bcm6328"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -45,7 +52,7 @@ label = "A4001N1:green:ppp"; gpios = <&pinctrl 3 1>; }; - power_green { + led_power_green: power_green { label = "A4001N1:green:power"; gpios = <&pinctrl 4 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts index 6fbac7d461..0e301425c6 100644 --- a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts +++ b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts @@ -8,6 +8,13 @@ model = "Broadcom bcm963281TAN reference board"; compatible = "brcm,bcm963281tan", "brcm,bcm6328"; + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -20,7 +27,7 @@ label = "963281TAN::internet"; gpios = <&pinctrl 1 1>; }; - power { + led_power: power { label = "963281TAN::power"; gpios = <&pinctrl 4 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts index a0a6c9ec54..be02005a02 100644 --- a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts +++ b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts @@ -8,6 +8,13 @@ model = "Broadcom BCM96328avng reference board"; compatible = "brcm,bcm96328avng", "brcm,bcm6328"; + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -24,7 +31,7 @@ label = "96328avng::dsl"; gpios = <&pinctrl 3 1>; }; - power { + led_power: power { label = "96328avng::power"; gpios = <&pinctrl 4 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts index e336024913..e8a5d79dd3 100644 --- a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts +++ b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts @@ -8,6 +8,13 @@ model = "Comtrend AR-5381u"; compatible = "comtrend,ar-5381u", "brcm,bcm6328"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -38,7 +45,7 @@ label = "AR-5381u:green:inet"; gpios = <&pinctrl 3 1>; }; - power_green { + led_power_green: power_green { label = "AR-5381u:green:power"; gpios = <&pinctrl 4 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts index 209eda37f4..e1199d2e66 100644 --- a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts +++ b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts @@ -8,6 +8,13 @@ model = "Comtrend AR-5387un"; compatible = "comtrend,ar-5387un", "brcm,bcm6328"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -42,7 +49,7 @@ label = "AR-5387un:green:inet"; gpios = <&pinctrl 7 0>; }; - power_green { + led_power_green: power_green { label = "AR-5387un:green:power"; gpios = <&pinctrl 8 0>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts b/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts index f3fab05062..25b833b0ec 100644 --- a/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts +++ b/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts @@ -8,6 +8,13 @@ model = "D-Link DSL-2740B/DSL-2741B rev F1"; compatible = "d-link,dsl-274xb-f1", "brcm,bcm6328"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -52,7 +59,7 @@ label = "dsl-274xb:green:dsl"; gpios = <&pinctrl 3 1>; }; - power_green { + led_power_green: power_green { label = "dsl-274xb:green:power"; gpios = <&pinctrl 4 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts b/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts index 5084bd8877..7bf0a64d18 100644 --- a/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts +++ b/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts @@ -8,12 +8,18 @@ model = "NuCom R5010UN v2"; compatible = "nucom,r5010un-v2", "brcm,bcm6328"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; }; - keys { compatible = "gpio-keys-polled"; #address-cells = <1>; @@ -50,7 +56,7 @@ label = "R5010UNv2:green:dsl"; gpios = <&pinctrl 3 1>; }; - power_green { + led_power_green: power_green { label = "R5010UNv2:green:power"; gpios = <&pinctrl 4 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts b/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts index d00d8fb4e5..268aebf824 100644 --- a/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts +++ b/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts @@ -8,6 +8,13 @@ model = "Sagem F@st 2704 V2"; compatible = "sagem,fast-2704-v2", "brcm,bcm6328"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -56,7 +63,7 @@ label = "F@ST2704V2:green:dsl"; gpios = <&pinctrl 3 1>; }; - power_green { + led_power_green: power_green { label = "F@ST2704V2:green:power"; gpios = <&pinctrl 4 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts index 36899a4cc0..0d2679c08c 100644 --- a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts +++ b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts @@ -8,6 +8,13 @@ model = "Sercomm AD1018 (SPI flash mod)"; compatible = "sercomm,ad1018-nor", "brcm,bcm6328"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -73,7 +80,7 @@ label = "AD1018:green:internet"; }; - power_green@8 { + led_power_green: power_green@8 { reg = <8>; active-low; label = "AD1018:green:power"; diff --git a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts index f678762c86..877d321423 100644 --- a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts +++ b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts @@ -8,6 +8,13 @@ model = "Siemens Gigaset SE515"; compatible = "dynalink,rta770bw", "brcm,bcm6345"; + aliases { + led-boot = &led_diag; + led-failsafe = &led_diag; + led-running = &led_diag; + led-upgrade = &led_diag; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -40,7 +47,7 @@ gpios = <&gpio0 8 0>; }; - diag { + led_diag: diag { label = "RTA770BW:green:diag"; gpios = <&gpio0 10 1>; }; diff --git a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts index ad0e7ce27d..d9efff961f 100644 --- a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts +++ b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts @@ -8,6 +8,13 @@ model = "Dynalink RTA770W"; compatible = "dynalink,rta770w", "brcm,bcm6345"; + aliases { + led-boot = &led_diag; + led-failsafe = &led_diag; + led-running = &led_diag; + led-upgrade = &led_diag; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -40,7 +47,7 @@ gpios = <&gpio0 8 0>; }; - diag { + led_diag: diag { label = "RTA770W:green:diag"; gpios = <&gpio0 10 1>; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts b/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts index bf7b4a3ec4..408afaa878 100644 --- a/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts +++ b/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts @@ -8,6 +8,13 @@ model = "ASMAX AR 1004g"; compatible = "asmax,ar-1004g", "brcm,bcm6348"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -30,7 +37,7 @@ leds { compatible = "gpio-leds"; - power_green { + led_power_green: power_green { label = "AR1004G:green:power"; gpios = <&pinctrl 0 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts index aeda3c2659..47e0c8fb5c 100644 --- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts +++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts @@ -8,6 +8,13 @@ model = "Broadcom BCM96348GW-11 reference board"; compatible = "brcm,bcm96348gw-11", "brcm,bcm6348"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -30,7 +37,7 @@ leds { compatible = "gpio-leds"; - power_green { + led_power_green: power_green { label = "96348GW-11:green:power"; gpios = <&pinctrl 0 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts index 61a0a3dd5c..fa94068595 100644 --- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts +++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts @@ -8,6 +8,13 @@ model = "Broadcom BCM96348GW reference board"; compatible = "brcm,bcm96348gw", "brcm,bcm6348"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -30,7 +37,7 @@ leds { compatible = "gpio-leds"; - power_green { + led_power_green: power_green { label = "96348GW:green:power"; gpios = <&pinctrl 0 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts index 1eac7e3745..6c2c24f2a4 100644 --- a/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts +++ b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts @@ -8,6 +8,13 @@ model = "BT Voyager 2110"; compatible = "bt,voyager-2110", "brcm,bcm6348"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -30,7 +37,7 @@ leds { compatible = "gpio-leds"; - power_green { + led_power_green: power_green { label = "V2110:green:power"; gpios = <&pinctrl 0 1>; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts index ead9bc3a20..f0486d1967 100644 --- a/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts +++ b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts @@ -8,6 +8,13 @@ model = "Comtrend CT-536+/CT-5621T"; compatible = "comtrend,ct-536plus", "brcm,bcm6348"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -30,7 +37,7 @@ leds { compatible = "gpio-leds"; - power_green { + led_power_green: power_green { label = "CT536_CT5621:green:power"; gpios = <&pinctrl 0 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts b/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts index 4213822a3e..8991a76e3e 100644 --- a/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts +++ b/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts @@ -8,6 +8,13 @@ model = "D-Link DSL-2640B rev B2"; compatible = "d-link,dsl-2640b-b", "brcm,bcm6348"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -30,7 +37,7 @@ leds { compatible = "gpio-leds"; - power_green { + led_power_green: power_green { label = "D-4P-W:green:power"; gpios = <&pinctrl 0 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts b/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts index 6e80675ff7..70c955fdc7 100644 --- a/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts +++ b/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts @@ -8,6 +8,13 @@ model = "Inventel Livebox 1"; compatible = "inventel,livebox-1", "brcm,bcm6348"; + aliases { + led-boot = &led_red_adsl_fail; + led-failsafe = &led_red_adsl_fail; + led-running = &led_red_adsl_fail; + led-upgrade = &led_red_adsl_fail; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -37,7 +44,7 @@ leds { compatible = "gpio-leds"; - red_adsl_fail { + led_red_adsl_fail: red_adsl_fail { label = "Livebox1:red:adsl-fail-power"; gpios = <&pinctrl 0 0>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts b/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts index 8b0d1cacfd..981e21ff2e 100644 --- a/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts +++ b/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts @@ -8,6 +8,13 @@ model = "T-Com Speedport W 500V"; compatible = "t-com,speedport-w-500v", "brcm,bcm6348"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -30,7 +37,7 @@ leds { compatible = "gpio-leds"; - power_green { + led_power_green: power_green { label = "SPW500V:green:power"; gpios = <&pinctrl 0 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts b/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts index c86cbf9203..f985059207 100644 --- a/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts +++ b/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts @@ -8,6 +8,13 @@ model = "TECOM GW6200"; compatible = "tecom,gw6200", "brcm,bcm6348"; + aliases { + led-boot = &led_line1_green; + led-failsafe = &led_line1_green; + led-running = &led_line1_green; + led-upgrade = &led_line1_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -30,7 +37,7 @@ leds { compatible = "gpio-leds"; - line1_green { + led_line1_green: line1_green { label = "GW6200:green:line1"; gpios = <&pinctrl 4 1>; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts b/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts index 351b2945d3..092e070406 100644 --- a/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts +++ b/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts @@ -8,6 +8,13 @@ model = "BT Home Hub 2.0 Type A"; compatible = "bt,home-hub-2-a", "brcm,bcm6358"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_upgrading_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -54,7 +61,7 @@ label = "HOMEHUB2A:red:power"; }; - led@1 { + led_power_green: led@1 { reg = <0>; active-low; label = "HOMEHUB2A:green:power"; @@ -127,7 +134,7 @@ label = "HOMEHUB2A:red:upgrading"; }; - led@13 { + led_upgrading_green: led@13 { reg = <13>; active-low; label = "HOMEHUB2A:green:upgrading"; diff --git a/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts b/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts index 6897378fe8..b508a29f43 100644 --- a/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts +++ b/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts @@ -8,6 +8,13 @@ model = "D-Link DSL-2740B/DSL-2741B rev C2/3"; compatible = "d-link,dsl-274xb-c2", "brcm,bcm6358"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -38,7 +45,7 @@ label = "dsl-274xb:red:power"; gpios = <&pinctrl 4 1>; }; - power_green { + led_power_green: power_green { label = "dsl-274xb:green:power"; gpios = <&pinctrl 5 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts index d23066866e..c73981b47b 100644 --- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts @@ -8,6 +8,13 @@ model = "Huawei EchoLife HG553"; compatible = "huawei,echolife-hg553", "brcm,bcm6358"; + aliases { + led-boot = &led_power_blue; + led-failsafe = &led_power_blue; + led-running = &led_power_blue; + led-upgrade = &led_power_blue; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -37,7 +44,7 @@ leds { compatible = "gpio-leds"; - power_green { + led_power_blue: power_blue { label = "HW553:blue:power"; gpios = <&pinctrl 4 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts index 1827e8e235..25f771cd28 100644 --- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts @@ -8,6 +8,13 @@ model = "Huawei EchoLife HG556a (version A)"; compatible = "huawei,echolife-hg556a-a", "brcm,bcm6358"; + aliases { + led-boot = &led_power_red; + led-failsafe = &led_power_red; + led-running = &led_power_red; + led-upgrade = &led_power_red; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -63,7 +70,7 @@ label = "HW556:red:dsl"; gpios = <&pinctrl 2 1>; }; - power_red { + led_power_red: power_red { label = "HW556:red:power"; gpios = <&pinctrl 3 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts index fa804bef9e..f608fa5709 100644 --- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts @@ -8,6 +8,13 @@ model = "Huawei EchoLife HG556a (version B)"; compatible = "huawei,echolife-hg556a-b", "brcm,bcm6358"; + aliases { + led-boot = &led_power_red; + led-failsafe = &led_power_red; + led-running = &led_power_red; + led-upgrade = &led_power_red; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -63,7 +70,7 @@ label = "HW556:red:dsl"; gpios = <&pinctrl 2 1>; }; - power_red { + led_power_red: power_red { label = "HW556:red:power"; gpios = <&pinctrl 3 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts index 5ed847baab..afb18e666f 100644 --- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts @@ -8,6 +8,13 @@ model = "Huawei EchoLife HG556a (version C)"; compatible = "huawei,echolife-hg556a-c", "brcm,bcm6358"; + aliases { + led-boot = &led_power_red; + led-failsafe = &led_power_red; + led-running = &led_power_red; + led-upgrade = &led_power_red; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -63,7 +70,7 @@ label = "HW556:red:dsl"; gpios = <&pinctrl 2 1>; }; - power_red { + led_power_red: power_red { label = "HW556:red:power"; gpios = <&pinctrl 3 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts b/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts index 4aed5f0eb6..28a515d2fb 100644 --- a/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts +++ b/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts @@ -8,6 +8,13 @@ model = "T-Com Speedport W 303V"; compatible = "t-com,speedport-w-303v", "brcm,bcm6358"; + aliases { + led-boot = &led_power_adsl_green; + led-failsafe = &led_power_adsl_green; + led-running = &led_power_adsl_green; + led-upgrade = &led_power_adsl_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -49,7 +56,7 @@ label = "spw303v:green:ppp"; gpios = <&pinctrl 5 1>; }; - power_adsl_green { + led_power_adsl_green: power_adsl_green { label = "spw303v:green:power+adsl"; gpios = <&pinctrl 22 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts b/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts index e422912297..9d7422145a 100644 --- a/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts +++ b/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts @@ -8,6 +8,13 @@ model = "Telsey CPVA642-type (CPA-ZNTE60T)"; compatible = "telsey,cpva642", "brcm,bcm6358"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -65,7 +72,7 @@ label = "CPVA642:green:link"; gpios = <&pinctrl 10 1>; }; - power_green { + led_power_green: power_green { label = "CPVA642:green:power"; gpios = <&pinctrl 11 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts b/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts index 5809b6da4e..4aa805e574 100644 --- a/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts +++ b/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts @@ -8,6 +8,13 @@ model = "Huawei EchoLife HG520v"; compatible = "huawei,echolife-hg520v", "brcm,bcm6359", "brcm,bcm6358"; + aliases { + led-boot = &led_inet_green; + led-failsafe = &led_inet_green; + led-running = &led_inet_green; + led-upgrade = &led_inet_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -30,7 +37,7 @@ leds { compatible = "gpio-leds"; - inet_green { + led_inet_green: inet_green { label = "HW520:green:net"; gpios = <&pinctrl 32 1>; }; diff --git a/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts b/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts index db8ce7318f..84f7455f95 100644 --- a/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts +++ b/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts @@ -8,6 +8,13 @@ model = "Sagem F@st 2504N"; compatible = "sagem,fast-2504n", "brcm,bcm6362"; + aliases { + led-boot = &led_ok_green; + led-failsafe = &led_ok_green; + led-running = &led_ok_green; + led-upgrade = &led_ok_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -50,7 +57,7 @@ label = "fast2504n:red:internet"; gpios = <&pinctrl 26 1>; }; - ok_green { + led_ok_green: ok_green { label = "fast2504n:green:ok"; gpios = <&pinctrl 28 1>; }; diff --git a/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts b/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts index 05198a1c9a..3b11ce30d9 100644 --- a/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts +++ b/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts @@ -8,6 +8,13 @@ model = "Actiontec R1000H"; compatible = "actiontec,r1000h", "brcm,bcm6368"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -47,7 +54,7 @@ gpios = <&pinctrl 21 1>; }; - power_green { + led_power_green: power_green { label = "R1000H:green:power"; gpios = <&pinctrl 22 0>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts b/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts index df9dc718e1..5b514796cf 100644 --- a/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts +++ b/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts @@ -9,6 +9,13 @@ model = "ADB P.DG AV4202N"; compatible = "adb,av4202n", "brcm,bcm6368"; + aliases { + led-boot = &led_power_white; + led-failsafe = &led_power_white; + led-running = &led_power_white; + led-upgrade = &led_power_white; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -38,7 +45,7 @@ leds { compatible = "gpio-leds"; - power_white { + led_power_white: power_white { label = "AV4202N:white:power"; gpios = <&pinctrl 10 GPIO_ACTIVE_LOW>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts index 248ec1d73d..6083e8e9bb 100644 --- a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts +++ b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts @@ -8,6 +8,13 @@ model = "Comtrend VR-3025u"; compatible = "comtrend,vr-3025u", "brcm,bcm6368"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -38,7 +45,7 @@ label = "VR-3025u:green:inet"; gpios = <&pinctrl 5 0>; }; - power_green { + led_power_green: power_green { label = "VR-3025u:green:power"; gpios = <&pinctrl 22 0>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts index ac1f896434..1431cf5bd5 100644 --- a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts +++ b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts @@ -8,6 +8,13 @@ model = "Comtrend VR-3025un"; compatible = "comtrend,vr-3025un", "brcm,bcm6368"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -38,7 +45,7 @@ label = "VR-3025un:green:inet"; gpios = <&pinctrl 5 0>; }; - power_green { + led_power_green: power_green { label = "VR-3025un:green:power"; gpios = <&pinctrl 22 0>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts index 8048d131a2..3948195e21 100644 --- a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts +++ b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts @@ -8,6 +8,13 @@ model = "Comtrend VR-3026e"; compatible = "comtrend,vr-3026e", "brcm,bcm6368"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -38,7 +45,7 @@ label = "VR-3026e:green:inet"; gpios = <&pinctrl 5 0>; }; - power_green { + led_power_green: power_green { label = "VR-3026e:green:power"; gpios = <&pinctrl 22 0>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts index 3f855bf0c9..0fcac83e7f 100644 --- a/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts +++ b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts @@ -8,6 +8,13 @@ model = "Huawei EchoLife HG655b"; compatible = "huawei,echolife-hg655b", "brcm,bcm6368"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -57,7 +64,7 @@ label = "HW65x:green:usb"; gpios = <&pinctrl 14 1>; }; - power_green { + led_power_green: power_green { label = "HW65x:green:power"; gpios = <&pinctrl 22 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts index 0354d8eddd..9f4040b96e 100644 --- a/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts +++ b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts @@ -8,6 +8,13 @@ model = "Netgear DGND3700v1/DGND3800B"; compatible = "netgear,dgnd3700-v1", "brcm,bcm6368"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -76,7 +83,7 @@ label = "DGND3700v1_3800B:green:lan"; gpios = <&pinctrl 23 1>; }; - power_green { + led_power_green: power_green { label = "DGND3700v1_3800B:green:power"; gpios = <&pinctrl 24 1>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts b/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts index 48f35b16e7..573bec743f 100644 --- a/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts +++ b/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts @@ -8,6 +8,13 @@ model = "Observa VH4032N"; compatible = "observa,vh4032n", "brcm,bcm6368"; + aliases { + led-boot = &led_power_blue; + led-failsafe = &led_power_blue; + led-running = &led_power_blue; + led-upgrade = &led_power_blue; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -53,7 +60,7 @@ label = "VH4032N:red:hspa"; gpios = <&pinctrl 12 1>; }; - power_blue { + led_power_blue: power_blue { label = "VH4032N:blue:power"; gpios = <&pinctrl 22 0>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts b/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts index c123832803..2edb802c60 100644 --- a/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts +++ b/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts @@ -8,6 +8,13 @@ model = "Zyxel P870HW-51a v2"; compatible = "zyxel,p870hw-51a-v2", "brcm,bcm6368"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -37,7 +44,7 @@ leds { compatible = "gpio-leds"; - power_green { + led_power_green: power_green { label = "P870HW-51a:green:power"; gpios = <&pinctrl 0 0>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts b/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts index c6db2721de..e0e24c0182 100644 --- a/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts +++ b/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts @@ -8,6 +8,13 @@ model = "Comtrend WAP-5813n"; compatible = "comtrend,wap-5813n", "brcm,bcm6369", "brcm,bcm6368"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -48,7 +55,7 @@ label = "WAP-5813n:green:inet"; gpios = <&pinctrl 5 0>; }; - power_green { + led_power_green: power_green { label = "WAP-5813n:green:power"; gpios = <&pinctrl 22 0>; default-state = "on"; diff --git a/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts b/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts index 93d4792740..902caa7f3a 100644 --- a/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts +++ b/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts @@ -8,6 +8,13 @@ model = "Netgear EVG2000"; compatible = "netgear,evg2000", "brcm,bcm6369", "brcm,bcm6368"; + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; stdout-path = "serial0:115200n8"; @@ -57,7 +64,7 @@ label = "EVG2000:green:usb"; gpios = <&pinctrl 15 1>; }; - power_green { + led_power_green: power_green { label = "EVG2000:green:power"; gpios = <&pinctrl 22 1>; default-state = "on"; From fdd968d64e507e902891bf8a2be9ac00f80a57e5 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 11 May 2020 11:49:43 +0200 Subject: [PATCH 11/12] bcm63xx: replace "ok" with "okay" for status in DTS files While "ok" is recognized in DT parsing, only "okay" is actually mentioned as valid value. Replace it accordingly. Signed-off-by: Adrian Schmutzler --- target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts | 6 +++--- target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts | 4 ++-- target/linux/bcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts | 4 ++-- target/linux/bcm63xx/dts/bcm63268-inteno-vg50.dts | 4 ++-- target/linux/bcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts | 6 +++--- target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348r.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-comtrend-ct-5365.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-davolink-dv-201amr.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-dynalink-rta1025w.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-netgear-dg834g-v4.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-sagem-fast-2404.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-sagem-fast-2604.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-tecom-gw6000.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-telsey-cpva502plus.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-telsey-magic.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6348-usrobotics-usr9108.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6358-alcatel-rg100a.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts | 6 +++--- target/linux/bcm63xx/dts/bcm6358-comtrend-ct-6373.dts | 6 +++--- target/linux/bcm63xx/dts/bcm6358-d-link-dsl-2650u.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6358-d-link-dva-g3810bn-tl.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts | 4 ++-- .../linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts | 4 ++-- .../linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts | 4 ++-- .../linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6358-pirelli-a226g.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6358-pirelli-a226m.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6358-pirelli-agpf-s0.dts | 4 ++-- .../linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts | 6 +++--- .../linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts | 6 +++--- target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts | 4 ++-- .../linux/bcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts | 6 +++--- target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg622.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts | 4 ++-- target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts | 4 ++-- 89 files changed, 185 insertions(+), 185 deletions(-) diff --git a/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts b/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts index 0cde89f7af..c0ec8d70c7 100644 --- a/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts +++ b/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts @@ -32,7 +32,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -59,9 +59,9 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; &uart1 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts b/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts index 7f8cf1ae71..466bfcd096 100644 --- a/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts +++ b/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts @@ -102,7 +102,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -121,5 +121,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts b/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts index 4edab6418c..92db7c83ad 100644 --- a/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts +++ b/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts @@ -61,7 +61,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -85,5 +85,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref.dts b/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref.dts index f6136b5886..4884760abb 100644 --- a/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref.dts +++ b/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref.dts @@ -55,7 +55,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -79,5 +79,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts b/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts index c8e814526b..000ff99767 100644 --- a/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts +++ b/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts @@ -77,7 +77,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -121,5 +121,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts b/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts index b22f5891cd..f5084829cf 100644 --- a/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts +++ b/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts @@ -91,7 +91,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -136,5 +136,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts b/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts index d4b0b31ef2..c828531dce 100644 --- a/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts +++ b/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts @@ -100,7 +100,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -138,5 +138,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts b/target/linux/bcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts index b4176885ed..2e3a1afa5a 100644 --- a/target/linux/bcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts +++ b/target/linux/bcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts @@ -36,7 +36,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -55,5 +55,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm63268-inteno-vg50.dts b/target/linux/bcm63xx/dts/bcm63268-inteno-vg50.dts index dbbea13f1b..80d5727bc2 100644 --- a/target/linux/bcm63xx/dts/bcm63268-inteno-vg50.dts +++ b/target/linux/bcm63xx/dts/bcm63268-inteno-vg50.dts @@ -36,7 +36,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -55,5 +55,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts b/target/linux/bcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts index bcd2286cf9..e3135151c7 100644 --- a/target/linux/bcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts +++ b/target/linux/bcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts @@ -43,7 +43,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -62,5 +62,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts index cc556372bf..ef3dd43732 100644 --- a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts +++ b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts @@ -69,7 +69,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -104,5 +104,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts index 8c8b4566a3..10bbda87cb 100644 --- a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts +++ b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts @@ -97,7 +97,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -135,5 +135,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts index 0e301425c6..fbf8e7cd47 100644 --- a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts +++ b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts @@ -52,7 +52,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -71,5 +71,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts index be02005a02..9bec24539b 100644 --- a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts +++ b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts @@ -52,7 +52,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -76,5 +76,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts index e8a5d79dd3..a2600cdc72 100644 --- a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts +++ b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts @@ -54,7 +54,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -92,5 +92,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts index e1199d2e66..0501d237e2 100644 --- a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts +++ b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts @@ -62,7 +62,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -100,5 +100,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts b/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts index 25b833b0ec..ef8e5eb27e 100644 --- a/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts +++ b/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts @@ -80,7 +80,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -124,5 +124,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts b/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts index 7bf0a64d18..639cef3a7e 100644 --- a/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts +++ b/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts @@ -77,7 +77,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -115,5 +115,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts b/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts index 268aebf824..1168047251 100644 --- a/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts +++ b/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts @@ -84,7 +84,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -122,5 +122,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts index 0d2679c08c..28c0916c0a 100644 --- a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts +++ b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts @@ -57,7 +57,7 @@ }; &leds { - status = "ok"; + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_leds &pinctrl_serial_led @@ -130,7 +130,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -149,5 +149,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts b/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts index 92363ec3a1..cc9be3fce4 100644 --- a/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts +++ b/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts @@ -41,7 +41,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; @@ -49,5 +49,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts b/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts index 3f6e8c0686..e5aa4e67f4 100644 --- a/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts +++ b/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts @@ -41,7 +41,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; @@ -49,5 +49,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts b/target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts index 8cf96a3a5c..9d7448e09b 100644 --- a/target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts +++ b/target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts @@ -35,7 +35,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -62,5 +62,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts b/target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts index bac605651f..39ce0f3591 100644 --- a/target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts +++ b/target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts @@ -37,7 +37,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -64,5 +64,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts b/target/linux/bcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts index 5aea2ddc8d..1a86007290 100644 --- a/target/linux/bcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts +++ b/target/linux/bcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts @@ -15,7 +15,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; @@ -23,5 +23,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts index 877d321423..d86b37e2be 100644 --- a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts +++ b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts @@ -60,7 +60,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -87,5 +87,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts index d9efff961f..bd304f6f8a 100644 --- a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts +++ b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts @@ -60,7 +60,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -87,5 +87,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts b/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts index 408afaa878..5b00d33bde 100644 --- a/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts +++ b/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts @@ -54,7 +54,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -86,5 +86,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts b/target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts index c39247d405..fd4cece3fb 100644 --- a/target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts +++ b/target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts @@ -55,7 +55,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -87,5 +87,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts index 014fd3fb9d..d63af96ac2 100644 --- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts +++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts @@ -55,7 +55,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; @@ -68,5 +68,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts index 47e0c8fb5c..e261985b7a 100644 --- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts +++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts @@ -62,7 +62,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; @@ -75,5 +75,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts index fa94068595..f47d2fd0fa 100644 --- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts +++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts @@ -62,7 +62,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; @@ -75,5 +75,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348r.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348r.dts index 20c88c48fc..04516e20cc 100644 --- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348r.dts +++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348r.dts @@ -41,7 +41,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; @@ -54,5 +54,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts index 6c2c24f2a4..0df43e7d53 100644 --- a/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts +++ b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts @@ -61,7 +61,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -93,5 +93,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts index 0975cffd65..7076bad65c 100644 --- a/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts +++ b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts @@ -54,7 +54,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -86,5 +86,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-5365.dts b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-5365.dts index 0d36aa21e0..75c0817b20 100644 --- a/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-5365.dts +++ b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-5365.dts @@ -61,7 +61,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -93,5 +93,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts index f0486d1967..c7c2147116 100644 --- a/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts +++ b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts @@ -50,7 +50,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -82,5 +82,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts b/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts index 8991a76e3e..3a092a8b3e 100644 --- a/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts +++ b/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts @@ -58,7 +58,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -90,5 +90,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-davolink-dv-201amr.dts b/target/linux/bcm63xx/dts/bcm6348-davolink-dv-201amr.dts index 6cafc891aa..59a1b7b5e3 100644 --- a/target/linux/bcm63xx/dts/bcm6348-davolink-dv-201amr.dts +++ b/target/linux/bcm63xx/dts/bcm6348-davolink-dv-201amr.dts @@ -15,7 +15,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -47,5 +47,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-dynalink-rta1025w.dts b/target/linux/bcm63xx/dts/bcm6348-dynalink-rta1025w.dts index 122e049b3c..76af7b4147 100644 --- a/target/linux/bcm63xx/dts/bcm6348-dynalink-rta1025w.dts +++ b/target/linux/bcm63xx/dts/bcm6348-dynalink-rta1025w.dts @@ -15,7 +15,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -47,5 +47,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts b/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts index 70c955fdc7..719cd16384 100644 --- a/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts +++ b/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts @@ -74,7 +74,7 @@ &pflash { reg = <0x1e400000 0x800000>; - status = "ok"; + status = "okay"; partitions { compatible = "ecoscentric,redboot-fis-partitions"; @@ -87,5 +87,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-netgear-dg834g-v4.dts b/target/linux/bcm63xx/dts/bcm6348-netgear-dg834g-v4.dts index 4ea096e81a..65a2ac7587 100644 --- a/target/linux/bcm63xx/dts/bcm6348-netgear-dg834g-v4.dts +++ b/target/linux/bcm63xx/dts/bcm6348-netgear-dg834g-v4.dts @@ -51,7 +51,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -83,5 +83,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts b/target/linux/bcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts index f7e203227c..3e4b2812ef 100644 --- a/target/linux/bcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts +++ b/target/linux/bcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts @@ -55,7 +55,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -87,5 +87,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2404.dts b/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2404.dts index 945fcc1f18..d3c0859a65 100644 --- a/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2404.dts +++ b/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2404.dts @@ -15,7 +15,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -47,5 +47,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2604.dts b/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2604.dts index a2d2717575..3aa03b3e04 100644 --- a/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2604.dts +++ b/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2604.dts @@ -51,7 +51,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -83,5 +83,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts b/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts index 981e21ff2e..5f7e641251 100644 --- a/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts +++ b/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts @@ -62,7 +62,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -94,5 +94,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-tecom-gw6000.dts b/target/linux/bcm63xx/dts/bcm6348-tecom-gw6000.dts index 4822b04926..e3876e1366 100644 --- a/target/linux/bcm63xx/dts/bcm6348-tecom-gw6000.dts +++ b/target/linux/bcm63xx/dts/bcm6348-tecom-gw6000.dts @@ -29,7 +29,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -61,5 +61,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts b/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts index f985059207..ec1f88573e 100644 --- a/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts +++ b/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts @@ -57,7 +57,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -89,5 +89,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-telsey-cpva502plus.dts b/target/linux/bcm63xx/dts/bcm6348-telsey-cpva502plus.dts index 71620bc655..f0024ae22d 100644 --- a/target/linux/bcm63xx/dts/bcm6348-telsey-cpva502plus.dts +++ b/target/linux/bcm63xx/dts/bcm6348-telsey-cpva502plus.dts @@ -43,7 +43,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -75,5 +75,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-telsey-magic.dts b/target/linux/bcm63xx/dts/bcm6348-telsey-magic.dts index 1358ebe99f..a058736dbd 100644 --- a/target/linux/bcm63xx/dts/bcm6348-telsey-magic.dts +++ b/target/linux/bcm63xx/dts/bcm6348-telsey-magic.dts @@ -55,7 +55,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -87,5 +87,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts b/target/linux/bcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts index be111edd40..0d79b40d22 100644 --- a/target/linux/bcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts +++ b/target/linux/bcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts @@ -55,7 +55,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -87,5 +87,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6348-usrobotics-usr9108.dts b/target/linux/bcm63xx/dts/bcm6348-usrobotics-usr9108.dts index 366eaf3bcd..4ce7fbce23 100644 --- a/target/linux/bcm63xx/dts/bcm6348-usrobotics-usr9108.dts +++ b/target/linux/bcm63xx/dts/bcm6348-usrobotics-usr9108.dts @@ -28,7 +28,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -60,5 +60,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-alcatel-rg100a.dts b/target/linux/bcm63xx/dts/bcm6358-alcatel-rg100a.dts index 22f50d5ada..e7367b07a3 100644 --- a/target/linux/bcm63xx/dts/bcm6358-alcatel-rg100a.dts +++ b/target/linux/bcm63xx/dts/bcm6358-alcatel-rg100a.dts @@ -37,7 +37,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -64,5 +64,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw.dts b/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw.dts index 669d1943f4..fc38c6e51a 100644 --- a/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw.dts +++ b/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw.dts @@ -41,7 +41,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; @@ -49,5 +49,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts b/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts index a4a977e73d..0248f41597 100644 --- a/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts +++ b/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts @@ -37,7 +37,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; @@ -45,5 +45,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts b/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts index 092e070406..321e7b3020 100644 --- a/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts +++ b/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts @@ -50,7 +50,7 @@ }; &leds { - status = "ok"; + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_serial_led>; @@ -148,7 +148,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -174,5 +174,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-comtrend-ct-6373.dts b/target/linux/bcm63xx/dts/bcm6358-comtrend-ct-6373.dts index c5e38ba6f6..9c990eeb73 100644 --- a/target/linux/bcm63xx/dts/bcm6358-comtrend-ct-6373.dts +++ b/target/linux/bcm63xx/dts/bcm6358-comtrend-ct-6373.dts @@ -47,7 +47,7 @@ }; &leds { - status = "ok"; + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_serial_led>; @@ -78,7 +78,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -105,5 +105,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-2650u.dts b/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-2650u.dts index c2dad26b12..caa6d3f4b4 100644 --- a/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-2650u.dts +++ b/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-2650u.dts @@ -37,7 +37,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -64,5 +64,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts b/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts index b508a29f43..bd40319f4f 100644 --- a/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts +++ b/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts @@ -62,7 +62,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -89,5 +89,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-d-link-dva-g3810bn-tl.dts b/target/linux/bcm63xx/dts/bcm6358-d-link-dva-g3810bn-tl.dts index fcf112a7e0..71c8f53676 100644 --- a/target/linux/bcm63xx/dts/bcm6358-d-link-dva-g3810bn-tl.dts +++ b/target/linux/bcm63xx/dts/bcm6358-d-link-dva-g3810bn-tl.dts @@ -55,7 +55,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -82,5 +82,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts index c73981b47b..63af70ea2e 100644 --- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts @@ -85,7 +85,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -112,5 +112,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts index 25f771cd28..435ed46bb9 100644 --- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts @@ -116,7 +116,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -149,5 +149,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts index f608fa5709..ab31991049 100644 --- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts @@ -116,7 +116,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -149,5 +149,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts index afb18e666f..7fcd50269f 100644 --- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts @@ -111,7 +111,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -144,5 +144,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226g.dts b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226g.dts index 44e297c08a..9ff56f0611 100644 --- a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226g.dts +++ b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226g.dts @@ -94,7 +94,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -121,5 +121,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts index bb1cd29359..d0b1e55213 100644 --- a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts +++ b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts @@ -94,7 +94,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -121,5 +121,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m.dts b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m.dts index e0a6b07697..8642d9d76a 100644 --- a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m.dts +++ b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m.dts @@ -94,7 +94,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -121,5 +121,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-pirelli-agpf-s0.dts b/target/linux/bcm63xx/dts/bcm6358-pirelli-agpf-s0.dts index 0b9c397719..3e020ea010 100644 --- a/target/linux/bcm63xx/dts/bcm6358-pirelli-agpf-s0.dts +++ b/target/linux/bcm63xx/dts/bcm6358-pirelli-agpf-s0.dts @@ -98,7 +98,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -125,5 +125,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts index de22658843..fc15291563 100644 --- a/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts +++ b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts @@ -75,7 +75,7 @@ }; &leds { - status = "ok"; + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_serial_led>; @@ -106,7 +106,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; @@ -114,5 +114,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts index db6c5f3306..2889324672 100644 --- a/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts +++ b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts @@ -75,7 +75,7 @@ }; &leds { - status = "ok"; + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_serial_led>; @@ -106,7 +106,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; @@ -114,5 +114,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts b/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts index 28a515d2fb..e61468e91c 100644 --- a/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts +++ b/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts @@ -73,7 +73,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -100,5 +100,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts b/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts index 9d7422145a..b02c657fa3 100644 --- a/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts +++ b/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts @@ -89,7 +89,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -116,5 +116,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts b/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts index 4aa805e574..a14578b622 100644 --- a/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts +++ b/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts @@ -45,7 +45,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -72,5 +72,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts b/target/linux/bcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts index 4498272887..af172564a2 100644 --- a/target/linux/bcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts +++ b/target/linux/bcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts @@ -58,7 +58,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -96,5 +96,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts b/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts index 84f7455f95..e0716893da 100644 --- a/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts +++ b/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts @@ -73,7 +73,7 @@ }; &hsspi { - status = "ok"; + status = "okay"; flash@0 { compatible = "jedec,spi-nor"; @@ -111,5 +111,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts b/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts index 3b11ce30d9..951603089b 100644 --- a/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts +++ b/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts @@ -83,7 +83,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -107,9 +107,9 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; &uart1 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts b/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts index 5b514796cf..95f98c187d 100644 --- a/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts +++ b/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts @@ -78,7 +78,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -105,5 +105,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts b/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts index 3df15144e4..757009fde6 100644 --- a/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts +++ b/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts @@ -41,7 +41,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; @@ -54,5 +54,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts b/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts index 1004f88396..ba9fcbe12a 100644 --- a/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts +++ b/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts @@ -41,7 +41,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; @@ -54,5 +54,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts index 6083e8e9bb..c5a0e1dc21 100644 --- a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts +++ b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts @@ -62,7 +62,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -95,5 +95,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts index 1431cf5bd5..bd4986312f 100644 --- a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts +++ b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts @@ -62,7 +62,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -95,5 +95,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts index 3948195e21..705c764c91 100644 --- a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts +++ b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts @@ -62,7 +62,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -95,5 +95,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg622.dts b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg622.dts index 77ecc62abd..e220909aeb 100644 --- a/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg622.dts +++ b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg622.dts @@ -52,7 +52,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -92,5 +92,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts index 0fcac83e7f..1ad87a9940 100644 --- a/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts +++ b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts @@ -81,7 +81,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -124,5 +124,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts index 9f4040b96e..0c88d56c86 100644 --- a/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts +++ b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts @@ -100,7 +100,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -188,5 +188,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts b/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts index 573bec743f..af65ded980 100644 --- a/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts +++ b/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts @@ -94,7 +94,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -121,5 +121,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts b/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts index 2edb802c60..d990a30af5 100644 --- a/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts +++ b/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts @@ -69,7 +69,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -101,5 +101,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts b/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts index e0e24c0182..7cbc5d6c37 100644 --- a/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts +++ b/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts @@ -76,7 +76,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -160,5 +160,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; diff --git a/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts b/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts index 902caa7f3a..77228115d9 100644 --- a/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts +++ b/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts @@ -89,7 +89,7 @@ }; &pflash { - status = "ok"; + status = "okay"; partitions { compatible = "fixed-partitions"; @@ -127,5 +127,5 @@ }; &uart0 { - status = "ok"; + status = "okay"; }; From 2308644b0ce938bbdfe6155b12aae85dd02beea7 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 11 May 2020 11:52:34 +0200 Subject: [PATCH 12/12] ipq40xx: replace "ok" with "okay" for status in DTS files While "ok" is recognized in DT parsing, only "okay" is actually mentioned as valid value. Replace it accordingly. Signed-off-by: Adrian Schmutzler --- .../arm/boot/dts/qcom-ipq4018-dap-2610.dts | 26 +++++++++---------- .../arch/arm/boot/dts/qcom-ipq4019-wpj419.dts | 2 +- .../arm/boot/dts/qcom-ipq4029-ap-303h.dts | 2 +- .../dts/qcom-ipq4029-aruba-glenmorangie.dtsi | 2 +- .../arm/boot/dts/qcom-ipq4018-dap-2610.dts | 26 +++++++++---------- .../arch/arm/boot/dts/qcom-ipq4019-wpj419.dts | 2 +- .../arm/boot/dts/qcom-ipq4029-ap-303h.dts | 2 +- .../dts/qcom-ipq4029-aruba-glenmorangie.dtsi | 2 +- ...com-ipq4019-add-USB-devicetree-nodes.patch | 10 +++---- .../900-dts-ipq4019-ap-dk01.1.patch | 4 +-- ...com-ipq4019-add-USB-devicetree-nodes.patch | 10 +++---- .../900-dts-ipq4019-ap-dk01.1.patch | 4 +-- 12 files changed, 46 insertions(+), 46 deletions(-) diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts index 0fd4318527..17d9215544 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts @@ -19,7 +19,7 @@ soc { edma@c080000 { qcom,num_gmac = <1>; - status = "ok"; + status = "okay"; }; tcsr@1949000 { @@ -41,25 +41,25 @@ }; rng@22000 { - status = "ok"; + status = "okay"; }; crypto@8e3a000 { - status = "ok"; + status = "okay"; }; watchdog@b017000 { - status = "ok"; + status = "okay"; }; ess-switch@c000000 { - status = "ok"; + status = "okay"; switch_lan_bmp = <0x20>; switch_wan_bmp = <0x00>; }; ess-psgmii@98000 { - status = "ok"; + status = "okay"; }; }; @@ -91,7 +91,7 @@ &blsp1_spi1 { pinctrl-0 = <&spi_0_pins>; pinctrl-names = "default"; - status = "ok"; + status = "okay"; cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>; flash@0 { @@ -179,17 +179,17 @@ }; &blsp_dma { - status = "ok"; + status = "okay"; }; &blsp1_uart1 { pinctrl-0 = <&serial_pins>; pinctrl-names = "default"; - status = "ok"; + status = "okay"; }; &cryptobam { - status = "ok"; + status = "okay"; }; &gmac0 { @@ -201,7 +201,7 @@ }; &mdio { - status = "ok"; + status = "okay"; }; &tlmm { @@ -231,11 +231,11 @@ }; &wifi0 { - status = "ok"; + status = "okay"; qcom,ath10k-calibration-variant = "dlink,dap-2610"; }; &wifi1 { - status = "ok"; + status = "okay"; qcom,ath10k-calibration-variant = "dlink,dap-2610"; }; diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts index 6cf9d46767..3a0e0b8cfa 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts @@ -275,7 +275,7 @@ i2c_0: i2c@78b7000 { pinctrl-0 = <&i2c_0_pins>; pinctrl-names = "default"; - status = "ok"; + status = "okay"; }; serial@78af000 { diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts index 0859f97c9e..1f7a728492 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts @@ -87,7 +87,7 @@ i2c_0: i2c@78b7000 { pinctrl-0 = <&i2c_0_pins>; pinctrl-names = "default"; - status = "ok"; + status = "okay"; tpm@29 { /* No Driver */ diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi index 6cf80d47d6..4d1d82a272 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi @@ -78,7 +78,7 @@ i2c_0: i2c@78b7000 { pinctrl-0 = <&i2c_0_pins>; pinctrl-names = "default"; - status = "ok"; + status = "okay"; tpm@29 { /* No Driver */ diff --git a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts index 0fd4318527..17d9215544 100644 --- a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts +++ b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts @@ -19,7 +19,7 @@ soc { edma@c080000 { qcom,num_gmac = <1>; - status = "ok"; + status = "okay"; }; tcsr@1949000 { @@ -41,25 +41,25 @@ }; rng@22000 { - status = "ok"; + status = "okay"; }; crypto@8e3a000 { - status = "ok"; + status = "okay"; }; watchdog@b017000 { - status = "ok"; + status = "okay"; }; ess-switch@c000000 { - status = "ok"; + status = "okay"; switch_lan_bmp = <0x20>; switch_wan_bmp = <0x00>; }; ess-psgmii@98000 { - status = "ok"; + status = "okay"; }; }; @@ -91,7 +91,7 @@ &blsp1_spi1 { pinctrl-0 = <&spi_0_pins>; pinctrl-names = "default"; - status = "ok"; + status = "okay"; cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>; flash@0 { @@ -179,17 +179,17 @@ }; &blsp_dma { - status = "ok"; + status = "okay"; }; &blsp1_uart1 { pinctrl-0 = <&serial_pins>; pinctrl-names = "default"; - status = "ok"; + status = "okay"; }; &cryptobam { - status = "ok"; + status = "okay"; }; &gmac0 { @@ -201,7 +201,7 @@ }; &mdio { - status = "ok"; + status = "okay"; }; &tlmm { @@ -231,11 +231,11 @@ }; &wifi0 { - status = "ok"; + status = "okay"; qcom,ath10k-calibration-variant = "dlink,dap-2610"; }; &wifi1 { - status = "ok"; + status = "okay"; qcom,ath10k-calibration-variant = "dlink,dap-2610"; }; diff --git a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts index 6cf9d46767..3a0e0b8cfa 100644 --- a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts +++ b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts @@ -275,7 +275,7 @@ i2c_0: i2c@78b7000 { pinctrl-0 = <&i2c_0_pins>; pinctrl-names = "default"; - status = "ok"; + status = "okay"; }; serial@78af000 { diff --git a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts index 0859f97c9e..1f7a728492 100644 --- a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts +++ b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts @@ -87,7 +87,7 @@ i2c_0: i2c@78b7000 { pinctrl-0 = <&i2c_0_pins>; pinctrl-names = "default"; - status = "ok"; + status = "okay"; tpm@29 { /* No Driver */ diff --git a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi index 6cf80d47d6..4d1d82a272 100644 --- a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi +++ b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi @@ -78,7 +78,7 @@ i2c_0: i2c@78b7000 { pinctrl-0 = <&i2c_0_pins>; pinctrl-names = "default"; - status = "ok"; + status = "okay"; tpm@29 { /* No Driver */ diff --git a/target/linux/ipq40xx/patches-4.19/077-qcom-ipq4019-add-USB-devicetree-nodes.patch b/target/linux/ipq40xx/patches-4.19/077-qcom-ipq4019-add-USB-devicetree-nodes.patch index e02fdf59c2..30a0678fd8 100644 --- a/target/linux/ipq40xx/patches-4.19/077-qcom-ipq4019-add-USB-devicetree-nodes.patch +++ b/target/linux/ipq40xx/patches-4.19/077-qcom-ipq4019-add-USB-devicetree-nodes.patch @@ -19,23 +19,23 @@ Signed-off-by: John Crispin }; + + usb3_ss_phy: ssphy@9a000 { -+ status = "ok"; ++ status = "okay"; + }; + + usb3_hs_phy: hsphy@a6000 { -+ status = "ok"; ++ status = "okay"; + }; + + usb3: usb3@8af8800 { -+ status = "ok"; ++ status = "okay"; + }; + + usb2_hs_phy: hsphy@a8000 { -+ status = "ok"; ++ status = "okay"; + }; + + usb2: usb2@60f8800 { -+ status = "ok"; ++ status = "okay"; + }; }; }; diff --git a/target/linux/ipq40xx/patches-4.19/900-dts-ipq4019-ap-dk01.1.patch b/target/linux/ipq40xx/patches-4.19/900-dts-ipq4019-ap-dk01.1.patch index 48825375eb..5157079762 100644 --- a/target/linux/ipq40xx/patches-4.19/900-dts-ipq4019-ap-dk01.1.patch +++ b/target/linux/ipq40xx/patches-4.19/900-dts-ipq4019-ap-dk01.1.patch @@ -17,7 +17,7 @@ + compatible = "qcom,tcsr"; + reg = <0x194b000 0x100>; + qcom,usb-hsphy-mode-select = ; -+ status = "ok"; ++ status = "okay"; + }; + + ess_tcsr@1953000 { @@ -77,7 +77,7 @@ + }; + usb3_ss_phy: ssphy@9a000 { - status = "ok"; + status = "okay"; }; --- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts +++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts diff --git a/target/linux/ipq40xx/patches-5.4/077-qcom-ipq4019-add-USB-devicetree-nodes.patch b/target/linux/ipq40xx/patches-5.4/077-qcom-ipq4019-add-USB-devicetree-nodes.patch index fbcbecf080..5efc08bcca 100644 --- a/target/linux/ipq40xx/patches-5.4/077-qcom-ipq4019-add-USB-devicetree-nodes.patch +++ b/target/linux/ipq40xx/patches-5.4/077-qcom-ipq4019-add-USB-devicetree-nodes.patch @@ -19,23 +19,23 @@ Signed-off-by: John Crispin }; + + usb3_ss_phy: ssphy@9a000 { -+ status = "ok"; ++ status = "okay"; + }; + + usb3_hs_phy: hsphy@a6000 { -+ status = "ok"; ++ status = "okay"; + }; + + usb3: usb3@8af8800 { -+ status = "ok"; ++ status = "okay"; + }; + + usb2_hs_phy: hsphy@a8000 { -+ status = "ok"; ++ status = "okay"; + }; + + usb2: usb2@60f8800 { -+ status = "ok"; ++ status = "okay"; + }; }; }; diff --git a/target/linux/ipq40xx/patches-5.4/900-dts-ipq4019-ap-dk01.1.patch b/target/linux/ipq40xx/patches-5.4/900-dts-ipq4019-ap-dk01.1.patch index 48825375eb..5157079762 100644 --- a/target/linux/ipq40xx/patches-5.4/900-dts-ipq4019-ap-dk01.1.patch +++ b/target/linux/ipq40xx/patches-5.4/900-dts-ipq4019-ap-dk01.1.patch @@ -17,7 +17,7 @@ + compatible = "qcom,tcsr"; + reg = <0x194b000 0x100>; + qcom,usb-hsphy-mode-select = ; -+ status = "ok"; ++ status = "okay"; + }; + + ess_tcsr@1953000 { @@ -77,7 +77,7 @@ + }; + usb3_ss_phy: ssphy@9a000 { - status = "ok"; + status = "okay"; }; --- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts +++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts