From f17a46754841f79ce4ecd802d5909352ef950e51 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 10 Nov 2021 14:53:13 +0100 Subject: [PATCH 01/14] Update OpenWrt --- build.sh | 6 +- ...-tt-Replace-thermal_notify_framework.patch | 15 - .../900-remove_module_supported_device.patch | 263 ------------------ ...LUG-with-UEVENT-in-FW_ACTION-defines.patch | 13 - 4 files changed, 3 insertions(+), 294 deletions(-) delete mode 100644 root/package/kernel/mac80211/patches/build/1-2-net-wireless-intel-iwlwifi-mvm-tt-Replace-thermal_notify_framework.patch delete mode 100644 root/package/kernel/mac80211/patches/build/900-remove_module_supported_device.patch delete mode 100644 root/package/kernel/mac80211/patches/build/firmware-replace-HOTPLUG-with-UEVENT-in-FW_ACTION-defines.patch diff --git a/build.sh b/build.sh index 50834967..aeee7466 100755 --- a/build.sh +++ b/build.sh @@ -96,9 +96,9 @@ if [ "$OMR_OPENWRT" = "default" ]; then _get_repo feeds/packages https://github.com/openwrt/packages "3aa30ceee4fcf7b131bdc0f98658391069573e12" _get_repo feeds/luci https://github.com/openwrt/luci "f28aaa35cd5c0cbbe59d8cc6a67de88ceeac382e" else - _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "585cef5f1a9c1c3aecd7d231364618e96d03ab65" - _get_repo feeds/packages https://github.com/openwrt/packages "e2055b5433da245e6ff8fb060d018d036499cf38" - _get_repo feeds/luci https://github.com/openwrt/luci "7c943a1d6bcf449019ca8a43e800e51f269bb8f6" + _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "8a6b1a8d29cbd62f005ba20998ca9c8048ff49fc" + _get_repo feeds/packages https://github.com/openwrt/packages "b5132de5cf4f7d0562445cf3c65f9f1a4bcb1bbf" + _get_repo feeds/luci https://github.com/openwrt/luci "02398a33837d1fe8fd23d933ad7ac32025144805" fi elif [ "$OMR_OPENWRT" = "master" ]; then _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "master" diff --git a/root/package/kernel/mac80211/patches/build/1-2-net-wireless-intel-iwlwifi-mvm-tt-Replace-thermal_notify_framework.patch b/root/package/kernel/mac80211/patches/build/1-2-net-wireless-intel-iwlwifi-mvm-tt-Replace-thermal_notify_framework.patch deleted file mode 100644 index 78d66377..00000000 --- a/root/package/kernel/mac80211/patches/build/1-2-net-wireless-intel-iwlwifi-mvm-tt-Replace-thermal_notify_framework.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c -index 507625f96dd7..a0c6be03903a 100644 ---- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c -@@ -146,8 +146,8 @@ void iwl_mvm_temp_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb) - if (mvm->tz_device.tzone) { - struct iwl_mvm_thermal_device *tz_dev = &mvm->tz_device; - -- thermal_notify_framework(tz_dev->tzone, -- tz_dev->fw_trips_index[ths_crossed]); -+ thermal_zone_device_update(tz_dev->tzone, -+ THERMAL_TRIP_VIOLATED); - } - #endif /* CONFIG_THERMAL */ - } diff --git a/root/package/kernel/mac80211/patches/build/900-remove_module_supported_device.patch b/root/package/kernel/mac80211/patches/build/900-remove_module_supported_device.patch deleted file mode 100644 index a9ca382e..00000000 --- a/root/package/kernel/mac80211/patches/build/900-remove_module_supported_device.patch +++ /dev/null @@ -1,263 +0,0 @@ -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/admtek/adm8211.c backports-5.10.42-1/drivers/net/wireless/admtek/adm8211.c ---- backports-5.10.42-1.anc/drivers/net/wireless/admtek/adm8211.c 2021-09-23 22:26:42.899395773 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/admtek/adm8211.c 2021-09-23 22:30:53.147231692 +0200 -@@ -28,7 +28,6 @@ - MODULE_AUTHOR("Michael Wu "); - MODULE_AUTHOR("Jouni Malinen "); - MODULE_DESCRIPTION("Driver for IEEE 802.11b wireless cards based on ADMtek ADM8211"); --MODULE_SUPPORTED_DEVICE("ADM8211"); - MODULE_LICENSE("GPL"); - - static unsigned int tx_ring_size __read_mostly = 16; -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ath/ath5k/base.c backports-5.10.42-1/drivers/net/wireless/ath/ath5k/base.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ath/ath5k/base.c 2021-09-23 22:26:42.903395707 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ath/ath5k/base.c 2021-09-23 22:30:46.011350432 +0200 -@@ -90,7 +90,6 @@ - MODULE_AUTHOR("Jiri Slaby"); - MODULE_AUTHOR("Nick Kossifidis"); - MODULE_DESCRIPTION("Support for 5xxx series of Atheros 802.11 wireless LAN cards."); --MODULE_SUPPORTED_DEVICE("Atheros 5xxx WLAN cards"); - MODULE_LICENSE("Dual BSD/GPL"); - - static int ath5k_init(struct ieee80211_hw *hw); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ath/ath9k/hw.c backports-5.10.42-1/drivers/net/wireless/ath/ath9k/hw.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ath/ath9k/hw.c 2021-09-23 22:26:42.907395640 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ath/ath9k/hw.c 2021-09-23 22:30:44.355377987 +0200 -@@ -34,7 +34,6 @@ - - MODULE_AUTHOR("Atheros Communications"); - MODULE_DESCRIPTION("Support for Atheros 802.11n wireless LAN cards."); --MODULE_SUPPORTED_DEVICE("Atheros 802.11n WLAN cards"); - MODULE_LICENSE("Dual BSD/GPL"); - - static void ath9k_hw_set_clockrate(struct ath_hw *ah) -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ath/ath9k/init.c backports-5.10.42-1/drivers/net/wireless/ath/ath9k/init.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ath/ath9k/init.c 2021-09-23 22:26:42.907395640 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ath/ath9k/init.c 2021-09-23 22:30:44.355377987 +0200 -@@ -37,7 +37,6 @@ - - MODULE_AUTHOR("Atheros Communications"); - MODULE_DESCRIPTION("Support for Atheros 802.11n wireless LAN cards."); --MODULE_SUPPORTED_DEVICE("Atheros 802.11n WLAN cards"); - MODULE_LICENSE("Dual BSD/GPL"); - - static unsigned int ath9k_debug = ATH_DBG_DEFAULT; -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/atmel/atmel.c backports-5.10.42-1/drivers/net/wireless/atmel/atmel.c ---- backports-5.10.42-1.anc/drivers/net/wireless/atmel/atmel.c 2021-09-23 22:26:42.911395574 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/atmel/atmel.c 2021-09-23 22:30:46.023350232 +0200 -@@ -75,7 +75,6 @@ - MODULE_AUTHOR("Simon Kelley"); - MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards."); - MODULE_LICENSE("GPL"); --MODULE_SUPPORTED_DEVICE("Atmel at76c50x wireless cards"); - - /* The name of the firmware file to be loaded - over-rides any automatic selection */ -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/atmel/atmel_cs.c backports-5.10.42-1/drivers/net/wireless/atmel/atmel_cs.c ---- backports-5.10.42-1.anc/drivers/net/wireless/atmel/atmel_cs.c 2021-09-23 22:26:42.911395574 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/atmel/atmel_cs.c 2021-09-23 22:30:46.023350232 +0200 -@@ -57,7 +57,6 @@ - MODULE_AUTHOR("Simon Kelley"); - MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards."); - MODULE_LICENSE("GPL"); --MODULE_SUPPORTED_DEVICE("Atmel at76c50x PCMCIA cards"); - - /*====================================================================*/ - -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/atmel/atmel_pci.c backports-5.10.42-1/drivers/net/wireless/atmel/atmel_pci.c ---- backports-5.10.42-1.anc/drivers/net/wireless/atmel/atmel_pci.c 2021-09-23 22:26:42.911395574 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/atmel/atmel_pci.c 2021-09-23 22:30:46.023350232 +0200 -@@ -16,7 +16,6 @@ - MODULE_AUTHOR("Simon Kelley"); - MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards."); - MODULE_LICENSE("GPL"); --MODULE_SUPPORTED_DEVICE("Atmel at76c506 PCI wireless cards"); - - static const struct pci_device_id card_ids[] = { - { 0x1114, 0x0506, PCI_ANY_ID, PCI_ANY_ID }, -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c backports-5.10.42-1/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c ---- backports-5.10.42-1.anc/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c 2021-09-23 22:26:42.915395506 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c 2021-09-23 22:30:48.843303308 +0200 -@@ -87,7 +87,6 @@ - - MODULE_AUTHOR("Broadcom Corporation"); - MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver."); --MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN cards"); - MODULE_LICENSE("Dual BSD/GPL"); - /* This needs to be adjusted when brcms_firmwares changes */ - MODULE_FIRMWARE("brcm/bcm43xx-0.fw"); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c backports-5.10.42-1/drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c ---- backports-5.10.42-1.anc/drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c 2021-09-23 22:26:42.915395506 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c 2021-09-23 22:30:51.611257250 +0200 -@@ -12,7 +12,6 @@ - - MODULE_AUTHOR("Broadcom Corporation"); - MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver utilities."); --MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN cards"); - MODULE_LICENSE("Dual BSD/GPL"); - - struct sk_buff *brcmu_pkt_buf_get_skb(uint len) -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/cisco/airo.c backports-5.10.42-1/drivers/net/wireless/cisco/airo.c ---- backports-5.10.42-1.anc/drivers/net/wireless/cisco/airo.c 2021-09-23 22:26:42.915395506 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/cisco/airo.c 2021-09-23 22:30:53.147231692 +0200 -@@ -251,7 +251,6 @@ - MODULE_DESCRIPTION("Support for Cisco/Aironet 802.11 wireless ethernet cards. " - "Direct support for ISA/PCI/MPI cards and support for PCMCIA when used with airo_cs."); - MODULE_LICENSE("Dual BSD/GPL"); --MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350"); - module_param_hw_array(io, int, ioport, NULL, 0); - module_param_hw_array(irq, int, irq, NULL, 0); - module_param_array(rates, int, NULL, 0); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/cisco/airo_cs.c backports-5.10.42-1/drivers/net/wireless/cisco/airo_cs.c ---- backports-5.10.42-1.anc/drivers/net/wireless/cisco/airo_cs.c 2021-09-23 22:26:42.915395506 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/cisco/airo_cs.c 2021-09-23 22:30:53.159231492 +0200 -@@ -47,7 +47,6 @@ - "cards. This is the module that links the PCMCIA card " - "with the airo module."); - MODULE_LICENSE("Dual BSD/GPL"); --MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340 PCMCIA cards"); - - /*====================================================================*/ - -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/intersil/hostap/hostap_cs.c backports-5.10.42-1/drivers/net/wireless/intersil/hostap/hostap_cs.c ---- backports-5.10.42-1.anc/drivers/net/wireless/intersil/hostap/hostap_cs.c 2021-09-23 22:26:42.919395441 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/intersil/hostap/hostap_cs.c 2021-09-23 22:30:53.027233689 +0200 -@@ -26,7 +26,6 @@ - MODULE_AUTHOR("Jouni Malinen"); - MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN " - "cards (PC Card)."); --MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PC Card)"); - MODULE_LICENSE("GPL"); - - -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/intersil/hostap/hostap_pci.c backports-5.10.42-1/drivers/net/wireless/intersil/hostap/hostap_pci.c ---- backports-5.10.42-1.anc/drivers/net/wireless/intersil/hostap/hostap_pci.c 2021-09-23 22:26:42.919395441 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/intersil/hostap/hostap_pci.c 2021-09-23 22:30:53.027233689 +0200 -@@ -27,7 +27,6 @@ - MODULE_AUTHOR("Jouni Malinen"); - MODULE_DESCRIPTION("Support for Intersil Prism2.5-based 802.11 wireless LAN " - "PCI cards."); --MODULE_SUPPORTED_DEVICE("Intersil Prism2.5-based WLAN PCI cards"); - MODULE_LICENSE("GPL"); - - -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/intersil/hostap/hostap_plx.c backports-5.10.42-1/drivers/net/wireless/intersil/hostap/hostap_plx.c ---- backports-5.10.42-1.anc/drivers/net/wireless/intersil/hostap/hostap_plx.c 2021-09-23 22:26:42.919395441 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/intersil/hostap/hostap_plx.c 2021-09-23 22:30:53.031233622 +0200 -@@ -30,7 +30,6 @@ - MODULE_AUTHOR("Jouni Malinen"); - MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN " - "cards (PLX)."); --MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PLX)"); - MODULE_LICENSE("GPL"); - - -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2400pci.c backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2400pci.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2400pci.c 2021-09-23 22:26:42.927395307 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2400pci.c 2021-09-23 22:30:53.039233489 +0200 -@@ -1821,7 +1821,6 @@ - MODULE_AUTHOR(DRV_PROJECT); - MODULE_VERSION(DRV_VERSION); - MODULE_DESCRIPTION("Ralink RT2400 PCI & PCMCIA Wireless LAN driver."); --MODULE_SUPPORTED_DEVICE("Ralink RT2460 PCI & PCMCIA chipset based cards"); - MODULE_DEVICE_TABLE(pci, rt2400pci_device_table); - MODULE_LICENSE("GPL"); - -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2500pci.c backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2500pci.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2500pci.c 2021-09-23 22:26:42.927395307 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2500pci.c 2021-09-23 22:30:53.039233489 +0200 -@@ -2119,7 +2119,6 @@ - MODULE_AUTHOR(DRV_PROJECT); - MODULE_VERSION(DRV_VERSION); - MODULE_DESCRIPTION("Ralink RT2500 PCI & PCMCIA Wireless LAN driver."); --MODULE_SUPPORTED_DEVICE("Ralink RT2560 PCI & PCMCIA chipset based cards"); - MODULE_DEVICE_TABLE(pci, rt2500pci_device_table); - MODULE_LICENSE("GPL"); - -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2500usb.c backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2500usb.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2500usb.c 2021-09-23 22:26:42.927395307 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2500usb.c 2021-09-23 22:30:53.039233489 +0200 -@@ -1956,7 +1956,6 @@ - MODULE_AUTHOR(DRV_PROJECT); - MODULE_VERSION(DRV_VERSION); - MODULE_DESCRIPTION("Ralink RT2500 USB Wireless LAN driver."); --MODULE_SUPPORTED_DEVICE("Ralink RT2570 USB chipset based cards"); - MODULE_DEVICE_TABLE(usb, rt2500usb_device_table); - MODULE_LICENSE("GPL"); - -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2800pci.c backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2800pci.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2800pci.c 2021-09-23 22:26:42.927395307 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2800pci.c 2021-09-23 22:30:53.039233489 +0200 -@@ -447,7 +447,6 @@ - MODULE_AUTHOR(DRV_PROJECT); - MODULE_VERSION(DRV_VERSION); - MODULE_DESCRIPTION("Ralink RT2800 PCI & PCMCIA Wireless LAN driver."); --MODULE_SUPPORTED_DEVICE("Ralink RT2860 PCI & PCMCIA chipset based cards"); - MODULE_FIRMWARE(FIRMWARE_RT2860); - MODULE_DEVICE_TABLE(pci, rt2800pci_device_table); - MODULE_LICENSE("GPL"); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2800usb.c backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2800usb.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2800usb.c 2021-09-23 22:26:42.927395307 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2800usb.c 2021-09-23 22:30:53.039233489 +0200 -@@ -1254,7 +1254,6 @@ - MODULE_AUTHOR(DRV_PROJECT); - MODULE_VERSION(DRV_VERSION); - MODULE_DESCRIPTION("Ralink RT2800 USB Wireless LAN driver."); --MODULE_SUPPORTED_DEVICE("Ralink RT2870 USB chipset based cards"); - MODULE_DEVICE_TABLE(usb, rt2800usb_device_table); - MODULE_FIRMWARE(FIRMWARE_RT2870); - MODULE_LICENSE("GPL"); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt61pci.c backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt61pci.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt61pci.c 2021-09-23 22:26:42.927395307 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt61pci.c 2021-09-23 22:30:53.047233356 +0200 -@@ -2993,7 +2993,5 @@ - MODULE_AUTHOR(DRV_PROJECT); - MODULE_VERSION(DRV_VERSION); - MODULE_DESCRIPTION("Ralink RT61 PCI & PCMCIA Wireless LAN driver."); --MODULE_SUPPORTED_DEVICE("Ralink RT2561, RT2561s & RT2661 " -- "PCI & PCMCIA chipset based cards"); - MODULE_DEVICE_TABLE(pci, rt61pci_device_table); - MODULE_FIRMWARE(FIRMWARE_RT2561); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt73usb.c backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt73usb.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt73usb.c 2021-09-23 22:26:42.927395307 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt73usb.c 2021-09-23 22:30:53.043233423 +0200 -@@ -2513,7 +2513,6 @@ - MODULE_AUTHOR(DRV_PROJECT); - MODULE_VERSION(DRV_VERSION); - MODULE_DESCRIPTION("Ralink RT73 USB Wireless LAN driver."); --MODULE_SUPPORTED_DEVICE("Ralink RT2571W & RT2671 USB chipset based cards"); - MODULE_DEVICE_TABLE(usb, rt73usb_device_table); - MODULE_FIRMWARE(FIRMWARE_RT2571); - MODULE_LICENSE("GPL"); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/rsi/rsi_91x_main.c backports-5.10.42-1/drivers/net/wireless/rsi/rsi_91x_main.c ---- backports-5.10.42-1.anc/drivers/net/wireless/rsi/rsi_91x_main.c 2021-09-23 22:26:42.935395174 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/rsi/rsi_91x_main.c 2021-09-23 22:30:53.059233156 +0200 -@@ -441,6 +441,5 @@ - module_exit(rsi_91x_hal_module_exit); - MODULE_AUTHOR("Redpine Signals Inc"); - MODULE_DESCRIPTION("Station driver for RSI 91x devices"); --MODULE_SUPPORTED_DEVICE("RSI-91x"); - MODULE_VERSION("0.1"); - MODULE_LICENSE("Dual BSD/GPL"); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/rsi/rsi_91x_sdio.c backports-5.10.42-1/drivers/net/wireless/rsi/rsi_91x_sdio.c ---- backports-5.10.42-1.anc/drivers/net/wireless/rsi/rsi_91x_sdio.c 2021-09-23 22:26:42.935395174 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/rsi/rsi_91x_sdio.c 2021-09-23 22:30:53.063233090 +0200 -@@ -1571,7 +1571,6 @@ - - MODULE_AUTHOR("Redpine Signals Inc"); - MODULE_DESCRIPTION("Common SDIO layer for RSI drivers"); --MODULE_SUPPORTED_DEVICE("RSI-91x"); - MODULE_DEVICE_TABLE(sdio, rsi_dev_table); - MODULE_FIRMWARE(FIRMWARE_RSI9113); - MODULE_VERSION("0.1"); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/rsi/rsi_91x_usb.c backports-5.10.42-1/drivers/net/wireless/rsi/rsi_91x_usb.c ---- backports-5.10.42-1.anc/drivers/net/wireless/rsi/rsi_91x_usb.c 2021-09-23 22:26:42.935395174 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/rsi/rsi_91x_usb.c 2021-09-23 22:30:53.063233090 +0200 -@@ -926,7 +926,6 @@ - - MODULE_AUTHOR("Redpine Signals Inc"); - MODULE_DESCRIPTION("Common USB layer for RSI drivers"); --MODULE_SUPPORTED_DEVICE("RSI-91x"); - MODULE_DEVICE_TABLE(usb, rsi_dev_table); - MODULE_FIRMWARE(FIRMWARE_RSI9113); - MODULE_VERSION("0.1"); diff --git a/root/package/kernel/mac80211/patches/build/firmware-replace-HOTPLUG-with-UEVENT-in-FW_ACTION-defines.patch b/root/package/kernel/mac80211/patches/build/firmware-replace-HOTPLUG-with-UEVENT-in-FW_ACTION-defines.patch deleted file mode 100644 index f04b5a0f..00000000 --- a/root/package/kernel/mac80211/patches/build/firmware-replace-HOTPLUG-with-UEVENT-in-FW_ACTION-defines.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c -index 8509b989940c..5bf15355c2b3 100644 ---- a/drivers/net/wireless/ti/wlcore/main.c -+++ b/drivers/net/wireless/ti/wlcore/main.c -@@ -6784,7 +6784,7 @@ int wlcore_probe(struct wl1271 *wl, struct platform_device *pdev) - - if (pdev_data->family && pdev_data->family->nvs_name) { - nvs_name = pdev_data->family->nvs_name; -- ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, -+ ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT, - nvs_name, &pdev->dev, GFP_KERNEL, - wl, wlcore_nvs_cb); - if (ret < 0) { From 0904562b9e74d63c1f82ed28629003982f81e575 Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Thu, 11 Nov 2021 05:21:43 +0800 Subject: [PATCH 02/14] Create 950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch --- ...0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch | 631 ++++++++++++++++++ 1 file changed, 631 insertions(+) create mode 100644 root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch diff --git a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch new file mode 100644 index 00000000..483749cb --- /dev/null +++ b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch @@ -0,0 +1,631 @@ +From 104dcc1aff0ae5509ad9875c11e3e0d8c290709d Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Tue, 2 Jun 2020 17:19:51 +0100 +Subject: [PATCH] ARM: dts: Add bcm2711-rpi-cm4.dts + +Add initial DTS file for Compute Module 4. + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 586 ++++++++++++++++++++++++++ + arch/arm/boot/dts/overlays/README | 6 + + 3 files changed, 594 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4.dts + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -12,7 +12,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ + bcm2710-rpi-3-b.dtb \ + bcm2711-rpi-4-b.dtb \ + bcm2710-rpi-3-b-plus.dtb \ +- bcm2710-rpi-cm3.dtb ++ bcm2710-rpi-cm3.dtb \ ++ bcm2711-rpi-cm4.dtb + + dtb-$(CONFIG_ARCH_ALPINE) += \ + alpine-db.dtb +--- /dev/null ++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +@@ -0,0 +1,586 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/dts-v1/; ++#include "bcm2711.dtsi" ++#include "bcm2835-rpi.dtsi" ++ ++/ { ++ compatible = "raspberrypi,4-compute-module", "brcm,bcm2711"; ++ model = "openmptcprouter5g"; ++ ++ chosen { ++ /* 8250 auxiliary UART instead of pl011 */ ++ stdout-path = "serial1:115200n8"; ++ }; ++ ++ /* Will be filled by the bootloader */ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0 0 0>; ++ }; ++ ++ aliases { ++ ethernet0 = &genet; ++ }; ++ ++ leds { ++ act { ++ gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ pwr { ++ label = "PWR"; ++ gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++ ++ wifi_pwrseq: wifi-pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>; ++ }; ++ ++ sd_io_1v8_reg: sd_io_1v8_reg { ++ compatible = "regulator-gpio"; ++ regulator-name = "vdd-sd-io"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-boot-on; ++ regulator-always-on; ++ regulator-settling-time-us = <5000>; ++ gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>; ++ states = <1800000 0x1 ++ 3300000 0x0>; ++ status = "okay"; ++ }; ++}; ++ ++&firmware { ++ expgpio: gpio { ++ compatible = "raspberrypi,firmware-gpio"; ++ gpio-controller; ++ #gpio-cells = <2>; ++ gpio-line-names = "BT_ON", ++ "WL_ON", ++ "PWR_LED_OFF", ++ "ANT1", ++ "VDD_SD_IO_SEL", ++ "CAM_GPIO", ++ "SD_PWR_ON", ++ "ANT2"; ++ status = "okay"; ++ ++ ant1: ant1 { ++ gpio-hog; ++ gpios = <3 GPIO_ACTIVE_HIGH>; ++ output-high; ++ }; ++ ++ ant2: ant2 { ++ gpio-hog; ++ gpios = <7 GPIO_ACTIVE_HIGH>; ++ output-low; ++ }; ++ }; ++}; ++ ++&pwm1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pwm1_0_gpio40 &pwm1_1_gpio41>; ++ status = "okay"; ++}; ++ ++/* SDHCI is used to control the SDIO for wireless */ ++&sdhci { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&emmc_gpio34>; ++ bus-width = <4>; ++ non-removable; ++ mmc-pwrseq = <&wifi_pwrseq>; ++ status = "okay"; ++ ++ brcmf: wifi@1 { ++ reg = <1>; ++ compatible = "brcm,bcm4329-fmac"; ++ }; ++}; ++ ++/* EMMC2 is used to drive the SD card */ ++&emmc2 { ++ vqmmc-supply = <&sd_io_1v8_reg>; ++ broken-cd; ++ status = "okay"; ++}; ++ ++&genet { ++ phy-handle = <&phy1>; ++ phy-mode = "rgmii-rxid"; ++ status = "okay"; ++}; ++ ++&genet_mdio { ++ phy1: ethernet-phy@1 { ++ /* No PHY interrupt */ ++ reg = <0x1>; ++ }; ++}; ++ ++/* uart0 communicates with the BT module */ ++&uart0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart0_ctsrts_gpio30 &uart0_gpio32>; ++ uart-has-rtscts; ++ status = "okay"; ++ ++ bluetooth { ++ compatible = "brcm,bcm43438-bt"; ++ max-speed = <2000000>; ++ shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>; ++ }; ++}; ++ ++/* uart1 is mapped to the pin header */ ++&uart1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart1_gpio14>; ++ status = "okay"; ++}; ++ ++&vchiq { ++ interrupts = ; ++}; ++ ++&vc4 { ++ status = "okay"; ++}; ++ ++&pixelvalve0 { ++ status = "okay"; ++}; ++ ++&pixelvalve1 { ++ status = "okay"; ++}; ++ ++&pixelvalve2 { ++ status = "okay"; ++}; ++ ++&pixelvalve3 { ++ status = "okay"; ++}; ++ ++&pixelvalve4 { ++ status = "okay"; ++}; ++ ++&hdmi0 { ++ status = "okay"; ++}; ++ ++&ddc0 { ++ status = "okay"; ++}; ++ ++&hdmi1 { ++ status = "okay"; ++}; ++ ++&ddc1 { ++ status = "okay"; ++}; ++ ++// ============================================= ++// Downstream rpi- changes ++ ++#include "bcm270x.dtsi" ++ ++/ { ++ soc { ++ /delete-node/ pixelvalve@7e807000; ++ /delete-node/ hdmi@7e902000; ++ }; ++}; ++ ++#include "bcm2711-rpi.dtsi" ++#include "bcm283x-rpi-csi1-2lane.dtsi" ++#include "bcm283x-rpi-i2c0mux_0_44.dtsi" ++ ++/delete-node/ &emmc2; ++ ++/ { ++ chosen { ++ bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1"; ++ }; ++ ++ aliases { ++ serial0 = &uart1; ++ serial1 = &uart0; ++ mmc0 = &emmc2; ++ mmc1 = &mmcnr; ++ mmc2 = &sdhost; ++ /delete-property/ i2c2; ++ i2c3 = &i2c3; ++ i2c4 = &i2c4; ++ i2c5 = &i2c5; ++ i2c6 = &i2c6; ++ /delete-property/ ethernet; ++ /delete-property/ intc; ++ pcie0 = &pcie0; ++ emmc2bus = &emmc2bus; ++ }; ++ ++ emmc2bus: emmc2bus { ++ compatible = "simple-bus"; ++ #address-cells = <2>; ++ #size-cells = <1>; ++ ++ ranges = <0x0 0x7e000000 0x0 0xfe000000 0x01800000>; ++ dma-ranges = <0x0 0xc0000000 0x0 0x00000000 0x40000000>; ++ ++ emmc2: emmc2@7e340000 { ++ compatible = "brcm,bcm2711-emmc2"; ++ status = "okay"; ++ interrupts = ; ++ clocks = <&clocks BCM2711_CLOCK_EMMC2>; ++ reg = <0x0 0x7e340000 0x100>; ++ vqmmc-supply = <&sd_io_1v8_reg>; ++ broken-cd; ++ }; ++ }; ++ ++ /delete-node/ wifi-pwrseq; ++}; ++ ++&mmcnr { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdio_pins>; ++ bus-width = <4>; ++ status = "okay"; ++}; ++ ++&uart0 { ++ pinctrl-0 = <&uart0_pins &bt_pins>; ++ status = "okay"; ++ ++ /delete-node/ bluetooth; ++}; ++ ++&uart1 { ++ pinctrl-0 = <&uart1_pins>; ++}; ++ ++&spi0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&spi0_pins &spi0_cs_pins>; ++ cs-gpios = <&gpio 8 1>, <&gpio 7 1>; ++ ++ spidev0: spidev@0{ ++ compatible = "spidev"; ++ reg = <0>; /* CE0 */ ++ #address-cells = <1>; ++ #size-cells = <0>; ++ spi-max-frequency = <125000000>; ++ }; ++ ++ spidev1: spidev@1{ ++ compatible = "spidev"; ++ reg = <1>; /* CE1 */ ++ #address-cells = <1>; ++ #size-cells = <0>; ++ spi-max-frequency = <125000000>; ++ }; ++}; ++ ++&gpio { ++ spi0_pins: spi0_pins { ++ brcm,pins = <9 10 11>; ++ brcm,function = ; ++ }; ++ ++ spi0_cs_pins: spi0_cs_pins { ++ brcm,pins = <8 7>; ++ brcm,function = ; ++ }; ++ ++ spi3_pins: spi3_pins { ++ brcm,pins = <1 2 3>; ++ brcm,function = ; ++ }; ++ ++ spi3_cs_pins: spi3_cs_pins { ++ brcm,pins = <0 24>; ++ brcm,function = ; ++ }; ++ ++ spi4_pins: spi4_pins { ++ brcm,pins = <5 6 7>; ++ brcm,function = ; ++ }; ++ ++ spi4_cs_pins: spi4_cs_pins { ++ brcm,pins = <4 25>; ++ brcm,function = ; ++ }; ++ ++ spi5_pins: spi5_pins { ++ brcm,pins = <13 14 15>; ++ brcm,function = ; ++ }; ++ ++ spi5_cs_pins: spi5_cs_pins { ++ brcm,pins = <12 26>; ++ brcm,function = ; ++ }; ++ ++ spi6_pins: spi6_pins { ++ brcm,pins = <19 20 21>; ++ brcm,function = ; ++ }; ++ ++ spi6_cs_pins: spi6_cs_pins { ++ brcm,pins = <18 27>; ++ brcm,function = ; ++ }; ++ ++ i2c0_pins: i2c0 { ++ brcm,pins = <0 1>; ++ brcm,function = ; ++ brcm,pull = ; ++ }; ++ ++ i2c1_pins: i2c1 { ++ brcm,pins = <2 3>; ++ brcm,function = ; ++ brcm,pull = ; ++ }; ++ ++ i2c3_pins: i2c3 { ++ brcm,pins = <4 5>; ++ brcm,function = ; ++ brcm,pull = ; ++ }; ++ ++ i2c4_pins: i2c4 { ++ brcm,pins = <8 9>; ++ brcm,function = ; ++ brcm,pull = ; ++ }; ++ ++ i2c5_pins: i2c5 { ++ brcm,pins = <12 13>; ++ brcm,function = ; ++ brcm,pull = ; ++ }; ++ ++ i2c6_pins: i2c6 { ++ brcm,pins = <22 23>; ++ brcm,function = ; ++ brcm,pull = ; ++ }; ++ ++ i2s_pins: i2s { ++ brcm,pins = <18 19 20 21>; ++ brcm,function = ; ++ }; ++ ++ sdio_pins: sdio_pins { ++ brcm,pins = <34 35 36 37 38 39>; ++ brcm,function = ; // alt3 = SD1 ++ brcm,pull = <0 2 2 2 2 2>; ++ }; ++ ++ bt_pins: bt_pins { ++ brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0 ++ // to fool pinctrl ++ brcm,function = <0>; ++ brcm,pull = <2>; ++ }; ++ ++ uart0_pins: uart0_pins { ++ brcm,pins = <32 33>; ++ brcm,function = ; ++ brcm,pull = <0 2>; ++ }; ++ ++ uart1_pins: uart1_pins { ++ brcm,pins; ++ brcm,function; ++ brcm,pull; ++ }; ++ ++ uart2_pins: uart2_pins { ++ brcm,pins = <0 1>; ++ brcm,function = ; ++ brcm,pull = <0 2>; ++ }; ++ ++ uart3_pins: uart3_pins { ++ brcm,pins = <4 5>; ++ brcm,function = ; ++ brcm,pull = <0 2>; ++ }; ++ ++ uart4_pins: uart4_pins { ++ brcm,pins = <8 9>; ++ brcm,function = ; ++ brcm,pull = <0 2>; ++ }; ++ ++ uart5_pins: uart5_pins { ++ brcm,pins = <12 13>; ++ brcm,function = ; ++ brcm,pull = <0 2>; ++ }; ++}; ++ ++&i2c0if { ++ clock-frequency = <100000>; ++}; ++ ++&i2c1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&i2c1_pins>; ++ clock-frequency = <100000>; ++}; ++ ++&i2s { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&i2s_pins>; ++}; ++ ++/ { ++ __overrides__ { ++ /delete-property/ i2c2_baudrate; ++ /delete-property/ i2c2_iknowwhatimdoing; ++ }; ++}; ++ ++// ============================================= ++// Board specific stuff here ++ ++/ { ++ sd_vcc_reg: sd_vcc_reg { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc-sd"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-boot-on; ++ enable-active-high; ++ gpio = <&expgpio 6 GPIO_ACTIVE_HIGH>; ++ }; ++}; ++ ++&sdhost { ++ status = "disabled"; ++}; ++ ++&emmc2 { ++ vmmc-supply = <&sd_vcc_reg>; ++ bus-width = <8>; ++}; ++ ++&phy1 { ++ led-modes = <0x00 0x08>; /* link/activity link */ ++}; ++ ++&gpio { ++ audio_pins: audio_pins { ++ brcm,pins = <40 41>; ++ brcm,function = <4>; ++ }; ++}; ++ ++&leds { ++ act_led: act { ++ label = "led0"; ++ linux,default-trigger = "mmc0"; ++ gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ pwr_led: pwr { ++ label = "led1"; ++ linux,default-trigger = "default-on"; ++ gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; ++ }; ++}; ++ ++&pwm1 { ++ status = "disabled"; ++}; ++ ++&audio { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&audio_pins>; ++}; ++ ++&vc4 { ++ status = "disabled"; ++}; ++ ++&pixelvalve0 { ++ status = "disabled"; ++}; ++ ++&pixelvalve1 { ++ status = "disabled"; ++}; ++ ++&pixelvalve2 { ++ status = "disabled"; ++}; ++ ++&pixelvalve3 { ++ status = "disabled"; ++}; ++ ++&pixelvalve4 { ++ status = "disabled"; ++}; ++ ++&hdmi0 { ++ status = "disabled"; ++}; ++ ++&ddc0 { ++ status = "disabled"; ++}; ++ ++&hdmi1 { ++ status = "disabled"; ++}; ++ ++&ddc1 { ++ status = "disabled"; ++}; ++ ++/ { ++ __overrides__ { ++ act_led_gpio = <&act_led>,"gpios:4"; ++ act_led_activelow = <&act_led>,"gpios:8"; ++ act_led_trigger = <&act_led>,"linux,default-trigger"; ++ ++ pwr_led_gpio = <&pwr_led>,"gpios:4"; ++ pwr_led_activelow = <&pwr_led>,"gpios:8"; ++ pwr_led_trigger = <&pwr_led>,"linux,default-trigger"; ++ ++ eth_led0 = <&phy1>,"led-modes:0"; ++ eth_led1 = <&phy1>,"led-modes:4"; ++ ++ ant1 = <&ant1>,"output-high?=on", ++ <&ant1>, "output-low?=off", ++ <&ant2>, "output-high?=off", ++ <&ant2>, "output-low?=on"; ++ ant2 = <&ant1>,"output-high?=off", ++ <&ant1>, "output-low?=on", ++ <&ant2>, "output-high?=on", ++ <&ant2>, "output-low?=off"; ++ noant = <&ant1>,"output-high?=off", ++ <&ant1>, "output-low?=on", ++ <&ant2>, "output-high?=off", ++ <&ant2>, "output-low?=on"; ++ ++ spi_dma4 = <&spi0>, "dmas:0=", <&dma40>, ++ <&spi0>, "dmas:8=", <&dma40>; ++ }; ++}; +--- a/arch/arm/boot/dts/overlays/README ++++ b/arch/arm/boot/dts/overlays/README +@@ -92,6 +92,12 @@ Name: + Info: Configures the base Raspberry Pi hardware + Load: + Params: ++ ant1 Select antenna 1 (default). CM4 only. ++ ++ ant2 Select antenna 2. CM4 only. ++ ++ noant Disable both antennas. CM4 only. ++ + audio Set to "on" to enable the onboard ALSA audio + interface (default "off") + From 24be2932e6d3d09990b66f8310ac3279cdc9bfee Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Fri, 12 Nov 2021 21:20:06 +0800 Subject: [PATCH 03/14] Update 950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch --- .../patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch index 483749cb..fa6837b4 100644 --- a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch +++ b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch @@ -35,7 +35,7 @@ Signed-off-by: Phil Elwell + +/ { + compatible = "raspberrypi,4-compute-module", "brcm,bcm2711"; -+ model = "openmptcprouter5g"; ++ model = "Raspberry Pi Compute Module 4"; + + chosen { + /* 8250 auxiliary UART instead of pl011 */ From cb3a5b54e71f25b71bd94b5ae11248b204b3acc8 Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Fri, 12 Nov 2021 22:27:33 +0800 Subject: [PATCH 04/14] Update 950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch --- ...0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch | 125 +++++++++--------- 1 file changed, 64 insertions(+), 61 deletions(-) diff --git a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch index fa6837b4..60658136 100644 --- a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch +++ b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell alpine-db.dtb --- /dev/null +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts -@@ -0,0 +1,586 @@ +@@ -0,0 +1,589 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +#include "bcm2711.dtsi" @@ -61,6 +61,69 @@ Signed-off-by: Phil Elwell + label = "PWR"; + gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; + }; ++ ++ wlan2g { ++ label = "blue:wlan2g"; ++ gpios = <&gpio 17 GPIO_ACTIVE_LOW>; ++ }; ++ ++ wlan5g { ++ label = "bule:wlan5g"; ++ gpios = <&gpio 3 GPIO_ACTIVE_LOW>; ++ }; ++ ++ wan { ++ label = "bule:wan"; ++ gpios = <&gpio 27 GPIO_ACTIVE_LOW>; ++ }; ++ 5g1 { ++ label = "bule:5g1"; ++ gpios = <&gpio 21 GPIO_ACTIVE_LOW>; ++ }; ++ 5g2 { ++ label = "bule:5g2"; ++ gpios = <&gpio 20 GPIO_ACTIVE_LOW>; ++ }; ++ 5g3 { ++ label = "bule:5g3"; ++ gpios = <&gpio 16 GPIO_ACTIVE_LOW>; ++ }; ++ 5g4 { ++ label = "bule:5g4"; ++ gpios = <&gpio 12 GPIO_ACTIVE_LOW>; ++ }; ++ 5g5 { ++ label = "bule:5g5"; ++ gpios = <&gpio 10 GPIO_ACTIVE_LOW>; ++ }; ++ 5g6 { ++ label = "bule:5g6"; ++ gpios = <&gpio 22 GPIO_ACTIVE_LOW>; ++ }; ++ 5gpwr1 { ++ label = "bule:5gpwr1"; ++ gpios = <&gpio 26 GPIO_ACTIVE_LOW>; ++ }; ++ 5gpwr2 { ++ label = "bule:5gpwr2"; ++ gpios = <&gpio 19 GPIO_ACTIVE_LOW>; ++ }; ++ 5gpwr3 { ++ label = "bule:5gpwr3"; ++ gpios = <&gpio 13 GPIO_ACTIVE_LOW>; ++ }; ++ 5gpwr4 { ++ label = "bule:5gpwr4"; ++ gpios = <&gpio 24 GPIO_ACTIVE_LOW>; ++ }; ++ 5gpwr5 { ++ label = "bule:5gpwr5"; ++ gpios = <&gpio 23 GPIO_ACTIVE_LOW>; ++ }; ++ 5gpwr6 { ++ label = "bule:5gpwr6"; ++ gpios = <&gpio 18 GPIO_ACTIVE_LOW>; ++ }; + }; + + wifi_pwrseq: wifi-pwrseq { @@ -323,11 +386,6 @@ Signed-off-by: Phil Elwell +}; + +&gpio { -+ spi0_pins: spi0_pins { -+ brcm,pins = <9 10 11>; -+ brcm,function = ; -+ }; -+ + spi0_cs_pins: spi0_cs_pins { + brcm,pins = <8 7>; + brcm,function = ; @@ -338,11 +396,6 @@ Signed-off-by: Phil Elwell + brcm,function = ; + }; + -+ spi3_cs_pins: spi3_cs_pins { -+ brcm,pins = <0 24>; -+ brcm,function = ; -+ }; -+ + spi4_pins: spi4_pins { + brcm,pins = <5 6 7>; + brcm,function = ; @@ -358,62 +411,18 @@ Signed-off-by: Phil Elwell + brcm,function = ; + }; + -+ spi5_cs_pins: spi5_cs_pins { -+ brcm,pins = <12 26>; -+ brcm,function = ; -+ }; -+ -+ spi6_pins: spi6_pins { -+ brcm,pins = <19 20 21>; -+ brcm,function = ; -+ }; -+ -+ spi6_cs_pins: spi6_cs_pins { -+ brcm,pins = <18 27>; -+ brcm,function = ; -+ }; -+ + i2c0_pins: i2c0 { + brcm,pins = <0 1>; + brcm,function = ; + brcm,pull = ; + }; + -+ i2c1_pins: i2c1 { -+ brcm,pins = <2 3>; -+ brcm,function = ; -+ brcm,pull = ; -+ }; -+ -+ i2c3_pins: i2c3 { -+ brcm,pins = <4 5>; -+ brcm,function = ; -+ brcm,pull = ; -+ }; -+ + i2c4_pins: i2c4 { + brcm,pins = <8 9>; + brcm,function = ; + brcm,pull = ; + }; + -+ i2c5_pins: i2c5 { -+ brcm,pins = <12 13>; -+ brcm,function = ; -+ brcm,pull = ; -+ }; -+ -+ i2c6_pins: i2c6 { -+ brcm,pins = <22 23>; -+ brcm,function = ; -+ brcm,pull = ; -+ }; -+ -+ i2s_pins: i2s { -+ brcm,pins = <18 19 20 21>; -+ brcm,function = ; -+ }; -+ + sdio_pins: sdio_pins { + brcm,pins = <34 35 36 37 38 39>; + brcm,function = ; // alt3 = SD1 @@ -456,12 +465,6 @@ Signed-off-by: Phil Elwell + brcm,function = ; + brcm,pull = <0 2>; + }; -+ -+ uart5_pins: uart5_pins { -+ brcm,pins = <12 13>; -+ brcm,function = ; -+ brcm,pull = <0 2>; -+ }; +}; + +&i2c0if { From f6d50ca26be54c29c653ab5b776fe26349f8c47c Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Fri, 12 Nov 2021 23:07:44 +0800 Subject: [PATCH 05/14] Update 950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch --- ...0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch index 60658136..b9869aea 100644 --- a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch +++ b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell alpine-db.dtb --- /dev/null +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts -@@ -0,0 +1,589 @@ +@@ -0,0 +1,601 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +#include "bcm2711.dtsi" @@ -75,51 +75,63 @@ Signed-off-by: Phil Elwell + wan { + label = "bule:wan"; + gpios = <&gpio 27 GPIO_ACTIVE_LOW>; -+ }; ++ }; ++ + 5g1 { + label = "bule:5g1"; + gpios = <&gpio 21 GPIO_ACTIVE_LOW>; -+ }; ++ }; ++ + 5g2 { + label = "bule:5g2"; + gpios = <&gpio 20 GPIO_ACTIVE_LOW>; -+ }; ++ }; ++ + 5g3 { + label = "bule:5g3"; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + }; ++ + 5g4 { + label = "bule:5g4"; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; -+ }; ++ }; ++ + 5g5 { + label = "bule:5g5"; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; -+ }; ++ }; ++ + 5g6 { + label = "bule:5g6"; + gpios = <&gpio 22 GPIO_ACTIVE_LOW>; -+ }; ++ }; ++ + 5gpwr1 { + label = "bule:5gpwr1"; + gpios = <&gpio 26 GPIO_ACTIVE_LOW>; -+ }; ++ }; ++ + 5gpwr2 { + label = "bule:5gpwr2"; + gpios = <&gpio 19 GPIO_ACTIVE_LOW>; -+ }; ++ }; ++ + 5gpwr3 { + label = "bule:5gpwr3"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + }; ++ + 5gpwr4 { + label = "bule:5gpwr4"; + gpios = <&gpio 24 GPIO_ACTIVE_LOW>; -+ }; ++ }; ++ + 5gpwr5 { + label = "bule:5gpwr5"; + gpios = <&gpio 23 GPIO_ACTIVE_LOW>; -+ }; ++ }; ++ + 5gpwr6 { + label = "bule:5gpwr6"; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; From 2dcfd56fb37e84c2ef73c0246ddfaa20212b04ea Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Fri, 12 Nov 2021 23:10:40 +0800 Subject: [PATCH 06/14] Update 950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch --- ...0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch index b9869aea..92ff9e9b 100644 --- a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch +++ b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch @@ -63,77 +63,77 @@ Signed-off-by: Phil Elwell + }; + + wlan2g { -+ label = "blue:wlan2g"; ++ label = "wlan2g"; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + }; + + wlan5g { -+ label = "bule:wlan5g"; ++ label = "wlan5g"; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; + }; + + wan { -+ label = "bule:wan"; ++ label = "wan"; + gpios = <&gpio 27 GPIO_ACTIVE_LOW>; + }; + + 5g1 { -+ label = "bule:5g1"; ++ label = "5g1"; + gpios = <&gpio 21 GPIO_ACTIVE_LOW>; + }; + + 5g2 { -+ label = "bule:5g2"; ++ label = "5g2"; + gpios = <&gpio 20 GPIO_ACTIVE_LOW>; + }; + + 5g3 { -+ label = "bule:5g3"; ++ label = "5g3"; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + }; + + 5g4 { -+ label = "bule:5g4"; ++ label = "5g4"; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + }; + + 5g5 { -+ label = "bule:5g5"; ++ label = "5g5"; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; + }; + + 5g6 { -+ label = "bule:5g6"; ++ label = "5g6"; + gpios = <&gpio 22 GPIO_ACTIVE_LOW>; + }; + + 5gpwr1 { -+ label = "bule:5gpwr1"; ++ label = "5gpwr1"; + gpios = <&gpio 26 GPIO_ACTIVE_LOW>; + }; + + 5gpwr2 { -+ label = "bule:5gpwr2"; ++ label = "5gpwr2"; + gpios = <&gpio 19 GPIO_ACTIVE_LOW>; + }; + + 5gpwr3 { -+ label = "bule:5gpwr3"; ++ label = "5gpwr3"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + }; + + 5gpwr4 { -+ label = "bule:5gpwr4"; ++ label = "5gpwr4"; + gpios = <&gpio 24 GPIO_ACTIVE_LOW>; + }; + + 5gpwr5 { -+ label = "bule:5gpwr5"; ++ label = "5gpwr5"; + gpios = <&gpio 23 GPIO_ACTIVE_LOW>; + }; + + 5gpwr6 { -+ label = "bule:5gpwr6"; ++ label = "5gpwr6"; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; + }; + }; From 42c19530623ede05856844a8267f6198571a5248 Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Fri, 12 Nov 2021 23:18:41 +0800 Subject: [PATCH 07/14] Update 950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch --- .../950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch index 92ff9e9b..d7772e9a 100644 --- a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch +++ b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell alpine-db.dtb --- /dev/null +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts -@@ -0,0 +1,601 @@ +@@ -0,0 +1,590 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +#include "bcm2711.dtsi" @@ -173,12 +173,6 @@ Signed-off-by: Phil Elwell + "ANT2"; + status = "okay"; + -+ ant1: ant1 { -+ gpio-hog; -+ gpios = <3 GPIO_ACTIVE_HIGH>; -+ output-high; -+ }; -+ + ant2: ant2 { + gpio-hog; + gpios = <7 GPIO_ACTIVE_HIGH>; @@ -418,11 +412,6 @@ Signed-off-by: Phil Elwell + brcm,function = ; + }; + -+ spi5_pins: spi5_pins { -+ brcm,pins = <13 14 15>; -+ brcm,function = ; -+ }; -+ + i2c0_pins: i2c0 { + brcm,pins = <0 1>; + brcm,function = ; From b6f6803e2585d977f2b07eced2784d82d5627931 Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Sat, 13 Nov 2021 00:03:22 +0800 Subject: [PATCH 08/14] Update 950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch --- ...0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch | 150 +++++++++--------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch index d7772e9a..7f82ec3e 100644 --- a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch +++ b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch @@ -61,81 +61,6 @@ Signed-off-by: Phil Elwell + label = "PWR"; + gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; + }; -+ -+ wlan2g { -+ label = "wlan2g"; -+ gpios = <&gpio 17 GPIO_ACTIVE_LOW>; -+ }; -+ -+ wlan5g { -+ label = "wlan5g"; -+ gpios = <&gpio 3 GPIO_ACTIVE_LOW>; -+ }; -+ -+ wan { -+ label = "wan"; -+ gpios = <&gpio 27 GPIO_ACTIVE_LOW>; -+ }; -+ -+ 5g1 { -+ label = "5g1"; -+ gpios = <&gpio 21 GPIO_ACTIVE_LOW>; -+ }; -+ -+ 5g2 { -+ label = "5g2"; -+ gpios = <&gpio 20 GPIO_ACTIVE_LOW>; -+ }; -+ -+ 5g3 { -+ label = "5g3"; -+ gpios = <&gpio 16 GPIO_ACTIVE_LOW>; -+ }; -+ -+ 5g4 { -+ label = "5g4"; -+ gpios = <&gpio 12 GPIO_ACTIVE_LOW>; -+ }; -+ -+ 5g5 { -+ label = "5g5"; -+ gpios = <&gpio 10 GPIO_ACTIVE_LOW>; -+ }; -+ -+ 5g6 { -+ label = "5g6"; -+ gpios = <&gpio 22 GPIO_ACTIVE_LOW>; -+ }; -+ -+ 5gpwr1 { -+ label = "5gpwr1"; -+ gpios = <&gpio 26 GPIO_ACTIVE_LOW>; -+ }; -+ -+ 5gpwr2 { -+ label = "5gpwr2"; -+ gpios = <&gpio 19 GPIO_ACTIVE_LOW>; -+ }; -+ -+ 5gpwr3 { -+ label = "5gpwr3"; -+ gpios = <&gpio 13 GPIO_ACTIVE_LOW>; -+ }; -+ -+ 5gpwr4 { -+ label = "5gpwr4"; -+ gpios = <&gpio 24 GPIO_ACTIVE_LOW>; -+ }; -+ -+ 5gpwr5 { -+ label = "5gpwr5"; -+ gpios = <&gpio 23 GPIO_ACTIVE_LOW>; -+ }; -+ -+ 5gpwr6 { -+ label = "5gpwr6"; -+ gpios = <&gpio 18 GPIO_ACTIVE_LOW>; -+ }; + }; + + wifi_pwrseq: wifi-pwrseq { @@ -537,6 +462,81 @@ Signed-off-by: Phil Elwell + linux,default-trigger = "default-on"; + gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; + }; ++ ++ wlan2g { ++ label = "wlan2g"; ++ gpios = <&gpio 17 GPIO_ACTIVE_LOW>; ++ }; ++ ++ wlan5g { ++ label = "wlan5g"; ++ gpios = <&gpio 3 GPIO_ACTIVE_LOW>; ++ }; ++ ++ wan { ++ label = "wan"; ++ gpios = <&gpio 27 GPIO_ACTIVE_LOW>; ++ }; ++ ++ 5g1 { ++ label = "5g1"; ++ gpios = <&gpio 21 GPIO_ACTIVE_LOW>; ++ }; ++ ++ 5g2 { ++ label = "5g2"; ++ gpios = <&gpio 20 GPIO_ACTIVE_LOW>; ++ }; ++ ++ 5g3 { ++ label = "5g3"; ++ gpios = <&gpio 16 GPIO_ACTIVE_LOW>; ++ }; ++ ++ 5g4 { ++ label = "5g4"; ++ gpios = <&gpio 12 GPIO_ACTIVE_LOW>; ++ }; ++ ++ 5g5 { ++ label = "5g5"; ++ gpios = <&gpio 10 GPIO_ACTIVE_LOW>; ++ }; ++ ++ 5g6 { ++ label = "5g6"; ++ gpios = <&gpio 22 GPIO_ACTIVE_LOW>; ++ }; ++ ++ 5gpwr1 { ++ label = "5gpwr1"; ++ gpios = <&gpio 26 GPIO_ACTIVE_LOW>; ++ }; ++ ++ 5gpwr2 { ++ label = "5gpwr2"; ++ gpios = <&gpio 19 GPIO_ACTIVE_LOW>; ++ }; ++ ++ 5gpwr3 { ++ label = "5gpwr3"; ++ gpios = <&gpio 13 GPIO_ACTIVE_LOW>; ++ }; ++ ++ 5gpwr4 { ++ label = "5gpwr4"; ++ gpios = <&gpio 24 GPIO_ACTIVE_LOW>; ++ }; ++ ++ 5gpwr5 { ++ label = "5gpwr5"; ++ gpios = <&gpio 23 GPIO_ACTIVE_LOW>; ++ }; ++ ++ 5gpwr6 { ++ label = "5gpwr6"; ++ gpios = <&gpio 18 GPIO_ACTIVE_LOW>; ++ }; +}; + +&pwm1 { From c38e1adf5aa9ec95bc6876ef6d3c595fbdd8685f Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Sat, 13 Nov 2021 00:11:40 +0800 Subject: [PATCH 09/14] Update 950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch --- .../patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch index 7f82ec3e..95d5382d 100644 --- a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch +++ b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell alpine-db.dtb --- /dev/null +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts -@@ -0,0 +1,590 @@ +@@ -0,0 +1,589 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +#include "bcm2711.dtsi" @@ -91,7 +91,6 @@ Signed-off-by: Phil Elwell + gpio-line-names = "BT_ON", + "WL_ON", + "PWR_LED_OFF", -+ "ANT1", + "VDD_SD_IO_SEL", + "CAM_GPIO", + "SD_PWR_ON", From cb8e9d36646d41821929cd013e83ba1c59d3cd67 Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Sat, 13 Nov 2021 02:41:09 +0800 Subject: [PATCH 10/14] Update 950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch --- ...0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch | 55 +------------------ 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch index 95d5382d..254a4e38 100644 --- a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch +++ b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell alpine-db.dtb --- /dev/null +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts -@@ -0,0 +1,589 @@ +@@ -0,0 +1,536 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +#include "bcm2711.dtsi" @@ -293,28 +293,6 @@ Signed-off-by: Phil Elwell + pinctrl-0 = <&uart1_pins>; +}; + -+&spi0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&spi0_pins &spi0_cs_pins>; -+ cs-gpios = <&gpio 8 1>, <&gpio 7 1>; -+ -+ spidev0: spidev@0{ -+ compatible = "spidev"; -+ reg = <0>; /* CE0 */ -+ #address-cells = <1>; -+ #size-cells = <0>; -+ spi-max-frequency = <125000000>; -+ }; -+ -+ spidev1: spidev@1{ -+ compatible = "spidev"; -+ reg = <1>; /* CE1 */ -+ #address-cells = <1>; -+ #size-cells = <0>; -+ spi-max-frequency = <125000000>; -+ }; -+}; -+ +&gpio { + spi0_cs_pins: spi0_cs_pins { + brcm,pins = <8 7>; @@ -396,24 +374,6 @@ Signed-off-by: Phil Elwell + clock-frequency = <100000>; +}; + -+&i2c1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2c1_pins>; -+ clock-frequency = <100000>; -+}; -+ -+&i2s { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2s_pins>; -+}; -+ -+/ { -+ __overrides__ { -+ /delete-property/ i2c2_baudrate; -+ /delete-property/ i2c2_iknowwhatimdoing; -+ }; -+}; -+ +// ============================================= +// Board specific stuff here + @@ -600,19 +560,6 @@ Signed-off-by: Phil Elwell + eth_led0 = <&phy1>,"led-modes:0"; + eth_led1 = <&phy1>,"led-modes:4"; + -+ ant1 = <&ant1>,"output-high?=on", -+ <&ant1>, "output-low?=off", -+ <&ant2>, "output-high?=off", -+ <&ant2>, "output-low?=on"; -+ ant2 = <&ant1>,"output-high?=off", -+ <&ant1>, "output-low?=on", -+ <&ant2>, "output-high?=on", -+ <&ant2>, "output-low?=off"; -+ noant = <&ant1>,"output-high?=off", -+ <&ant1>, "output-low?=on", -+ <&ant2>, "output-high?=off", -+ <&ant2>, "output-low?=on"; -+ + spi_dma4 = <&spi0>, "dmas:0=", <&dma40>, + <&spi0>, "dmas:8=", <&dma40>; + }; From f38a83f5996a6e82d6de3cee69252427b0671c0f Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Sat, 13 Nov 2021 04:03:30 +0800 Subject: [PATCH 11/14] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 10368afe..c1df9260 100755 --- a/build.sh +++ b/build.sh @@ -94,7 +94,7 @@ if [ "$OMR_OPENWRT" = "default" ]; then # Use OpenWrt 21.02 for 5.4 kernel _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "f441be3921c769b732f0148f005d4f1bbace0508" _get_repo feeds/packages https://github.com/openwrt/packages "3aa30ceee4fcf7b131bdc0f98658391069573e12" - _get_repo feeds/luci https://github.com/openwrt/luci "f28aaa35cd5c0cbbe59d8cc6a67de88ceeac382e" + _get_repo feeds/luci https://github.com/openwrt/luci "6ddea93e8a6e6768e4a50f0bc37a8fe75cf81d13" else _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "8a6b1a8d29cbd62f005ba20998ca9c8048ff49fc" _get_repo feeds/packages https://github.com/openwrt/packages "b5132de5cf4f7d0562445cf3c65f9f1a4bcb1bbf" From 1dd537220e5f80146a1dd5ead6b70a7630c6c28d Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Sat, 13 Nov 2021 13:37:40 +0800 Subject: [PATCH 12/14] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index c1df9260..65dabda3 100755 --- a/build.sh +++ b/build.sh @@ -94,7 +94,7 @@ if [ "$OMR_OPENWRT" = "default" ]; then # Use OpenWrt 21.02 for 5.4 kernel _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "f441be3921c769b732f0148f005d4f1bbace0508" _get_repo feeds/packages https://github.com/openwrt/packages "3aa30ceee4fcf7b131bdc0f98658391069573e12" - _get_repo feeds/luci https://github.com/openwrt/luci "6ddea93e8a6e6768e4a50f0bc37a8fe75cf81d13" + _get_repo feeds/luci https://github.com/openwrt/luci "fceabd74465f2aafc40edc084429f30837deff2c" else _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "8a6b1a8d29cbd62f005ba20998ca9c8048ff49fc" _get_repo feeds/packages https://github.com/openwrt/packages "b5132de5cf4f7d0562445cf3c65f9f1a4bcb1bbf" From aa244105848dba3cf0c93b55d0f9ac1d8f4ec919 Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Sat, 13 Nov 2021 13:39:16 +0800 Subject: [PATCH 13/14] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 65dabda3..c1df9260 100755 --- a/build.sh +++ b/build.sh @@ -94,7 +94,7 @@ if [ "$OMR_OPENWRT" = "default" ]; then # Use OpenWrt 21.02 for 5.4 kernel _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "f441be3921c769b732f0148f005d4f1bbace0508" _get_repo feeds/packages https://github.com/openwrt/packages "3aa30ceee4fcf7b131bdc0f98658391069573e12" - _get_repo feeds/luci https://github.com/openwrt/luci "fceabd74465f2aafc40edc084429f30837deff2c" + _get_repo feeds/luci https://github.com/openwrt/luci "6ddea93e8a6e6768e4a50f0bc37a8fe75cf81d13" else _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "8a6b1a8d29cbd62f005ba20998ca9c8048ff49fc" _get_repo feeds/packages https://github.com/openwrt/packages "b5132de5cf4f7d0562445cf3c65f9f1a4bcb1bbf" From 7ab0a6c1ab732dcfef99effbcc7e01cd6f739ead Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 17 Nov 2021 17:40:58 +0100 Subject: [PATCH 14/14] Add kernel in version --- build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.sh b/build.sh index aeee7466..7b074fdf 100755 --- a/build.sh +++ b/build.sh @@ -517,6 +517,7 @@ if [ "$OMR_KERNEL" = "5.4" ]; then if [ -f target/linux/mvebu/patches-5.4/022-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch ]; then rm -f target/linux/mvebu/patches-5.4/022-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch fi + echo "CONFIG_VERSION_CODE=5.4" >> ".config" fi if [ "$OMR_KERNEL" = "5.10" ]; then echo "Set to kernel 5.10 for rpi arch" @@ -565,6 +566,7 @@ if [ "$OMR_KERNEL" = "5.14" ]; then echo 'CONFIG_BINUTILS_VERSION_2_36_1=y' >> ".config" echo 'CONFIG_BINUTILS_VERSION="2.36.1' >> ".config" echo "CONFIG_BINUTILS_USE_VERSION_2_36_1=y" >> ".config" + echo "CONFIG_VERSION_CODE=5.14" >> ".config" #echo "CONFIG_GCC_USE_VERSION_10=y" >> ".config" if [ "$TARGET" = "bpi-r2" ]; then echo "# CONFIG_VERSION_CODE_FILENAMES is not set" >> ".config"