diff --git a/patch.sh b/patch.sh
index 7e6f4d0205ef3de7ab88cb02a4e4d7ff16c059bd..537c01067af41707d61152e6642d377615589c5a 100644
--- a/patch.sh
+++ b/patch.sh
@@ -408,6 +408,7 @@ post_backports () {
 		cd -
 	fi
 
+	rm -f arch/arm/boot/dts/overlays/*.dtbo || true
 	${git_bin} add .
 	${git_bin} commit -a -m "backports: ${subsystem}: from: linux.git" -m "Reference: ${backport_tag}" -s
 	if [ ! -d ../patches/backports/${subsystem}/ ] ; then
@@ -422,7 +423,7 @@ patch_backports (){
 }
 
 backports () {
-	backport_tag="v5.12-rc8"
+	backport_tag="v5.12"
 
 	subsystem="greybus"
 	#regenerate="enable"
@@ -434,11 +435,11 @@ backports () {
 
 		post_backports
 		exit 2
-	else
-		patch_backports
+#	else
+#		patch_backports
 	fi
 
-	backport_tag="v5.12-rc8"
+	backport_tag="v5.12"
 
 	subsystem="wlcore"
 	#regenerate="enable"
@@ -449,9 +450,26 @@ backports () {
 
 		post_backports
 		exit 2
-	else
-		patch_backports
+#	else
+#		patch_backports
 	fi
+
+	backport_tag="v5.12"
+
+	subsystem="spidev"
+	#regenerate="enable"
+	if [ "x${regenerate}" = "xenable" ] ; then
+		pre_backports
+
+		cp -v ~/linux-src/drivers/spi/spidev.c ./drivers/spi/spidev.c
+
+		post_backports
+		exit 2
+#	else
+#		patch_backports
+	fi
+
+	${git} "${DIR}/patches/backports/spidev/0002-spidev-Add-Micron-SPI-NOR-Authenta-device-compatible.patch"
 }
 
 reverts () {
@@ -473,8 +491,9 @@ reverts () {
 }
 
 drivers () {
+	#https://github.com/raspberrypi/linux/branches
 	#exit 2
-#	dir 'RPi'
+	dir 'RPi'
 	dir 'drivers/ar1021_i2c'
 	dir 'drivers/spi'
 	dir 'drivers/tps65217'
@@ -499,7 +518,7 @@ soc () {
 }
 
 ###
-#backports
+backports
 #reverts
 drivers
 soc
diff --git a/patches/RPi/0001-Overlays-Port-RPi-Overlay-building.patch b/patches/RPi/0001-Overlays-Port-RPi-Overlay-building.patch
index cecf38ec8626cdbce9b5c3ba028450b19f37a65c..674405122b8a6aaf6317f326e88abbc405e06bf8 100644
--- a/patches/RPi/0001-Overlays-Port-RPi-Overlay-building.patch
+++ b/patches/RPi/0001-Overlays-Port-RPi-Overlay-building.patch
@@ -1,32 +1,17 @@
-From 2feda718d4b869c7c6a151fcb1292c78fb2e79f8 Mon Sep 17 00:00:00 2001
+From ee4d39487dc85195307f1de3510080b9d071538d Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Thu, 4 Mar 2021 11:53:31 -0600
+Date: Tue, 27 Apr 2021 09:05:28 -0500
 Subject: [PATCH] Overlays: Port RPi Overlay building
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
- Makefile                   |  3 +++
  arch/arm/boot/dts/Makefile | 10 ++++++++++
- scripts/Makefile.dtbinst   |  6 +++++-
- scripts/Makefile.lib       | 13 +++++++++++++
- 4 files changed, 31 insertions(+), 1 deletion(-)
+ scripts/Makefile.dtbinst   |  3 ++-
+ scripts/Makefile.lib       | 19 +++++++++++++++++++
+ 3 files changed, 31 insertions(+), 1 deletion(-)
 
-diff --git a/Makefile b/Makefile
-index 617be9fd59ce..ea0bb8243f46 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1332,6 +1332,9 @@ ifneq ($(dtstree),)
- %.dtb: include/config/kernel.release scripts_dtc
- 	$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
- 
-+%.dtbo: include/config/kernel.release scripts_dtc
-+	$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
-+
- PHONY += dtbs dtbs_install dtbs_check
- dtbs: include/config/kernel.release scripts_dtc
- 	$(Q)$(MAKE) $(build)=$(dtstree)
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index b146ce79c29d..00cb939e57cb 100644
+index 9974480e0361..dedd6a832b99 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -1,4 +1,9 @@
@@ -40,16 +25,16 @@ index b146ce79c29d..00cb939e57cb 100644
  	alpine-db.dtb
  dtb-$(CONFIG_MACH_ARTPEC6) += \
 @@ -1439,3 +1444,8 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
- 	aspeed-bmc-opp-zaius.dtb \
  	aspeed-bmc-portwell-neptune.dtb \
- 	aspeed-bmc-quanta-q71l.dtb
+ 	aspeed-bmc-quanta-q71l.dtb \
+ 	aspeed-bmc-supermicro-x11spi.dtb
 +
 +targets += dtbs dtbs_install
 +targets += $(dtb-y)
 +
 +subdir-y	:= overlays
 diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
-index 50d580d77ae9..079b83308011 100644
+index ba01f5ba2517..079b83308011 100644
 --- a/scripts/Makefile.dtbinst
 +++ b/scripts/Makefile.dtbinst
 @@ -18,9 +18,10 @@ include scripts/Kbuild.include
@@ -64,21 +49,11 @@ index 50d580d77ae9..079b83308011 100644
  	@:
  
  quiet_cmd_dtb_install = INSTALL $@
-@@ -29,6 +30,9 @@ quiet_cmd_dtb_install = INSTALL $@
- $(dst)/%.dtb: $(obj)/%.dtb
- 	$(call cmd,dtb_install)
- 
-+$(dst)/%.dtbo: $(obj)/%.dtbo
-+	$(call cmd,dtb_install)
-+
- PHONY += $(subdirs)
- $(subdirs):
- 	$(Q)$(MAKE) $(dtbinst)=$@ dst=$(patsubst $(obj)/%,$(dst)/%,$@)
 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index 213677a5ed33..6c1d72c6efea 100644
+index 8cd67b1b6d15..c0bbecb2f1be 100644
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
-@@ -283,6 +283,7 @@ DTC_FLAGS += -Wno-interrupt_provider
+@@ -291,6 +291,7 @@ DTC_FLAGS += -Wno-interrupt_provider
  ifeq ($(findstring 1,$(KBUILD_EXTRA_WARN)),)
  DTC_FLAGS += -Wno-unit_address_vs_reg \
  	-Wno-unit_address_format \
@@ -86,9 +61,9 @@ index 213677a5ed33..6c1d72c6efea 100644
  	-Wno-avoid_unnecessary_addr_size \
  	-Wno-alias_paths \
  	-Wno-graph_child_address \
-@@ -343,6 +344,18 @@ endef
+@@ -354,6 +355,24 @@ endef
  $(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
- 	$(call if_changed_rule,dtc,yaml)
+ 	$(call if_changed_rule,dtc)
  
 +quiet_cmd_dtco = DTCO    $@
 +cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \
@@ -96,6 +71,12 @@ index 213677a5ed33..6c1d72c6efea 100644
 +	$(DTC) -@ -H epapr -O dtb -o $@ -b 0 \
 +		-i $(dir $<) $(DTC_FLAGS) \
 +		-Wno-interrupts_property \
++		-Wno-label_is_string \
++		-Wno-reg_format \
++		-Wno-pci_device_bus_num \
++		-Wno-i2c_bus_reg \
++		-Wno-spi_bus_reg \
++		-Wno-avoid_default_addr_size \
 +		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
 +	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
 +
@@ -106,5 +87,5 @@ index 213677a5ed33..6c1d72c6efea 100644
  
  # Bzip2
 -- 
-2.30.1
+2.30.2
 
diff --git a/patches/backports/spidev/0002-spidev-Add-Micron-SPI-NOR-Authenta-device-compatible.patch b/patches/backports/spidev/0002-spidev-Add-Micron-SPI-NOR-Authenta-device-compatible.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d0826395ca790c17ec768d0b8a451a5214bdf117
--- /dev/null
+++ b/patches/backports/spidev/0002-spidev-Add-Micron-SPI-NOR-Authenta-device-compatible.patch
@@ -0,0 +1,29 @@
+From f3b840250aca984a81c17c196d536a26c78ae56e Mon Sep 17 00:00:00 2001
+From: Shivamurthy Shastri <sshivamurthy@micron.com>
+Date: Mon, 19 Apr 2021 20:40:15 +0000
+Subject: [PATCH 2/2] spidev: Add Micron SPI NOR Authenta device compatible
+
+Add compatible string for Micron SPI NOR Authenta device.
+
+Signed-off-by: Shivamurthy Shastri <sshivamurthy@micron.com>
+Link: https://lore.kernel.org/r/20210419204015.1769-1-sshivamurthy@micron.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+---
+ drivers/spi/spidev.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
+index 8cb4d923aeaa..f56e0e975a46 100644
+--- a/drivers/spi/spidev.c
++++ b/drivers/spi/spidev.c
+@@ -683,6 +683,7 @@ static const struct of_device_id spidev_dt_ids[] = {
+ 	{ .compatible = "dh,dhcom-board" },
+ 	{ .compatible = "menlo,m53cpld" },
+ 	{ .compatible = "cisco,spi-petra" },
++	{ .compatible = "micron,spi-authenta" },
+ 	{},
+ };
+ MODULE_DEVICE_TABLE(of, spidev_dt_ids);
+-- 
+2.30.2
+
diff --git a/patches/backports/wlcore/0002-wlcore-Downgrade-exceeded-max-RX-BA-sessions-to-debu.patch b/patches/backports/wlcore/0002-wlcore-Downgrade-exceeded-max-RX-BA-sessions-to-debu.patch
deleted file mode 100644
index f8d5107b2c44545a687c4f1ebe4c21791712b367..0000000000000000000000000000000000000000
--- a/patches/backports/wlcore/0002-wlcore-Downgrade-exceeded-max-RX-BA-sessions-to-debu.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 38ec75affcb2f54248c3e0558d62b8a61af22a38 Mon Sep 17 00:00:00 2001
-From: Tony Lindgren <tony@atomide.com>
-Date: Fri, 1 Jan 2021 08:59:55 +0200
-Subject: [PATCH 2/3] wlcore: Downgrade exceeded max RX BA sessions to debug
-
-We can get the following in the logs every few minutes or so:
-
-wlcore: ERROR exceeded max RX BA sessions
-
-Let's downgrade the message to a debug message as suggested by the TI
-support folks at:
-
-https://e2e.ti.com/support/wireless-connectivity/wifi/f/968/p/352435/1244754
-
-"The WL127x firmware supports max of 3 BA sessions. It cannot be increased.
- I think the problem here is the peer trying to initiate a 4th BA session
- (ADDBA request)."
-
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-Link: https://lore.kernel.org/r/20210101065955.63386-1-tony@atomide.com
----
- drivers/net/wireless/ti/wlcore/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
-index 122c7a4b374f..fb0305d075dd 100644
---- a/drivers/net/wireless/ti/wlcore/main.c
-+++ b/drivers/net/wireless/ti/wlcore/main.c
-@@ -5394,7 +5394,7 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw,
- 
- 		if (wl->ba_rx_session_count >= wl->ba_rx_session_count_max) {
- 			ret = -EBUSY;
--			wl1271_error("exceeded max RX BA sessions");
-+			wl1271_debug(DEBUG_RX, "exceeded max RX BA sessions");
- 			break;
- 		}
- 
--- 
-2.29.2
-
diff --git a/patches/backports/wlcore/0003-wlcore-Fix-command-execute-failure-19-for-wl12xx.patch b/patches/backports/wlcore/0003-wlcore-Fix-command-execute-failure-19-for-wl12xx.patch
deleted file mode 100644
index d441649e9be4d6f92c0d52595e999fe91d0bafe6..0000000000000000000000000000000000000000
--- a/patches/backports/wlcore/0003-wlcore-Fix-command-execute-failure-19-for-wl12xx.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From fc3cc6e30c40acbdee10b1a26d28b7056b4ae909 Mon Sep 17 00:00:00 2001
-From: Tony Lindgren <tony@atomide.com>
-Date: Fri, 15 Jan 2021 08:56:13 +0200
-Subject: [PATCH 3/3] wlcore: Fix command execute failure 19 for wl12xx
-
-We can currently get a "command execute failure 19" error on beacon loss
-if the signal is weak:
-
-wlcore: Beacon loss detected. roles:0xff
-wlcore: Connection loss work (role_id: 0).
-...
-wlcore: ERROR command execute failure 19
-...
-WARNING: CPU: 0 PID: 1552 at drivers/net/wireless/ti/wlcore/main.c:803
-...
-(wl12xx_queue_recovery_work.part.0 [wlcore])
-(wl12xx_cmd_role_start_sta [wlcore])
-(wl1271_op_bss_info_changed [wlcore])
-(ieee80211_prep_connection [mac80211])
-
-Error 19 is defined as CMD_STATUS_WRONG_NESTING from the wlcore firmware,
-and seems to mean that the firmware no longer wants to see the quirk
-handling for WLCORE_QUIRK_START_STA_FAILS done.
-
-This quirk got added with commit 18eab430700d ("wlcore: workaround
-start_sta problem in wl12xx fw"), and it seems that this already got fixed
-in the firmware long time ago back in 2012 as wl18xx never had this quirk
-in place to start with.
-
-As we no longer even support firmware that early, to me it seems that it's
-safe to just drop WLCORE_QUIRK_START_STA_FAILS to fix the error. Looks
-like earlier firmware got disabled back in 2013 with commit 0e284c074ef9
-("wl12xx: increase minimum singlerole firmware version required").
-
-If it turns out we still need WLCORE_QUIRK_START_STA_FAILS with any
-firmware that the driver works with, we can simply revert this patch and
-add extra checks for firmware version used.
-
-With this fix wlcore reconnects properly after a beacon loss.
-
-Cc: Raz Bouganim <r-bouganim@ti.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-Link: https://lore.kernel.org/r/20210115065613.7731-1-tony@atomide.com
----
- drivers/net/wireless/ti/wl12xx/main.c   |  3 ---
- drivers/net/wireless/ti/wlcore/main.c   | 15 +--------------
- drivers/net/wireless/ti/wlcore/wlcore.h |  3 ---
- 3 files changed, 1 insertion(+), 20 deletions(-)
-
-diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
-index 3c9c623bb428..9d7dbfe7fe0c 100644
---- a/drivers/net/wireless/ti/wl12xx/main.c
-+++ b/drivers/net/wireless/ti/wl12xx/main.c
-@@ -635,7 +635,6 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
- 		wl->quirks |= WLCORE_QUIRK_LEGACY_NVS |
- 			      WLCORE_QUIRK_DUAL_PROBE_TMPL |
- 			      WLCORE_QUIRK_TKIP_HEADER_SPACE |
--			      WLCORE_QUIRK_START_STA_FAILS |
- 			      WLCORE_QUIRK_AP_ZERO_SESSION_ID;
- 		wl->sr_fw_name = WL127X_FW_NAME_SINGLE;
- 		wl->mr_fw_name = WL127X_FW_NAME_MULTI;
-@@ -659,7 +658,6 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
- 		wl->quirks |= WLCORE_QUIRK_LEGACY_NVS |
- 			      WLCORE_QUIRK_DUAL_PROBE_TMPL |
- 			      WLCORE_QUIRK_TKIP_HEADER_SPACE |
--			      WLCORE_QUIRK_START_STA_FAILS |
- 			      WLCORE_QUIRK_AP_ZERO_SESSION_ID;
- 		wl->plt_fw_name = WL127X_PLT_FW_NAME;
- 		wl->sr_fw_name = WL127X_FW_NAME_SINGLE;
-@@ -688,7 +686,6 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
- 		wl->quirks |= WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN |
- 			      WLCORE_QUIRK_DUAL_PROBE_TMPL |
- 			      WLCORE_QUIRK_TKIP_HEADER_SPACE |
--			      WLCORE_QUIRK_START_STA_FAILS |
- 			      WLCORE_QUIRK_AP_ZERO_SESSION_ID;
- 
- 		wlcore_set_min_fw_ver(wl, WL128X_CHIP_VER,
-diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
-index fb0305d075dd..8509b989940c 100644
---- a/drivers/net/wireless/ti/wlcore/main.c
-+++ b/drivers/net/wireless/ti/wlcore/main.c
-@@ -2872,21 +2872,8 @@ static int wlcore_join(struct wl1271 *wl, struct wl12xx_vif *wlvif)
- 
- 	if (is_ibss)
- 		ret = wl12xx_cmd_role_start_ibss(wl, wlvif);
--	else {
--		if (wl->quirks & WLCORE_QUIRK_START_STA_FAILS) {
--			/*
--			 * TODO: this is an ugly workaround for wl12xx fw
--			 * bug - we are not able to tx/rx after the first
--			 * start_sta, so make dummy start+stop calls,
--			 * and then call start_sta again.
--			 * this should be fixed in the fw.
--			 */
--			wl12xx_cmd_role_start_sta(wl, wlvif);
--			wl12xx_cmd_role_stop_sta(wl, wlvif);
--		}
--
-+	else
- 		ret = wl12xx_cmd_role_start_sta(wl, wlvif);
--	}
- 
- 	return ret;
- }
-diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
-index b7821311ac75..81c94d390623 100644
---- a/drivers/net/wireless/ti/wlcore/wlcore.h
-+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
-@@ -547,9 +547,6 @@ wlcore_set_min_fw_ver(struct wl1271 *wl, unsigned int chip,
- /* Each RX/TX transaction requires an end-of-transaction transfer */
- #define WLCORE_QUIRK_END_OF_TRANSACTION		BIT(0)
- 
--/* the first start_role(sta) sometimes doesn't work on wl12xx */
--#define WLCORE_QUIRK_START_STA_FAILS		BIT(1)
--
- /* wl127x and SPI don't support SDIO block size alignment */
- #define WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN		BIT(2)
- 
--- 
-2.29.2
-
diff --git a/patches/defconfig b/patches/defconfig
index a20e26c255a2d8b5c701a7c3704f622e0d17b9a8..43451ac193dbeae2ea7f56d3c029f2d7a3e13c73 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.12.0-rc8 Kernel Configuration
+# Linux/arm 5.12.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="arm-none-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103"
 CONFIG_CC_IS_GCC=y
diff --git a/patches/git/BBDTBS b/patches/git/BBDTBS
index 6a1835c40b04639210088d67ebc1329b50c7b64f..ae9b0a159e99e480f99d032bf062b171c0e7d769 100644
--- a/patches/git/BBDTBS
+++ b/patches/git/BBDTBS
@@ -1 +1 @@
-BBDTBS: https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/ca3ab9b315268f3b0f22e78d5019f43a46f2e04b
+BBDTBS: https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/f9bbbcb253f50ba050235220cb4525162409d189
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index 50ce4fc2f5abd103cb2d80940d561dd0c26f43f8..c44fc706f0fa4bf80dd64f5c68f0551e7ffe5765 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.12.0-rc8 Kernel Configuration
+# Linux/arm 5.12.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="arm-none-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103"
 CONFIG_CC_IS_GCC=y
diff --git a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.12.x.patch b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.12.x.patch
index 6fe50c29493562d66dc66c7b73a361a5cef36a22..8f28b79b2726fc2cc159cae13c2038dfc2ac4322 100644
--- a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.12.x.patch
+++ b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.12.x.patch
@@ -1,11 +1,11 @@
-From 729a02a2019fe16d244f36be5aff47d0e7f1652e Mon Sep 17 00:00:00 2001
+From 0c0684f81b0099a8200e5560bd6651c5875bb982 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Mon, 19 Apr 2021 11:28:49 -0500
+Date: Tue, 27 Apr 2021 09:13:27 -0500
 Subject: [PATCH] Add BeagleBoard.org DTBS: v5.12.x
 
 https://github.com/beagleboard/BeagleBoard-DeviceTrees/tree/v5.12.x
 
-https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/ca3ab9b315268f3b0f22e78d5019f43a46f2e04b
+https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/f9bbbcb253f50ba050235220cb4525162409d189
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
  arch/arm/boot/dts/Makefile                    |   1 +
@@ -22,10 +22,12 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  arch/arm/boot/dts/am335x-osd335x-common.dtsi  |   1 +
  arch/arm/boot/dts/am335x-pocketbeagle.dts     |   2 +
  arch/arm/boot/dts/am335x-sancloud-bbe.dts     |   5 +
+ arch/arm/boot/dts/am33xx.dtsi                 |  11 +-
  arch/arm/boot/dts/am5729-beagleboneai.dts     |   5 +
  arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts |   5 +
  arch/arm/boot/dts/am57xx-beagle-x15-revc.dts  |   5 +
  arch/arm/boot/dts/am57xx-beagle-x15.dts       |   5 +
+ arch/arm/boot/dts/dra7.dtsi                   |  12 ++
  arch/arm/boot/dts/omap3-beagle-xm.dts         |   2 +
  arch/arm/boot/dts/omap3-beagle.dts            |   2 +
  arch/arm/boot/dts/omap4-panda-a4.dts          |  12 ++
@@ -34,9 +36,13 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  arch/arm/boot/dts/omap4-panda-es.dts          |  12 ++
  arch/arm/boot/dts/omap4-panda.dts             |  12 ++
  arch/arm/boot/dts/omap4-sdp.dts               |   2 +
+ arch/arm/boot/dts/overlays/BBORG_FAN-A000.dts |  30 +++++
+ arch/arm/boot/dts/overlays/Makefile           |  10 ++
  arch/arm/boot/dts/twl6030.dtsi                |   5 +
- 27 files changed, 233 insertions(+), 49 deletions(-)
+ 31 files changed, 292 insertions(+), 53 deletions(-)
  create mode 100644 arch/arm/boot/dts/omap4-panda-es-b3.dts
+ create mode 100644 arch/arm/boot/dts/overlays/BBORG_FAN-A000.dts
+ create mode 100644 arch/arm/boot/dts/overlays/Makefile
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
 index 8e5d4ab4e75e..9974480e0361 100644
@@ -399,6 +405,28 @@ index 275ba339adf4..0a80f58489d9 100644
  };
  
  &am33xx_pinmux {
+diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
+index 5e33d0e88f5b..fd481b56b42a 100644
+--- a/arch/arm/boot/dts/am33xx.dtsi
++++ b/arch/arm/boot/dts/am33xx.dtsi
+@@ -629,10 +629,13 @@ target-module@56000000 {
+ 			#size-cells = <1>;
+ 			ranges = <0 0x56000000 0x1000000>;
+ 
+-			/*
+-			 * Closed source PowerVR driver, no child device
+-			 * binding or driver in mainline
+-			 */
++			gpu: gpu@0 {
++				compatible = "ti,am3352-sgx530", "img,sgx530";
++				reg = <0x0 0x10000>;
++				interrupts = <37>;
++				clocks = <&gfx_fck_div_ck>;
++				clock-names = "fclk";
++			};
+ 		};
+ 	};
+ };
 diff --git a/arch/arm/boot/dts/am5729-beagleboneai.dts b/arch/arm/boot/dts/am5729-beagleboneai.dts
 index 149cfafb90bf..630107b270e7 100644
 --- a/arch/arm/boot/dts/am5729-beagleboneai.dts
