Skip to content

Commit 4108b6c

Browse files
committed
Merge tag 'omap-for-v5.15/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 3188459 + 8d5a937 commit 4108b6c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

MAINTAINERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16456,6 +16456,12 @@ F: drivers/phy/samsung/phy-s5pv210-usb2.c
1645616456
F: drivers/phy/samsung/phy-samsung-usb2.c
1645716457
F: drivers/phy/samsung/phy-samsung-usb2.h
1645816458

16459+
SANCLOUD BEAGLEBONE ENHANCED DEVICE TREE
16460+
M: Paul Barker <[email protected]>
16461+
R: Marc Murphy <[email protected]>
16462+
S: Supported
16463+
F: arch/arm/boot/dts/am335x-sancloud*
16464+
1645916465
SC1200 WDT DRIVER
1646016466
M: Zwane Mwaikambo <[email protected]>
1646116467
S: Maintained

arch/arm/mach-omap2/Kconfig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,6 @@ config MACH_OMAP2_TUSB6010
204204
depends on ARCH_OMAP2 && SOC_OMAP2420
205205
default y if MACH_NOKIA_N8X0
206206

207-
config MACH_OMAP3517EVM
208-
bool "OMAP3517/ AM3517 EVM board"
209-
depends on ARCH_OMAP3
210-
default y
211-
212207
config MACH_OMAP3_PANDORA
213208
bool "OMAP3 Pandora"
214209
depends on ARCH_OMAP3

0 commit comments

Comments
 (0)