common: Drop net.h from common header

[platform/kernel/u-boot.git] / board / logicpd / omap3som / omap3logic.c

diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c
index 0b82735..5c178a2 100644 (file)
--- a/board/logicpd/omap3som/omap3logic.c
+++ b/board/logicpd/omap3som/omap3logic.c
@@ -12,11 +12,14 @@
  */
 #include <common.h>
 #include <dm.h>
+#include <init.h>
+#include <net.h>
 #include <ns16550.h>
 #include <netdev.h>
 #include <flash.h>
 #include <nand.h>
 #include <i2c.h>
+#include <serial.h>
 #include <twl4030.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
@@ -40,35 +43,21 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-/* This is only needed until SPL gets OF support */
-#ifdef CONFIG_SPL_BUILD
-static const struct ns16550_platdata omap3logic_serial = {
-       .base = OMAP34XX_UART1,
-       .reg_shift = 2,
-       .clock = V_NS16550_CLK,
-       .fcr = UART_FCR_DEFVAL,
-};
-
-U_BOOT_DEVICE(omap3logic_uart) = {
-       "ns16550_serial",
-       &omap3logic_serial
-};
-
-static const struct omap_hsmmc_plat omap3_logic_mmc0_platdata = {
-       .base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE,
-       .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_4BIT,
-       .cfg.f_min = 400000,
-       .cfg.f_max = 52000000,
-       .cfg.voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195,
-       .cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT,
-};
-
-U_BOOT_DEVICE(am335x_mmc0) = {
-       .name = "omap_hsmmc",
-       .platdata = &omap3_logic_mmc0_platdata,
-};
-
-#endif
+#define LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG1     0x00011203
+#define LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG2     0x000A1302
+#define LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG3     0x000F1302
+#define LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG4     0x0A021303
+#define LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG5     0x00120F18
+#define LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG6     0x0A030000
+#define LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG7     0x00000C50
+
+#define LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG1   0x00011203
+#define LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG2   0x00091102
+#define LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG3   0x000D1102
+#define LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG4   0x09021103
+#define LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG5   0x00100D15
+#define LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG6   0x09030000
+#define LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG7   0x00000C50
 
 #ifdef CONFIG_SPL_OS_BOOT
 int spl_start_uboot(void)
@@ -148,60 +137,6 @@ void spl_board_prepare_for_linux(void)
 }
 #endif
 
-#ifdef CONFIG_USB_MUSB_OMAP2PLUS
-static struct musb_hdrc_config musb_config = {
-       .multipoint     = 1,
-       .dyn_fifo       = 1,
-       .num_eps        = 16,
-       .ram_bits       = 12,
-};
-
-static struct omap_musb_board_data musb_board_data = {
-       .interface_type = MUSB_INTERFACE_ULPI,
-};
-
-static struct musb_hdrc_platform_data musb_plat = {
-#if defined(CONFIG_USB_MUSB_HOST)
-       .mode           = MUSB_HOST,
-#elif defined(CONFIG_USB_MUSB_GADGET)
-       .mode           = MUSB_PERIPHERAL,
-#else
-#error "Please define either CONFIG_USB_MUSB_HOST or CONFIG_USB_MUSB_GADGET"
-#endif
-       .config         = &musb_config,
-       .power          = 100,
-       .platform_ops   = &omap2430_ops,
-       .board_data     = &musb_board_data,
-};
-#endif
-
-#if defined(CONFIG_USB_EHCI_HCD) && !defined(CONFIG_SPL_BUILD)
-/* Call usb_stop() before starting the kernel */
-void show_boot_progress(int val)
-{
-       if (val == BOOTSTAGE_ID_RUN_OS)
-               usb_stop();
-}
-
-static struct omap_usbhs_board_data usbhs_bdata = {
-       .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
-       .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
-       .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED
-};
-
-int ehci_hcd_init(int index, enum usb_init_type init,
-               struct ehci_hccr **hccr, struct ehci_hcor **hcor)
-{
-       return omap_ehci_hcd_init(index, &usbhs_bdata, hccr, hcor);
-}
-
-int ehci_hcd_stop(int index)
-{
-       return omap_ehci_hcd_stop();
-}
-
-#endif /* CONFIG_USB_EHCI_HCD */
-
 /*
  * Routine: misc_init_r
  * Description: Configure board specific parts
@@ -209,15 +144,33 @@ int ehci_hcd_stop(int index)
 int misc_init_r(void)
 {
        twl4030_power_init();
+       twl4030_power_mmc_init(0);
        omap_die_id_display();
-
-#ifdef CONFIG_USB_MUSB_OMAP2PLUS
-       musb_register(&musb_plat, &musb_board_data, (void *)MUSB_BASE);
-#endif
-
        return 0;
 }
 
+#if defined(CONFIG_FLASH_CFI_DRIVER)
+static const u32 gpmc_dm37_c2nor_config[] = {
+       LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG1,
+       LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG2,
+       LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG3,
+       LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG4,
+       LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG5,
+       LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG6,
+       LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG7
+};
+
+static const u32 gpmc_omap35_c2nor_config[] = {
+       LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG1,
+       LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG2,
+       LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG3,
+       LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG4,
+       LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG5,
+       LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG6,
+       LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG7
+};
+#endif
+
 /*
  * Routine: board_init
  * Description: Early hardware init.
@@ -228,7 +181,16 @@ int board_init(void)
 
        /* boot param addr */
        gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
-
+#if defined(CONFIG_FLASH_CFI_DRIVER)
+       if (get_cpu_family() == CPU_OMAP36XX) {
+               /* Enable CS2 for NOR Flash */
+               enable_gpmc_cs_config(gpmc_dm37_c2nor_config, &gpmc_cfg->cs[2],
+                                     0x10000000, GPMC_SIZE_64M);
+       } else {
+               enable_gpmc_cs_config(gpmc_omap35_c2nor_config, &gpmc_cfg->cs[2],
+                                     0x10000000, GPMC_SIZE_64M);
+       }
+#endif
        return 0;
 }