Revert "ARM: da830 - Add support for DA830/OMAP-L137 EVM"

This reverts commit 32b9fa0d.

arch/arm/mach-davinci/Kconfig

@@ -87,12 +87,6 @@ config MACH_DAVINCI_DM365_EVM
 	  Configure this option to specify whether the board used
 	  for development is a DM365 EVM
 
-config MACH_DAVINCI_DA830_EVM
-	bool "TI DA830/OMAP-L137 Reference Platform"
-	default ARCH_DAVINCI_DA830
-	depends on ARCH_DAVINCI_DA830
-	help
-	  Say Y here to select the TI DA830/OMAP-L137 Evaluation Module.
 
 config DAVINCI_MUX
 	bool "DAVINCI multiplexing support"

arch/arm/mach-davinci/Makefile

@@ -26,4 +26,3 @@ obj-$(CONFIG_MACH_DAVINCI_DM355_EVM)	+= board-dm355-evm.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_DA830_EVM)	+= board-da830-evm.o

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

-/*
- * TI DA830/OMAP L137 EVM board
- *
- * Author: Mark A. Greer <mgreer@mvista.com>
- * Derived from: arch/arm/mach-davinci/board-dm644x-evm.c
- *
- * 2007, 2009 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/console.h>
-#include <linux/i2c.h>
-#include <linux/i2c/at24.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/cp_intc.h>
-#include <mach/da830.h>
-
-#define DA830_EVM_PHY_MASK		0x0
-#define DA830_EVM_MDIO_FREQUENCY	2200000	/* PHY bus frequency */
-
-static struct at24_platform_data da830_evm_i2c_eeprom_info = {
-	.byte_len	= SZ_256K / 8,
-	.page_size	= 64,
-	.flags		= AT24_FLAG_ADDR16,
-	.setup		= davinci_get_mac_addr,
-	.context	= (void *)0x7f00,
-};
-
-static struct i2c_board_info __initdata da830_evm_i2c_devices[] = {
-	{
-		I2C_BOARD_INFO("24c256", 0x50),
-		.platform_data	= &da830_evm_i2c_eeprom_info,
-	},
-};
-
-static struct davinci_i2c_platform_data da830_evm_i2c_0_pdata = {
-	.bus_freq	= 100,	/* kHz */
-	.bus_delay	= 0,	/* usec */
-};
-
-static struct davinci_uart_config da830_evm_uart_config __initdata = {
-	.enabled_uarts = 0x7,
-};
-
-static __init void da830_evm_init(void)
-{
-	struct davinci_soc_info *soc_info = &davinci_soc_info;
-	int ret;
-
-	ret = da830_register_edma();
-	if (ret)
-		pr_warning("da830_evm_init: edma registration failed: %d\n",
-				ret);
-
-	ret = da830_pinmux_setup(da830_i2c0_pins);
-	if (ret)
-		pr_warning("da830_evm_init: i2c0 mux setup failed: %d\n",
-				ret);
-
-	ret = da830_register_i2c(0, &da830_evm_i2c_0_pdata);
-	if (ret)
-		pr_warning("da830_evm_init: i2c0 registration failed: %d\n",
-				ret);
-
-	soc_info->emac_pdata->phy_mask = DA830_EVM_PHY_MASK;
-	soc_info->emac_pdata->mdio_max_freq = DA830_EVM_MDIO_FREQUENCY;
-	soc_info->emac_pdata->rmii_en = 1;
-
-	ret = da830_pinmux_setup(da830_cpgmac_pins);
-	if (ret)
-		pr_warning("da830_evm_init: cpgmac mux setup failed: %d\n",
-				ret);
-
-	ret = da830_register_emac();
-	if (ret)
-		pr_warning("da830_evm_init: emac registration failed: %d\n",
-				ret);
-
-	ret = da830_register_watchdog();
-	if (ret)
-		pr_warning("da830_evm_init: watchdog registration failed: %d\n",
-				ret);
-
-	davinci_serial_init(&da830_evm_uart_config);
-	i2c_register_board_info(1, da830_evm_i2c_devices,
-			ARRAY_SIZE(da830_evm_i2c_devices));
-}
-
-#ifdef CONFIG_SERIAL_8250_CONSOLE
-static int __init da830_evm_console_init(void)
-{
-	return add_preferred_console("ttyS", 2, "115200");
-}
-console_initcall(da830_evm_console_init);
-#endif
-
-static __init void da830_evm_irq_init(void)
-{
-	struct davinci_soc_info *soc_info = &davinci_soc_info;
-
-	cp_intc_init((void __iomem *)DA830_CP_INTC_VIRT, DA830_N_CP_INTC_IRQ,
-			soc_info->intc_irq_prios);
-}
-
-static void __init da830_evm_map_io(void)
-{
-	da830_init();
-}
-
-MACHINE_START(DAVINCI_DA8XX_EVM, "DaVinci DA830/OMAP L137 EVM")
-	.phys_io	= IO_PHYS,
-	.io_pg_offst	= (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
-	.boot_params	= (DA830_DDR_BASE + 0x100),
-	.map_io		= da830_evm_map_io,
-	.init_irq	= da830_evm_irq_init,
-	.timer		= &davinci_timer,
-	.init_machine	= da830_evm_init,
-MACHINE_END

arch/arm/mach-davinci/include/mach/debug-macro.S

@@ -24,14 +24,7 @@
 		tst	\rx, #1			@ MMU enabled?
 		moveq	\rx, #0x01000000	@ physical base address
 		movne	\rx, #0xfe000000	@ virtual base
-#if defined(CONFIG_ARCH_DAVINCI_DA830) && defined(CONFIG_ARCH_DAVINCI_DMx)
-#error Cannot enable DaVinci and DA830 platforms concurrently
-#elif defined(CONFIG_MACH_DAVINCI_DA830_EVM)
-		orr	\rx, \rx, #0x00d00000	@ physical base address
-		orr	\rx, \rx, #0x0000d000	@ of UART 2
-#else
 		orr	\rx, \rx, #0x00c20000   @ UART 0
-#endif
 		.endm
 
 		.macro	senduart,rd,rx

arch/arm/mach-davinci/include/mach/uncompress.h

@@ -21,10 +21,8 @@ static u32 *uart;
 
 static u32 *get_uart_base(void)
 {
-	if (__machine_arch_type == MACH_TYPE_DAVINCI_DA8XX_EVM)
-		return (u32 *)DA830_UART2_BASE;
-	else
-		return (u32 *)DAVINCI_UART0_BASE;
+	/* Add logic here for new platforms, using __macine_arch_type */
+	return (u32 *)DAVINCI_UART0_BASE;
 }
 
 /* PORT_16C550A, in polled non-fifo mode */