ARM: uniphier: remove #include <net.h> again from micro-support-card.c

[oweals/u-boot.git] / arch / arm / mach-uniphier / micro-support-card.c

diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c
index 4c34748c25cb89b970b7e49b8433e7bcec5ab707..d23c0bd12927cbe4aecee5955f8f455b01a3bd78 100644 (file)
--- a/arch/arm/mach-uniphier/micro-support-card.c
+++ b/arch/arm/mach-uniphier/micro-support-card.c
@@ -1,20 +1,62 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Copyright (C) 2012-2015 Panasonic Corporation
+ * Copyright (C) 2015-2020 Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
 #include <common.h>
+#include <dm/of.h>
+#include <fdt_support.h>
+#include <log.h>
 #include <linux/ctype.h>
+#include <linux/delay.h>
 #include <linux/io.h>
-#include <mach/micro-support-card.h>
 
-#define MICRO_SUPPORT_CARD_BASE                0x43f00000
-#define SMC911X_BASE                   ((MICRO_SUPPORT_CARD_BASE) + 0x00000)
-#define LED_BASE                       ((MICRO_SUPPORT_CARD_BASE) + 0x90000)
-#define NS16550A_BASE                  ((MICRO_SUPPORT_CARD_BASE) + 0xb0000)
-#define MICRO_SUPPORT_CARD_RESET       ((MICRO_SUPPORT_CARD_BASE) + 0xd0034)
-#define MICRO_SUPPORT_CARD_REVISION    ((MICRO_SUPPORT_CARD_BASE) + 0xd00E0)
+#include "micro-support-card.h"
+
+#define SMC911X_OFFSET                 0x00000
+#define LED_OFFSET                     0x90000
+#define NS16550A_OFFSET                        0xb0000
+#define MICRO_SUPPORT_CARD_RESET       0xd0034
+#define MICRO_SUPPORT_CARD_REVISION    0xd00e0
+
+static bool support_card_found;
+static void __iomem *support_card_base;
+
+static void support_card_detect(void)
+{
+       DECLARE_GLOBAL_DATA_PTR;
+       const void *fdt = gd->fdt_blob;
+       int offset;
+       u64 addr, addr2;
+
+       offset = fdt_node_offset_by_compatible(fdt, 0, "smsc,lan9118");
+       if (offset < 0)
+               return;
+
+       addr = fdt_get_base_address(fdt, offset);
+       if (addr == OF_BAD_ADDR)
+               return;
+       addr -= SMC911X_OFFSET;
+
+       offset = fdt_node_offset_by_compatible(fdt, 0, "ns16550a");
+       if (offset < 0)
+               return;
+
+       addr2 = fdt_get_base_address(fdt, offset);
+       if (addr2 == OF_BAD_ADDR)
+               return;
+       addr2 -= NS16550A_OFFSET;
+
+       /* sanity check */
+       if (addr != addr2)
+               return;
+
+       support_card_base = ioremap(addr, 0x100000);
+
+       support_card_found = true;
+}
 
 /*
  * 0: reset deassert, 1: reset
@@ -22,40 +64,47 @@
  * bit[0]: LAN, I2C, LED
  * bit[1]: UART
  */
-void support_card_reset_deassert(void)
+static void support_card_reset_deassert(void)
 {
-       writel(0, MICRO_SUPPORT_CARD_RESET);
+       writel(0x00010000, support_card_base + MICRO_SUPPORT_CARD_RESET);
 }
 
-void support_card_reset(void)
+static void support_card_reset(void)
 {
-       writel(3, MICRO_SUPPORT_CARD_RESET);
+       writel(0x00020003, support_card_base + MICRO_SUPPORT_CARD_RESET);
 }
 
 static int support_card_show_revision(void)
 {
        u32 revision;
 
-       revision = readl(MICRO_SUPPORT_CARD_REVISION);
-       printf("(CPLD version %d.%d)\n", revision >> 4, revision & 0xf);
-       return 0;
-}
+       revision = readl(support_card_base + MICRO_SUPPORT_CARD_REVISION);
+       revision &= 0xff;
 
-int check_support_card(void)
-{
-       printf("SC:    Micro Support Card ");
-       return support_card_show_revision();
+       /* revision 3.6.x card changed the revision format */
+       printf("SC:    Micro Support Card (CPLD version %s%d.%d)\n",
+              revision >> 4 == 6 ? "3." : "",
+              revision >> 4, revision & 0xf);
+
+       return 0;
 }
 
 void support_card_init(void)
 {
+       support_card_detect();
+
+       if (!support_card_found)
+               return;
+
+       support_card_reset();
        /*
         * After power on, we need to keep the LAN controller in reset state
         * for a while. (200 usec)
-        * Fortunately, enough wait time is already inserted in pll_init()
-        * function. So we do not have to wait here.
         */
+       udelay(200);
        support_card_reset_deassert();
+
+       support_card_show_revision();
 }
 
 #if defined(CONFIG_SMC911X)
@@ -63,14 +112,16 @@ void support_card_init(void)
 
 int board_eth_init(bd_t *bis)
 {
-       return smc911x_initialize(0, SMC911X_BASE);
+       if (!support_card_found)
+               return 0;
+
+       return smc911x_initialize(0, (unsigned long)support_card_base + SMC911X_OFFSET);
 }
 #endif
 
-#if !defined(CONFIG_SYS_NO_FLASH)
+#if defined(CONFIG_MTD_NOR_FLASH)
 
 #include <mtd/cfi_flash.h>
-#include <mach/sbc-regs.h>
 
 struct memory_bank {
        phys_addr_t base;
@@ -142,21 +193,25 @@ static void detect_num_flash_banks(void)
                                                                memory_bank;
 
                        debug("flash bank found: base = 0x%lx, size = 0x%lx\n",
-                             memory_bank->base, memory_bank->size);
+                             (unsigned long)memory_bank->base,
+                             (unsigned long)memory_bank->size);
                        cfi_flash_num_flash_banks++;
                }
        }
 
        debug("number of flash banks: %d\n", cfi_flash_num_flash_banks);
 }
-#else /* CONFIG_SYS_NO_FLASH */
-void detect_num_flash_banks(void)
+#else /* CONFIG_MTD_NOR_FLASH */
+static void detect_num_flash_banks(void)
 {
 };
-#endif /* CONFIG_SYS_NO_FLASH */
+#endif /* CONFIG_MTD_NOR_FLASH */
 
 void support_card_late_init(void)
 {
+       if (!support_card_found)
+               return;
+
        detect_num_flash_banks();
 }
 
@@ -217,6 +272,9 @@ void led_puts(const char *s)
        int i;
        u32 val = 0;
 
+       if (!support_card_found)
+               return;
+
        if (!s)
                return;
 
@@ -227,5 +285,5 @@ void led_puts(const char *s)
                        s++;
        }
 
-       writel(~val, LED_BASE);
+       writel(~val, support_card_base + LED_OFFSET);
 }