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

ARM: davinci: drop DAVINCI_DMxxx references 



Support for all the dm3xx/dm64xx SoCs is no longer
available, so drop all other references to those.

Acked-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 2af4fcc0

arch/arm/mach-davinci/cputype.h

+0 −32
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ struct davinci_id { 
};



/* Can use lower 16 bits of cpu id  for a variant when required */

#define	DAVINCI_CPU_ID_DM6446		0x64460000

#define	DAVINCI_CPU_ID_DM6467		0x64670000

#define	DAVINCI_CPU_ID_DM355		0x03550000

#define	DAVINCI_CPU_ID_DM365		0x03650000

#define	DAVINCI_CPU_ID_DA830		0x08300000

#define	DAVINCI_CPU_ID_DA850		0x08500000
@@ -38,37 +34,9 @@ static inline int is_davinci_ ##type(void) \ 
	return (davinci_soc_info.cpu_id == (id));			\

}



IS_DAVINCI_CPU(dm644x, DAVINCI_CPU_ID_DM6446)

IS_DAVINCI_CPU(dm646x, DAVINCI_CPU_ID_DM6467)

IS_DAVINCI_CPU(dm355, DAVINCI_CPU_ID_DM355)

IS_DAVINCI_CPU(dm365, DAVINCI_CPU_ID_DM365)

IS_DAVINCI_CPU(da830, DAVINCI_CPU_ID_DA830)

IS_DAVINCI_CPU(da850, DAVINCI_CPU_ID_DA850)



#ifdef CONFIG_ARCH_DAVINCI_DM644x

#define cpu_is_davinci_dm644x() is_davinci_dm644x()

#else

#define cpu_is_davinci_dm644x() 0

#endif



#ifdef CONFIG_ARCH_DAVINCI_DM646x

#define cpu_is_davinci_dm646x() is_davinci_dm646x()

#else

#define cpu_is_davinci_dm646x() 0

#endif



#ifdef CONFIG_ARCH_DAVINCI_DM355

#define cpu_is_davinci_dm355() is_davinci_dm355()

#else

#define cpu_is_davinci_dm355() 0

#endif



#ifdef CONFIG_ARCH_DAVINCI_DM365

#define cpu_is_davinci_dm365() is_davinci_dm365()

#else

#define cpu_is_davinci_dm365() 0

#endif



#ifdef CONFIG_ARCH_DAVINCI_DA830

#define cpu_is_davinci_da830() is_davinci_da830()

#else

arch/arm/mach-davinci/serial.c

+0 −4
Original line number Diff line number Diff line
@@ -40,10 +40,6 @@ static void __init davinci_serial_reset(struct plat_serial8250_port *p) 
	pwremu |= (0x3 << 13);

	pwremu |= 0x1;

	serial_write_reg(p, UART_DAVINCI_PWREMU, pwremu);



	if (cpu_is_davinci_dm646x())

		serial_write_reg(p, UART_DM646X_SCR,

				 UART_DM646X_SCR_TX_WATERMARK);

}



int __init davinci_serial_init(struct platform_device *serial_dev)

arch/arm/mach-davinci/usb.c

+0 −13
Original line number Diff line number Diff line
@@ -41,11 +41,6 @@ static struct resource usb_resources[] = { 
		.flags          = IORESOURCE_IRQ,

		.name		= "mc"

	},

	{

		/* placeholder for the dedicated CPPI IRQ */

		.flags          = IORESOURCE_IRQ,

		.name		= "dma"

	},

};



static u64 usb_dmamask = DMA_BIT_MASK(32);
@@ -67,14 +62,6 @@ void __init davinci_setup_usb(unsigned mA, unsigned potpgt_ms) 
	usb_data.power = mA > 510 ? 255 : mA / 2;

	usb_data.potpgt = (potpgt_ms + 1) / 2;



	if (cpu_is_davinci_dm646x()) {

		/* Override the defaults as DM6467 uses different IRQs. */

		usb_dev.resource[1].start = DAVINCI_INTC_IRQ(IRQ_DM646X_USBINT);

		usb_dev.resource[2].start = DAVINCI_INTC_IRQ(

							IRQ_DM646X_USBDMAINT);

	} else	/* other devices don't have dedicated CPPI IRQ */

		usb_dev.num_resources = 2;



	platform_device_register(&usb_dev);

}

drivers/clk/davinci/pll.c

+0 −8
Original line number Diff line number Diff line
@@ -881,14 +881,6 @@ static const struct platform_device_id davinci_pll_id_table[] = { 
#ifdef CONFIG_ARCH_DAVINCI_DA850

	{ .name = "da850-pll0",  .driver_data = (kernel_ulong_t)da850_pll0_init  },

	{ .name = "da850-pll1",  .driver_data = (kernel_ulong_t)da850_pll1_init  },

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM355

	{ .name = "dm355-pll1",  .driver_data = (kernel_ulong_t)dm355_pll1_init  },

	{ .name = "dm355-pll2",  .driver_data = (kernel_ulong_t)dm355_pll2_init  },

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM365

	{ .name = "dm365-pll1",  .driver_data = (kernel_ulong_t)dm365_pll1_init  },

	{ .name = "dm365-pll2",  .driver_data = (kernel_ulong_t)dm365_pll2_init  },

#endif

	{ }

};

drivers/clk/davinci/pll.h

+0 −5
Original line number Diff line number Diff line
@@ -122,13 +122,8 @@ int of_davinci_pll_init(struct device *dev, struct device_node *node, 


/* Platform-specific callbacks */



#ifdef CONFIG_ARCH_DAVINCI_DA850

int da850_pll1_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);

void of_da850_pll0_init(struct device_node *node);

int of_da850_pll1_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);

#endif

#ifdef CONFIG_ARCH_DAVINCI_DM355

int dm355_pll2_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);

#endif



#endif /* __CLK_DAVINCI_PLL_H___ */