at91: kernel: bump to 5.10

Bump at91 targets to kernel v5.10. With this patches and files for
wb45n and wb50n were removed as they are now included in upstream
kernel. Along with:
- this the kernel config for sama5d2 and sam9x targets has been
  refreshed (with make kernel_menuconfig + save);
- CONFIG_ARCH_AT91 and specific sam9x SoCs (AT91RM9200, AT91SAM9,
  SAM9X60) has been enabled such that sam9x SoCs to be able to boot.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>

14 files changed, 109 insertions, 779 deletions

diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile
index fe6a93244a..e4da7fb7e7 100644
--- a/target/linux/at91/Makefile
+++ b/target/linux/at91/Makefile
@@ -10,7 +10,7 @@ BOARDNAME:=Microchip (Atmel AT91)
 FEATURES:=ext4 squashfs targz usb usbgadget ubifs
 SUBTARGETS:=sama5 sam9x
 
-KERNEL_PATCHVER:=5.4
+KERNEL_PATCHVER:=5.10
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/at91/files/arch/arm/boot/dts/wb45n.dts b/target/linux/at91/files/arch/arm/boot/dts/wb45n.dts
deleted file mode 100644
index fd9d260f2a..0000000000
--- a/target/linux/at91/files/arch/arm/boot/dts/wb45n.dts
+++ /dev/null
@@ -1,220 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * wb45n.dts - Device Tree file for WB45NBT board
- *
- *  Copyright (C) 2015 Laird
- */
-
-/dts-v1/;
-#include "at91sam9g25.dtsi"
-
-/ {
-	model = "Laird Workgroup Bridge 45N - Atmel AT91SAM (dt)";
-	compatible = "laird,wb45n", "laird,wbxx", "atmel,at91sam9x5", "atmel,at91sam9";
-
-	chosen {
-		bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs";
-	};
-
-	memory {
-		reg = <0x20000000 0x4000000>;
-	};
-
-	clocks {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-
-		main_clock: clock@0 {
-			compatible = "atmel,osc", "fixed-clock";
-			clock-frequency = <12000000>;
-		};
-
-		slow_xtal {
-			clock-frequency = <32768>;
-		};
-
-		main_xtal {
-			clock-frequency = <12000000>;
-		};
-	};
-
-	ahb {
-		apb {
-
-			rstc@fffffe00 {
-				compatible = "atmel,sama5d3-rstc";
-			};
-
-			pinctrl@fffff400 {
-				nand {
-					pinctrl_nand: nand-0 {
-						atmel,pins =
-							<AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PD0 periph A Read Enable */
-							 AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PD1 periph A Write Enable */
-							 AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PD2 periph A Address Latch Enable */
-							 AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PD3 periph A Command Latch Enable */
-							 AT91_PIOD 4 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP	/* PD4 gpio Chip Enable pin pull_up */
-							 AT91_PIOD 5 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;  /* PD5 gpio RDY/BUSY pin pull_up */
-					};
-				};
-
-				usb2 {
-					pinctrl_board_usb2: usb2-board {
-						atmel,pins =
-							<AT91_PIOB 11 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;		/* PB11 gpio vbus sense, deglitch */
-					};
-				};
-			};
-
-			dbgu: serial@fffff200 {
-				status = "okay";
-			};
-
-			usart0: serial@f801c000 {
-				status = "okay";
-			};
-
-			usart3: serial@f8028000 {
-				status = "okay";
-			};
-
-			spi0: spi@f0000000 {
-				status = "okay";
-				cs-gpios = <&pioA 14 0>, <&pioA 7 0>, <0>, <0>;
-			};
-
-			mmc0: mmc@f0008000 {
-				pinctrl-0 = <
-					&pinctrl_mmc0_slot0_clk_cmd_dat0
-					&pinctrl_mmc0_slot0_dat1_3>;
-				status = "okay";
-				/delete-property/dmas;
-				/delete-property/dma-names;
-				slot@0 {
-					reg = <0>;
-					bus-width = <4>;
-				};
-			};
-
-			macb0: ethernet@f802c000 {
-				phy-mode = "rmii";
-				status = "okay";
-			};
-
-			usb2: gadget@f803c000 {
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_board_usb2>;
-				atmel,vbus-gpio = <&pioB 11 GPIO_ACTIVE_HIGH>;
-				status = "okay";
-			};
-
-			i2c1: i2c@f8014000 {
-				status = "okay";
-			};
-
-			watchdog@fffffe40 {
-				status = "okay";
-			};
-
-			shdwc@fffffe10 {
-				atmel,wakeup-mode = "low";
-			};
-
-			rtc@fffffeb0 {
-				status = "okay";
-			};
-		};
-
-		usb0: ohci@00600000 {
-			status = "okay";
-			num-ports = <2>;
-			atmel,vbus-gpio = <
-					   &pioB 12 GPIO_ACTIVE_HIGH
-					   &pioA 31 GPIO_ACTIVE_HIGH
-					  >;
-			atmel,oc-gpio = <&pioB 13 GPIO_ACTIVE_LOW>;
-		};
-
-		usb1: ehci@00700000 {
-			status = "okay";
-		};
-
-		nand0: nand@40000000 {
-			nand-bus-width = <8>;
-			nand-ecc-mode = "hw";
-			atmel,has-pmecc;	/* Enable PMECC */
-			atmel,pmecc-cap = <4>;
-			atmel,pmecc-sector-size = <512>;
-			nand-on-flash-bbt;
-			status = "okay";
-
-			at91bootstrap@0 {
-				label = "at91bs";
-				reg = <0x0 0x20000>;
-			};
-
-			uboot@20000 {
-				label = "u-boot";
-				reg = <0x20000 0x80000>;
-			};
-
-			ubootenv@a0000 {
-				label = "u-boot-env";
-				reg = <0xa0000 0x20000>;
-			};
-
-			ubootenv@c0000 {
-				label = "redund-env";
-				reg = <0xc0000 0x20000>;
-			};
-
-			kernel-a@e0000 {
-				label = "kernel-a";
-				reg = <0xe0000 0x280000>;
-			};
-
-			kernel-b@360000 {
-				label = "kernel-b";
-				reg = <0x360000 0x280000>;
-			};
-
-			rootfs-a@5e0000 {
-				label = "rootfs-a";
-				reg = <0x5e0000 0x2600000>;
-			};
-
-			rootfs-b@2be0000 {
-				label = "rootfs-b";
-				reg = <0x2be0000 0x2600000>;
-			};
-
-			user@51e0000 {
-				label = "user";
-				reg = <0x51e0000 0x2dc0000>;
-			};
-
-			logs@7fa0000 {
-				label = "logs";
-				reg = <0x7fa0000 0x60000>;
-			};
-		};
-	};
-
-	atheros {
-		compatible = "atheros,ath6kl";
-		atheros,board-id = "SD32";
-	};
-
-	keys {
-		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		irqbtn@pb18 {
-			label = "IRQBTN";
-			linux,code = <99>;
-			gpios = <&pioB 18 GPIO_ACTIVE_LOW>;
-			gpio-key,wakeup = <1>;
-		};
-	};
-};
diff --git a/target/linux/at91/files/arch/arm/boot/dts/wb50n.dts b/target/linux/at91/files/arch/arm/boot/dts/wb50n.dts
deleted file mode 100644
index 15b10a8b06..0000000000
--- a/target/linux/at91/files/arch/arm/boot/dts/wb50n.dts
+++ /dev/null
@@ -1,113 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * wb50n.dts - Device Tree file for wb50n board
- *
- *  Copyright (C) 2015 Laird
- */
-
-/dts-v1/;
-#include "wb50n.dtsi"
-
-/ {
-	model = "Laird Workgroup Bridge 50N - Atmel SAMA5D";
-	compatible = "laird,wb50n", "atmel,sama5d31ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5";
-
-	chosen {
-		bootargs = "console=ttyS0,115200 earlyprintk loglevel=4 mem=64M";
-	};
-
-	ahb {
-
-		apb {
-			mmc0: mmc@f0000000 {
-				status = "okay";
-			};
-
-			macb1: ethernet@f802c000 {
-				status = "okay";
-			};
-
-			dbgu: serial@ffffee00 {
-				status = "okay";
-			};
-
-			/* On BB40 this port is labeled UART1 */
-			usart0: serial@f001c000 {
-				status = "okay";
-			};
-
-			/* On BB40 this port is labeled UART0 */
-			usart1: serial@f0020000 {
-				status = "okay";
-			};
-
-			i2c0: i2c@f0014000 {
-				status = "okay";
-			};
-
-			spi1: spi@f8008000 {
-				status = "okay";
-
-				spidev@0 {
-					compatible = "spidev";
-					reg = <0>;
-					spi-max-frequency = <8000000>;
-				};
-			};
-
-			watchdog@fffffe40 {
-				status = "okay";
-			};
-		};
-
-		usb0: gadget@00500000 {
-			status = "okay";
-		};
-
-		usb1: ohci@00600000 {
-			status = "okay";
-		};
-
-		usb2: ehci@00700000 {
-			status = "okay";
-		};
-	};
-
-	keys {
-		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		btn0@pa10 {
-			label = "BTNESC";
-			linux,code = <1>; /* ESC button */
-			gpios = <&pioA 10 GPIO_ACTIVE_LOW>;
-			gpio-key,wakeup = <1>;
-		};
-
-		irqbtn@pe31 {
-			label = "IRQBTN";
-			linux,code = <99>; /* SysReq button */
-			gpios = <&pioE 31 GPIO_ACTIVE_LOW>;
-			gpio-key,wakeup = <1>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led0 {
-			label = "wb50n:blue:led0";
-			gpios = <&pioA 12 GPIO_ACTIVE_LOW>;
-		};
-
-		led1 {
-			label = "wb50n:green:led1";
-			gpios = <&pioA 24 GPIO_ACTIVE_LOW>;
-		};
-
-		led2 {
-			label = "wb50n:red:led2";
-			gpios = <&pioA 26 GPIO_ACTIVE_LOW>;
-		};
-	};
-};
diff --git a/target/linux/at91/files/arch/arm/boot/dts/wb50n.dtsi b/target/linux/at91/files/arch/arm/boot/dts/wb50n.dtsi
deleted file mode 100644
index 936cce39ed..0000000000
--- a/target/linux/at91/files/arch/arm/boot/dts/wb50n.dtsi
+++ /dev/null
@@ -1,205 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * wb50n.dts - Device Tree file for wb50n board
- *
- *  Copyright (C) 2015 Laird
- */
-
-#include "sama5d31.dtsi"
-
-/ {
-	model = "Laird Workgroup Bridge 50N - Atmel SAMA5D";
-	compatible = "laird,wb50n", "atmel,sama5d31ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5";
-
-	chosen {
-		bootargs = "console=ttyS0,115200 earlyprintk loglevel=4 mem=64M";
-	};
-
-	memory {
-		reg = <0x20000000 0x4000000>;
-	};
-
-	clocks {
-		slow_xtal {
-			clock-frequency = <32768>;
-		};
-
-		main_xtal {
-			clock-frequency = <12000000>;
-		};
-	};
-
-	ahb {
-
-		apb {
-			pmc: pmc@fffffc00 {
-				main: mainck {
-					clock-frequency = <12000000>;
-				};
-
-				periphck {
-					usart1_clk: usart1_clk {
-						#clock-cells = <0>;
-						reg = <13>;
-						atmel,clk-output-range = <0 132000000>;
-					};
-				};
-			};
-
-			pinctrl@fffff200 {
-				board {
-					pinctrl_mmc0_cd: mmc0_cd {
-						atmel,pins =
-							<AT91_PIOC 26 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PC26 GPIO with pullup deglitch */
-					};
-
-					pinctrl_usba_vbus: usba_vbus {
-						atmel,pins =
-							<AT91_PIOB 13 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PB13 GPIO with deglitch */
-					};
-				};
-			};
-
-			mmc0: mmc@f0000000 {
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_cd>;
-				cd-gpios = <&pioC 26 GPIO_ACTIVE_LOW>;
-				slot@0 {
-					reg = <0>;
-					bus-width = <4>;
-				};
-			};
-
-			mmc1: mmc@f8000000 {
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3>;
-				status = "okay";
-				slot@0 {
-					reg = <0>;
-					bus-width = <4>;
-				};
-			};
-
-			macb1: ethernet@f802c000 {
-				phy-mode = "rmii";
-			};
-
-
-			dbgu: serial@ffffee00 {
-				dmas = <0>, <0>;	/*  Do not use DMA for dbgu */
-			};
-
-			/* On BB40 this port is labeled UART1 */
-			usart0: serial@f001c000 {
-				atmel,use-dma-rx;
-				atmel,use-dma-tx;
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_usart0 &pinctrl_usart0_rts_cts>;
-			};
-
-			/* On BB40 this port is labeled UART0 */
-			usart1: serial@f0020000 {
-				atmel,use-dma-rx;
-				atmel,use-dma-tx;
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_usart1 &pinctrl_usart1_rts_cts>;
-				dtr-gpios = <&pioD 13 GPIO_ACTIVE_LOW>;
-				dsr-gpios = <&pioD 11 GPIO_ACTIVE_LOW>;
-				dcd-gpios = <&pioD 7 GPIO_ACTIVE_LOW>;
-				rng-gpios = <&pioD 8 GPIO_ACTIVE_LOW>;
-			};
-
-			/* USART3 is direct-connect to the Bluetooth UART on the radio SIP */
-			usart3: serial@f8024000 {
-				atmel,use-dma-rx;
-				atmel,use-dma-tx;
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_usart3 &pinctrl_usart3_rts_cts>;
-				status = "okay";
-			};
-
-			spi1: spi@f8008000 {
-				cs-gpios = <&pioC 25 0>, <0>, <0>, <0>;
-			};
-
-			sckc@fffffe50 {
-				slow_osc: slow_osc {
-					atmel,osc-bypass;
-				};
-			};
-		};
-
-		nand0: nand@60000000 {
-			nand-bus-width = <8>;
-			nand-ecc-mode = "hw";
-			atmel,has-pmecc;
-			atmel,pmecc-cap = <8>;
-			atmel,pmecc-sector-size = <512>;
-			nand-on-flash-bbt;
-			status = "okay";
-
-			at91bootstrap@0 {
-				label = "at91bs";
-				reg = <0x0 0x20000>;
-			};
-
-			uboot@20000 {
-				label = "u-boot";
-				reg = <0x20000 0x80000>;
-			};
-
-			ubootenv@a0000 {
-				label = "u-boot-env";
-				reg = <0xa0000 0x20000>;
-			};
-
-			ubootenv@c0000 {
-				label = "u-boot-env";
-				reg = <0xc0000 0x20000>;
-			};
-
-			kernel-a@e0000 {
-				label = "kernel-a";
-				reg = <0xe0000 0x500000>;
-			};
-
-			kernel-b@5e0000 {
-				label = "kernel-b";
-				reg = <0x5e0000 0x500000>;
-			};
-
-			rootfs-a@ae0000 {
-				label = "rootfs-a";
-				reg = <0xae0000 0x3000000>;
-			};
-
-			rootfs-b@3ae0000 {
-				label = "rootfs-b";
-				reg = <0x3ae0000 0x3000000>;
-			};
-
-			user@6ae0000 {
-				label = "user";
-				reg = <0x6ae0000 0x14e0000>;
-			};
-
-		};
-
-		usb0: gadget@00500000 {
-			atmel,vbus-gpio = <&pioB 13 GPIO_ACTIVE_LOW>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_usba_vbus>;
-		};
-
-		usb1: ohci@00600000 {
-			num-ports = <3>;
-			atmel,vbus-gpio = <&pioA 2 GPIO_ACTIVE_LOW>;
-			atmel,oc-gpio = <&pioA 4 GPIO_ACTIVE_LOW>;
-		};
-	};
-
-	atheros {
-		compatible = "atheros,ath6kl";
-		atheros,board-id = "SD32";
- 	};
-};
diff --git a/target/linux/at91/image/sam9x.mk b/target/linux/at91/image/sam9x.mk
index 1a036e493f..6f10123bba 100644
--- a/target/linux/at91/image/sam9x.mk
+++ b/target/linux/at91/image/sam9x.mk
@@ -194,6 +194,7 @@ define Device/laird_wb45n
   $(Device/evaluation-fit)
   DEVICE_VENDOR := Laird
   DEVICE_MODEL := WB45N
+  DEVICE_DTS := at91-wb45n
   DEVICE_PACKAGES := \
 	kmod-mmc-at91 kmod-ath6kl-sdio ath6k-firmware \
 	kmod-usb-storage kmod-fs-vfat kmod-fs-msdos \
diff --git a/target/linux/at91/image/sama5.mk b/target/linux/at91/image/sama5.mk
index d644f89266..f8e05aae93 100644
--- a/target/linux/at91/image/sama5.mk
+++ b/target/linux/at91/image/sama5.mk
@@ -104,6 +104,7 @@ ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"")
     $(Device/evaluation-fit)
     DEVICE_VENDOR := Laird
     DEVICE_MODEL := WB50N
