diff --git a/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch index 570b02e25..a6967e024 100644 --- a/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch +++ b/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch @@ -1,7 +1,7 @@ From cf30569da906ee631341244693ab1affde38809d Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:59:28 +0100 -Subject: [PATCH 1/9] ARM: atags: add support for Marvell's u-boot +Subject: [PATCH 1/7] ARM: atags: add support for Marvell's u-boot Marvell uses a specific atag in its u-boot which includes among other information the MAC addresses for up to 4 network interfaces. @@ -47,5 +47,5 @@ index 25ceda63b284..83578c54975b 100644 }; -- -2.33.1 +2.35.1 diff --git a/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch index db31ada95..c8220871f 100644 --- a/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch +++ b/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch @@ -1,7 +1,7 @@ From 9f2269dc32ec1f583bba94432ca17dcef3778677 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:56:58 +0100 -Subject: [PATCH 2/9] ARM: atags/fdt: retrieve MAC addresses from Marvell boot +Subject: [PATCH 2/7] ARM: atags/fdt: retrieve MAC addresses from Marvell boot loader The atags are parsed and if a Marvell atag is found, up to 4 MAC @@ -34,5 +34,5 @@ index 1feb6b0f7a1f..5e5cb3094b6a 100644 } -- -2.33.1 +2.35.1 diff --git a/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch b/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch deleted file mode 100644 index cf1f22d46..000000000 --- a/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch +++ /dev/null @@ -1,209 +0,0 @@ -From 3838f22a178fa15eef0b4a2d49dd1f27454dea88 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Fri, 5 Sep 2014 15:41:19 -0600 -Subject: [PATCH 3/9] SMILE Plug device tree file - -This adds a dts file for the SMILE Plug, which only differs from the Mirabox -dts with the LED definitions. - -Signed-off-by: Kevin Mihelich ---- - arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/armada-370-smileplug.dts | 173 +++++++++++++++++++++ - 2 files changed, 174 insertions(+) - create mode 100644 arch/arm/boot/dts/armada-370-smileplug.dts - -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 235ad559acb2..c0fe17d1b4ef 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -1418,6 +1418,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ - armada-370-db.dtb \ - armada-370-dlink-dns327l.dtb \ - armada-370-mirabox.dtb \ -+ armada-370-smileplug.dtb \ - armada-370-netgear-rn102.dtb \ - armada-370-netgear-rn104.dtb \ - armada-370-rd.dtb \ -diff --git a/arch/arm/boot/dts/armada-370-smileplug.dts b/arch/arm/boot/dts/armada-370-smileplug.dts -new file mode 100644 -index 000000000000..d01308ab848b ---- /dev/null -+++ b/arch/arm/boot/dts/armada-370-smileplug.dts -@@ -0,0 +1,173 @@ -+/* -+ * Device Tree file for Marvell SMILE Plug -+ * -+ * Kevin Mihelich -+ * Gregory CLEMENT -+ * -+ * This file is licensed under the terms of the GNU General Public -+ * License version 2. This program is licensed "as is" without any -+ * warranty of any kind, whether express or implied. -+ */ -+ -+/dts-v1/; -+#include -+#include "armada-370.dtsi" -+ -+/ { -+ model = "Marvell SMILE Plug"; -+ compatible = "marvell,smileplug", "marvell,armada370", "marvell,armada-370-xp"; -+ -+ chosen { -+ bootargs = "console=ttyS0,115200 earlyprintk"; -+ }; -+ -+ memory { -+ device_type = "memory"; -+ reg = <0x00000000 0x20000000>; /* 512 MB */ -+ }; -+ -+ soc { -+ ranges = ; -+ -+ pcie-controller { -+ status = "okay"; -+ -+ /* Internal mini-PCIe connector */ -+ pcie@1,0 { -+ /* Port 0, Lane 0 */ -+ status = "okay"; -+ }; -+ -+ /* Connected on the PCB to a USB 3.0 XHCI controller */ -+ pcie@2,0 { -+ /* Port 1, Lane 0 */ -+ status = "okay"; -+ }; -+ }; -+ -+ internal-regs { -+ serial@12000 { -+ status = "okay"; -+ }; -+ timer@20300 { -+ clock-frequency = <600000000>; -+ status = "okay"; -+ }; -+ -+ gpio_leds { -+ compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&smile_led_pins>; -+ -+ red_eyes_led { -+ label = "smileplug:red:eyes"; -+ gpios = <&gpio1 31 0>; -+ default-state = "off"; -+ }; -+ -+ green_eyes_led { -+ label = "smileplug:green:eyes"; -+ gpios = <&gpio2 0 0>; -+ linux,default-trigger = "default-on"; -+ }; -+ -+ red_smile_led { -+ label = "smileplug:red:smile"; -+ gpios = <&gpio1 15 0>; -+ default-state = "off"; -+ }; -+ -+ green_smile_led { -+ label = "smileplug:green:smile"; -+ gpios = <&gpio1 27 0>; -+ linux,default-trigger = "default-on"; -+ }; -+ }; -+ -+ mdio { -+ pinctrl-0 = <&mdio_pins>; -+ pinctrl-names = "default"; -+ phy0: ethernet-phy@0 { -+ reg = <0>; -+ }; -+ -+ phy1: ethernet-phy@1 { -+ reg = <1>; -+ }; -+ }; -+ ethernet@70000 { -+ pinctrl-0 = <&ge0_rgmii_pins>; -+ pinctrl-names = "default"; -+ status = "okay"; -+ phy = <&phy0>; -+ phy-mode = "rgmii-id"; -+ }; -+ ethernet@74000 { -+ pinctrl-0 = <&ge1_rgmii_pins>; -+ pinctrl-names = "default"; -+ status = "okay"; -+ phy = <&phy1>; -+ phy-mode = "rgmii-id"; -+ }; -+ -+ mvsdio@d4000 { -+ pinctrl-0 = <&sdio_pins3>; -+ pinctrl-names = "default"; -+ status = "okay"; -+ /* -+ * No CD or WP GPIOs: SDIO interface used for -+ * Wifi/Bluetooth chip -+ */ -+ broken-cd; -+ }; -+ -+ usb@50000 { -+ status = "okay"; -+ }; -+ -+ usb@51000 { -+ status = "okay"; -+ }; -+ -+ i2c@11000 { -+ status = "okay"; -+ clock-frequency = <100000>; -+ pca9505: pca9505@25 { -+ compatible = "nxp,pca9505"; -+ gpio-controller; -+ #gpio-cells = <2>; -+ reg = <0x25>; -+ }; -+ }; -+ -+ nand@d0000 { -+ status = "okay"; -+ num-cs = <1>; -+ marvell,nand-keep-config; -+ marvell,nand-enable-arbiter; -+ nand-on-flash-bbt; -+ -+ partition@0 { -+ label = "U-Boot"; -+ reg = <0 0x400000>; -+ }; -+ partition@400000 { -+ label = "Linux"; -+ reg = <0x400000 0x400000>; -+ }; -+ partition@800000 { -+ label = "Filesystem"; -+ reg = <0x800000 0x3f800000>; -+ }; -+ }; -+ }; -+ }; -+}; -+ -+&pinctrl { -+ smile_led_pins: smile-led-pins { -+ marvell,pins = "mpp63", "mpp64", "mpp47", "mpp59"; -+ marvell,function = "gpio"; -+ }; -+}; --- -2.33.1 - diff --git a/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch b/core/linux-armv7-rc/0003-fix-mvsdio-eMMC-timing.patch similarity index 92% rename from core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch rename to core/linux-armv7-rc/0003-fix-mvsdio-eMMC-timing.patch index 442684e24..a494c2d5c 100644 --- a/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch +++ b/core/linux-armv7-rc/0003-fix-mvsdio-eMMC-timing.patch @@ -1,7 +1,7 @@ -From 17f128e9651c36339a8352acb9a8aae948c1acd2 Mon Sep 17 00:00:00 2001 +From e8da1680d0273aaca806c23a10b4f3467a6b4f96 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:43:56 -0600 -Subject: [PATCH 4/9] fix mvsdio eMMC timing +Subject: [PATCH 3/7] fix mvsdio eMMC timing These changes from Globalscale change the MMC timing to allow the eMMC versions of the Mirabox and SMILE Plug to work. @@ -34,5 +34,5 @@ index 629efbe639c4..c507c064736c 100644 host->clock = ios->clock; host->ns_per_clk = 1000000000 / (host->base_clock / (m+1)); -- -2.33.1 +2.35.1 diff --git a/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/core/linux-armv7-rc/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch similarity index 95% rename from core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch rename to core/linux-armv7-rc/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index 93c7e1fa7..fd99811bc 100644 --- a/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/core/linux-armv7-rc/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,7 +1,7 @@ -From 54c45c01e85fa4424227b3d556ce1aeba026291c Mon Sep 17 00:00:00 2001 +From f0eaedee0904275b2ed55b383dba794d53fac17d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Feb 2014 01:43:50 -0300 -Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter +Subject: [PATCH 4/7] net/smsc95xx: Allow mac address to be set as a parameter --- drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++ @@ -91,5 +91,5 @@ index bc1e3dd67c04..51ae8e6fec4e 100644 /* maybe the boot loader passed the MAC address in devicetree */ -- -2.33.1 +2.35.1 diff --git a/core/linux-armv7-rc/0006-set-default-cubietruck-led-triggers.patch b/core/linux-armv7-rc/0005-set-default-cubietruck-led-triggers.patch similarity index 86% rename from core/linux-armv7-rc/0006-set-default-cubietruck-led-triggers.patch rename to core/linux-armv7-rc/0005-set-default-cubietruck-led-triggers.patch index 38ab07c90..f09051572 100644 --- a/core/linux-armv7-rc/0006-set-default-cubietruck-led-triggers.patch +++ b/core/linux-armv7-rc/0005-set-default-cubietruck-led-triggers.patch @@ -1,7 +1,7 @@ -From 2caa2f3ca0cee5459d122cbcdc02c8eb6f21ce37 Mon Sep 17 00:00:00 2001 +From 363e156344b831978306bf95dac7859dafe61d14 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 14 Feb 2015 12:32:27 +0100 -Subject: [PATCH 6/9] set default cubietruck led triggers +Subject: [PATCH 5/7] set default cubietruck led triggers Signed-off-by: Kevin Mihelich --- @@ -29,5 +29,5 @@ index 52160e368304..21c8ef94c756 100644 }; -- -2.33.1 +2.35.1 diff --git a/core/linux-armv7-rc/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/core/linux-armv7-rc/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch similarity index 87% rename from core/linux-armv7-rc/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch rename to core/linux-armv7-rc/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch index 9e5885d14..319015242 100644 --- a/core/linux-armv7-rc/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch +++ b/core/linux-armv7-rc/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch @@ -1,7 +1,7 @@ -From a605a09491885b2effe85041d86bb3c24e40beb8 Mon Sep 17 00:00:00 2001 +From b4dcf8b9c59c451b667f7cc3f20e7fe837951517 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 11 Aug 2016 00:42:37 -0600 -Subject: [PATCH 7/9] exynos4412-odroid: set higher minimum buck2 regulator +Subject: [PATCH 6/7] exynos4412-odroid: set higher minimum buck2 regulator voltage Set a higher minimum voltage to help reboot issue. @@ -26,5 +26,5 @@ index 5b1d4591b35c..8a8d2c6add10 100644 regulator-always-on; regulator-boot-on; -- -2.33.1 +2.35.1 diff --git a/core/linux-armv7-rc/0009-USB-Armory-MkII-support.patch b/core/linux-armv7-rc/0007-USB-Armory-MkII-support.patch similarity index 99% rename from core/linux-armv7-rc/0009-USB-Armory-MkII-support.patch rename to core/linux-armv7-rc/0007-USB-Armory-MkII-support.patch index 0e64fb59b..711d50d6d 100644 --- a/core/linux-armv7-rc/0009-USB-Armory-MkII-support.patch +++ b/core/linux-armv7-rc/0007-USB-Armory-MkII-support.patch @@ -1,7 +1,7 @@ -From 8b7805d6eadfb3378fcdb54f5d0abcfc54703677 Mon Sep 17 00:00:00 2001 +From 915405b2da517ee56a07e57230273ab2ff4e522d Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 11 Aug 2019 12:34:17 -0600 -Subject: [PATCH 9/9] USB Armory MkII support +Subject: [PATCH 7/7] USB Armory MkII support --- arch/arm/boot/dts/Makefile | 2 + @@ -12,7 +12,7 @@ Subject: [PATCH 9/9] USB Armory MkII support create mode 100644 arch/arm/boot/dts/imx6ull-usbarmory.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index c0fe17d1b4ef..60d7beb46e0e 100644 +index 235ad559acb2..ca79830160bd 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -694,6 +694,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ @@ -557,5 +557,5 @@ index 000000000000..f74d0296d5f6 + status = "okay"; +}; -- -2.33.1 +2.35.1 diff --git a/core/linux-armv7-rc/0008-ARM-dove-enable-ethernet-on-D3Plug.patch b/core/linux-armv7-rc/0008-ARM-dove-enable-ethernet-on-D3Plug.patch deleted file mode 100644 index af966db9b..000000000 --- a/core/linux-armv7-rc/0008-ARM-dove-enable-ethernet-on-D3Plug.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7843d1a632544f78f1bb5d82ffc3f3043b603414 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Sun, 7 May 2017 13:32:25 -0600 -Subject: [PATCH 8/9] ARM: dove: enable ethernet on D3Plug - -Signed-off-by: Kevin Mihelich ---- - arch/arm/boot/dts/dove-d3plug.dts | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/arch/arm/boot/dts/dove-d3plug.dts b/arch/arm/boot/dts/dove-d3plug.dts -index 826026c28f90..a4c9963e1261 100644 ---- a/arch/arm/boot/dts/dove-d3plug.dts -+++ b/arch/arm/boot/dts/dove-d3plug.dts -@@ -61,6 +61,13 @@ usb_power: regulator@1 { - &uart0 { status = "okay"; }; - &sata0 { status = "okay"; }; - &i2c0 { status = "okay"; }; -+&mdio { status = "okay"; }; -+ð { status = "okay"; }; -+ -+ðphy { -+ compatible = "marvell,88e1310"; -+ reg = <1>; -+}; - - /* Samsung M8G2F eMMC */ - &sdio0 { --- -2.33.1 - diff --git a/core/linux-armv7-rc/PKGBUILD b/core/linux-armv7-rc/PKGBUILD index 9bdc77209..0a025e03d 100644 --- a/core/linux-armv7-rc/PKGBUILD +++ b/core/linux-armv7-rc/PKGBUILD @@ -5,15 +5,15 @@ buildarch=4 _rcver=5.17 _rcrel=5 -_rcnrel=armv7-x3 -_rcnrc=3 +_rcnrel=armv7-x4 +_rcnrc=5 pkgbase=linux-armv7-rc _srcname=linux-${_rcver}-rc${_rcrel} _kernelname=${pkgbase#linux} _desc="ARMv7 multi-platform (release candidate)" pkgver=${_rcver}.rc${_rcrel} -pkgrel=1 +pkgrel=2 arch=('armv7h') url="http://www.kernel.org/" license=('GPL2') @@ -23,13 +23,11 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz" "http://rcn-ee.com/deb/sid-armhf/v${_rcver}.0-rc${_rcnrc}-${_rcnrel}/patch-${_rcver}-rc${_rcnrc}-${_rcnrel}.diff.gz" '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch' '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch' - '0003-SMILE-Plug-device-tree-file.patch' - '0004-fix-mvsdio-eMMC-timing.patch' - '0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch' - '0006-set-default-cubietruck-led-triggers.patch' - '0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch' - '0008-ARM-dove-enable-ethernet-on-D3Plug.patch' - '0009-USB-Armory-MkII-support.patch' + '0003-fix-mvsdio-eMMC-timing.patch' + '0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch' + '0005-set-default-cubietruck-led-triggers.patch' + '0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch' + '0007-USB-Armory-MkII-support.patch' 'config' 'kernel.its' 'kernel.keyblock' @@ -37,17 +35,15 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz" 'linux.preset' '99-linux.hook') md5sums=('5cc0697249489053d4ae9ea3b4c322c6' - '0b93d53210189fffda654e86715321b4' - '87ea5f10af410a55adc001d2c54a9a02' - '351f5057a0419674b8980eaecce50888' - '4402c0561cba393589eb5c89e218dbd4' - '6d0ced187fce0017fabddd78f48015ba' - '83fec9488db3c6f7c014c07127a74dbb' - 'abc5ca460d32720446814c0da139ea44' - '114aec2225b78a12853434d10797ace6' - '2e3c34b04fa35e94deceae9d4d69a5d9' - 'd30ce6532c642318aecc393ec3205b96' - '6fdd48ad79e5ee25ca89c64a817e2f75' + 'a7c7cdb814a1cb1c5140249fe0a0df3f' + '874e99c5570d305f43f9925592f08556' + '10f667fedbe19c86c8f51bf1f4edc527' + '19e8d3975bdd5171eef7f98ef50613d0' + 'cd41f35d1fac769f411181b3008e4a5a' + 'fe6296e63ea66ffb7c8d1ee841206eab' + 'd89c1c23e9cf681e5e481b328cb0a9da' + '1e53ab3336cb431233ca5adb18e6d934' + '9fb706f33fc404f0e1419d980c1671b6' '0963ff6490be16935370812fc75fa065' '61c5ff73c136ed07a7aadbf58db3d96a' '584777ae88bce2c5659960151b64c7d8' @@ -64,13 +60,11 @@ prepare() { # ALARM patches git apply ../0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch git apply ../0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch - git apply ../0003-SMILE-Plug-device-tree-file.patch - git apply ../0004-fix-mvsdio-eMMC-timing.patch - git apply ../0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch - git apply ../0006-set-default-cubietruck-led-triggers.patch - git apply ../0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch - git apply ../0008-ARM-dove-enable-ethernet-on-D3Plug.patch - git apply ../0009-USB-Armory-MkII-support.patch + git apply ../0003-fix-mvsdio-eMMC-timing.patch + git apply ../0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch + git apply ../0005-set-default-cubietruck-led-triggers.patch + git apply ../0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch + git apply ../0007-USB-Armory-MkII-support.patch cat "${srcdir}/config" > ./.config diff --git a/core/linux-armv7-rc/config b/core/linux-armv7-rc/config index c607e0f99..9e54f8d7c 100644 --- a/core/linux-armv7-rc/config +++ b/core/linux-armv7-rc/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.17.0-rc5-1 Kernel Configuration +# Linux/arm 5.17.0-rc5-2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y @@ -401,7 +401,7 @@ CONFIG_SOC_IMX7ULP=y CONFIG_SOC_VF610=y CONFIG_VF_USE_ARM_GLOBAL_TIMER=y # CONFIG_VF_USE_PIT_TIMER is not set -CONFIG_ARCH_KEYSTONE=y +# CONFIG_ARCH_KEYSTONE is not set # CONFIG_ARCH_MEDIATEK is not set CONFIG_ARCH_MESON=y CONFIG_MACH_MESON6=y @@ -412,12 +412,12 @@ CONFIG_MACH_MESON8=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_MVEBU_ANY=y CONFIG_MACH_MVEBU_V7=y -CONFIG_MACH_ARMADA_370=y +# CONFIG_MACH_ARMADA_370 is not set CONFIG_MACH_ARMADA_375=y CONFIG_MACH_ARMADA_38X=y CONFIG_MACH_ARMADA_39X=y -CONFIG_MACH_ARMADA_XP=y -CONFIG_MACH_DOVE=y +# CONFIG_MACH_ARMADA_XP is not set +# CONFIG_MACH_DOVE is not set # CONFIG_ARCH_NPCM is not set CONFIG_ARCH_OMAP=y @@ -504,8 +504,6 @@ CONFIG_PLAT_VERSATILE=y # # Processor Type # -CONFIG_CPU_PJ4=y -CONFIG_CPU_PJ4B=y CONFIG_CPU_V7=y CONFIG_CPU_THUMB_CAPABLE=y CONFIG_CPU_32v6K=y @@ -547,15 +545,12 @@ CONFIG_PL310_ERRATA_588369=y CONFIG_PL310_ERRATA_727915=y CONFIG_PL310_ERRATA_753970=y CONFIG_PL310_ERRATA_769419=y -CONFIG_CACHE_TAUROS2=y CONFIG_ARM_L1_CACHE_SHIFT_6=y CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_DMA_MEM_BUFFERABLE=y CONFIG_ARM_HEAVY_MB=y CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y CONFIG_DEBUG_ALIGN_RODATA=y -CONFIG_IWMMXT=y -CONFIG_PJ4B_ERRATA_4742=y CONFIG_ARM_ERRATA_430973=y CONFIG_ARM_ERRATA_643719=y CONFIG_ARM_ERRATA_720789=y @@ -2102,8 +2097,6 @@ CONFIG_PCIE_DW_PLAT=y CONFIG_PCIE_DW_PLAT_HOST=y # CONFIG_PCI_EXYNOS is not set CONFIG_PCI_IMX6=y -CONFIG_PCI_KEYSTONE=y -CONFIG_PCI_KEYSTONE_HOST=y # CONFIG_PCI_LAYERSCAPE is not set # CONFIG_PCIE_ARMADA_8K is not set # CONFIG_PCIE_ROCKCHIP_DW_HOST is not set @@ -2396,7 +2389,6 @@ CONFIG_MTD_NAND_GPMI_NAND=y # CONFIG_MTD_NAND_FSL_IFC is not set CONFIG_MTD_NAND_VF610_NFC=y CONFIG_MTD_NAND_MXC=m -# CONFIG_MTD_NAND_DAVINCI is not set CONFIG_MTD_NAND_SUNXI=y # CONFIG_MTD_NAND_MXIC is not set # CONFIG_MTD_NAND_TEGRA is not set @@ -4164,7 +4156,6 @@ CONFIG_HW_RANDOM_VIRTIO=m CONFIG_HW_RANDOM_IMX_RNGC=m CONFIG_HW_RANDOM_MESON=m CONFIG_HW_RANDOM_EXYNOS=m -CONFIG_HW_RANDOM_KEYSTONE=m # CONFIG_HW_RANDOM_CCTRNG is not set # CONFIG_HW_RANDOM_XIPHERA is not set CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m @@ -4247,7 +4238,6 @@ CONFIG_I2C_BCM2835=m CONFIG_I2C_BRCMSTB=y CONFIG_I2C_CADENCE=y # CONFIG_I2C_CBUS_GPIO is not set -CONFIG_I2C_DAVINCI=y CONFIG_I2C_DESIGNWARE_CORE=y # CONFIG_I2C_DESIGNWARE_SLAVE is not set CONFIG_I2C_DESIGNWARE_PLATFORM=y @@ -4318,7 +4308,6 @@ CONFIG_SPI_BITBANG=y CONFIG_SPI_CADENCE=y CONFIG_SPI_CADENCE_QUADSPI=m # CONFIG_SPI_CADENCE_XSPI is not set -CONFIG_SPI_DAVINCI=y # CONFIG_SPI_DESIGNWARE is not set CONFIG_SPI_DLN2=m CONFIG_SPI_FSL_LPSPI=m @@ -4442,12 +4431,9 @@ CONFIG_PINCTRL_MESON8=y CONFIG_PINCTRL_MESON8B=y CONFIG_PINCTRL_MESON8_PMX=y CONFIG_PINCTRL_MVEBU=y -CONFIG_PINCTRL_DOVE=y -CONFIG_PINCTRL_ARMADA_370=y CONFIG_PINCTRL_ARMADA_375=y CONFIG_PINCTRL_ARMADA_38X=y CONFIG_PINCTRL_ARMADA_39X=y -CONFIG_PINCTRL_ARMADA_XP=y # # Renesas pinctrl drivers @@ -4508,7 +4494,6 @@ CONFIG_GPIO_MAX730X=m # CONFIG_GPIO_ALTERA is not set CONFIG_GPIO_RASPBERRYPI_EXP=y # CONFIG_GPIO_CADENCE is not set -CONFIG_GPIO_DAVINCI=y CONFIG_GPIO_DWAPB=y # CONFIG_GPIO_EXAR is not set # CONFIG_GPIO_FTGPIO010 is not set @@ -4629,11 +4614,11 @@ CONFIG_W1_SLAVE_DS2408_READBACK=y CONFIG_W1_SLAVE_DS2413=m CONFIG_W1_SLAVE_DS2406=m CONFIG_W1_SLAVE_DS2423=m -# CONFIG_W1_SLAVE_DS2805 is not set -# CONFIG_W1_SLAVE_DS2430 is not set +CONFIG_W1_SLAVE_DS2805=m +CONFIG_W1_SLAVE_DS2430=m CONFIG_W1_SLAVE_DS2431=m CONFIG_W1_SLAVE_DS2433=m -# CONFIG_W1_SLAVE_DS2433_CRC is not set +CONFIG_W1_SLAVE_DS2433_CRC=y CONFIG_W1_SLAVE_DS2438=m CONFIG_W1_SLAVE_DS250X=m CONFIG_W1_SLAVE_DS2780=m @@ -4656,7 +4641,6 @@ CONFIG_POWER_RESET_RESTART=y # CONFIG_POWER_RESET_TPS65086 is not set CONFIG_POWER_RESET_VERSATILE=y CONFIG_POWER_RESET_VEXPRESS=y -CONFIG_POWER_RESET_KEYSTONE=y CONFIG_POWER_RESET_SYSCON=y CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_REBOOT_MODE=y @@ -4962,7 +4946,6 @@ CONFIG_IMX_THERMAL=y # CONFIG_QORIQ_THERMAL is not set CONFIG_SUN8I_THERMAL=y CONFIG_ROCKCHIP_THERMAL=y -CONFIG_DOVE_THERMAL=y CONFIG_ARMADA_THERMAL=y CONFIG_AMLOGIC_THERMAL=y @@ -5034,7 +5017,6 @@ CONFIG_CADENCE_WATCHDOG=m CONFIG_S3C2410_WATCHDOG=m CONFIG_DW_WATCHDOG=m CONFIG_OMAP_WATCHDOG=m -CONFIG_DAVINCI_WATCHDOG=m CONFIG_ORION_WATCHDOG=m CONFIG_RN5T618_WATCHDOG=m CONFIG_SUNXI_WATCHDOG=m @@ -6266,7 +6248,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y CONFIG_DRM_VGEM=m # CONFIG_DRM_VKMS is not set -CONFIG_DRM_EXYNOS=m +CONFIG_DRM_EXYNOS=y # # CRTCs @@ -6465,7 +6447,7 @@ CONFIG_DRM_TI_TFP410=m # CONFIG_DRM_TI_TPD12S015 is not set # CONFIG_DRM_ANALOGIX_ANX6345 is not set CONFIG_DRM_ANALOGIX_ANX78XX=m -CONFIG_DRM_ANALOGIX_DP=m +CONFIG_DRM_ANALOGIX_DP=y # CONFIG_DRM_ANALOGIX_ANX7625 is not set CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7511_AUDIO=y @@ -7473,7 +7455,6 @@ CONFIG_USB_DWC3_DUAL_ROLE=y CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_EXYNOS=y CONFIG_USB_DWC3_HAPS=y -CONFIG_USB_DWC3_KEYSTONE=y CONFIG_USB_DWC3_MESON_G12A=y CONFIG_USB_DWC3_OF_SIMPLE=y CONFIG_USB_DWC2=y @@ -7600,7 +7581,6 @@ CONFIG_USB_XUSBATM=m # USB Physical Layer drivers # CONFIG_USB_PHY=y -CONFIG_KEYSTONE_USB_PHY=m CONFIG_NOP_USB_XCEIV=y CONFIG_AM335X_CONTROL_USB=m CONFIG_AM335X_PHY_USB=m @@ -7770,7 +7750,6 @@ CONFIG_MMC_SDHCI_OF_ESDHC=y # CONFIG_MMC_SDHCI_OF_DWCMSHC is not set CONFIG_MMC_SDHCI_CADENCE=y CONFIG_MMC_SDHCI_ESDHC_IMX=y -CONFIG_MMC_SDHCI_DOVE=y CONFIG_MMC_SDHCI_TEGRA=y CONFIG_MMC_SDHCI_S3C=y CONFIG_MMC_SDHCI_PXAV3=y @@ -7868,7 +7847,6 @@ CONFIG_LEDS_REGULATOR=m CONFIG_LEDS_BD2802=m CONFIG_LEDS_LT3593=m CONFIG_LEDS_MC13783=m -CONFIG_LEDS_NS2=m CONFIG_LEDS_TCA6507=m CONFIG_LEDS_TLC591XX=m CONFIG_LEDS_MAX8997=m @@ -8444,8 +8422,6 @@ CONFIG_CLK_VF610=y # CONFIG_CLK_IMX8MP is not set # CONFIG_CLK_IMX8MQ is not set # CONFIG_CLK_IMX8ULP is not set -CONFIG_COMMON_CLK_KEYSTONE=y -CONFIG_TI_SYSCON_CLK=y # # Clock support for Amlogic platforms @@ -8457,14 +8433,10 @@ CONFIG_COMMON_CLK_MESON8B=y # end of Clock support for Amlogic platforms CONFIG_MVEBU_CLK_COMMON=y -CONFIG_MVEBU_CLK_CPU=y CONFIG_MVEBU_CLK_COREDIV=y -CONFIG_ARMADA_370_CLK=y CONFIG_ARMADA_375_CLK=y CONFIG_ARMADA_38X_CLK=y CONFIG_ARMADA_39X_CLK=y -CONFIG_ARMADA_XP_CLK=y -CONFIG_DOVE_CLK=y CONFIG_COMMON_CLK_ROCKCHIP=y CONFIG_CLK_RV110X=y CONFIG_CLK_RK3036=y @@ -8521,12 +8493,10 @@ CONFIG_DW_APB_TIMER_OF=y CONFIG_ROCKCHIP_TIMER=y CONFIG_ARMADA_370_XP_TIMER=y CONFIG_MESON6_TIMER=y -CONFIG_ORION_TIMER=y CONFIG_SUN4I_TIMER=y CONFIG_SUN5I_HSTIMER=y CONFIG_TEGRA_TIMER=y CONFIG_CADENCE_TTC_TIMER=y -CONFIG_KEYSTONE_TIMER=y CONFIG_CLKSRC_TI_32K=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y @@ -8554,7 +8524,6 @@ CONFIG_OMAP_MBOX_KFIFO_SIZE=256 CONFIG_ROCKCHIP_MBOX=y CONFIG_ALTERA_MBOX=y CONFIG_BCM2835_MBOX=y -# CONFIG_TI_MESSAGE_MANAGER is not set # CONFIG_MAILBOX_TEST is not set # CONFIG_TEGRA_HSP_MBOX is not set CONFIG_SUN6I_MSGBOX=y @@ -8596,7 +8565,6 @@ CONFIG_IMX_REMOTEPROC=m CONFIG_OMAP_REMOTEPROC=m CONFIG_OMAP_REMOTEPROC_WATCHDOG=y CONFIG_WKUP_M3_RPROC=y -# CONFIG_KEYSTONE_REMOTEPROC is not set # CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set CONFIG_PRU_REMOTEPROC=m # end of Remoteproc drivers @@ -8685,8 +8653,6 @@ CONFIG_SOC_TEGRA_PMC=y CONFIG_SOC_TEGRA20_VOLTAGE_COUPLER=y CONFIG_SOC_TEGRA30_VOLTAGE_COUPLER=y CONFIG_SOC_TI=y -# CONFIG_KEYSTONE_NAVIGATOR_QMSS is not set -# CONFIG_KEYSTONE_NAVIGATOR_DMA is not set CONFIG_AMX3_PM=y CONFIG_WKUP_M3_IPC=y CONFIG_TI_PRUSS=y @@ -8743,7 +8709,6 @@ CONFIG_EXTCON_USB_GPIO=y CONFIG_MEMORY=y CONFIG_DDR=y # CONFIG_ARM_PL172_MPMC is not set -CONFIG_TI_AEMIF=y CONFIG_TI_EMIF=y CONFIG_OMAP_GPMC=y # CONFIG_OMAP_GPMC_DEBUG is not set @@ -9394,11 +9359,9 @@ CONFIG_ARMADA_370_XP_IRQ=y # CONFIG_AL_FIC is not set CONFIG_BRCMSTB_L2_IRQ=y CONFIG_OMAP_IRQCHIP=y -CONFIG_ORION_IRQCHIP=y # CONFIG_TS4800_IRQ is not set # CONFIG_XILINX_INTC is not set CONFIG_IRQ_CROSSBAR=y -# CONFIG_KEYSTONE_IRQ is not set CONFIG_IMX_GPCV2=y CONFIG_LS_EXTIRQ=y CONFIG_LS_SCFG_MSI=y @@ -9463,7 +9426,6 @@ CONFIG_ARMADA375_USBCLUSTER_PHY=y CONFIG_PHY_MVEBU_A38X_COMPHY=m # CONFIG_PHY_MVEBU_CP110_COMPHY is not set # CONFIG_PHY_MVEBU_CP110_UTMI is not set -CONFIG_PHY_MVEBU_SATA=y # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_LAN966X_SERDES is not set