common: Drop net.h from common header

[oweals/u-boot.git] / board / highbank / highbank.c

diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index a1b67494f6c526d6659a75f460c050d58f196978..f7f2e2c52594d5b8b6f59ae4d13651f8757e7657 100644 (file)
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -1,11 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2010-2011 Calxeda, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <ahci.h>
+#include <cpu_func.h>
+#include <env.h>
+#include <net.h>
 #include <netdev.h>
 #include <scsi.h>
 
@@ -14,9 +16,11 @@
 
 #define HB_AHCI_BASE                   0xffe08000
 
+#define HB_SCU_A9_PWR_STATUS           0xfff10008
 #define HB_SREG_A9_PWR_REQ             0xfff3cf00
 #define HB_SREG_A9_BOOT_SRC_STAT       0xfff3cf04
 #define HB_SREG_A9_PWRDOM_STAT         0xfff3cf20
+#define HB_SREG_A15_PWR_CTRL           0xfff3c200
 
 #define HB_PWR_SUSPEND                 0
 #define HB_PWR_SOFT_RESET              1
@@ -27,8 +31,14 @@
 #define PWRDOM_STAT_PCI                        0x40000000
 #define PWRDOM_STAT_EMMC               0x20000000
 
+#define HB_SCU_A9_PWR_NORMAL           0
+#define HB_SCU_A9_PWR_DORMANT          2
+#define HB_SCU_A9_PWR_OFF              3
+
 DECLARE_GLOBAL_DATA_PTR;
 
+void cphy_disable_overrides(void);
+
 /*
  * Miscellaneous platform dependent initialisations
  */
@@ -56,9 +66,10 @@ void scsi_init(void)
 {
        u32 reg = readl(HB_SREG_A9_PWRDOM_STAT);
 
+       cphy_disable_overrides();
        if (reg & PWRDOM_STAT_SATA) {
-               ahci_init(HB_AHCI_BASE);
-               scsi_scan(1);
+               ahci_init((void __iomem *)HB_AHCI_BASE);
+               scsi_scan(true);
        }
 }
 #endif
@@ -71,11 +82,11 @@ int misc_init_r(void)
 
        boot_choice = readl(HB_SREG_A9_BOOT_SRC_STAT) & 0xff;
        sprintf(envbuffer, "bootcmd%d", boot_choice);
-       if (getenv(envbuffer)) {
+       if (env_get(envbuffer)) {
                sprintf(envbuffer, "run bootcmd%d", boot_choice);
-               setenv("bootcmd", envbuffer);
+               env_set("bootcmd", envbuffer);
        } else
-               setenv("bootcmd", "");
+               env_set("bootcmd", "");
 
        return 0;
 }
@@ -87,14 +98,8 @@ int dram_init(void)
        return 0;
 }
 
-void dram_init_banksize(void)
-{
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
-       gd->bd->bi_dram[0].size =  PHYS_SDRAM_1_SIZE;
-}
-
 #if defined(CONFIG_OF_BOARD_SETUP)
-void ft_board_setup(void *fdt, bd_t *bd)
+int ft_board_setup(void *fdt, bd_t *bd)
 {
        static const char disabled[] = "disabled";
        u32 reg = readl(HB_SREG_A9_PWRDOM_STAT);
@@ -106,12 +111,36 @@ void ft_board_setup(void *fdt, bd_t *bd)
        if (!(reg & PWRDOM_STAT_EMMC))
                do_fixup_by_compat(fdt, "calxeda,hb-sdhci", "status",
                        disabled, sizeof(disabled), 1);
+
+       return 0;
 }
 #endif
 
+static int is_highbank(void)
+{
+       uint32_t midr;
+
+       asm volatile ("mrc p15, 0, %0, c0, c0, 0\n" : "=r"(midr));
+
+       return (midr & 0xfff0) == 0xc090;
+}
+
 void reset_cpu(ulong addr)
 {
        writel(HB_PWR_HARD_RESET, HB_SREG_A9_PWR_REQ);
+       if (is_highbank())
+               writeb(HB_SCU_A9_PWR_OFF, HB_SCU_A9_PWR_STATUS);
+       else
+               writel(0x1, HB_SREG_A15_PWR_CTRL);
 
        wfi();
 }
+
+/*
+ * turn off the override before transferring control to Linux, since Linux
+ * may not support spread spectrum.
+ */
+void arch_preboot_os(void)
+{
+       cphy_disable_overrides();
+}