+    DEVICE_DTS := at91-wb50n
     DEVICE_PACKAGES := \
 	  kmod-mmc-at91 kmod-ath6kl-sdio ath6k-firmware \
 	  kmod-usb-storage kmod-fs-vfat kmod-fs-msdos \
diff --git a/target/linux/at91/patches-5.10/101-ARM-at91-build-dtb-for-q5xr5.patch b/target/linux/at91/patches-5.10/101-ARM-at91-build-dtb-for-q5xr5.patch
new file mode 100644
index 0000000000..2bf8ca52ec
--- /dev/null
+++ b/target/linux/at91/patches-5.10/101-ARM-at91-build-dtb-for-q5xr5.patch
@@ -0,0 +1,10 @@
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -41,6 +41,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \
+ 	at91-kizboxmini-mb.dtb \
+ 	at91-kizboxmini-rd.dtb \
+ 	at91-smartkiz.dtb \
++	at91-q5xr5.dtb \
+ 	at91-wb45n.dtb \
+ 	at91sam9g15ek.dtb \
+ 	at91sam9g25-gardena-smart-gateway.dtb \
diff --git a/target/linux/at91/patches-5.4/101-ARM-at91-build-dtb-for-q5xr5.patch b/target/linux/at91/patches-5.4/101-ARM-at91-build-dtb-for-q5xr5.patch
deleted file mode 100644
index b736b99f7f..0000000000
--- a/target/linux/at91/patches-5.4/101-ARM-at91-build-dtb-for-q5xr5.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -38,6 +38,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \
- 	at91-ariettag25.dtb \
- 	at91-cosino_mega2560.dtb \
- 	at91-kizboxmini.dtb \
-+	at91-q5xr5.dtb \
- 	at91-wb45n.dtb \
- 	at91sam9g15ek.dtb \
- 	at91sam9g25ek.dtb \
diff --git a/target/linux/at91/patches-5.4/102-ARM-at91-build-dtb-for-wb45n.patch b/target/linux/at91/patches-5.4/102-ARM-at91-build-dtb-for-wb45n.patch
deleted file mode 100644
index c35ecc510a..0000000000
--- a/target/linux/at91/patches-5.4/102-ARM-at91-build-dtb-for-wb45n.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -44,7 +44,8 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \
- 	at91sam9g25ek.dtb \
- 	at91sam9g35ek.dtb \
- 	at91sam9x25ek.dtb \
--	at91sam9x35ek.dtb
-+	at91sam9x35ek.dtb \
-+	wb45n.dtb
- dtb-$(CONFIG_SOC_SAM_V7) += \
- 	at91-kizbox2.dtb \
- 	at91-nattis-2-natte-2.dtb \
diff --git a/target/linux/at91/patches-5.4/102-ARM-at91-wb45n-fix-duplicate-label.patch b/target/linux/at91/patches-5.4/102-ARM-at91-wb45n-fix-duplicate-label.patch
deleted file mode 100644
index 9d060426ec..0000000000
--- a/target/linux/at91/patches-5.4/102-ARM-at91-wb45n-fix-duplicate-label.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/arch/arm/boot/dts/wb45n.dts
-+++ b/arch/arm/boot/dts/wb45n.dts
-@@ -126,7 +126,7 @@
- 			};
- 		};
- 
--		usb0: ohci@00600000 {
-+		usb0: ohci@600000 {
- 			status = "okay";
- 			num-ports = <2>;
- 			atmel,vbus-gpio = <
-@@ -136,7 +136,7 @@
- 			atmel,oc-gpio = <&pioB 13 GPIO_ACTIVE_LOW>;
- 		};
- 
--		usb1: ehci@00700000 {
-+		usb1: ehci@700000 {
- 			status = "okay";
- 		};
- 
diff --git a/target/linux/at91/patches-5.4/103-ARM-at91-build-dtb-for-wb50n.patch b/target/linux/at91/patches-5.4/103-ARM-at91-build-dtb-for-wb50n.patch
deleted file mode 100644
index ab5d7afcbb..0000000000
--- a/target/linux/at91/patches-5.4/103-ARM-at91-build-dtb-for-wb50n.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -66,7 +66,8 @@ dtb-$(CONFIG_SOC_SAM_V7) += \
- 	at91-sama5d4_ma5d4evk.dtb \
- 	at91-sama5d4_xplained.dtb \
- 	at91-sama5d4ek.dtb \
--	at91-vinco.dtb
-+	at91-vinco.dtb \
-+	wb50n.dtb
- dtb-$(CONFIG_ARCH_ATLAS6) += \
- 	atlas6-evb.dtb
- dtb-$(CONFIG_ARCH_ATLAS7) += \
diff --git a/target/linux/at91/patches-5.4/103-ARM-at91-wb50n-fix-duplicate-label.patch b/target/linux/at91/patches-5.4/103-ARM-at91-wb50n-fix-duplicate-label.patch
deleted file mode 100644
index bfe6e5a9ba..0000000000
--- a/target/linux/at91/patches-5.4/103-ARM-at91-wb50n-fix-duplicate-label.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/arch/arm/boot/dts/wb50n.dts
-+++ b/arch/arm/boot/dts/wb50n.dts
-@@ -60,15 +60,15 @@
- 			};
- 		};
- 
--		usb0: gadget@00500000 {
-+		usb0: gadget@500000 {
- 			status = "okay";
- 		};
- 
--		usb1: ohci@00600000 {
-+		usb1: ohci@600000 {
- 			status = "okay";
- 		};
- 
--		usb2: ehci@00700000 {
-+		usb2: ehci@700000 {
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/wb50n.dtsi
-+++ b/arch/arm/boot/dts/wb50n.dtsi
-@@ -185,13 +185,13 @@
- 
- 		};
- 
--		usb0: gadget@00500000 {
-+		usb0: gadget@500000 {
- 			atmel,vbus-gpio = <&pioB 13 GPIO_ACTIVE_LOW>;
- 			pinctrl-names = "default";
- 			pinctrl-0 = <&pinctrl_usba_vbus>;
- 		};
- 
--		usb1: ohci@00600000 {
-+		usb1: ohci@600000 {
- 			num-ports = <3>;
- 			atmel,vbus-gpio = <&pioA 2 GPIO_ACTIVE_LOW>;
- 			atmel,oc-gpio = <&pioA 4 GPIO_ACTIVE_LOW>;
diff --git a/target/linux/at91/sam9x/config-default b/target/linux/at91/sam9x/config-default
index d0a1cbc0a4..51d1e763cf 100644
--- a/target/linux/at91/sam9x/config-default
+++ b/target/linux/at91/sam9x/config-default
@@ -1,22 +1,6 @@
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_ARCH_HAS_BINFMT_FLAT=y
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-CONFIG_ARCH_HAS_DMA_WRITE_COMBINE=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_ARCH_HAS_KCOV=y
-CONFIG_ARCH_HAS_KEEPINITRD=y
-CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
-CONFIG_ARCH_HAS_PHYS_TO_DMA=y
-CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
-CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
-CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+CONFIG_ARCH_AT91=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
@@ -27,27 +11,37 @@ CONFIG_ARCH_MULTI_V4_V5=y
 CONFIG_ARCH_MULTI_V5=y
 CONFIG_ARCH_NR_GPIO=0
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_ARM_L1_CACHE_SHIFT=5
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_ARM_THUMB=y
 CONFIG_ARM_UNWIND=y
+# CONFIG_AT91RM9200_WATCHDOG is not set
+# CONFIG_AT91SAM9X_WATCHDOG is not set
+CONFIG_AT91_SOC_ID=y
+# CONFIG_AT91_SOC_SFR is not set
+CONFIG_ATMEL_AIC5_IRQ=y
+CONFIG_ATMEL_AIC_IRQ=y
+CONFIG_ATMEL_CLOCKSOURCE_PIT=y
+CONFIG_ATMEL_CLOCKSOURCE_TCB=y
+CONFIG_ATMEL_EBI=y
+CONFIG_ATMEL_PIT=y
+CONFIG_ATMEL_SDRAMC=y
+CONFIG_ATMEL_ST=y
+CONFIG_ATMEL_TCB_CLKSRC=y
+# CONFIG_ATMEL_TCLIB is not set
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
-CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_COMMON_CLK=y
+CONFIG_COMMON_CLK_AT91=y
 CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_CONFIGFS_FS=y
 CONFIG_CPU_32v4T=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV4T=y
@@ -69,9 +63,12 @@ CONFIG_CPU_USE_DOMAINS=y
 CONFIG_CRC7=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+CONFIG_DMA_OPS=y
 CONFIG_DMA_REMAP=y
 CONFIG_DTC=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
@@ -85,56 +82,28 @@ CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
 CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_PINCONF=y
+CONFIG_GENERIC_PINCTRL_GROUPS=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
 CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GLOB=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_EBPF_JIT=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_HAVE_NET_DSA=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_PCI=y
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_PROC_CPU=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_UID16=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HZ_FIXED=0
+CONFIG_HZ=128
+CONFIG_HZ_FIXED=128
 CONFIG_HZ_PERIODIC=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IRQCHIP=y
@@ -142,10 +111,16 @@ CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_WORK=y
 CONFIG_LIBFDT=y
+CONFIG_LLD_VERSION=0
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
 CONFIG_MEMFD_CREATE=y
+CONFIG_MEMORY=y
+# CONFIG_MFD_AT91_USART is not set
+CONFIG_MFD_ATMEL_SMC=y
+CONFIG_MFD_SYSCON=y
 CONFIG_MIGRATION=y
 CONFIG_MMC=y
+# CONFIG_MMC_ATMELMCI is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_OF_AT91=y
@@ -154,10 +129,12 @@ CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_KUSER_HELPERS=y
 CONFIG_NEED_PER_CPU_KM=y
+CONFIG_NLS=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_FLATTREE=y
+CONFIG_OF_GPIO=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_KOBJ=y
 CONFIG_OF_NET=y
@@ -166,9 +143,21 @@ CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PGTABLE_LEVELS=2
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_AT91=y
+# CONFIG_PINCTRL_AT91PIO4 is not set
 CONFIG_RATIONAL=y
-CONFIG_REFCOUNT_FULL=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_MMIO=y
+# CONFIG_SAMA5D4_WATCHDOG is not set
 CONFIG_SERIAL_8250_FSL=y
+# CONFIG_SERIAL_ATMEL is not set
+CONFIG_SERIAL_MCTRL_GPIO=y
+CONFIG_SOC_AT91RM9200=y
+CONFIG_SOC_AT91SAM9=y
+CONFIG_SOC_BUS=y
+CONFIG_SOC_SAM9X60=y
+CONFIG_SOC_SAM_V4_V5=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_SPLIT_PTLOCK_CPUS=999999
 CONFIG_SRCU=y
@@ -179,6 +168,24 @@ CONFIG_TIMER_PROBE=y
 CONFIG_TINY_SRCU=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
+CONFIG_USB=y
+CONFIG_USB_ACM=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+# CONFIG_USB_AT91 is not set
+# CONFIG_USB_ATMEL_USBA is not set
+CONFIG_USB_COMMON=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD_AT91=y
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+# CONFIG_USB_ETH is not set
+CONFIG_USB_GADGET=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_AT91=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_SERIAL=y
+# CONFIG_USB_SERIAL_CONSOLE is not set
+CONFIG_USB_SERIAL_FTDI_SIO=y
+CONFIG_USB_SERIAL_PL2303=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USE_OF=y
 # CONFIG_VFP is not set
diff --git a/target/linux/at91/sama5/config-default b/target/linux/at91/sama5/config-default
index 10d7d4d3b0..20fb90502a 100644
--- a/target/linux/at91/sama5/config-default
+++ b/target/linux/at91/sama5/config-default
@@ -1,22 +1,6 @@
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_ARCH_32BIT_OFF_T=y
 CONFIG_ARCH_AT91=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_ARCH_HAS_BINFMT_FLAT=y
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_ARCH_HAS_KCOV=y
-CONFIG_ARCH_HAS_KEEPINITRD=y
-CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
-CONFIG_ARCH_HAS_PHYS_TO_DMA=y
-CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
-CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
-CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
@@ -26,14 +10,9 @@ CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_NR_GPIO=0
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARM=y
 CONFIG_ARM_AT91_CPUIDLE=y
 CONFIG_ARM_CPU_SUSPEND=y
@@ -50,6 +29,7 @@ CONFIG_AT91SAM9X_WATCHDOG=y
 CONFIG_AT91_ADC=y
 CONFIG_AT91_SAMA5D2_ADC=y
 CONFIG_AT91_SOC_ID=y
+# CONFIG_AT91_SOC_SFR is not set
 CONFIG_ATMEL_AIC5_IRQ=y
 # CONFIG_ATMEL_CLOCKSOURCE_PIT is not set
 CONFIG_ATMEL_CLOCKSOURCE_TCB=y
@@ -74,7 +54,6 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_PM=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_CACHE_L2X0=y
-CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_CMA=y
@@ -118,29 +97,17 @@ CONFIG_CRC16=y
 # CONFIG_CRC32_SARWATE is not set
 CONFIG_CRC32_SLICEBY8=y
 CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_MENU=y
-CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_JITTERENTROPY=y
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
@@ -156,6 +123,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_CMA=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_OF=y
+CONFIG_DMA_OPS=y
 CONFIG_DMA_REMAP=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DNOTIFY=y
@@ -173,6 +141,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_DTC=y
+CONFIG_DVB_CORE=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EEPROM_AT24=y
@@ -196,12 +165,14 @@ CONFIG_FORCE_MAX_ZONEORDER=15
 CONFIG_FREEZER=y
 CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=y
+CONFIG_FW_CACHE=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
@@ -213,6 +184,8 @@ CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_VDSO_32=y
 CONFIG_GLOB=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
@@ -222,53 +195,7 @@ CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_HAVE_ARCH_BITREVERSE=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_ARM_SMCCC=y
-CONFIG_HAVE_AT91_AUDIO_PLL=y
-CONFIG_HAVE_AT91_GENERATED_CLK=y
-CONFIG_HAVE_AT91_H32MX=y
-CONFIG_HAVE_AT91_I2S_MUX_CLK=y
-CONFIG_HAVE_AT91_SMD=y
-CONFIG_HAVE_AT91_USB_CLK=y
-CONFIG_HAVE_AT91_UTMI=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_EBPF_JIT=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_HAVE_NET_DSA=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_PCI=y
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_PROC_CPU=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
 CONFIG_HAVE_SMP=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_UID16=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HDMI=y
 CONFIG_HID=y
 CONFIG_HID_GENERIC=y
@@ -301,6 +228,7 @@ CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_WORK=y
 CONFIG_JBD2=y
 # CONFIG_JFFS2_FS is not set
+CONFIG_KCMP=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KEXEC=y
@@ -312,19 +240,28 @@ CONFIG_LEDS_PWM=y
 CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_LIBFDT=y
+CONFIG_LLD_VERSION=0
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_MACB=y
-CONFIG_MACB_USE_HWSTAMP=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MANDATORY_FILE_LOCKING=y
 CONFIG_MDIO_BUS=y
 CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_TEST_SUPPORT=y
+CONFIG_MEDIA_TUNER=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_MEMORY=y
@@ -386,6 +323,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PGTABLE_LEVELS=2
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
 CONFIG_PINCTRL_AT91PIO4=y
@@ -411,7 +349,6 @@ CONFIG_PWM_ATMEL_HLCDC_PWM=y
 CONFIG_PWM_ATMEL_TCB=y
 CONFIG_PWM_SYSFS=y
 CONFIG_RATIONAL=y
-CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_MMIO=y
@@ -457,6 +394,8 @@ CONFIG_SND_DMAENGINE_PCM=y
 CONFIG_SND_JACK=y
 CONFIG_SND_JACK_INPUT_DEV=y
 # CONFIG_SND_MCHP_SOC_I2S_MCC is not set
+# CONFIG_SND_MCHP_SOC_SPDIFRX is not set
+# CONFIG_SND_MCHP_SOC_SPDIFTX is not set
 CONFIG_SND_PCM=y
 CONFIG_SND_PCM_TIMER=y
 CONFIG_SND_SOC=y
@@ -511,11 +450,13 @@ CONFIG_USB_ACM=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 # CONFIG_USB_AT91 is not set
 # CONFIG_USB_ATMEL_USBA is not set
+# CONFIG_USB_AUDIO is not set
 CONFIG_USB_COMMON=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_HCD_AT91=y
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_ETH is not set
 CONFIG_USB_GADGET=y
 CONFIG_USB_HID=y
 CONFIG_USB_OHCI_HCD=y
@@ -534,6 +475,7 @@ CONFIG_VFAT_FS=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_VIDEOMODE_HELPERS=y
+# CONFIG_VIDEO_ATMEL_ISC is not set
 # CONFIG_VIDEO_ATMEL_ISI is not set
 # CONFIG_VIDEO_CPIA2 is not set
 CONFIG_VIDEO_DEV=y