From 221f97ff4737f012c90feb086bc1c2ed86c6001b Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Mon, 11 May 2020 21:29:10 +0200 Subject: [PATCH 01/26] feeds: add freifunk feed Read the freifunk packages, that have been moved from the LuCI feed into its own feed in January 2019. Signed-off-by: Sven Roederer --- feeds.conf.default | 1 + 1 file changed, 1 insertion(+) diff --git a/feeds.conf.default b/feeds.conf.default index da6c665624..03bfacb620 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -2,6 +2,7 @@ src-git packages https://git.openwrt.org/feed/packages.git src-git luci https://git.openwrt.org/project/luci.git src-git routing https://git.openwrt.org/feed/routing.git src-git telephony https://git.openwrt.org/feed/telephony.git +src-git freifunk https://github.com/freifunk/openwrt-packages.git #src-git video https://github.com/openwrt/video.git #src-git targets https://github.com/openwrt/targets.git #src-git management https://github.com/openwrt-management/packages.git From d4dea7efcdc46530d47b2fa33ebc7f6606491d3d Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Sun, 23 Feb 2020 21:39:26 +0900 Subject: [PATCH 02/26] urandom-seed: update Makefile - update SPDX license identifier - use https in URL - use default PKG_BUILD_DIR Suggested-by: Josef Schlehofer Tested-by: Josef Schlehofer Signed-off-by: Sungbo Eo --- package/system/urandom-seed/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package/system/urandom-seed/Makefile b/package/system/urandom-seed/Makefile index aa13765a52..5a48a07ce1 100644 --- a/package/system/urandom-seed/Makefile +++ b/package/system/urandom-seed/Makefile @@ -2,10 +2,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=urandom-seed PKG_VERSION:=1.0 -PKG_RELEASE:=1 -PKG_LICENSE:=GPL-2.0 - -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) +PKG_RELEASE:=2 +PKG_LICENSE:=GPL-2.0-only include $(INCLUDE_DIR)/package.mk @@ -14,7 +12,7 @@ define Package/urandom-seed CATEGORY:=Base system DEPENDS:=+getrandom TITLE:=/etc/urandom.seed handling for OpenWrt - URL:=http://openwrt.org/ + URL:=https://openwrt.org/ endef define Build/Prepare From 751e6ab8e625b7b29d1184c8f28ecd6b2df81fa0 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Wed, 24 Jun 2020 22:30:58 +0200 Subject: [PATCH 03/26] dropbear: fix compilation for uClibc Backport patches which fix compile issue for uClibc-ng : dbrandom.c:174:8: warning: implicit declaration of function 'getrandom'; did you mean 'genrandom'? [-Wimplicit-function-declaration] ret = getrandom(buf, sizeof(buf), GRND_NONBLOCK); ^~~~~~~~~ genrandom dbrandom.c:174:36: error: 'GRND_NONBLOCK' undeclared (first use in this function); did you mean 'SOCK_NONBLOCK'? ret = getrandom(buf, sizeof(buf), GRND_NONBLOCK); ^~~~~~~~~~~~~ SOCK_NONBLOCK Signed-off-by: Hans Dedecker --- .../001-backport_GNU_SOURCE-for-random.patch | 25 ++++++++++++++ ...002-backport-move-GNU_SOURCE-earlier.patch | 34 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 package/network/services/dropbear/patches/001-backport_GNU_SOURCE-for-random.patch create mode 100644 package/network/services/dropbear/patches/002-backport-move-GNU_SOURCE-earlier.patch diff --git a/package/network/services/dropbear/patches/001-backport_GNU_SOURCE-for-random.patch b/package/network/services/dropbear/patches/001-backport_GNU_SOURCE-for-random.patch new file mode 100644 index 0000000000..d9b13d77dd --- /dev/null +++ b/package/network/services/dropbear/patches/001-backport_GNU_SOURCE-for-random.patch @@ -0,0 +1,25 @@ +From 3f5c106a880a02b21739f2022746e6aa7672474c Mon Sep 17 00:00:00 2001 +From: Matt Johnston +Date: Tue, 23 Jun 2020 21:38:46 +0800 +Subject: [PATCH] _GNU_SOURCE for random + +--- + includes.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/includes.h b/includes.h +index e8c3e18..2789f23 100644 +--- a/includes.h ++++ b/includes.h +@@ -125,6 +125,8 @@ + #endif + + #ifdef HAVE_SYS_RANDOM_H ++/* uclibc needs _GNU_SOURCE */ ++#define _GNU_SOURCE + #include + #endif + +-- +2.25.1 + diff --git a/package/network/services/dropbear/patches/002-backport-move-GNU_SOURCE-earlier.patch b/package/network/services/dropbear/patches/002-backport-move-GNU_SOURCE-earlier.patch new file mode 100644 index 0000000000..26454c2829 --- /dev/null +++ b/package/network/services/dropbear/patches/002-backport-move-GNU_SOURCE-earlier.patch @@ -0,0 +1,34 @@ +From a7a67585cbc3fe5df85c641618b347a51a943356 Mon Sep 17 00:00:00 2001 +From: Matt Johnston +Date: Tue, 23 Jun 2020 22:24:58 +0800 +Subject: [PATCH] move GNU_SOURCE earlier + +--- + includes.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/includes.h b/includes.h +index 2789f23..884ebf7 100644 +--- a/includes.h ++++ b/includes.h +@@ -25,6 +25,8 @@ + #ifndef DROPBEAR_INCLUDES_H_ + #define DROPBEAR_INCLUDES_H_ + ++/* uclibc needs _GNU_SOURCE, maybe other things? */ ++#define _GNU_SOURCE + + #include "options.h" + #include "debug.h" +@@ -125,8 +127,6 @@ + #endif + + #ifdef HAVE_SYS_RANDOM_H +-/* uclibc needs _GNU_SOURCE */ +-#define _GNU_SOURCE + #include + #endif + +-- +2.25.1 + From 8ff631feff50e901f75d9cdae4c475050d6fc4a7 Mon Sep 17 00:00:00 2001 From: Natalie Kagelmacher Date: Thu, 14 May 2020 10:44:21 +0200 Subject: [PATCH 04/26] ath79: add support for AVM FRITZ!WLAN Repeater DVB-C This commit adds support for the AVM FRITZ!WLAN Repeater DVB-C SOC: Qualcomm Atheros QCA9556 RAM: 64 MiB FLASH: 16 MB SPI-NOR WLAN: QCA9556 3T3R 2.4 GHZ b/g/n and QCA9880 3T3R 5 GHz n/ac ETH: Atheros AR8033 1000 Base-T DVB-C: EM28174 with MaxLinear MXL251 tuner BTN: WPS Button LED: Power, WLAN, TV, RSSI0-4 Tested and working: - Ethernet (correct MAC, gigabit, iperf3 about 200 Mbit/s) - 2.4 GHz Wi-Fi (correct MAC) - 5 GHz Wi-Fi (correct MAC) - WPS Button (tested using wifitoggle) - LEDs - Installation via EVA bootloader (FTP recovery) - OpenWrt sysupgrade (both CLI and LuCI) - Download of "urlader" (mtd0) Not working: - Internal USB - DVB-C em28174+MxL251 (depends on internal USB) Installation via EVA bootloader (FTP recovery): Set NIC to 192.168.178.3/24 gateway 192.168.178.1 and power on the device, connect to 192.168.178.1 through FTP and sign in with adam2/adam2: ftp> quote USER adam2 ftp> quote PASS adam2 ftp> binary ftp> debug ftp> passive ftp> quote MEDIA FLSH ftp> put openwrt-sysupgrade.bin mtd1 Wait for "Transfer complete" together with the transfer details. Wait two minutes to make sure flash is complete (just to be safe). Then restart the device (power off and on) to boot into OpenWrt. Revert your NIC settings to reach OpenWrt at 192.168.1.1 Signed-off-by: Natalie Kagelmacher [fixed sorting - removed change to other board - prettified commit message] Signed-off-by: David Bauer --- .../linux/ath79/dts/qca9556_avm_fritzdvbc.dts | 111 ++++++++++++++++++ .../generic/base-files/etc/board.d/01_leds | 8 ++ .../generic/base-files/etc/board.d/02_network | 4 +- .../etc/hotplug.d/firmware/10-ath9k-eeprom | 3 +- .../etc/hotplug.d/firmware/11-ath10k-caldata | 3 +- .../base-files/lib/preinit/10_fix_eth_mac.sh | 3 +- target/linux/ath79/image/generic.mk | 10 ++ 7 files changed, 138 insertions(+), 4 deletions(-) create mode 100644 target/linux/ath79/dts/qca9556_avm_fritzdvbc.dts diff --git a/target/linux/ath79/dts/qca9556_avm_fritzdvbc.dts b/target/linux/ath79/dts/qca9556_avm_fritzdvbc.dts new file mode 100644 index 0000000000..28b19f92ef --- /dev/null +++ b/target/linux/ath79/dts/qca9556_avm_fritzdvbc.dts @@ -0,0 +1,111 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "qca9556_avm_fritz-repeater.dtsi" + +/ { + compatible = "avm,fritzdvbc", "qca,qca9556"; + model = "AVM FRITZ!WLAN Repeater DVB-C"; + + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; + + led_spi { + compatible = "spi-gpio"; + #address-cells = <1>; + #size-cells = <0>; + + sck-gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + mosi-gpios = <&gpio 15 GPIO_ACTIVE_LOW>; + num-chipselects = <0>; + + spi_gpio: led_gpio@0 { + compatible = "fairchild,74hc595"; + reg = <0>; + gpio-controller; + #gpio-cells = <2>; + registers-number = <2>; + spi-max-frequency = <10000000>; + + gpio_latch_bit { + gpio-hog; + gpios = <16 GPIO_ACTIVE_HIGH>; + output-high; + line-name = "gpio-latch-bit"; + }; + }; + }; + + /* + * GPIO pins 100 or greater in the vendor GPL dump are redirected + * to the shift register. + * So OEM source pin 100 becomes 0 on the SR and so forth. + */ + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "fritzdvbc:green:power"; + gpios = <&spi_gpio 6 GPIO_ACTIVE_LOW>; + }; + + wlan { + label = "fritzdvbc:green:wlan"; + gpios = <&spi_gpio 7 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; + }; + + tv { + label = "fritzdvbc:green:tv"; + gpios = <&spi_gpio 5 GPIO_ACTIVE_LOW>; + }; + + rssihigh { + label = "fritzdvbc:green:rssihigh"; + gpios = <&spi_gpio 1 GPIO_ACTIVE_LOW>; + }; + + rssimediumhigh { + label = "fritzdvbc:green:rssimediumhigh"; + gpios = <&spi_gpio 2 GPIO_ACTIVE_LOW>; + }; + + rssimedium { + label = "fritzdvbc:green:rssimedium"; + gpios = <&spi_gpio 3 GPIO_ACTIVE_LOW>; + }; + + rssimediumlow { + label = "fritzdvbc:green:rssimediumlow"; + gpios = <&spi_gpio 4 GPIO_ACTIVE_LOW>; + }; + + rssilow { + label = "fritzdvbc:green:rssilow"; + gpios = <&spi_gpio 0 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&pcie0 { + status = "okay"; +}; + +&gpio { + reset-pcie-ep { + gpio-hog; + gpios = <109 GPIO_ACTIVE_HIGH>; + output-high; + line-name = "PCIE EP reset"; + }; + + reset-pcie-bus { + gpio-hog; + gpios = <110 GPIO_ACTIVE_HIGH>; + output-high; + line-name = "PCIE Bus reset"; + }; +}; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds index be0c3b1217..398c9ed495 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds @@ -38,6 +38,14 @@ avm,fritz4020) ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1" ucidef_set_led_switch "lan" "LAN" "$boardname:green:lan" "switch0" "0x1E" ;; +avm,fritzdvbc) + ucidef_set_rssimon "wlan1" "200000" "1" + ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:green:rssilow" "wlan1" "1" "100" + ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "$boardname:green:rssimediumlow" "wlan1" "20" "100" + ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "$boardname:green:rssimedium" "wlan1" "40" "100" + ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "$boardname:green:rssimediumhigh" "wlan1" "60" "100" + ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssihigh" "wlan1" "80" "100" + ;; comfast,cf-e110n-v2) ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth1" ucidef_set_led_switch "wan" "WAN" "$boardname:green:wan" "switch0" "0x02" diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index 02245031fa..4b74565aa3 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -15,6 +15,7 @@ ath79_setup_interfaces() aruba,ap-105|\ avm,fritz1750e|\ avm,fritz300e|\ + avm,fritzdvbc|\ comfast,cf-wr752ac-v1|\ comfast,cf-e130n-v2|\ devolo,dvl1200i|\ @@ -352,7 +353,8 @@ ath79_setup_macs() label_mac=$(mtd_get_mac_binary art 0x1002) ;; avm,fritz1750e|\ - avm,fritz450e) + avm,fritz450e|\ + avm,fritzdvbc) label_mac=$(fritz_tffs -n macwlan -i $(find_mtd_part "tffs (1)")) ;; avm,fritz300e) diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 56d083b4bf..3db4d2a994 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -11,7 +11,8 @@ case "$FIRMWARE" in case $board in avm,fritz1750e|\ avm,fritz4020|\ - avm,fritz450e) + avm,fritz450e|\ + avm,fritzdvbc) caldata_extract_reverse "urlader" 0x1541 0x440 ;; dlink,dap-2695-a1) diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 603557d6c2..9d4306e66b 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -10,7 +10,8 @@ board=$(board_name) case "$FIRMWARE" in "ath10k/cal-pci-0000:00:00.0.bin") case $board in - avm,fritz1750e) + avm,fritz1750e|\ + avm,fritzdvbc) caldata_extract "urlader" 0x198a 0x844 ;; comfast,cf-wr650ac-v1|\ diff --git a/target/linux/ath79/generic/base-files/lib/preinit/10_fix_eth_mac.sh b/target/linux/ath79/generic/base-files/lib/preinit/10_fix_eth_mac.sh index 61577a376b..c5d9cd536f 100644 --- a/target/linux/ath79/generic/base-files/lib/preinit/10_fix_eth_mac.sh +++ b/target/linux/ath79/generic/base-files/lib/preinit/10_fix_eth_mac.sh @@ -3,7 +3,8 @@ preinit_set_mac_address() { case $(board_name) in avm,fritz1750e|\ - avm,fritz450e) + avm,fritz450e|\ + avm,fritzdvbc) ip link set dev eth0 address $(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)")) ;; dlink,dap-2695-a1) diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index e92dbc99d6..9f296adaa7 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -223,6 +223,16 @@ define Device/avm_fritz450e endef TARGET_DEVICES += avm_fritz450e +define Device/avm_fritzdvbc + $(Device/avm) + SOC := qca9556 + IMAGE_SIZE := 15232k + DEVICE_MODEL := FRITZ!WLAN Repeater DVB-C + DEVICE_PACKAGES += rssileds kmod-ath10k-ct-smallbuffers \ + ath10k-firmware-qca988x-ct -swconfig +endef +TARGET_DEVICES += avm_fritzdvbc + define Device/buffalo_bhr-4grv SOC := ar7242 DEVICE_VENDOR := Buffalo From 870588b6ebd8d818f65e5784bc866a8d67de0a31 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 25 Jun 2020 02:36:19 +0200 Subject: [PATCH 05/26] mac80211: ath9k: enable MFP capability unconditionally ath9k will already fallback on software-crypto for chipsets not supporting IEEE802.11w (MFP). So advertising MFP is not dependent on disabling HW crypto for all traffic entirely. Tested on Sonicwall SonicPoint Ni (AR9132) Signed-off-by: David Bauer --- ...abled-MFP-capability-unconditionally.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/kernel/mac80211/patches/ath/450-ath9k-enabled-MFP-capability-unconditionally.patch diff --git a/package/kernel/mac80211/patches/ath/450-ath9k-enabled-MFP-capability-unconditionally.patch b/package/kernel/mac80211/patches/ath/450-ath9k-enabled-MFP-capability-unconditionally.patch new file mode 100644 index 0000000000..c75d6c7982 --- /dev/null +++ b/package/kernel/mac80211/patches/ath/450-ath9k-enabled-MFP-capability-unconditionally.patch @@ -0,0 +1,34 @@ +From d946085ff5a331de64e91a2e3c96b9ca79d740f5 Mon Sep 17 00:00:00 2001 +From: David Bauer +Date: Mon, 15 Jun 2020 00:10:34 +0200 +Subject: [PATCH] ath9k: enabled MFP capability unconditionally + +ath9k will already fallback on software-crypto for chipsets not +supporting IEEE802.11w (MFP). So advertising MFP is not dependent +on disabling HW crypto for all traffic entirely. + +Signed-off-by: David Bauer +--- + drivers/net/wireless/ath/ath9k/init.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +--- a/drivers/net/wireless/ath/ath9k/init.c ++++ b/drivers/net/wireless/ath/ath9k/init.c +@@ -928,6 +928,7 @@ static void ath9k_set_hw_capab(struct at + ieee80211_hw_set(hw, HOST_BROADCAST_PS_BUFFERING); + ieee80211_hw_set(hw, SUPPORT_FAST_XMIT); + ieee80211_hw_set(hw, SUPPORTS_CLONED_SKBS); ++ ieee80211_hw_set(hw, MFP_CAPABLE); + + if (ath9k_ps_enable) + ieee80211_hw_set(hw, SUPPORTS_PS); +@@ -940,9 +941,6 @@ static void ath9k_set_hw_capab(struct at + IEEE80211_RADIOTAP_MCS_HAVE_STBC; + } + +- if (AR_SREV_9160_10_OR_LATER(sc->sc_ah) || ath9k_modparam_nohwcrypt) +- ieee80211_hw_set(hw, MFP_CAPABLE); +- + hw->wiphy->features |= NL80211_FEATURE_ACTIVE_MONITOR | + NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE | + NL80211_FEATURE_P2P_GO_CTWIN; From 54b19e213aba6ec140614901f098593f7e395a47 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 25 Jun 2020 22:31:40 +0200 Subject: [PATCH 06/26] ramips: drop redundant chosen/bootargs chosen/bootargs are defined to the same value in device DTS files that is already set in the SoC DTSI. Remove the redundant definitions. Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts | 4 ---- target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts | 4 ---- target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts | 4 ---- target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi | 4 ---- target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts | 4 ---- .../ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi | 4 ---- target/linux/ramips/dts/mt7620a_netgear_ex3x00_ex61xx.dtsi | 4 ---- target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi | 4 ---- target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts | 4 ---- target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts | 4 ---- target/linux/ramips/dts/mt7628an_skylab_skw92a.dts | 6 +----- target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts | 4 ---- target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts | 4 ---- target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts | 4 ---- 14 files changed, 1 insertion(+), 57 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts b/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts index 6eab114fa5..6c603bd12f 100644 --- a/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts +++ b/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts @@ -9,10 +9,6 @@ compatible = "dovado,tiny-ac", "ralink,mt7620a-soc"; model = "Dovado Tiny AC"; - chosen { - bootargs = "console=ttyS0,57600"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts index 977f0aa356..f4b3132fb9 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts +++ b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts @@ -29,10 +29,6 @@ led-upgrade = &led_power; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts b/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts index 966c47b465..f5ca7dc61d 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts +++ b/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts @@ -17,10 +17,6 @@ led-upgrade = &led_power; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi index 4f2745286d..be83db2503 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi +++ b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi @@ -15,10 +15,6 @@ led-upgrade = &led_power; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts b/target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts index 641b5ad7b1..092792fe40 100644 --- a/target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts +++ b/target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts @@ -17,10 +17,6 @@ led-upgrade = &led_wps; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi b/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi index 54336ed1fe..f48cd8887b 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi +++ b/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi @@ -4,10 +4,6 @@ #include "mt7620a.dtsi" / { - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex3x00_ex61xx.dtsi b/target/linux/ramips/dts/mt7620a_netgear_ex3x00_ex61xx.dtsi index 1f255c76b2..0272df5ab8 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_ex3x00_ex61xx.dtsi +++ b/target/linux/ramips/dts/mt7620a_netgear_ex3x00_ex61xx.dtsi @@ -4,10 +4,6 @@ #include "mt7620a.dtsi" / { - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi b/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi index add4e6d69e..7e16f097ef 100644 --- a/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi +++ b/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi @@ -13,10 +13,6 @@ led-upgrade = &led_power; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts index ae085255b3..23a112d168 100644 --- a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts +++ b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts @@ -10,10 +10,6 @@ compatible = "hilink,hlk-7628n", "mediatek,mt7628an-soc"; model = "HILINK HLK-7628N"; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts index 4a05264d7f..7c2ebf1b6b 100644 --- a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts +++ b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts @@ -16,10 +16,6 @@ led-upgrade = &led_status; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts index a231985b9c..5cbfcf8986 100644 --- a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts +++ b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts @@ -6,7 +6,7 @@ #include #include -/{ +/ { compatible = "skylab,skw92a", "mediatek,mt7628an-soc"; model = "SKYLAB SKW92A"; @@ -15,10 +15,6 @@ led-failsafe = &led_power; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts index 21d804f77c..bf199f226c 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts @@ -18,10 +18,6 @@ label-mac-device = ðernet; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts index e1e9479c81..a14f3cbef3 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts @@ -8,10 +8,6 @@ compatible = "wavlink,wl-wn570ha1", "mediatek,mt7628an-soc"; model = "Wavlink WL-WN570HA1"; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts index bee13a9683..35ef3cbf1a 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts @@ -8,10 +8,6 @@ compatible = "wavlink,wl-wn575a3", "mediatek,mt7628an-soc"; model = "Wavlink WL-WN575A3"; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; From 635f111148c3f7ccb0ecc92863a3b1a142f6ebeb Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 25 Jun 2020 23:09:05 +0200 Subject: [PATCH 07/26] ath79: drop and consolidate redundant chosen/bootargs In ath79, for several SoCs the console bootargs are defined to the very same value in every device's DTS. Consolidate these definitions in the SoC dtsi files and drop further redundant definitions elsewhere. The only device without any bootargs set has been OpenMesh OM5P-AC V2. This will now inherit the setting from qca955x.dtsi Note that while this tidies up master a lot, it might develop into a frequent pitfall for backports. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/ar7100.dtsi | 4 ++++ target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi | 4 ---- target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dts | 4 ---- target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts | 4 ---- target/linux/ath79/dts/ar7161_netgear_wndr.dtsi | 4 ---- target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts | 4 ---- target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi | 4 ---- target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi | 4 ---- target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts | 4 ---- target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts | 4 ---- target/linux/ath79/dts/qca9531_yuncore_a770.dts | 4 ---- target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi | 4 ---- target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi | 4 ---- target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts | 4 ---- target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi | 4 ---- target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi | 4 ---- target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi | 4 ---- target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi | 4 ---- .../dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts | 4 ---- target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts | 4 ---- target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi | 4 ---- target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi | 4 ---- target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi | 4 ---- target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts | 4 ---- target/linux/ath79/dts/qca9558_domywifi_dw33d.dts | 4 ---- target/linux/ath79/dts/qca9558_engenius_ecb1750.dts | 4 ---- target/linux/ath79/dts/qca9558_engenius_epg5000.dts | 4 ---- .../linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts | 4 ---- .../dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts | 4 ---- target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi | 4 ---- target/linux/ath79/dts/qca9558_ocedo_koala.dts | 4 ---- target/linux/ath79/dts/qca9558_ocedo_ursus.dts | 4 ---- target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts | 4 ---- target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi | 4 ---- target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi | 4 ---- target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts | 4 ---- target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi | 4 ---- target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts | 4 ---- target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi | 4 ---- target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts | 4 ---- target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts | 4 ---- target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 4 ---- target/linux/ath79/dts/qca955x.dtsi | 4 ++++ target/linux/ath79/dts/qca955x_ubnt_xc.dtsi | 6 ------ target/linux/ath79/dts/qca9561_avm_fritz4020.dts | 4 ---- target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts | 4 ---- target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi | 4 ---- target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi | 4 ---- target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts | 4 ---- target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi | 4 ---- target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts | 4 ---- target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi | 4 ---- target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi | 4 ---- target/linux/ath79/dts/qca9563_nec_wg1200cr.dts | 4 ---- target/linux/ath79/dts/qca9563_nec_wg800hp.dts | 4 ---- target/linux/ath79/dts/qca9563_netgear_wndr.dtsi | 4 ---- target/linux/ath79/dts/qca9563_phicomm_k2t.dts | 4 ---- target/linux/ath79/dts/qca9563_rosinson_wr818.dts | 4 ---- target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts | 4 ---- target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts | 4 ---- target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi | 4 ---- target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi | 4 ---- target/linux/ath79/dts/qca9563_tplink_re450.dtsi | 4 ---- target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi | 4 ---- target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi | 4 ---- target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi | 4 ---- target/linux/ath79/dts/qca956x.dtsi | 4 ++++ target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi | 4 ---- 68 files changed, 12 insertions(+), 262 deletions(-) diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi index e3f0edccff..fe88cfab2d 100644 --- a/target/linux/ath79/dts/ar7100.dtsi +++ b/target/linux/ath79/dts/ar7100.dtsi @@ -5,6 +5,10 @@ / { compatible = "qca,ar7100"; + chosen { + bootargs = "console=ttyS0,115200"; + }; + cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi index e957a51e27..58753b6d4a 100644 --- a/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi +++ b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi @@ -12,10 +12,6 @@ led-running = &led_user; }; - chosen { - bootargs = "console=ttyS0,115200"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dts b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dts index b3855eff06..43f35683bd 100644 --- a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dts +++ b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dts @@ -16,10 +16,6 @@ led-upgrade = &led_diag; }; - chosen { - bootargs = "console=ttyS0,115200"; - }; - extosc: ref { compatible = "fixed-clock"; #clock-cells = <0>; diff --git a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts index 5e35dddd4b..bb6c31da9e 100644 --- a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts +++ b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts @@ -17,10 +17,6 @@ led-upgrade = &led_power_orange; }; - chosen { - bootargs = "console=ttyS0,115200"; - }; - extosc: ref { compatible = "fixed-clock"; #clock-cells = <0>; diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi index f1db1ffd58..87c619aa03 100644 --- a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi +++ b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi @@ -14,10 +14,6 @@ label-mac-device = ð0; }; - chosen { - bootargs = "console=ttyS0,115200"; - }; - extosc: ref { compatible = "fixed-clock"; #clock-cells = <0>; diff --git a/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts b/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts index 8e0a80cb32..5ebfb4c872 100644 --- a/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts +++ b/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts @@ -10,10 +10,6 @@ compatible = "siemens,ws-ap3610", "qca,ar7161"; model = "Siemens WS-AP3610"; - chosen { - bootargs = "console=ttyS0,115200"; - }; - aliases { led-boot = &led_power_green; led-failsafe = &led_power_red; diff --git a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi index fc5d8335b5..cf4095379b 100644 --- a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi +++ b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi @@ -6,10 +6,6 @@ #include "ar7100.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200"; - }; - aliases { led-boot = &led_rf; led-failsafe = &led_rf; diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi index 9d9af23bab..82d232d444 100644 --- a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi +++ b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi @@ -6,10 +6,6 @@ #include "ar9344.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts index 130944f4f5..3aa6bd1367 100644 --- a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts +++ b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts @@ -18,10 +18,6 @@ label-mac-device = &wmac; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts index 4f5a29cfa0..0e338fe012 100644 --- a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts +++ b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts @@ -18,10 +18,6 @@ label-mac-device = &wmac; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ath79/dts/qca9531_yuncore_a770.dts b/target/linux/ath79/dts/qca9531_yuncore_a770.dts index 1caae75f1d..21283d98df 100644 --- a/target/linux/ath79/dts/qca9531_yuncore_a770.dts +++ b/target/linux/ath79/dts/qca9531_yuncore_a770.dts @@ -17,10 +17,6 @@ led-upgrade = &led_status; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi index e0505e5724..fb805ff66a 100644 --- a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi +++ b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi @@ -6,10 +6,6 @@ #include "qca953x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_link4; led-failsafe = &led_link4; diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi index 546a87a9b6..19d101f8cc 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi @@ -14,10 +14,6 @@ led-upgrade = &led_system; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts index 5236912047..f2e2dee04f 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts @@ -18,10 +18,6 @@ label-mac-device = &wmac; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi index f89d020672..df920c842f 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi @@ -6,10 +6,6 @@ #include "qca953x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_system; led-failsafe = &led_system; diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi index 3559481f7d..ade5dec718 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi @@ -6,10 +6,6 @@ #include "qca953x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { label-mac-device = &wmac; }; diff --git a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi index b24ed1fb14..fcfd82702c 100644 --- a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi +++ b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi @@ -6,10 +6,6 @@ #include "qca953x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_system; led-failsafe = &led_system; diff --git a/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi b/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi index 13e0b3371a..9d18995395 100644 --- a/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi +++ b/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi @@ -7,10 +7,6 @@ #include "qca955x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts index feae550039..c5c51b6879 100644 --- a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts +++ b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts @@ -15,10 +15,6 @@ serial0 = &uart; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts index 7f6c6b5889..d7380bac38 100644 --- a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts +++ b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts @@ -17,10 +17,6 @@ led-upgrade = &led_power; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi b/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi index 2b199bfa48..78ee3a39db 100644 --- a/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi +++ b/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi @@ -13,10 +13,6 @@ led-upgrade = &led_power; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - leds: leds { compatible = "gpio-leds"; diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi index e2a71c0ce6..1a93a023af 100644 --- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi +++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi @@ -6,10 +6,6 @@ #include "qca955x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi index fc15dd4416..208d6e3580 100644 --- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi +++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi @@ -16,10 +16,6 @@ #include "qca955x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts index 4ae9ee2b47..2c17ab8b61 100644 --- a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts +++ b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts @@ -10,10 +10,6 @@ compatible = "dlink,dap-2695-a1", "qca,qca9558"; model = "D-link DAP-2695-A1"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_power_red; led-failsafe = &led_power_red; diff --git a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts index 5e6e44be74..876e3d118c 100644 --- a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts +++ b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts @@ -10,10 +10,6 @@ compatible = "domywifi,dw33d", "qca,qca9558"; model = "DomyWifi DW33D"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_system; led-failsafe = &led_system; diff --git a/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts b/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts index 15286b7670..a1efcaffe1 100644 --- a/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts +++ b/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts @@ -10,10 +10,6 @@ compatible = "engenius,ecb1750", "qca,qca9558"; model = "EnGenius ECB1750"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_power_orange; led-failsafe = &led_power_orange; diff --git a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts index 94daefbb79..eccd3a968d 100644 --- a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts +++ b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts @@ -10,10 +10,6 @@ model = "EnGenius EPG5000"; compatible = "engenius,epg5000", "qca,qca9558"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_power; led-failsafe = &led_power; diff --git a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts index ef00d1807b..8a55abd244 100644 --- a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts +++ b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts @@ -10,10 +10,6 @@ compatible = "librerouter,librerouter-v1", "qca,qca9558"; model = "LibreRouter v1"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_system; led-failsafe = &led_system; diff --git a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts index 391c034dab..a3f42f87bf 100644 --- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts +++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts @@ -17,10 +17,6 @@ serial0 = &uart; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi index 19b6d5c8cb..c15c5c023b 100644 --- a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi +++ b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi @@ -6,10 +6,6 @@ #include "qca955x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_power_green; led-failsafe = &led_power_amber; diff --git a/target/linux/ath79/dts/qca9558_ocedo_koala.dts b/target/linux/ath79/dts/qca9558_ocedo_koala.dts index b3934a90d4..ff4230c3b5 100644 --- a/target/linux/ath79/dts/qca9558_ocedo_koala.dts +++ b/target/linux/ath79/dts/qca9558_ocedo_koala.dts @@ -10,10 +10,6 @@ compatible = "ocedo,koala", "qca,qca9558"; model = "OCEDO Koala"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_system; led-failsafe = &led_system; diff --git a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts index d629f5b6ba..a97e36aad3 100644 --- a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts +++ b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts @@ -10,10 +10,6 @@ compatible = "ocedo,ursus", "qca,qca9558"; model = "OCEDO Ursus"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts b/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts index 98f2789564..ba3a338912 100644 --- a/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts +++ b/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts @@ -10,10 +10,6 @@ model = "Sitecom WLR-8100 (X8 AC1750)"; compatible = "sitecom,wlr-8100", "qca,qca9558"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_status_amber; led-failsafe = &led_status_amber; diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi index 1a550137dd..1f3d0b8d7b 100644 --- a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi @@ -6,10 +6,6 @@ #include "qca955x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_system; led-failsafe = &led_system; diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi index aab8eac7ce..2d63671700 100644 --- a/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi @@ -6,10 +6,6 @@ #include "qca955x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_system; led-failsafe = &led_system; diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts index 8e79e12617..887b6eea5f 100644 --- a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts +++ b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts @@ -18,10 +18,6 @@ mdio-gpio0 = &mdio2; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi index 2dde5585cd..618f0d434b 100644 --- a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi @@ -6,10 +6,6 @@ #include "qca955x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_power; led-failsafe = &led_power; diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts index 0003bd1924..70fcfd3524 100644 --- a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts +++ b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts @@ -10,10 +10,6 @@ compatible = "tplink,tl-wdr4900-v2", "qca,qca9558"; model = "TP-Link TL-WDR4900 v2"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_system; led-failsafe = &led_system; diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi index 8a39a10ba5..aca5745ff3 100644 --- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi @@ -6,10 +6,6 @@ #include "qca955x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_system; led-failsafe = &led_system; diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts index fb60631a3c..bcd9e4d18b 100644 --- a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts +++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts @@ -10,10 +10,6 @@ compatible = "tplink,tl-wr941n-v7-cn", "qca,qca9558"; model = "TP-Link TL-WR941N v7 (CN)"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_system; led-failsafe = &led_system; diff --git a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts index fb7d5fe40c..e23a5991b1 100644 --- a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts +++ b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts @@ -10,10 +10,6 @@ compatible = "trendnet,tew-823dru", "qca,qca9558"; model = "TRENDNET TEW-823DRU"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_power_green; led-failsafe = &led_power_green; diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts index ac4a70fbde..ade9159fcf 100644 --- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts +++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts @@ -10,10 +10,6 @@ compatible = "zyxel,nbg6716", "qca,qca9558"; model = "ZyXEL NBG6716"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_power; led-failsafe = &led_power; diff --git a/target/linux/ath79/dts/qca955x.dtsi b/target/linux/ath79/dts/qca955x.dtsi index 5bcaccaa14..ff8ac70d73 100644 --- a/target/linux/ath79/dts/qca955x.dtsi +++ b/target/linux/ath79/dts/qca955x.dtsi @@ -8,6 +8,10 @@ #address-cells = <1>; #size-cells = <1>; + chosen { + bootargs = "console=ttyS0,115200n8"; + }; + cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/ath79/dts/qca955x_ubnt_xc.dtsi b/target/linux/ath79/dts/qca955x_ubnt_xc.dtsi index bd8ebaf040..b27a9c2fe8 100644 --- a/target/linux/ath79/dts/qca955x_ubnt_xc.dtsi +++ b/target/linux/ath79/dts/qca955x_ubnt_xc.dtsi @@ -5,12 +5,6 @@ #include "qca955x.dtsi" -/ { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; -}; - &uart { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts index 75cc5761ba..7c13c3e470 100644 --- a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts +++ b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts @@ -17,10 +17,6 @@ led-upgrade = &led_info_red; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - led_spi { compatible = "spi-gpio"; #address-cells = <1>; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts index e7b30df81f..7078da479e 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts @@ -10,10 +10,6 @@ compatible = "tplink,archer-c25-v1", "qca,qca9561"; model = "TP-Link Archer C25 v1"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_power; led-failsafe = &led_power; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi index c8e4710b39..4d1eb64160 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi @@ -16,10 +16,6 @@ label-mac-device = ð1; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - led_spi { compatible = "spi-gpio"; #address-cells = <1>; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi index b1b166d89a..993c6acc56 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi @@ -6,10 +6,6 @@ #include "qca956x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_power; led-failsafe = &led_power; diff --git a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts index e4c737b8ff..5f1748f936 100644 --- a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts +++ b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts @@ -17,10 +17,6 @@ led-upgrade = &led_red; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi b/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi index 6b2fb1c4a0..5e2c614dfc 100644 --- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi +++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi @@ -6,10 +6,6 @@ #include "qca956x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts b/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts index 8502bed4c5..b9e413a265 100644 --- a/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts +++ b/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts @@ -17,10 +17,6 @@ led-upgrade = &led_power; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi index 9395c7b26f..8df752a2ec 100644 --- a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi +++ b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi @@ -6,10 +6,6 @@ #include "qca956x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_power; led-failsafe = &led_power; diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi index 8a00029c65..6111b968a2 100644 --- a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi +++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi @@ -9,10 +9,6 @@ compatible = "glinet,gl-ar750s", "qca,qca9563"; model = "GL.iNet GL-AR750S"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_power; led-failsafe = &led_power; diff --git a/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts b/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts index 68b10647b9..3997777562 100644 --- a/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts +++ b/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts @@ -10,10 +10,6 @@ model = "NEC Aterm WG1200CR"; compatible = "nec,wg1200cr", "qca,qca9563"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_power_green; led-failsafe = &led_power_red; diff --git a/target/linux/ath79/dts/qca9563_nec_wg800hp.dts b/target/linux/ath79/dts/qca9563_nec_wg800hp.dts index 2efedcffec..09df26621e 100644 --- a/target/linux/ath79/dts/qca9563_nec_wg800hp.dts +++ b/target/linux/ath79/dts/qca9563_nec_wg800hp.dts @@ -10,10 +10,6 @@ model = "NEC Aterm WG800HP"; compatible = "nec,wg800hp", "qca,qca9563"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_power_green; led-failsafe = &led_power_red; diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi index 29b422536f..2c0b0b0d71 100644 --- a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi +++ b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi @@ -6,10 +6,6 @@ #include "qca956x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_power_amber; led-failsafe = &led_power_amber; diff --git a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts index a6aa3a8ad3..f12d0c9973 100644 --- a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts +++ b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts @@ -17,10 +17,6 @@ led-upgrade = &led_status_red; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts index 028324410f..6a06f8904b 100644 --- a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts +++ b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts @@ -10,10 +10,6 @@ model = "ROSINSON WR818"; compatible = "rosinson,wr818", "qca,qca9563"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_system; led-failsafe = &led_system; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts index 7852bed1f3..6b40de2546 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts +++ b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts @@ -10,10 +10,6 @@ compatible = "tplink,archer-c2-v3", "qca,qca9563"; model = "TP-Link Archer C2 v3"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_system; led-failsafe = &led_system; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts index dcdd7bcf3c..4b45fa6da6 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts +++ b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts @@ -10,10 +10,6 @@ compatible = "tplink,archer-c7-v4", "qca,qca9563"; model = "TP-Link Archer C7 v4"; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_system; led-failsafe = &led_system; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi b/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi index 367f826b9d..8d28b088d2 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi @@ -9,10 +9,6 @@ aliases { label-mac-device = ð0; }; - - chosen { - bootargs = "console=ttyS0,115200n8"; - }; }; &pcie { diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi index 8d6e1ed9f9..f5daf98ca6 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi @@ -6,10 +6,6 @@ #include "qca956x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_system; led-failsafe = &led_system; diff --git a/target/linux/ath79/dts/qca9563_tplink_re450.dtsi b/target/linux/ath79/dts/qca9563_tplink_re450.dtsi index 6c894a314e..9fc30decaf 100644 --- a/target/linux/ath79/dts/qca9563_tplink_re450.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_re450.dtsi @@ -6,10 +6,6 @@ #include "qca956x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { label-mac-device = ð0; led-boot = &led_power; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi index 47480481fa..eab19fe1f2 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi @@ -6,10 +6,6 @@ #include "qca956x.dtsi" / { - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - aliases { led-boot = &led_system; led-failsafe = &led_system; diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi index bfad3ff306..574baae304 100644 --- a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi +++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi @@ -13,10 +13,6 @@ led-upgrade = &led_blue; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi index bd6b24209b..657ed31003 100644 --- a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi +++ b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi @@ -10,10 +10,6 @@ label-mac-device = ð0; }; - chosen { - bootargs = "console=ttyS0,115200n8"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi index 333428443f..081e29e78f 100644 --- a/target/linux/ath79/dts/qca956x.dtsi +++ b/target/linux/ath79/dts/qca956x.dtsi @@ -8,6 +8,10 @@ #address-cells = <1>; #size-cells = <1>; + chosen { + bootargs = "console=ttyS0,115200n8"; + }; + cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi index d98250b070..94fd95c5d8 100644 --- a/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi +++ b/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi @@ -9,10 +9,6 @@ aliases { label-mac-device = &wmac; }; - - chosen { - bootargs = "console=ttyS0,115200n8"; - }; }; &spi { From 2b550a6be198ff78ac672d654d867ff1a0a13760 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 30 Jul 2018 08:24:03 +0200 Subject: [PATCH 08/26] kernel/leds-apu2: remove deprecated leds-apu2 driver Remove leds-apu2 out of tree driver. There is a new upstream device gpio and leds driver stack available for the APUv2 and APUv3 boards from pc egnines. This new driver stack was add in kernel version 4.15. Signed-off-by: Florian Eckert --- package/kernel/leds-apu2/Makefile | 51 ---- package/kernel/leds-apu2/src/Kconfig | 8 - package/kernel/leds-apu2/src/Makefile | 1 - package/kernel/leds-apu2/src/leds-apu2.c | 363 ----------------------- 4 files changed, 423 deletions(-) delete mode 100644 package/kernel/leds-apu2/Makefile delete mode 100644 package/kernel/leds-apu2/src/Kconfig delete mode 100644 package/kernel/leds-apu2/src/Makefile delete mode 100644 package/kernel/leds-apu2/src/leds-apu2.c diff --git a/package/kernel/leds-apu2/Makefile b/package/kernel/leds-apu2/Makefile deleted file mode 100644 index 1d01548ba2..0000000000 --- a/package/kernel/leds-apu2/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2017 Chris Blake -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk - -PKG_NAME:=leds-apu2 -PKG_RELEASE:=1 - -PKG_MAINTAINER:=Chris Blake -PKG_LICENSE:=GPL-2.0 - -include $(INCLUDE_DIR)/package.mk - -define KernelPackage/leds-apu2 - SUBMENU:=LED modules - TITLE:= PC Engines APU2/APU3 LED support - DEPENDS:= @GPIO_SUPPORT @TARGET_x86 - FILES:=$(PKG_BUILD_DIR)/leds-apu2.ko - AUTOLOAD:=$(call AutoLoad,41,leds-apu2,1) - KCONFIG:= -endef - -define KernelPackage/leds-apu2/description - Driver for the PC Engines APU2/APU3 LEDs & Reset Button. -endef - -EXTRA_KCONFIG:= \ - CONFIG_LEDS_APU2=m - -EXTRA_CFLAGS:= \ - $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \ - $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \ - -MAKE_OPTS:= \ - $(KERNEL_MAKE_FLAGS) \ - M="$(PKG_BUILD_DIR)" \ - EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ - $(EXTRA_KCONFIG) - -define Build/Compile - $(MAKE) -C "$(LINUX_DIR)" \ - $(MAKE_OPTS) \ - modules -endef - -$(eval $(call KernelPackage,leds-apu2)) diff --git a/package/kernel/leds-apu2/src/Kconfig b/package/kernel/leds-apu2/src/Kconfig deleted file mode 100644 index d0ad5bea4f..0000000000 --- a/package/kernel/leds-apu2/src/Kconfig +++ /dev/null @@ -1,8 +0,0 @@ -config LEDS_APU2 - tristate "PC Engines APU2/APU3 LED support" - depends on LEDS_CLASS - depends on LEDS_GPIO - depends on GPIOLIB - help - Say yes here to enable support for the CPU GPIO pins on the PC Engines - APU2/APU3 board, which enables the front LEDs and Reset Button. diff --git a/package/kernel/leds-apu2/src/Makefile b/package/kernel/leds-apu2/src/Makefile deleted file mode 100644 index 4f77b393cc..0000000000 --- a/package/kernel/leds-apu2/src/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-${CONFIG_LEDS_APU2} += leds-apu2.o diff --git a/package/kernel/leds-apu2/src/leds-apu2.c b/package/kernel/leds-apu2/src/leds-apu2.c deleted file mode 100644 index ef125c8768..0000000000 --- a/package/kernel/leds-apu2/src/leds-apu2.c +++ /dev/null @@ -1,363 +0,0 @@ -/* -* APU2 LED/GPIO Driver -* Copyright (c) 2016 Christian Lamparter -* -* Based on gpio-apu2.c - AMD FCH GPIO support for PC-Engines APU-2 board -* -* Copyright (c) 2015 Carsten Spiess -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#define DEVNAME "leds-apu2" - -#define FCH_ACPI_MMIO_BASE 0xFED80000 -#define FCH_GPIO_BASE (FCH_ACPI_MMIO_BASE + 0x1500) -#define FCH_GPIO_SIZE 0x300 - -#define APU_NUM_GPIO 4 - -#define GPIO_BIT_DIR 23 -#define GPIO_BIT_WRITE 22 -#define GPIO_BIT_READ 16 - -/* internal variables */ -static struct pci_dev *gpio_apu2_pci; -static DEFINE_SPINLOCK (gpio_lock); - -/* the watchdog platform device */ -static struct platform_device *gpio_apu2_platform_device; -static struct platform_device *leddev; -static struct platform_device *keydev; - -static const struct pci_device_id gpio_apu2_pci_tbl[] ={ - {PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, PCI_ANY_ID, PCI_ANY_ID}, - { 0, } /* End of list */ -}; -MODULE_DEVICE_TABLE (pci, gpio_apu2_pci_tbl); - -/* EGPIO89=GPIO32, AGPIO68=GPIO57, AGPIO69=GPIO58, AGPIO70=GPIO59 */ -static u8 gpio_offset[APU_NUM_GPIO] = {89, 68, 69, 70}; - -static void __iomem *gpio_addr[APU_NUM_GPIO] = {NULL, NULL, NULL, NULL}; - -static int gpio_apu2_get_dir (struct gpio_chip *chip, unsigned offset) -{ - u32 val; - - val = ~ioread32 (gpio_addr[offset]); - - return (val >> GPIO_BIT_DIR) & 1; -} - -static int gpio_apu2_dir_in (struct gpio_chip *gc, unsigned offset) -{ - u32 val; - - spin_lock_bh (&gpio_lock); - - val = ioread32 (gpio_addr[offset]); - val &= ~BIT(GPIO_BIT_DIR); - iowrite32 (val, gpio_addr[offset]); - - spin_unlock_bh (&gpio_lock); - - return 0; -} - -static int gpio_apu2_dir_out (struct gpio_chip *chip, unsigned offset, - int value) -{ - u32 val; - - spin_lock_bh (&gpio_lock); - - val = ioread32 (gpio_addr[offset]); - val |= BIT(GPIO_BIT_DIR); - iowrite32 (val, gpio_addr[offset]); - - spin_unlock_bh (&gpio_lock); - - return 0; -} - -static int gpio_apu2_get_data (struct gpio_chip *chip, unsigned offset) -{ - u32 val; - - val = ioread32 (gpio_addr[offset]); - - return (val >> GPIO_BIT_READ) & 1; -} - -static void gpio_apu2_set_data (struct gpio_chip *chip, unsigned offset, int value) -{ - u32 val; - - spin_lock_bh (&gpio_lock); - - val = ioread32 (gpio_addr[offset]); - - if (value) - val |= BIT(GPIO_BIT_WRITE); - else - val &= ~BIT(GPIO_BIT_WRITE); - - iowrite32 (val, gpio_addr[offset]); - - spin_unlock_bh (&gpio_lock); -} - -static struct gpio_chip gpio_apu2_chip = { - .label = DEVNAME, - .owner = THIS_MODULE, - .base = -1, - .ngpio = APU_NUM_GPIO, - .get_direction = gpio_apu2_get_dir, - .direction_input = gpio_apu2_dir_in, - .direction_output = gpio_apu2_dir_out, - .get = gpio_apu2_get_data, - .set = gpio_apu2_set_data, -}; - -/* - * - */ -static int gpio_apu2_probe (struct platform_device *dev) -{ - int ret = 0; - int i; - struct pci_dev *pci_dev = NULL; - - /* Match the PCI device */ - for_each_pci_dev (pci_dev) { - if (pci_match_id (gpio_apu2_pci_tbl, pci_dev) != NULL) { - gpio_apu2_pci = pci_dev; - break; - } - } - - if (!gpio_apu2_pci) - return -ENODEV; - - pr_info ("%s: PCI Revision ID: 0x%x\n", DEVNAME, gpio_apu2_pci->revision); - - /* Determine type of southbridge chipset */ - if (gpio_apu2_pci->revision < 0x40) { - return -EACCES; - } - - /* Request memory region for GPIO's */ - if (!devm_request_mem_region (&dev->dev, FCH_GPIO_BASE, - FCH_GPIO_SIZE, DEVNAME)){ - pr_err ("%s: request GPIO mem region failed\n", DEVNAME); - return -ENXIO; - } - - /* Map IO's for GPIO's */ - for (i = 0; i < APU_NUM_GPIO; i++) { - gpio_addr[i] = devm_ioremap (&dev->dev, - FCH_GPIO_BASE + (gpio_offset[i] * sizeof (u32)), sizeof (u32)); - if (!gpio_addr[i]) { - pr_err ("%s: map GPIO%d address failed\n", DEVNAME, gpio_offset[i]); - return -ENXIO; - } - } - - gpio_apu2_chip.parent = &dev->dev; - ret = gpiochip_add (&gpio_apu2_chip); - if (ret) { - pr_err ("%s: adding gpiochip failed\n", DEVNAME); - } - - return ret; -} - -static int gpio_apu2_remove (struct platform_device *dev) -{ - gpiochip_remove (&gpio_apu2_chip); - return 0; -} - -static struct platform_driver gpio_apu2_driver = { - .probe = gpio_apu2_probe, - .remove = gpio_apu2_remove, - .driver = { - .owner = THIS_MODULE, - .name = DEVNAME - } -}; - -static struct gpio_led apu2_leds_gpio[] = { - { - .name = "apu2:green:power", - .gpio = 509, - .active_low = 1, - }, - { - .name = "apu2:green:led2", - .gpio = 510, - .active_low = 1, - }, - { - .name = "apu2:green:led3", - .gpio = 511, - .active_low = 1, - }, -}; - -static struct gpio_keys_button apu2_gpio_keys[] = { - { - .desc = "Reset button", - .type = EV_KEY, - .code = KEY_RESTART, - .debounce_interval = 60, - .gpio = 508, - .active_low = 1, - }, -}; - -static void register_gpio_keys_polled(int id, unsigned poll_interval, - unsigned nbuttons, - struct gpio_keys_button *buttons) -{ - struct gpio_keys_platform_data pdata = { }; - int err; - - keydev = platform_device_alloc("gpio-keys-polled", id); - if (!keydev) { - printk(KERN_ERR "Failed to allocate gpio-keys platform device\n"); - return; - } - - pdata.poll_interval = poll_interval; - pdata.nbuttons = nbuttons; - pdata.buttons = buttons; - - err = platform_device_add_data(keydev, &pdata, sizeof(pdata)); - if (err) { - dev_err(&keydev->dev, "failed to add platform data to key driver (%d)", err); - goto err_put_pdev; - } - - err = platform_device_add(keydev); - if (err) { - dev_err(&keydev->dev, "failed to register key platform device (%d)", err); - goto err_put_pdev; - } - - return; - -err_put_pdev: - platform_device_put(keydev); - keydev = NULL; -} - -static void register_leds_gpio(int id, unsigned num_leds, struct gpio_led *leds) -{ - struct gpio_led_platform_data pdata = { }; - int err; - - leddev = platform_device_alloc("leds-gpio", id); - if (!leddev) { - printk(KERN_ERR "Failed to allocate leds-gpio platform device\n"); - return; - } - - pdata.num_leds = num_leds; - pdata.leds = leds; - - err = platform_device_add_data(leddev, &pdata, sizeof(pdata)); - if (err) { - dev_err(&leddev->dev, "failed to add platform data to key driver (%d)", err); - goto err_put_pdev; - } - - err = platform_device_add(leddev); - if (err) { - dev_err(&leddev->dev, "failed to register key platform device (%d)", err); - goto err_put_pdev; - } - - return; - -err_put_pdev: - platform_device_put(leddev); - leddev = NULL; -} - -static int __init gpio_apu2_init (void) -{ - int err; - const char *board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR); - const char *board_name = dmi_get_system_info(DMI_BOARD_NAME); - - pr_info ("%s: load APU2/LED GPIO driver module\n", DEVNAME); - - err = platform_driver_register (&gpio_apu2_driver); - if (err) - goto exit; - - gpio_apu2_platform_device = platform_device_register_simple (DEVNAME, -1, NULL, 0); - if (IS_ERR(gpio_apu2_platform_device)) { - err = PTR_ERR(gpio_apu2_platform_device); - goto exit_driver; - } - - pr_info ("%s: APU2 GPIO/LED driver module loaded\n", DEVNAME); - - register_leds_gpio(-1, ARRAY_SIZE(apu2_leds_gpio), apu2_leds_gpio); - register_gpio_keys_polled(-1, 20, ARRAY_SIZE(apu2_gpio_keys), apu2_gpio_keys); - return 0; - -exit_driver: - platform_driver_unregister (&gpio_apu2_driver); -exit: - return err; -} - -static void __exit gpio_apu2_exit (void) -{ - platform_device_unregister (gpio_apu2_platform_device); - platform_device_unregister (leddev); - platform_device_unregister (keydev); - platform_driver_unregister (&gpio_apu2_driver); - pr_info ("%s: APU2 GPIO/LED driver module unloaded\n", DEVNAME); -} - -MODULE_AUTHOR ("Carsten Spiess "); -MODULE_DESCRIPTION("GPIO driver for AMD FCH on PC-Engines APU-2"); -MODULE_LICENSE("GPL"); - -module_init (gpio_apu2_init); -module_exit (gpio_apu2_exit); From 97bc87d81a98dc0597b6492017cef9098cc9c012 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 2 Jul 2019 12:04:27 +0200 Subject: [PATCH 09/26] kernel: add gpio-amd-fch module description Add a module description for the new gpio-amd-fch device driver. Signed-off-by: Florian Eckert --- package/kernel/linux/modules/other.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 936a1327fd..15d67b4679 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -313,6 +313,23 @@ endef $(eval $(call KernelPackage,gpio-it87)) +define KernelPackage/gpio-amd-fch + SUBMENU:=$(OTHER_MENU) + DEPENDS:=@GPIO_SUPPORT @TARGET_x86 + TITLE:=GPIO support for AMD Fusion Controller Hub (G-series SOCs) + KCONFIG:=CONFIG_GPIO_AMD_FCH + FILES:=$(LINUX_DIR)/drivers/gpio/gpio-amd-fch.ko + AUTOLOAD:=$(call AutoLoad,25,gpio-amd-fch,1) +endef + +define KernelPackage/gpio-amd-fch/description + This option enables driver for GPIO on AMDs Fusion Controller Hub, + as found on G-series SOCs (eg. GX-412TC) +endef + +$(eval $(call KernelPackage,gpio-amd-fch)) + + define KernelPackage/ppdev SUBMENU:=$(OTHER_MENU) TITLE:=Parallel port support From f3c5c09e5ad6671519c6a3b29f9c6adb7fff66cb Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 2 Jul 2019 12:04:58 +0200 Subject: [PATCH 10/26] kernel: add pcengines-apu2 module description Add a module description for the new pcengnies-apu2 device driver. This driver supports the front button and LEDs on the PC Engines APUv2/APUv3 boards. Signed-off-by: Florian Eckert --- target/linux/x86/modules.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/target/linux/x86/modules.mk b/target/linux/x86/modules.mk index c8722938d3..61ab400dc9 100644 --- a/target/linux/x86/modules.mk +++ b/target/linux/x86/modules.mk @@ -34,3 +34,20 @@ define KernelPackage/sp5100-tco/description endef $(eval $(call KernelPackage,sp5100-tco)) + + +define KernelPackage/pcengines-apuv2 + SUBMENU:=$(OTHER_MENU) + TITLE:=PC Engines APUv2/3 front button and LEDs driver + DEPENDS:=@TARGET_x86 +kmod-gpio-amd-fch +kmod-leds-gpio + KCONFIG:=CONFIG_PCENGINES_APU2 + FILES:=$(LINUX_DIR)/drivers/platform/x86/pcengines-apuv2.ko + AUTOLOAD:=$(call AutoLoad,60,pcengines-apuv2) +endef + +define KernelPackage/pcengines-apuv2/description + This driver provides support for the front button and LEDs on + PC Engines APUv2/APUv3 board. +endef + +$(eval $(call KernelPackage,pcengines-apuv2)) From 5596452cd4c48e806d7060badb1a106102af57d6 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 27 Mar 2020 16:23:14 +0100 Subject: [PATCH 11/26] target/hack-5.4: platform/x86/pcengines: revert led simswich compromise With this change the LED subsystem is abused in the kernel to switch the simswap. This change will be reverted, so we could use again the gpio subsystem. Signed-off-by: Florian Eckert --- ...x86-pcengines-apuv2-revert-simswitch.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 target/linux/generic/hack-5.4/991-platform-x86-pcengines-apuv2-revert-simswitch.patch diff --git a/target/linux/generic/hack-5.4/991-platform-x86-pcengines-apuv2-revert-simswitch.patch b/target/linux/generic/hack-5.4/991-platform-x86-pcengines-apuv2-revert-simswitch.patch new file mode 100644 index 0000000000..84a4191157 --- /dev/null +++ b/target/linux/generic/hack-5.4/991-platform-x86-pcengines-apuv2-revert-simswitch.patch @@ -0,0 +1,56 @@ +From 8c9254d41881c81bea610193c6ac59c8cb8b79fe Mon Sep 17 00:00:00 2001 +From: Florian Eckert +Date: Fri, 27 Mar 2020 16:11:55 +0100 +Subject: [PATCH] Revert "platform/x86: pcengines-apuv2: wire up simswitch gpio + as led" + +This reverts commit 5037d4ddda31c2dbbb018109655f61054b1756dc. + +Commit message from linux: +The APU3+ boards have two SIM sockets, while only one of them +can be routed to the mpcie slots at a time. Selection is done +via simswap gpio. + +We currently don't have a fitting subsystem for those cases yet, +so just wire it up to a LED for the time being. While this isn't +really semantically correct, it's a good compromise. + +Explanation why this does not work: +This change connects the simswap to the LED subsystem of the kernel. +From my point of view, it's nonsense. If we do it this way, then this +can be switched relatively easily via the LED subsystem (trigger: +none/default-on) and that is dangerous! If this is used, it would be +unfavorable, since there is also another trigger (trigger: heartbeat/netdev). +This LED also appears in the LuCI and can therefore be switched by the user. + +Therefore, this simswap GPIO should remain in the GPIO +subsystem and be switched via it and not be connected to the LED +subsystem. To avoid the problems mentioned above. The LED subsystem is +not made for this and it is not a good compromise, but rather dangerous. + +Signed-off-by: Florian Eckert +--- + drivers/platform/x86/pcengines-apuv2.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +--- a/drivers/platform/x86/pcengines-apuv2.c ++++ b/drivers/platform/x86/pcengines-apuv2.c +@@ -77,8 +77,7 @@ static const struct amd_fch_gpio_pdata b + static const struct gpio_led apu2_leds[] = { + { .name = "apu:green:1" }, + { .name = "apu:green:2" }, +- { .name = "apu:green:3" }, +- { .name = "apu:simswap" }, ++ { .name = "apu:green:3" } + }; + + static const struct gpio_led_platform_data apu2_leds_pdata = { +@@ -95,8 +94,6 @@ static struct gpiod_lookup_table gpios_l + NULL, 1, GPIO_ACTIVE_LOW), + GPIO_LOOKUP_IDX(AMD_FCH_GPIO_DRIVER_NAME, APU2_GPIO_LINE_LED3, + NULL, 2, GPIO_ACTIVE_LOW), +- GPIO_LOOKUP_IDX(AMD_FCH_GPIO_DRIVER_NAME, APU2_GPIO_LINE_SIMSWAP, +- NULL, 3, GPIO_ACTIVE_LOW), + } + }; + From 67575b64107d39096195aaaa13b2c2986a5ff97f Mon Sep 17 00:00:00 2001 From: Huangbin Zhan Date: Wed, 10 Jun 2020 07:11:08 +0800 Subject: [PATCH 12/26] logger: enable alternatives support Avoid conflict with busybox Signed-off-by: Huangbin Zhan --- package/utils/util-linux/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 77b4b98b56..3953d83238 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux PKG_VERSION:=2.35.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.35 @@ -267,6 +267,7 @@ endef define Package/logger $(call Package/util-linux/Default) TITLE:=a shell command interface to the syslog system log module + ALTERNATIVES:=200:/usr/bin/logger:/usr/bin/util-linux-logger endef define Package/logger/description @@ -659,7 +660,7 @@ endef define Package/logger/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/logger $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/logger $(1)/usr/bin/util-linux-logger endef define Package/look/install From 3d6ac4d20facaae17f944826e1f0234815eb0891 Mon Sep 17 00:00:00 2001 From: Huangbin Zhan Date: Wed, 3 Jun 2020 10:24:52 +0800 Subject: [PATCH 13/26] ubox: add ALTERNATIVES This avoids a conflict with the kmod util from the package feed. Signed-off-by: Huangbin Zhan --- package/system/ubox/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile index cfa0b594e4..e1269ca6ce 100644 --- a/package/system/ubox/Makefile +++ b/package/system/ubox/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ubox -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git @@ -25,6 +25,12 @@ define Package/ubox CATEGORY:=Base system DEPENDS:=+libubox +ubusd +ubus +libubus +libuci +USE_GLIBC:librt TITLE:=OpenWrt system helper toolbox + ALTERNATIVES:=\ + 100:/sbin/rmmod:/sbin/kmodloader \ + 100:/sbin/insmod:/sbin/kmodloader \ + 100:/sbin/lsmod:/sbin/kmodloader \ + 100:/sbin/modinfo:/sbin/kmodloader \ + 100:/sbin/modprobe:/sbin/kmodloader endef define Package/getrandom @@ -50,12 +56,6 @@ define Package/ubox/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib - - $(LN) kmodloader $(1)/sbin/rmmod - $(LN) kmodloader $(1)/sbin/insmod - $(LN) kmodloader $(1)/sbin/lsmod - $(LN) kmodloader $(1)/sbin/modinfo - $(LN) kmodloader $(1)/sbin/modprobe endef define Package/logd/install From f3cb1636abeaba5a753d70592d05541ad929daeb Mon Sep 17 00:00:00 2001 From: "Gregory L. Dietsche" Date: Sat, 6 Jun 2020 23:30:23 -0500 Subject: [PATCH 14/26] x86: Support Intel 10 Gigabit Ethernet Cards Support Intel 10 Gigabit Ethernet Cards in x86/64 images by default. This ensures that systems with cards such as the Intel x520 will work properly. Signed-off-by: Gregory L. Dietsche --- target/linux/x86/image/64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/x86/image/64.mk b/target/linux/x86/image/64.mk index 61e6d408d7..745b307585 100644 --- a/target/linux/x86/image/64.mk +++ b/target/linux/x86/image/64.mk @@ -1,7 +1,7 @@ define Device/generic DEVICE_TITLE := Generic x86/64 DEVICE_PACKAGES += kmod-bnx2 kmod-e1000e kmod-e1000 kmod-forcedeth kmod-igb \ - kmod-r8169 + kmod-ixgbe kmod-r8169 GRUB2_VARIANT := generic endef TARGET_DEVICES += generic From fed9bfbfeb84a15c198138a2015d001f82e480d4 Mon Sep 17 00:00:00 2001 From: Huangbin Zhan Date: Thu, 4 Jun 2020 21:49:54 +0800 Subject: [PATCH 15/26] base-files: coreutil-sha256sum breaks status code With package "coreutil-sha256sum" installed "sysupgrade" fails to perform 'sha256sum -s' and instead returns 'invalid option -- 's''. This is caused due to: different syntax for a sha256sum status check ('sha256sum --status' with "coreutil-sha256sum") '/usr/bin/sha256sum' being symlinked to '/usr/bin/gnu-sha256sum' (after installation of "coreutil-sha256sum") "coreutil-sha256sum" package from the packages feed replaces the Busybox sha256sum This patch restores for 'sysupgrade' the busybox call to its sha256sum applet. Signed-off-by: Huangbin Zhan --- package/base-files/files/sbin/sysupgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index abd34bdcfb..ca2eb298dc 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -127,7 +127,7 @@ list_changed_conffiles() { list_conffiles | while read file csum; do [ -r "$file" ] || continue - echo "${csum} ${file}" | sha256sum -sc - || echo "$file" + echo "${csum} ${file}" | busybox sha256sum -sc - || echo "$file" done } From 9c85153b8776aee8050b0c80b53525ac38af8653 Mon Sep 17 00:00:00 2001 From: Rogan Dawes Date: Wed, 27 May 2020 10:43:26 +0200 Subject: [PATCH 16/26] sunxi: add text referencing Allwinner H3 and H5 CPUs This makes it a little easier to figure out which options to choose. Signed-off-by: Rogan Dawes --- target/linux/sunxi/Makefile | 2 +- target/linux/sunxi/cortexa53/target.mk | 2 +- target/linux/sunxi/cortexa7/target.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/sunxi/Makefile b/target/linux/sunxi/Makefile index 37b8a30e22..1b1c30628f 100644 --- a/target/linux/sunxi/Makefile +++ b/target/linux/sunxi/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=sunxi -BOARDNAME:=Allwinner A1x/A20/A3x/R40 +BOARDNAME:=Allwinner A1x/A20/A3x/H3/H5/R40 FEATURES:=fpu usb ext4 display rtc squashfs SUBTARGETS:=cortexa8 cortexa7 cortexa53 diff --git a/target/linux/sunxi/cortexa53/target.mk b/target/linux/sunxi/cortexa53/target.mk index 6715d00bda..435d88f5f4 100644 --- a/target/linux/sunxi/cortexa53/target.mk +++ b/target/linux/sunxi/cortexa53/target.mk @@ -8,6 +8,6 @@ include $(TOPDIR)/rules.mk ARCH:=aarch64 -BOARDNAME:=Allwinner A64 +BOARDNAME:=Allwinner A64/H5 CPU_TYPE:=cortex-a53 KERNELNAME:=Image dtbs diff --git a/target/linux/sunxi/cortexa7/target.mk b/target/linux/sunxi/cortexa7/target.mk index b6bdd483bb..238eb17ac1 100644 --- a/target/linux/sunxi/cortexa7/target.mk +++ b/target/linux/sunxi/cortexa7/target.mk @@ -7,6 +7,6 @@ include $(TOPDIR)/rules.mk -BOARDNAME:=Allwinner A20/A3x/R40 +BOARDNAME:=Allwinner A20/A3x/H3/R40 CPU_TYPE:=cortex-a7 CPU_SUBTYPE:=neon-vfpv4 From 930f3c014821df423507c878415c7fb4910a454d Mon Sep 17 00:00:00 2001 From: Alberto Bursi Date: Fri, 22 May 2020 18:49:15 +0200 Subject: [PATCH 17/26] uboot-kirkwood: enable sata in nsa310 uboot the uboot of nsa310 cannot use the network chip as it is a realtek on the PCIe lanes and not a Marvell ethernet from the SoC. Therefore tftp is not possible on this device and the only way to install is by loading files from a USB drive. If the USB subsystem is dead there is no way to install OpenWrt. Enable sata support and commands so it can be used as a fallback in case of USB issues. Signed-off-by: Alberto Bursi --- .../uboot-kirkwood/patches/007-nsa310-uboot-generic.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch b/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch index 09dc587bf7..eea561fab8 100644 --- a/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch +++ b/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch @@ -505,7 +505,7 @@ NOTE: this patch is ready for upstream, LEDE-specific parts are in +#endif /* __NSA310_H */ --- /dev/null +++ b/configs/nsa310_defconfig -@@ -0,0 +1,48 @@ +@@ -0,0 +1,50 @@ +CONFIG_ARM=y +CONFIG_SYS_DCACHE_OFF=y +CONFIG_ARCH_CPU_INIT=y @@ -554,6 +554,8 @@ NOTE: this patch is ready for upstream, LEDE-specific parts are in +CONFIG_LZMA=y +CONFIG_LZO=y +CONFIG_SYS_LONGHELP=y ++CONFIG_SATA_MV=y ++CONFIG_CMD_IDE=y --- /dev/null +++ b/include/configs/nsa310.h @@ -0,0 +1,103 @@ From c856f7adfb355b218728a5a7cc60d6fafd9b3b94 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Fri, 22 May 2020 16:33:04 +0200 Subject: [PATCH 18/26] netifd: replace timesvr with timesrv /lib/netifd/dhcp.script: Keep support for 'timesvr' while also supporting 'timesrv' Add log message indicating deprecation of 'timesvr' Signed-off-by: Sukru Senli --- .../network/config/netifd/files/lib/netifd/dhcp.script | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script index 00604f40e7..6585b641d6 100755 --- a/package/network/config/netifd/files/lib/netifd/dhcp.script +++ b/package/network/config/netifd/files/lib/netifd/dhcp.script @@ -46,10 +46,16 @@ setup_interface () { proto_add_dns_search "$i" done + # TODO: Deprecate timesvr in favor of timesrv + if [ -n "$timesvr" -a -z "$timesrv" ]; then + timesrv="$timesvr" + echo "Environment variable 'timesvr' will be deprecated; use 'timesrv' instead." + fi + proto_add_data [ -n "$ZONE" ] && json_add_string zone "$ZONE" [ -n "$ntpsrv" ] && json_add_string ntpserver "$ntpsrv" - [ -n "$timesvr" ] && json_add_string timeserver "$timesvr" + [ -n "$timesrv" ] && json_add_string timeserver "$timesrv" [ -n "$hostname" ] && json_add_string hostname "$hostname" [ -n "$message" ] && json_add_string message "$message" [ -n "$timezone" ] && json_add_int timezone "$timezone" From dd13add3ceed9056b0b3cce182241ba553ed07cb Mon Sep 17 00:00:00 2001 From: Scott Roberts Date: Wed, 20 May 2020 13:28:39 -0600 Subject: [PATCH 19/26] kernel: i2c-pxa: remove slave Removing i2c pxa slave The i2c-pxa is typically not use in slave mode. It does not make sense to have slave mode enabled by default. Having slave mode enabled prevents the i2c controller from being reset if a real slave device such as an SFP is attached to the i2c-pxa bus and locks it up. Disable slave mode so that the i2c controller can be reset if the bus is locked up. If someone actually has a need for pxa slave mode this can be enabled in kernel config. Signed-off-by: Scott Roberts --- package/kernel/linux/modules/i2c.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/kernel/linux/modules/i2c.mk b/package/kernel/linux/modules/i2c.mk index 6690384a89..ca6463c81b 100644 --- a/package/kernel/linux/modules/i2c.mk +++ b/package/kernel/linux/modules/i2c.mk @@ -210,7 +210,6 @@ $(eval $(call KernelPackage,i2c-piix4)) I2C_PXA_MODULES:= \ - CONFIG_I2C_PXA_SLAVE=y \ CONFIG_I2C_PXA:drivers/i2c/busses/i2c-pxa define KernelPackage/i2c-pxa From cd6515c2e87b85bb3796ba365db34b3c52a251d5 Mon Sep 17 00:00:00 2001 From: Qin Wei Date: Sat, 16 May 2020 15:51:36 +0800 Subject: [PATCH 20/26] ramips: fix sd polling This is fixed in 18.06, it appears again in 19.07. Currently mt7628 sdcard driver do not support polling mode which is for the device do not have card-detect pin to detect sd card insert. Without this patch, device will not detect sdcard is inserted. This patch is a fix of that. Signed-off-by: Qin Wei --- target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c index 8cbc87da3a..188e015572 100644 --- a/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c +++ b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c @@ -439,6 +439,8 @@ static void msdc_tasklet_card(struct work_struct *work) inserted = (status & MSDC_PS_CDSTS) ? 0 : 1; else inserted = (status & MSDC_PS_CDSTS) ? 1 : 0; + if (host->mmc->caps & MMC_CAP_NEEDS_POLL) + inserted = 1; #if 0 change = host->card_inserted ^ inserted; @@ -1857,6 +1859,8 @@ static int msdc_ops_get_cd(struct mmc_host *mmc) present = (sdr_read32(MSDC_PS) & MSDC_PS_CDSTS) ? 0 : 1; else present = (sdr_read32(MSDC_PS) & MSDC_PS_CDSTS) ? 1 : 0; + if (host->mmc->caps & MMC_CAP_NEEDS_POLL) + present = 1; host->card_inserted = present; #endif spin_unlock_irqrestore(&host->lock, flags); From 58a6f06978f8c1995fefee01d6c3c6f3c78b36c9 Mon Sep 17 00:00:00 2001 From: Aleksander Jan Bajkowski Date: Sat, 2 May 2020 18:26:29 +0200 Subject: [PATCH 21/26] lantiq: remove unused PHY drivers on xrx200 All boards on xrx200 use builtin switch and there is no supported device with external switch. It was copy paste from xway subtarget and was added in commit 18b76c66fbfea0e21ff66c6df432fa109c5bbb43. Save 20.3 kB flash memory. Signed-off-by: Aleksander Jan Bajkowski --- target/linux/lantiq/xrx200/config-4.19 | 6 ------ target/linux/lantiq/xrx200/config-5.4 | 6 ------ 2 files changed, 12 deletions(-) diff --git a/target/linux/lantiq/xrx200/config-4.19 b/target/linux/lantiq/xrx200/config-4.19 index 0c14f3dadc..c9451ec363 100644 --- a/target/linux/lantiq/xrx200/config-4.19 +++ b/target/linux/lantiq/xrx200/config-4.19 @@ -1,5 +1,3 @@ -CONFIG_ADM6996_PHY=y -CONFIG_AR8216_PHY=y CONFIG_AT803X_PHY=y CONFIG_BLK_MQ_PCI=y CONFIG_CPU_MIPSR2_IRQ_EI=y @@ -69,10 +67,6 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_RFS_ACCEL=y CONFIG_RPS=y -CONFIG_RTL8306_PHY=y -CONFIG_RTL8366S_PHY=y -CONFIG_RTL8367B_PHY=y -CONFIG_RTL8367_PHY=y CONFIG_SENSORS_LTQ_CPUTEMP=y CONFIG_SGL_ALLOC=y CONFIG_SMP=y diff --git a/target/linux/lantiq/xrx200/config-5.4 b/target/linux/lantiq/xrx200/config-5.4 index cad6ebf1ae..b3749b927a 100644 --- a/target/linux/lantiq/xrx200/config-5.4 +++ b/target/linux/lantiq/xrx200/config-5.4 @@ -1,5 +1,3 @@ -CONFIG_ADM6996_PHY=y -CONFIG_AR8216_PHY=y CONFIG_AT803X_PHY=y CONFIG_BLK_MQ_PCI=y CONFIG_CPU_MIPSR2_IRQ_EI=y @@ -74,10 +72,6 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_RFS_ACCEL=y CONFIG_RPS=y -CONFIG_RTL8306_PHY=y -CONFIG_RTL8366S_PHY=y -CONFIG_RTL8367B_PHY=y -CONFIG_RTL8367_PHY=y CONFIG_SENSORS_LTQ_CPUTEMP=y CONFIG_SGL_ALLOC=y CONFIG_SMP=y From 0cca96284ac2d3454a90b0d8127ab030951af557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gonz=C3=A1lez=20Cabanelas?= Date: Sun, 26 Apr 2020 22:20:24 +0200 Subject: [PATCH 22/26] mvebu: LS421DE: dts file improvements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Delete useless HDD presence inputs: they aren't buttons, and probably they are outputs in the stock firmware. - Change the Function Button keycode: the current one isn't mapped by the kernel module. - Use the recommended property names for the ethernet stuff. - Add missing i2c pinmux. - Minor cosmetic changes. Signed-off-by: Daniel González Cabanelas --- .../boot/dts/armada-370-buffalo-ls421de.dts | 53 ++++++++----------- 1 file changed, 22 insertions(+), 31 deletions(-) diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts index 6b8a964ab3..4d2760eb72 100644 --- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts +++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts @@ -42,7 +42,7 @@ gpio_fan { gpios = <&gpio0 13 GPIO_ACTIVE_HIGH - &gpio0 14 GPIO_ACTIVE_HIGH>; + &gpio0 14 GPIO_ACTIVE_HIGH>; alarm-gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; }; @@ -50,22 +50,9 @@ compatible = "gpio-keys"; #address-cells = <1>; #size-cells = <0>; - pinctrl-0 = <&pmx_hdd_present &pmx_buttons>; + pinctrl-0 = <&pmx_buttons>; pinctrl-names = "default"; - hdd1-present { - label = "HDD1 Present"; - linux,code = ; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; - }; - - hdd2-present { - label = "HDD2 Present"; - linux,code = ; - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; - - }; - power { label = "Power Switch"; linux,code = ; @@ -75,7 +62,7 @@ function { label = "Function Button"; - linux,code = ; + linux,code = ; gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; }; }; @@ -131,11 +118,11 @@ #address-cells = <1>; #size-cells = <0>; pinctrl-0 = <&pmx_power_usb &pmx_power_hdd1 &pmx_power_hdd2>; - pinctrl-names = "default"; - usb_v5_regulator: usb-v5-regulator { + usb_power: regulator@0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "USB"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; @@ -145,7 +132,7 @@ gpio = <&gpio0 5 GPIO_ACTIVE_HIGH>; }; - ata1_regulator: ata1-regulator { + sata1_power: regulator@1 { compatible = "regulator-fixed"; reg = <1>; regulator-name = "HDD1"; @@ -158,7 +145,7 @@ gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>; }; - ata2_regulator: ata2-regulator { + sata2_power: regulator@2 { compatible = "regulator-fixed"; reg = <2>; regulator-name = "HDD2"; @@ -183,11 +170,13 @@ pinctrl-0 = <&ge1_rgmii_pins>; pinctrl-names = "default"; status = "okay"; - phy = <&phy0>; - phy-mode = "rgmii-id"; + phy-handle = <ðphy0>; + phy-connection-type = "rgmii-id"; }; &i2c0 { + pinctrl-0 = <&i2c0_pins>; + pinctrl-names = "default"; clock-frequency = <100000>; status = "okay"; @@ -201,16 +190,18 @@ pinctrl-0 = <&mdio_pins>; pinctrl-names = "default"; - phy0: ethernet-phy@0 { /* Marvell 88E1518 */ + ethphy0: ethernet-phy@0 { /* Marvell 88E1518 */ reg = <0>; - /* LED2 is used to inform uBoot if the power-switch was slided - to the "off" position, and then power off the machine. - Page 0x3, Register 0x10, bit 8: - 0x800: LED2 off, power off the machine - 0x900: LED2 on, boot the machine */ - marvell,reg-init = <0x3 0x10 0x1 0x1991>, /* LED Function */ - <0x3 0x11 0x1 0x4401>, /* LED polarity */ - <0x3 0x12 0x1 0x4905>; /* LED Timer */ + /* + * LED2 is used to inform, at restart time, if the power + * switch was slided to the "off" position. + * Page 0x3, Register 0x10, bits 8-11: + * 0x800: LED2 off, power off the machine + * 0x900: LED2 on, boot the machine + */ + marvell,reg-init = <0x3 0x10 0x1 0x1991>, /* LED function */ + <0x3 0x11 0x1 0x4401>, /* LED polarity */ + <0x3 0x12 0x1 0x4905>; /* LED timer */ }; }; From 4c3b81b75d0e0960cf49515ee8e48ada22256fd2 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 13 May 2020 23:42:15 +0200 Subject: [PATCH 23/26] ath79: Fix ubnt_edgeswitch-8xp DEVICE_PACKAGES switch-bcm53xx-mdio does not exists, use kmod-switch-bcm53xx-mdio instead. Signed-off-by: Hauke Mehrtens Cc: Tobias Schramm --- target/linux/ath79/image/generic-ubnt.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 480b3a5e68..3f4cc13916 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -159,7 +159,7 @@ TARGET_DEVICES += ubnt_edgeswitch-5xp define Device/ubnt_edgeswitch-8xp $(Device/ubnt-sw) DEVICE_MODEL := EdgeSwitch 8XP - DEVICE_PACKAGES += switch-bcm53xx-mdio + DEVICE_PACKAGES += kmod-switch-bcm53xx-mdio endef TARGET_DEVICES += ubnt_edgeswitch-8xp From caf09f2b842d31b70815e1281098bf895b067714 Mon Sep 17 00:00:00 2001 From: Javier Marcet Date: Wed, 3 Jun 2020 14:01:37 +0200 Subject: [PATCH 24/26] kernel: rename CONFIG_NETPRIO_CGROUP to CONFIG_CGROUP_NET_PRIO This has been changed in kernel 3.14. Signed-off-by: Javier Marcet --- config/Config-kernel.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/Config-kernel.in b/config/Config-kernel.in index fc24c3c932..301d679e4e 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in @@ -766,7 +766,7 @@ if KERNEL_CGROUPS bool "Control Group Classifier" default y - config KERNEL_NETPRIO_CGROUP + config KERNEL_CGROUP_NET_PRIO bool "Network priority cgroup" default y From bd49f2c9848ec10c7c7b41eaa14ac6c26e2bc977 Mon Sep 17 00:00:00 2001 From: Alex Lewontin Date: Fri, 21 Feb 2020 15:56:44 -0500 Subject: [PATCH 25/26] ramips: add support for Netgear R6080 This adds support for the Netgear R6080, aka Netgear AC1000. The R6080 has almost the same hardware as the Netgear R6120, aka Netgear AC1200, but it lacks the USB port, has only 8 MiB flash and uses a different SERCOMM_HWID. Specification: SoC: MediaTek MT7628 (580 MHz) Flash: 8 MiB RAM: 64 MiB Wireless: 2.4Ghz (builtin) and 5Ghz (MT7612E) LAN speed: 10/100 LAN ports: 4 WAN speed: 10/100 WAN ports: 1 UART (57600 8N1) on PCB Installation: Flashing OpenWRT from stock firmware requires nmrpflash. Use an ethernet cable to connect to LAN port 1 of the R6080, and power the R6080 off. From the connected workstation, run `nmrpflash -i eth0 -f openwrt-ramips-mt76x8-netgear_r6080-squashfs-factory.img`, replacing eth0 with the appropriate interface (can be identified by running `nmrpflash -L`). Then power on the R6080. After flashing has finished, power cycle the R6080, and it will boot into OpenWRT. Once OpenWRT has been installed, subsequent flashes can use the web interface and sysupgrade files. Signed-off-by: Alex Lewontin [rebase and adjust for 5.4] Signed-off-by: Adrian Schmutzler --- .../ramips/dts/mt7628an_netgear_r6080.dts | 148 ++++++++++++++++++ target/linux/ramips/image/mt76x8.mk | 19 +++ .../mt76x8/base-files/etc/board.d/01_leds | 1 + .../mt76x8/base-files/etc/board.d/02_network | 2 + 4 files changed, 170 insertions(+) create mode 100644 target/linux/ramips/dts/mt7628an_netgear_r6080.dts diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6080.dts b/target/linux/ramips/dts/mt7628an_netgear_r6080.dts new file mode 100644 index 0000000000..5bca023c71 --- /dev/null +++ b/target/linux/ramips/dts/mt7628an_netgear_r6080.dts @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7628an.dtsi" + +#include +#include + +/ { + compatible = "netgear,r6080", "mediatek,mt7628an-soc"; + model = "Netgear R6080"; + + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + label-mac-device = ðernet; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + + lan { + label = "r6080:green:lan"; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; + }; + + led_power: power { + label = "r6080:green:power"; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; + }; + + wlan2g_green { + label = "r6080:green:wlan2g"; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + wlan2g_orange { + label = "r6080:orange:wlan2g"; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; + }; + + wan_green { + label = "r6080:green:wan"; + gpios = <&gpio 40 GPIO_ACTIVE_LOW>; + }; + + wan_orange { + label = "r6080:orange:wan"; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&state_default { + gpio { + groups = "p0led_an", "p1led_an", "p2led_an", "p3led_an", + "p4led_an", "wdt", "wled_an"; + function = "gpio"; + }; +}; + +&spi0 { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <86000000>; + m25p,fast-read; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x40000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x20000>; + read-only; + }; + + partition@60000 { + label = "nvram"; + reg = <0x60000 0x30000>; + read-only; + }; + + partition@90000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x90000 0x760000>; + }; + + partition@7f0000 { + label = "reserved"; + reg = <0x7f0000 0x10000>; + read-only; + }; + }; + }; +}; + +&wmac { + status = "okay"; +}; + +ðernet { + mtd-mac-address = <&factory 0x4>; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + wifi@0,0 { + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x8000>; + ieee80211-freq-limit = <5000000 6000000>; + }; +}; + +&ehci { + status = "disabled"; +}; + +&ohci { + status = "disabled"; +}; diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index f3ae384a23..a18afefd74 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -189,6 +189,25 @@ define Device/mercury_mac1200r-v2 endef TARGET_DEVICES += mercury_mac1200r-v2 +define Device/netgear_r6080 + BLOCKSIZE := 64k + IMAGE_SIZE := 7552k + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := R6080 + DEVICE_PACKAGES := kmod-mt76x2 + SERCOMM_HWID := CFR + SERCOMM_HWVER := A001 + SERCOMM_SWVER := 0x0040 + IMAGES += factory.img + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size + IMAGE/factory.img := pad-extra 576k | $$(IMAGE/default) | \ + pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | zip R6080.bin | \ + sercom-seal +endef +TARGET_DEVICES += netgear_r6080 + define Device/netgear_r6120 BLOCKSIZE := 64k IMAGE_SIZE := 15744k diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds b/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds index 0837f9d003..fc582becb9 100755 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds @@ -23,6 +23,7 @@ alfa-network,awusfree1) asus,rt-n10p-v3|\ asus,rt-n11p-b1|\ asus,rt-n12-vp-b1|\ +netgear,r6080|\ netgear,r6120) ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0xf" ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x10" diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network index 398b5e88c7..2b4ca0926f 100755 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network @@ -92,6 +92,7 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0" ;; + netgear,r6080|\ netgear,r6120) ucidef_add_switch "switch0" \ "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan" "6@eth0" @@ -146,6 +147,7 @@ ramips_setup_macs() label_mac=$(mtd_get_mac_binary factory 0x4) ;; duzun,dm06|\ + netgear,r6080|\ netgear,r6120|\ wrtnode,wrtnode2p|\ wrtnode,wrtnode2r|\ From b1d5ab1a698b05d7522df029a85f8078ee4217af Mon Sep 17 00:00:00 2001 From: Jan Hoffmann Date: Fri, 26 Jun 2020 23:46:19 +0200 Subject: [PATCH 26/26] ramips: add support for NETGEAR WAC124 The WAC124 hardware appears to be identical to R6260/R6350/R6850. SoC: MediaTek MT7621AT RAM: 128M DDR3 FLASH: 128M NAND (Macronix MX30LF1G18AC) WiFI: MediaTek MT7603 bgn 2T2R MediaTek MT7615 nac 4T4R ETH: SoC Integrated Gigabit Switch (1x WAN, 4x LAN) USB: 1x USB 2.0 BTN: Reset, WPS LED: Power, Internet, WiFi, USB (all green) Installation: The factory image can be flashed from the stock firmware web interface or using nmrpflash. With nmrpflash it is also possible to revert to stock firmware. Signed-off-by: Jan Hoffmann --- .../ramips/dts/mt7621_netgear_wac124.dts | 25 +++++++++++++++++++ target/linux/ramips/image/mt7621.mk | 12 +++++++++ .../mt7621/base-files/etc/board.d/01_leds | 1 + .../mt7621/base-files/lib/upgrade/platform.sh | 1 + 4 files changed, 39 insertions(+) create mode 100644 target/linux/ramips/dts/mt7621_netgear_wac124.dts diff --git a/target/linux/ramips/dts/mt7621_netgear_wac124.dts b/target/linux/ramips/dts/mt7621_netgear_wac124.dts new file mode 100644 index 0000000000..b081581a31 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_netgear_wac124.dts @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0-only +/dts-v1/; + +#include "mt7621_netgear_sercomm_chj.dtsi" + +/ { + compatible = "netgear,wac124", "mediatek,mt7621-soc"; + model = "Netgear WAC124"; +}; + +&led_power { + label = "wac124:green:power"; +}; + +&led_usb { + label = "wac124:green:usb"; +}; + +&led_internet { + label = "wac124:green:wan"; +}; + +&led_wifi { + label = "wac124:green:wifi"; +}; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index d6423f81d9..de20934598 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -702,6 +702,18 @@ define Device/netgear_wac104 endef TARGET_DEVICES += netgear_wac104 +define Device/netgear_wac124 + $(Device/netgear_sercomm_nand) + DEVICE_MODEL := WAC124 + SERCOMM_HWNAME := WAC124 + SERCOMM_HWID := CTL + SERCOMM_HWVER := A003 + SERCOMM_SWVER := 0x0402 + IMAGE_SIZE := 40960k + DEVICE_PACKAGES += kmod-mt7615e kmod-mt7615-firmware +endef +TARGET_DEVICES += netgear_wac124 + define Device/netgear_wndr3700-v5 $(Device/uimage-lzma-loader) BLOCKSIZE := 64k diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds index fdfd29d011..716bc6e462 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds @@ -56,6 +56,7 @@ netgear,r6220|\ netgear,r6260|\ netgear,r6350|\ netgear,r6850|\ +netgear,wac124|\ netgear,wndr3700-v5) ucidef_set_led_netdev "wan" "wan" "$boardname:green:wan" "wan" ;; diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh index cb26b7745b..233ed80b4e 100755 --- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh @@ -53,6 +53,7 @@ platform_do_upgrade() { netgear,r6800|\ netgear,r6850|\ netgear,wac104|\ + netgear,wac124|\ netis,wf2881|\ xiaomi,mir3g|\ xiaomi,mir3p|\