Merge tag 'omap-for-v5.15/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel...

SoC changes for omaps for v5.15

Update MAINTAINERS for SanCloud devices and drop unused old Kconfig

* tag 'omap-for-v5.15/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  MAINTAINERS: Adopt SanCloud dts files as supported
  arm: omap2: Drop MACH_OMAP3517EVM entry

Link: https://lore.kernel.org/r/pull-1628153040-834155@atomide.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/MAINTAINERS b/MAINTAINERS
index c9467d2..385a227 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16456,6 +16456,12 @@ F:     drivers/phy/samsung/phy-s5pv210-usb2.c
 F:     drivers/phy/samsung/phy-samsung-usb2.c
 F:     drivers/phy/samsung/phy-samsung-usb2.h
 
+SANCLOUD BEAGLEBONE ENHANCED DEVICE TREE
+M:     Paul Barker <paul.barker@sancloud.com>
+R:     Marc Murphy <marc.murphy@sancloud.com>
+S:     Supported
+F:     arch/arm/boot/dts/am335x-sancloud*
+
 SC1200 WDT DRIVER
 M:     Zwane Mwaikambo <zwanem@gmail.com>
 S:     Maintained

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 7df8f52..dbe7fa6 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -204,11 +204,6 @@ config MACH_OMAP2_TUSB6010
        depends on ARCH_OMAP2 && SOC_OMAP2420
        default y if MACH_NOKIA_N8X0
 
-config MACH_OMAP3517EVM
-       bool "OMAP3517/ AM3517 EVM board"
-       depends on ARCH_OMAP3
-       default y
-
 config MACH_OMAP3_PANDORA
        bool "OMAP3 Pandora"
        depends on ARCH_OMAP3