Unverified Commit b1f8b0cf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'davinci-boards-delete-v5.20' of... 

Merge tag 'davinci-boards-delete-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio into arm/soc

Delete the two DaVinci board families DM644x and DM646x.

The reason why I'm pushing for this is that I have floated
patches to update the board files to use GPIO descriptors,
iterated and fixed bugs in the patches reported by reviewers
and build robots, and then the patches have not been merged.
See:

v6:
https://lore.kernel.org/linux-arm-kernel/20201103000158.325147-1-linus.walleij@linaro.org/
https://lore.kernel.org/linux-arm-kernel/20210715191141.430307-3-linus.walleij@linaro.org/

v7:
https://lore.kernel.org/linux-arm-kernel/20220507124536.171930-1-linus.walleij@linaro.org/
https://lore.kernel.org/linux-arm-kernel/20220507124536.171930-2-linus.walleij@linaro.org/

I assume this is not getting merged because of lack of interest
in the platform, and such things happen. To save myself and
others from spending work hours on maintaining and modernizing
a platform that is not used, delete the board files.

* tag 'davinci-boards-delete-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

:
  ARM: davinci: Delete DM646x board files
  ARM: davinci: Delete DM644x board files

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4ea08784 b4aed01d

arch/arm/mach-davinci/Kconfig

+0 −44
Original line number Original line Diff line number Diff line
@@ -19,21 +19,11 @@ config ARCH_DAVINCI_DMx 




comment "DaVinci Core Type"

comment "DaVinci Core Type"





config ARCH_DAVINCI_DM644x

	bool "DaVinci 644x based system"

	select DAVINCI_AINTC

	select ARCH_DAVINCI_DMx



config ARCH_DAVINCI_DM355

config ARCH_DAVINCI_DM355

	bool "DaVinci 355 based system"

	bool "DaVinci 355 based system"

	select DAVINCI_AINTC

	select DAVINCI_AINTC

	select ARCH_DAVINCI_DMx

	select ARCH_DAVINCI_DMx





config ARCH_DAVINCI_DM646x

	bool "DaVinci 646x based system"

	select DAVINCI_AINTC

	select ARCH_DAVINCI_DMx



config ARCH_DAVINCI_DA830

config ARCH_DAVINCI_DA830

	bool "DA830/OMAP-L137/AM17x based system"

	bool "DA830/OMAP-L137/AM17x based system"

	depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT)

	depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT)
@@ -67,28 +57,6 @@ config MACH_DA8XX_DT 
	  Say y here to include support for TI DaVinci DA850 based using

	  Say y here to include support for TI DaVinci DA850 based using

	  Flattened Device Tree. More information at Documentation/devicetree

	  Flattened Device Tree. More information at Documentation/devicetree





config MACH_DAVINCI_EVM

	bool "TI DM644x EVM"

	default ARCH_DAVINCI_DM644x

	depends on ARCH_DAVINCI_DM644x

	help

	  Configure this option to specify the whether the board used

	  for development is a DM644x EVM



config MACH_SFFSDR

	bool "Lyrtech SFFSDR"

	depends on ARCH_DAVINCI_DM644x

	help

	  Say Y here to select the Lyrtech Small Form Factor

	  Software Defined Radio (SFFSDR) board.



config MACH_NEUROS_OSD2

	bool "Neuros OSD2 Open Television Set Top Box"

	depends on ARCH_DAVINCI_DM644x

	help

	  Configure this option to specify the whether the board used

	  for development is a Neuros OSD2 Open Set Top Box.



config MACH_DAVINCI_DM355_EVM

config MACH_DAVINCI_DM355_EVM

	bool "TI DM355 EVM"

	bool "TI DM355 EVM"

	default ARCH_DAVINCI_DM355

	default ARCH_DAVINCI_DM355
@@ -104,18 +72,6 @@ config MACH_DM355_LEOPARD 
	  Configure this option to specify the whether the board used

	  Configure this option to specify the whether the board used

	  for development is a DM355 Leopard board.

	  for development is a DM355 Leopard board.