@@ -484,6 +512,29 @@ index 0a8b16505ed9..028928f8d43e 100644
  };
  
  &tpd12s015 {
+diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
+index ce1194744f84..9e1eb63b1ec1 100644
+--- a/arch/arm/boot/dts/dra7.dtsi
++++ b/arch/arm/boot/dts/dra7.dtsi
+@@ -776,6 +776,18 @@ target-module@56000000 {
+ 			#address-cells = <1>;
+ 			#size-cells = <1>;
+ 			ranges = <0 0x56000000 0x2000000>;
++
++			gpu: gpu@0 {
++				compatible = "ti,dra7-sgx544", "img,sgx544";
++				reg = <0x0 0x10000>;
++				interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
++				clocks = <&l3_iclk_div>,
++					 <&gpu_core_gclk_mux>,
++					 <&gpu_hyd_gclk_mux>;
++				clock-names = "iclk",
++					      "fclk1",
++					      "fclk2";
++			};
+ 		};
+ 
+ 		crossbar_mpu: crossbar@4a002a48 {
 diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
 index a858ebfa1500..bc319ffbc54d 100644
 --- a/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -749,6 +800,58 @@ index 9e976140f34a..01314cca6665 100644
  };
  
  &keypad {
+diff --git a/arch/arm/boot/dts/overlays/BBORG_FAN-A000.dts b/arch/arm/boot/dts/overlays/BBORG_FAN-A000.dts
+new file mode 100644
+index 000000000000..f9db495e71e8
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/BBORG_FAN-A000.dts
+@@ -0,0 +1,30 @@
++/*
++ * Copyright (C) 2020 Robert Nelson <robercnelson@gmail.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++/dts-v1/;
++/plugin/;
++
++/*
++* Helper to show loaded overlays under: /proc/device-tree/chosen/overlays/
++*/
++&{/chosen} {
++	overlays {
++		BBORG_FAN-A000 = __TIMESTAMP__;
++	};
++};
++
++/* From dra7.dtsi opp_nom-1000000000 */
++&cpu0_opp_table {
++	opp_slow-500000000 {
++		opp-hz = /bits/ 64 <1000000000>;
++		opp-microvolt = <1060000 850000 1150000>,
++				<1060000 850000 1150000>;
++		opp-supported-hw = <0xFF 0x01>;
++		opp-suspend;
++	};
++};
+diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
+new file mode 100644
+index 000000000000..522af0551206
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/Makefile
+@@ -0,0 +1,10 @@
++# Overlays for the BeagleBone platform
++
++dtbo-$(CONFIG_ARCH_OMAP2PLUS) += \
++	BBORG_FAN-A000.dtbo
++
++targets += dtbs dtbs_install
++targets += $(dtbo-y)
++
++always-y	:= $(dtbo-y)
++clean-files	:= *.dtbo
 diff --git a/arch/arm/boot/dts/twl6030.dtsi b/arch/arm/boot/dts/twl6030.dtsi
 index 9d588cfaa5cb..c0094e0c4e0f 100644
 --- a/arch/arm/boot/dts/twl6030.dtsi
diff --git a/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch b/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch
index 0a8323c174d55647fb98a32a798ceab948402ab6..a737da40b36a8db5aa8a2386ed79eae4acf9bc4f 100644
--- a/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch
+++ b/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch
@@ -1,6 +1,6 @@
-From 80a1afc12721fbd755a77579db27f5389596a041 Mon Sep 17 00:00:00 2001
+From c952af722f04aceeb672cea2b205993468ae2210 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Mon, 19 Apr 2021 11:28:38 -0500
+Date: Tue, 27 Apr 2021 08:59:43 -0500
 Subject: [PATCH] merge: wpanusb: https://github.com/statropy/wpanusb
 
 https://github.com/statropy/wpanusb/commit/251f0167545bf2dcaa3cad991a59dbf5ab05490a
diff --git a/version.sh b/version.sh
index 61e0267536efa9a366af348c4ee0dddbb259c56b..6fb5e78f8ee89ec3156479082377e91fef960ec1 100644
--- a/version.sh
+++ b/version.sh
@@ -42,10 +42,10 @@ toolchain="gcc_arm_gnueabihf_10"
 
 #Kernel
 KERNEL_REL=5.12
-KERNEL_TAG=${KERNEL_REL}-rc8
+KERNEL_TAG=${KERNEL_REL}
 kernel_rt=".x-rty"
 #Kernel Build
-BUILD=${build_prefix}10
+BUILD=${build_prefix}10.1
 
 #v5.X-rcX + upto SHA
 #prev_KERNEL_SHA=""