Commit dec85a95 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: davinci: clean up platform support 



With the board file support gone, and the platform using
DT only, a lot of the remaining code is no longer referenced
and can be removed.

Technically, the DT file only references DA850, but since that
is very similar to DA830, I'm leaving the latter.

Acked-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent c3848db3

arch/arm/mach-davinci/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ comment "DaVinci Core Type" 


config ARCH_DAVINCI_DA830

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

	depends on AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT

	depends on ATAGS

	select ARCH_DAVINCI_DA8XX

	# needed on silicon revs 1.0, 1.1:

	select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE
@@ -27,25 +25,11 @@ config ARCH_DAVINCI_DA830 


config ARCH_DAVINCI_DA850

	bool "DA850/OMAP-L138/AM18x based system"

	depends on AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT

	depends on ATAGS

	select ARCH_DAVINCI_DA8XX

	select DAVINCI_CP_INTC



config ARCH_DAVINCI_DA8XX

	bool



comment "DaVinci Board Type"



config MACH_DA8XX_DT

	bool "Support DA8XX platforms using device tree"

	default y

	depends on ARCH_DAVINCI_DA850

	select PINCTRL

	help

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

	  Flattened Device Tree. More information at Documentation/devicetree



config DAVINCI_MUX

	bool "DAVINCI multiplexing support"

	depends on ARCH_DAVINCI

arch/arm/mach-davinci/Makefile

+4 −5
Original line number Diff line number Diff line
@@ -5,16 +5,15 @@ 
#

#

# Common objects

obj-y 					:= serial.o usb.o common.o sram.o

obj-y 					:= common.o sram.o devices-da8xx.o



obj-$(CONFIG_DAVINCI_MUX)		+= mux.o



# Chip specific

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_DA830)	+= da830.o

obj-$(CONFIG_ARCH_DAVINCI_DA850)	+= da850.o pdata-quirks.o



# Board specific

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

obj-y					+= da8xx-dt.o



# Power Management

obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o

arch/arm/mach-davinci/asp.h

deleted100644 → 0
+0 −57
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * TI DaVinci Audio definitions

 */

#ifndef __ASM_ARCH_DAVINCI_ASP_H

#define __ASM_ARCH_DAVINCI_ASP_H



/* Bases of dm644x and dm355 register banks */

#define DAVINCI_ASP0_BASE	0x01E02000

#define DAVINCI_ASP1_BASE	0x01E04000



/* Bases of dm365 register banks */

#define DAVINCI_DM365_ASP0_BASE	0x01D02000



/* Bases of dm646x register banks */

#define DAVINCI_DM646X_MCASP0_REG_BASE		0x01D01000

#define DAVINCI_DM646X_MCASP1_REG_BASE		0x01D01800



/* Bases of da850/da830 McASP0  register banks */

#define DAVINCI_DA8XX_MCASP0_REG_BASE	0x01D00000



/* Bases of da830 McASP1 register banks */

#define DAVINCI_DA830_MCASP1_REG_BASE	0x01D04000



/* Bases of da830 McASP2 register banks */

#define DAVINCI_DA830_MCASP2_REG_BASE	0x01D08000



/* EDMA channels of dm644x and dm355 */

#define DAVINCI_DMA_ASP0_TX	2

#define DAVINCI_DMA_ASP0_RX	3

#define DAVINCI_DMA_ASP1_TX	8

#define DAVINCI_DMA_ASP1_RX	9



/* EDMA channels of dm646x */

#define DAVINCI_DM646X_DMA_MCASP0_AXEVT0	6

#define DAVINCI_DM646X_DMA_MCASP0_AREVT0	9

#define DAVINCI_DM646X_DMA_MCASP1_AXEVT1	12



/* EDMA channels of da850/da830 McASP0 */

#define DAVINCI_DA8XX_DMA_MCASP0_AREVT	0

#define DAVINCI_DA8XX_DMA_MCASP0_AXEVT	1



/* EDMA channels of da830 McASP1 */

#define DAVINCI_DA830_DMA_MCASP1_AREVT	2

#define DAVINCI_DA830_DMA_MCASP1_AXEVT	3



/* EDMA channels of da830 McASP2 */

#define DAVINCI_DA830_DMA_MCASP2_AREVT	4

#define DAVINCI_DA830_DMA_MCASP2_AXEVT	5



/* Interrupts */

#define DAVINCI_ASP0_RX_INT	DAVINCI_INTC_IRQ(IRQ_MBRINT)

#define DAVINCI_ASP0_TX_INT	DAVINCI_INTC_IRQ(IRQ_MBXINT)

#define DAVINCI_ASP1_RX_INT	DAVINCI_INTC_IRQ(IRQ_MBRINT)

#define DAVINCI_ASP1_TX_INT	DAVINCI_INTC_IRQ(IRQ_MBXINT)



#endif /* __ASM_ARCH_DAVINCI_ASP_H */

arch/arm/mach-davinci/common.h

+2 −5
Original line number Diff line number Diff line
@@ -45,9 +45,6 @@ struct davinci_soc_info { 
	unsigned			gpio_num;

	unsigned			gpio_irq;

	unsigned			gpio_unbanked;

	struct davinci_gpio_controller	*gpio_ctlrs;

	int				gpio_ctlrs_num;

	struct emac_platform_data	*emac_pdata;

	dma_addr_t			sram_dma;

	unsigned			sram_len;

};

arch/arm/mach-davinci/cputype.h

+0 −21
Original line number Diff line number Diff line
@@ -28,25 +28,4 @@ struct davinci_id { 
#define	DAVINCI_CPU_ID_DA830		0x08300000

#define	DAVINCI_CPU_ID_DA850		0x08500000



#define IS_DAVINCI_CPU(type, id)					\

static inline int is_davinci_ ##type(void)				\

{									\

	return (davinci_soc_info.cpu_id == (id));			\

}



IS_DAVINCI_CPU(da830, DAVINCI_CPU_ID_DA830)

IS_DAVINCI_CPU(da850, DAVINCI_CPU_ID_DA850)



#ifdef CONFIG_ARCH_DAVINCI_DA830

#define cpu_is_davinci_da830() is_davinci_da830()

#else

#define cpu_is_davinci_da830() 0

#endif



#ifdef CONFIG_ARCH_DAVINCI_DA850

#define cpu_is_davinci_da850() is_davinci_da850()

#else

#define cpu_is_davinci_da850() 0

#endif



#endif