config MACH_DAVINCI_DM6467_EVM

	bool "TI DM6467 EVM"

	default ARCH_DAVINCI_DM646x

	depends on ARCH_DAVINCI_DM646x

	select MACH_DAVINCI_DM6467TEVM

	help

	  Configure this option to specify the whether the board used

	  for development is a DM6467 EVM



config MACH_DAVINCI_DM6467TEVM

	bool



config MACH_DAVINCI_DM365_EVM

config MACH_DAVINCI_DM365_EVM

	bool "TI DM365 EVM"

	bool "TI DM365 EVM"

	default ARCH_DAVINCI_DM365

	default ARCH_DAVINCI_DM365

arch/arm/mach-davinci/Makefile

+0 −6
Original line number Original line Diff line number Diff line
@@ -10,21 +10,15 @@ obj-y := serial.o usb.o common.o sram.o 
obj-$(CONFIG_DAVINCI_MUX)		+= mux.o

obj-$(CONFIG_DAVINCI_MUX)		+= mux.o





# Chip specific

# Chip specific

obj-$(CONFIG_ARCH_DAVINCI_DM644x)       += dm644x.o devices.o

obj-$(CONFIG_ARCH_DAVINCI_DM355)        += dm355.o devices.o

obj-$(CONFIG_ARCH_DAVINCI_DM355)        += dm355.o devices.o

obj-$(CONFIG_ARCH_DAVINCI_DM646x)       += dm646x.o devices.o

obj-$(CONFIG_ARCH_DAVINCI_DM365)	+= dm365.o devices.o

obj-$(CONFIG_ARCH_DAVINCI_DM365)	+= dm365.o devices.o

obj-$(CONFIG_ARCH_DAVINCI_DA830)	+= da830.o devices-da8xx.o usb-da8xx.o

obj-$(CONFIG_ARCH_DAVINCI_DA830)	+= da830.o devices-da8xx.o usb-da8xx.o

obj-$(CONFIG_ARCH_DAVINCI_DA850)	+= da850.o devices-da8xx.o usb-da8xx.o

obj-$(CONFIG_ARCH_DAVINCI_DA850)	+= da850.o devices-da8xx.o usb-da8xx.o





# Board specific

# Board specific

obj-$(CONFIG_MACH_DA8XX_DT)		+= da8xx-dt.o pdata-quirks.o

obj-$(CONFIG_MACH_DA8XX_DT)		+= da8xx-dt.o pdata-quirks.o

obj-$(CONFIG_MACH_DAVINCI_EVM)  	+= board-dm644x-evm.o

obj-$(CONFIG_MACH_SFFSDR)		+= board-sffsdr.o

obj-$(CONFIG_MACH_NEUROS_OSD2)		+= board-neuros-osd2.o

obj-$(CONFIG_MACH_DAVINCI_DM355_EVM)	+= board-dm355-evm.o

obj-$(CONFIG_MACH_DAVINCI_DM355_EVM)	+= board-dm355-evm.o

obj-$(CONFIG_MACH_DM355_LEOPARD)	+= board-dm355-leopard.o

obj-$(CONFIG_MACH_DM355_LEOPARD)	+= board-dm355-leopard.o

obj-$(CONFIG_MACH_DAVINCI_DM6467_EVM)	+= board-dm646x-evm.o

obj-$(CONFIG_MACH_DAVINCI_DM365_EVM)	+= board-dm365-evm.o

obj-$(CONFIG_MACH_DAVINCI_DM365_EVM)	+= board-dm365-evm.o

obj-$(CONFIG_MACH_DAVINCI_DA830_EVM)	+= board-da830-evm.o

obj-$(CONFIG_MACH_DAVINCI_DA830_EVM)	+= board-da830-evm.o

obj-$(CONFIG_MACH_DAVINCI_DA850_EVM)	+= board-da850-evm.o

obj-$(CONFIG_MACH_DAVINCI_DA850_EVM)	+= board-da850-evm.o

arch/arm/mach-davinci/board-dm644x-evm.c

deleted100644 → 0
+0 −928

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-davinci/board-dm646x-evm.c

deleted100644 → 0
+0 −873

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-davinci/board-neuros-osd2.c

deleted100644 → 0
+0 −238

File deleted.

Preview size limit exceeded, changes collapsed.