]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
ARM: uniphier: remove SPL support for ARMv8 SoCs
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 13 Jul 2017 11:32:15 +0000 (20:32 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Wed, 26 Jul 2017 13:27:15 +0000 (22:27 +0900)
It has been a while since ARM Trusted Firmware supported UniPhier SoC
family.  U-Boot SPL was intended as a temporary loader that runs in
secure world.  It is a maintenance headache to support two different
boot mechanisms.  Secure firmware is realm of ARM Trusted Firmware
and now U-Boot only serves as a non-secure boot loader for UniPhier
ARMv8 SoCs.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
36 files changed:
arch/arm/dts/uniphier-ld11-global.dts
arch/arm/dts/uniphier-ld11-ref.dts
arch/arm/dts/uniphier-ld11.dtsi
arch/arm/dts/uniphier-ld20-global.dts
arch/arm/dts/uniphier-ld20-ref.dts
arch/arm/dts/uniphier-ld20.dtsi
arch/arm/mach-uniphier/Kconfig
arch/arm/mach-uniphier/arm64/Makefile
arch/arm/mach-uniphier/arm64/arm-cci500.c [deleted file]
arch/arm/mach-uniphier/arm64/smp.S [deleted file]
arch/arm/mach-uniphier/arm64/smp_kick_cpus.c [deleted file]
arch/arm/mach-uniphier/arm64/timer.c [deleted file]
arch/arm/mach-uniphier/board_init.c
arch/arm/mach-uniphier/boards.c
arch/arm/mach-uniphier/boot-device/Makefile
arch/arm/mach-uniphier/boot-device/spl_board.c [deleted file]
arch/arm/mach-uniphier/clk/Makefile
arch/arm/mach-uniphier/clk/clk-dram-ld11.c [deleted file]
arch/arm/mach-uniphier/clk/clk-dram-ld20.c [deleted file]
arch/arm/mach-uniphier/clk/clk-early-ld11.c [deleted file]
arch/arm/mach-uniphier/clk/dpll-ld11.c [deleted file]
arch/arm/mach-uniphier/clk/dpll-ld20.c [deleted file]
arch/arm/mach-uniphier/dram/Makefile
arch/arm/mach-uniphier/dram/ddruqphy-regs.h [deleted file]
arch/arm/mach-uniphier/dram/umc-ld11.c [deleted file]
arch/arm/mach-uniphier/dram/umc-ld20.c [deleted file]
arch/arm/mach-uniphier/dram/umc64-regs.h [deleted file]
arch/arm/mach-uniphier/init.h
arch/arm/mach-uniphier/spl_board_init.c
configs/uniphier_ld11_defconfig [deleted file]
configs/uniphier_ld20_defconfig [deleted file]
doc/README.uniphier
drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
include/configs/uniphier.h

index 2ed13606b505e5e1d72c5b3acfc1b093ead1414b..7a650a02486acc0001060f7cc6f40c3780e13cdc 100644 (file)
 &usb2 {
        status = "okay";
 };
-
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
-};
index 4bdf1121d6785e74c61d4761683bc4a4694bae87..cc8ebe34c27cd35e131e7a05f66a5c5a63dca7e4 100644 (file)
 &usb2 {
        status = "okay";
 };
-
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
-};
index 75dfd1ff3b6b25ff60094e31f6d6c3774be19052..74f8f721a88891378a9992331f2c9adfad4cbdc5 100644 (file)
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0 0 0 0xffffffff>;
-               u-boot,dm-pre-reloc;
 
                serial0: serial@54006800 {
                        compatible = "socionext,uniphier-uart";
                        compatible = "socionext,uniphier-ld11-soc-glue",
                                     "simple-mfd", "syscon";
                        reg = <0x5f800000 0x2000>;
-                       u-boot,dm-pre-reloc;
 
                        pinctrl: pinctrl {
                                compatible = "socionext,uniphier-ld11-pinctrl";
-                               u-boot,dm-pre-reloc;
                        };
                };
 
index 535c0eeed5455067c213fa418894c12e0f949396..9f620d4101b54fa0a1d2aecee398813598891c41 100644 (file)
 &i2c0 {
        status = "okay";
 };
-
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
-};
index 2bcab967f7f870febd15133ff44f5863fc0ebb71..494166aee24ce3c304045075c1a0938f6fdf43f2 100644 (file)
 &i2c0 {
        status = "okay";
 };
-
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
-};
index ab031f2cab585f905039f85a09c25b2c71256e30..927340fa48d2b5bcfd25d9a5bb3288c3a7fe992c 100644 (file)
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0 0 0 0xffffffff>;
-               u-boot,dm-pre-reloc;
 
                serial0: serial@54006800 {
                        compatible = "socionext,uniphier-uart";
                        compatible = "socionext,uniphier-ld20-soc-glue",
                                     "simple-mfd", "syscon";
                        reg = <0x5f800000 0x2000>;
-                       u-boot,dm-pre-reloc;
 
                        pinctrl: pinctrl {
                                compatible = "socionext,uniphier-ld20-pinctrl";
-                               u-boot,dm-pre-reloc;
                        };
                };
 
index 5739325da71b91004a4b168970647525120670c7..1aed55a539bddb162053634ef6d6a9ee7335891f 100644 (file)
@@ -10,14 +10,6 @@ config ARCH_UNIPHIER_32BIT
        select ARMV7_NONSEC
        select ARCH_SUPPORT_PSCI
 
-config ARCH_UNIPHIER_64BIT
-       bool
-       select ARM64
-       select CMD_UNZIP
-       select SPL_SEPARATE_BSS if SPL
-       select ARMV8_MULTIENTRY if SPL
-       select ARMV8_SPIN_TABLE if SPL
-
 choice
         prompt "UniPhier SoC select"
         default ARCH_UNIPHIER_PRO4
@@ -38,18 +30,11 @@ config ARCH_UNIPHIER_PRO5_PXS2_LD6B
        bool "UniPhier Pro5/PXs2/LD6b SoCs"
        select ARCH_UNIPHIER_32BIT
 
-config ARCH_UNIPHIER_LD11_SINGLE
-       bool "UniPhier LD11 SoC"
-       select ARCH_UNIPHIER_64BIT
-
-config ARCH_UNIPHIER_LD20_SINGLE
-       bool "UniPhier LD20 SoC"
-       select ARCH_UNIPHIER_64BIT
-
 config ARCH_UNIPHIER_V8_MULTI
        bool "UniPhier V8 SoCs"
        depends on !SPL
-       select ARCH_UNIPHIER_64BIT
+       select ARM64
+       select CMD_UNZIP
 
 endchoice
 
@@ -79,13 +64,13 @@ config ARCH_UNIPHIER_LD6B
        default y
 
 config ARCH_UNIPHIER_LD11
-       bool "Enable UniPhier LD11 SoC support" if ARCH_UNIPHIER_V8_MULTI
-       depends on ARCH_UNIPHIER_LD11_SINGLE || ARCH_UNIPHIER_V8_MULTI
+       bool "Enable UniPhier LD11 SoC support"
+       depends on ARCH_UNIPHIER_V8_MULTI
        default y
 
 config ARCH_UNIPHIER_LD20
-       bool "Enable UniPhier LD20 SoC support" if ARCH_UNIPHIER_V8_MULTI
-       depends on ARCH_UNIPHIER_LD20_SINGLE || ARCH_UNIPHIER_V8_MULTI
+       bool "Enable UniPhier LD20 SoC support"
+       depends on ARCH_UNIPHIER_V8_MULTI
        select OF_BOARD_SETUP
        default y
 
index 06072f23bd8c478e49ef6dfc613775e29b7f57fe..12d91e0491e8e5e299315bdc90e272c1112723df 100644 (file)
@@ -2,14 +2,5 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-ifdef CONFIG_SPL_BUILD
-obj-y += timer.o
-else
 obj-y += mem_map.o
-ifdef CONFIG_ARMV8_MULTIENTRY
-obj-y += smp.o smp_kick_cpus.o
-obj-$(CONFIG_ARCH_UNIPHIER_LD20) += arm-cci500.o
-else
 obj-$(CONFIG_ARCH_UNIPHIER_LD20) += lowlevel_init.o
-endif
-endif
diff --git a/arch/arm/mach-uniphier/arm64/arm-cci500.c b/arch/arm/mach-uniphier/arm64/arm-cci500.c
deleted file mode 100644 (file)
index bf0fad4..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Initialization of ARM Corelink CCI-500 Cache Coherency Interconnect
- *
- * Copyright (C) 2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <linux/bitops.h>
-#include <linux/io.h>
-#include <linux/sizes.h>
-
-#include "../init.h"
-
-#define CCI500_BASE                    0x5FD00000
-#define CCI500_SLAVE_OFFSET            0x1000
-
-#define CCI500_SNOOP_CTRL
-#define   CCI500_SNOOP_CTRL_EN_DVM     BIT(1)
-#define   CCI500_SNOOP_CTRL_EN_SNOOP   BIT(0)
-
-void cci500_init(unsigned int nr_slaves)
-{
-       unsigned long slave_base = CCI500_BASE + CCI500_SLAVE_OFFSET;
-       int i;
-
-       for (i = 0; i < nr_slaves; i++) {
-               void __iomem *base;
-               u32 tmp;
-
-               base = ioremap(slave_base, SZ_4K);
-
-               tmp = readl(base);
-               tmp |= CCI500_SNOOP_CTRL_EN_DVM | CCI500_SNOOP_CTRL_EN_SNOOP;
-               writel(tmp, base);
-
-               iounmap(base);
-
-               slave_base += CCI500_SLAVE_OFFSET;
-       }
-}
diff --git a/arch/arm/mach-uniphier/arm64/smp.S b/arch/arm/mach-uniphier/arm64/smp.S
deleted file mode 100644 (file)
index 9348ec9..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <linux/linkage.h>
-
-ENTRY(uniphier_smp_setup)
-       mrs     x0, s3_1_c15_c2_1       /* CPUECTLR_EL1 */
-       orr     x0, x0, #(1 << 6)       /* SMPEN */
-       msr     s3_1_c15_c2_1, x0
-       ret
-ENDPROC(uniphier_smp_setup)
-
-ENTRY(uniphier_secondary_startup)
-       bl      uniphier_smp_setup
-       b       _start
-ENDPROC(uniphier_secondary_startup)
diff --git a/arch/arm/mach-uniphier/arm64/smp_kick_cpus.c b/arch/arm/mach-uniphier/arm64/smp_kick_cpus.c
deleted file mode 100644 (file)
index 8e5b198..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <linux/io.h>
-#include <linux/sizes.h>
-
-#include "../init.h"
-
-#define UNIPHIER_SMPCTRL_ROM_RSV0      0x59801200
-
-void uniphier_smp_setup(void);
-void uniphier_secondary_startup(void);
-
-void uniphier_smp_kick_all_cpus(void)
-{
-       void __iomem *rom_boot_rsv0;
-
-       rom_boot_rsv0 = ioremap(UNIPHIER_SMPCTRL_ROM_RSV0, SZ_8);
-
-       writeq((u64)uniphier_secondary_startup, rom_boot_rsv0);
-
-       iounmap(rom_boot_rsv0);
-
-       uniphier_smp_setup();
-
-       asm("dsb        ishst\n" /* Ensure the write to ROM_RSV0 is visible */
-           "sev"); /* Bring up all secondary CPUs from Boot ROM into U-Boot */
-}
diff --git a/arch/arm/mach-uniphier/arm64/timer.c b/arch/arm/mach-uniphier/arm64/timer.c
deleted file mode 100644 (file)
index c10903a..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <linux/bitops.h>
-#include <linux/io.h>
-#include <linux/sizes.h>
-
-#define CNT_CONTROL_BASE       0x60E00000
-
-#define CNTCR                  0x000
-#define   CNTCR_EN                     BIT(0)
-
-/* setup ARMv8 Generic Timer */
-int timer_init(void)
-{
-       void __iomem *base;
-       u32 tmp;
-
-       base = ioremap(CNT_CONTROL_BASE, SZ_4K);
-
-       /*
-        * Note:
-        * In a system that implements both Secure and Non-secure states,
-        * this register is only writable in Secure state.
-        */
-       tmp = readl(base + CNTCR);
-       tmp |= CNTCR_EN;
-       writel(tmp, base + CNTCR);
-
-       iounmap(base);
-
-       return 0;
-}
index ca910f6d725450362c809a233e94f0492cb8684e..884bc67654d46dd64cfcc75ad511219ca2d954a7 100644 (file)
@@ -73,9 +73,6 @@ static void uniphier_ld20_misc_init(void)
                writel(0x0000b500, 0x6184e024);
                writel(0x00000001, 0x6184e000);
        }
-#ifdef CONFIG_ARMV8_MULTIENTRY
-       cci500_init(2);
-#endif
 }
 #endif
 
@@ -230,12 +227,6 @@ int board_init(void)
 
        support_card_late_init();
 
-       led_puts("U6");
-
-#ifdef CONFIG_ARMV8_MULTIENTRY
-       uniphier_smp_kick_all_cpus();
-#endif
-
        led_puts("Uboo");
 
        return 0;
index e3b933502230489e374354b127eb0cc0355bee58..78de256a01e54d3d05a9f75dc62148cf636ac676 100644 (file)
@@ -140,69 +140,6 @@ static const struct uniphier_board_data uniphier_ld6b_data = {
 };
 #endif
 
-#if defined(CONFIG_ARCH_UNIPHIER_LD11)
-static const struct uniphier_board_data uniphier_ld11_data = {
-       .dram_freq = 1600,
-       .dram_ch[0] = {
-               .size = 0x20000000,
-               .width = 16,
-       },
-       .dram_ch[1] = {
-               .size = 0x20000000,
-               .width = 16,
-       },
-};
-#endif
-
-#if defined(CONFIG_ARCH_UNIPHIER_LD20)
-static const struct uniphier_board_data uniphier_ld20_ref_data = {
-       .dram_freq = 1866,
-       .dram_ch[0] = {
-               .size = 0x40000000,
-               .width = 32,
-       },
-       .dram_ch[1] = {
-               .size = 0x40000000,
-               .width = 32,
-       },
-       .dram_ch[2] = {
-               .size = 0x40000000,
-               .width = 32,
-       },
-       .flags = UNIPHIER_BD_BOARD_LD20_REF,
-};
-
-static const struct uniphier_board_data uniphier_ld20_data = {
-       .dram_freq = 1866,
-       .dram_ch[0] = {
-               .size = 0x40000000,
-               .width = 32,
-       },
-       .dram_ch[1] = {
-               .size = 0x40000000,
-               .width = 32,
-       },
-       .dram_ch[2] = {
-               .size = 0x40000000,
-               .width = 32,
-       },
-       .flags = UNIPHIER_BD_BOARD_LD20_GLOBAL,
-};
-
-static const struct uniphier_board_data uniphier_ld21_data = {
-       .dram_freq = 1866,
-       .dram_ch[0] = {
-               .size = 0x20000000,
-               .width = 32,
-       },
-       .dram_ch[1] = {
-               .size = 0x40000000,
-               .width = 32,
-       },
-       .flags = UNIPHIER_BD_DRAM_SPARSE | UNIPHIER_BD_BOARD_LD21_GLOBAL,
-};
-#endif
-
 struct uniphier_board_id {
        const char *compatible;
        const struct uniphier_board_data *param;
@@ -232,14 +169,6 @@ static const struct uniphier_board_id uniphier_boards[] = {
 #if defined(CONFIG_ARCH_UNIPHIER_LD6B)
        { "socionext,uniphier-ld6b", &uniphier_ld6b_data, },
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_LD11)
-       { "socionext,uniphier-ld11", &uniphier_ld11_data, },
-#endif
-#if defined(CONFIG_ARCH_UNIPHIER_LD20)
-       { "socionext,uniphier-ld21", &uniphier_ld21_data, },
-       { "socionext,uniphier-ld20-ref", &uniphier_ld20_ref_data, },
-       { "socionext,uniphier-ld20", &uniphier_ld20_data, },
-#endif
 };
 
 const struct uniphier_board_data *uniphier_get_board_param(void)
index abb58a729aa31eda3ff193860426baa2f663c5b1..b35729213032ff74aa796beefcd640b16a19796f 100644 (file)
@@ -14,7 +14,3 @@ obj-$(CONFIG_ARCH_UNIPHIER_LD6B)      += boot-device-pxs2.o
 obj-$(CONFIG_ARCH_UNIPHIER_LD11)       += boot-device-ld11.o
 obj-$(CONFIG_ARCH_UNIPHIER_LD20)       += boot-device-ld11.o
 obj-$(CONFIG_ARCH_UNIPHIER_PXS3)       += boot-device-pxs3.o
-
-ifdef CONFIG_SPL_BUILD
-obj-$(CONFIG_SPL_BOARD_LOAD_IMAGE)     += spl_board.o
-endif
diff --git a/arch/arm/mach-uniphier/boot-device/spl_board.c b/arch/arm/mach-uniphier/boot-device/spl_board.c
deleted file mode 100644 (file)
index bd47ac8..0000000
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (C) 2017 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <spl.h>
-#include <linux/bitops.h>
-#include <linux/compat.h>
-#include <linux/io.h>
-#include <asm/processor.h>
-
-#include "../soc-info.h"
-
-#define MMC_CMD_SWITCH                 6
-#define MMC_CMD_SELECT_CARD            7
-#define MMC_CMD_SEND_CSD               9
-#define MMC_CMD_READ_MULTIPLE_BLOCK    18
-
-#define EXT_CSD_PART_CONF              179     /* R/W */
-
-#define MMC_RSP_PRESENT BIT(0)
-#define MMC_RSP_136    BIT(1)          /* 136 bit response */
-#define MMC_RSP_CRC    BIT(2)          /* expect valid crc */
-#define MMC_RSP_BUSY   BIT(3)          /* card may send busy */
-#define MMC_RSP_OPCODE BIT(4)          /* response contains opcode */
-
-#define MMC_RSP_NONE   (0)
-#define MMC_RSP_R1     (MMC_RSP_PRESENT | MMC_RSP_CRC | MMC_RSP_OPCODE)
-#define MMC_RSP_R1b    (MMC_RSP_PRESENT | MMC_RSP_CRC | MMC_RSP_OPCODE | \
-                       MMC_RSP_BUSY)
-#define MMC_RSP_R2     (MMC_RSP_PRESENT | MMC_RSP_136 | MMC_RSP_CRC)
-#define MMC_RSP_R3     (MMC_RSP_PRESENT)
-#define MMC_RSP_R4     (MMC_RSP_PRESENT)
-#define MMC_RSP_R5     (MMC_RSP_PRESENT | MMC_RSP_CRC | MMC_RSP_OPCODE)
-#define MMC_RSP_R6     (MMC_RSP_PRESENT | MMC_RSP_CRC | MMC_RSP_OPCODE)
-#define MMC_RSP_R7     (MMC_RSP_PRESENT | MMC_RSP_CRC | MMC_RSP_OPCODE)
-
-#define SDHCI_DMA_ADDRESS      0x00
-#define SDHCI_BLOCK_SIZE       0x04
-#define  SDHCI_MAKE_BLKSZ(dma, blksz) ((((dma) & 0x7) << 12) | ((blksz) & 0xFFF))
-#define SDHCI_BLOCK_COUNT      0x06
-#define SDHCI_ARGUMENT         0x08
-#define SDHCI_TRANSFER_MODE    0x0C
-#define  SDHCI_TRNS_DMA                BIT(0)
-#define  SDHCI_TRNS_BLK_CNT_EN BIT(1)
-#define  SDHCI_TRNS_ACMD12     BIT(2)
-#define  SDHCI_TRNS_READ       BIT(4)
-#define  SDHCI_TRNS_MULTI      BIT(5)
-#define SDHCI_COMMAND          0x0E
-#define  SDHCI_CMD_RESP_MASK   0x03
-#define  SDHCI_CMD_CRC         0x08
-#define  SDHCI_CMD_INDEX       0x10
-#define  SDHCI_CMD_DATA                0x20
-#define  SDHCI_CMD_ABORTCMD    0xC0
-#define  SDHCI_CMD_RESP_NONE   0x00
-#define  SDHCI_CMD_RESP_LONG   0x01
-#define  SDHCI_CMD_RESP_SHORT  0x02
-#define  SDHCI_CMD_RESP_SHORT_BUSY 0x03
-#define  SDHCI_MAKE_CMD(c, f) ((((c) & 0xff) << 8) | ((f) & 0xff))
-#define SDHCI_RESPONSE         0x10
-#define SDHCI_HOST_CONTROL     0x28
-#define  SDHCI_CTRL_DMA_MASK   0x18
-#define   SDHCI_CTRL_SDMA      0x00
-#define SDHCI_BLOCK_GAP_CONTROL        0x2A
-#define SDHCI_SOFTWARE_RESET   0x2F
-#define  SDHCI_RESET_CMD       0x02
-#define  SDHCI_RESET_DATA      0x04
-#define SDHCI_INT_STATUS       0x30
-#define  SDHCI_INT_RESPONSE    BIT(0)
-#define  SDHCI_INT_DATA_END    BIT(1)
-#define  SDHCI_INT_ERROR       BIT(15)
-#define SDHCI_SIGNAL_ENABLE    0x38
-
-/* RCA assigned by Boot ROM */
-#define UNIPHIER_EMMC_RCA      0x1000
-
-struct uniphier_mmc_cmd {
-       unsigned int cmdidx;
-       unsigned int resp_type;
-       unsigned int cmdarg;
-       unsigned int is_data;
-};
-
-static int uniphier_emmc_send_cmd(void __iomem *host_base,
-                                 struct uniphier_mmc_cmd *cmd)
-{
-       u32 mode = 0;
-       u32 mask = SDHCI_INT_RESPONSE;
-       u32 stat, flags;
-
-       writel(U32_MAX, host_base + SDHCI_INT_STATUS);
-       writel(0, host_base + SDHCI_SIGNAL_ENABLE);
-       writel(cmd->cmdarg, host_base + SDHCI_ARGUMENT);
-
-       if (cmd->is_data)
-               mode = SDHCI_TRNS_DMA | SDHCI_TRNS_BLK_CNT_EN |
-                       SDHCI_TRNS_ACMD12 | SDHCI_TRNS_READ |
-                       SDHCI_TRNS_MULTI;
-
-       writew(mode, host_base + SDHCI_TRANSFER_MODE);
-
-       if (!(cmd->resp_type & MMC_RSP_PRESENT))
-               flags = SDHCI_CMD_RESP_NONE;
-       else if (cmd->resp_type & MMC_RSP_136)
-               flags = SDHCI_CMD_RESP_LONG;
-       else if (cmd->resp_type & MMC_RSP_BUSY)
-               flags = SDHCI_CMD_RESP_SHORT_BUSY;
-       else
-               flags = SDHCI_CMD_RESP_SHORT;
-
-       if (cmd->resp_type & MMC_RSP_CRC)
-               flags |= SDHCI_CMD_CRC;
-       if (cmd->resp_type & MMC_RSP_OPCODE)
-               flags |= SDHCI_CMD_INDEX;
-       if (cmd->is_data)
-               flags |= SDHCI_CMD_DATA;
-
-       if (cmd->resp_type & MMC_RSP_BUSY || cmd->is_data)
-               mask |= SDHCI_INT_DATA_END;
-
-       writew(SDHCI_MAKE_CMD(cmd->cmdidx, flags), host_base + SDHCI_COMMAND);
-
-       do {
-               stat = readl(host_base + SDHCI_INT_STATUS);
-               if (stat & SDHCI_INT_ERROR)
-                       return -EIO;
-
-       } while ((stat & mask) != mask);
-
-       return 0;
-}
-
-static int uniphier_emmc_switch_part(void __iomem *host_base, int part_num)
-{
-       struct uniphier_mmc_cmd cmd = {};
-
-       cmd.cmdidx = MMC_CMD_SWITCH;
-       cmd.resp_type = MMC_RSP_R1b;
-       cmd.cmdarg = (EXT_CSD_PART_CONF << 16) | (part_num << 8) | (3 << 24);
-
-       return uniphier_emmc_send_cmd(host_base, &cmd);
-}
-
-static int uniphier_emmc_is_over_2gb(void __iomem *host_base)
-{
-       struct uniphier_mmc_cmd cmd = {};
-       u32 csd40, csd72;       /* CSD[71:40], CSD[103:72] */
-       int ret;
-
-       cmd.cmdidx = MMC_CMD_SEND_CSD;
-       cmd.resp_type = MMC_RSP_R2;
-       cmd.cmdarg = UNIPHIER_EMMC_RCA << 16;
-
-       ret = uniphier_emmc_send_cmd(host_base, &cmd);
-       if (ret)
-               return ret;
-
-       csd40 = readl(host_base + SDHCI_RESPONSE + 4);
-       csd72 = readl(host_base + SDHCI_RESPONSE + 8);
-
-       return !(~csd40 & 0xffc00380) && !(~csd72 & 0x3);
-}
-
-static int uniphier_emmc_load_image(void __iomem *host_base, u32 dev_addr,
-                                   unsigned long load_addr, u32 block_cnt)
-{
-       struct uniphier_mmc_cmd cmd = {};
-       u8 tmp;
-
-       WARN_ON(load_addr >> 32);
-
-       writel(load_addr, host_base + SDHCI_DMA_ADDRESS);
-       writew(SDHCI_MAKE_BLKSZ(7, 512), host_base + SDHCI_BLOCK_SIZE);
-       writew(block_cnt, host_base + SDHCI_BLOCK_COUNT);
-
-       tmp = readb(host_base + SDHCI_HOST_CONTROL);
-       tmp &= ~SDHCI_CTRL_DMA_MASK;
-       tmp |= SDHCI_CTRL_SDMA;
-       writeb(tmp, host_base + SDHCI_HOST_CONTROL);
-
-       tmp = readb(host_base + SDHCI_BLOCK_GAP_CONTROL);
-       tmp &= ~1;              /* clear Stop At Block Gap Request */
-       writeb(tmp, host_base + SDHCI_BLOCK_GAP_CONTROL);
-
-       cmd.cmdidx = MMC_CMD_READ_MULTIPLE_BLOCK;
-       cmd.resp_type = MMC_RSP_R1;
-       cmd.cmdarg = dev_addr;
-       cmd.is_data = 1;
-
-       return uniphier_emmc_send_cmd(host_base, &cmd);
-}
-
-static int spl_board_load_image(struct spl_image_info *spl_image,
-                               struct spl_boot_device *bootdev)
-{
-       u32 dev_addr = CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR;
-       void __iomem *host_base = (void __iomem *)0x5a000200;
-       struct uniphier_mmc_cmd cmd = {};
-       int ret;
-
-       /*
-        * deselect card before SEND_CSD command.
-        * Do not check the return code.  It fails, but it is OK.
-        */
-       cmd.cmdidx = MMC_CMD_SELECT_CARD;
-       cmd.resp_type = MMC_RSP_R1;
-
-       uniphier_emmc_send_cmd(host_base, &cmd); /* CMD7 (arg=0) */
-
-       /* reset CMD Line */
-       writeb(SDHCI_RESET_CMD | SDHCI_RESET_DATA,
-              host_base + SDHCI_SOFTWARE_RESET);
-       while (readb(host_base + SDHCI_SOFTWARE_RESET))
-               cpu_relax();
-
-       ret = uniphier_emmc_is_over_2gb(host_base);
-       if (ret < 0)
-               return ret;
-       if (ret) {
-               debug("card is block addressing\n");
-       } else {
-               debug("card is byte addressing\n");
-               dev_addr *= 512;
-       }
-
-       cmd.cmdarg = UNIPHIER_EMMC_RCA << 16;
-
-       /* select card again */
-       ret = uniphier_emmc_send_cmd(host_base, &cmd);
-       if (ret)
-               printf("failed to select card\n");
-
-       /* Switch to Boot Partition 1 */
-       ret = uniphier_emmc_switch_part(host_base, 1);
-       if (ret)
-               printf("failed to switch partition\n");
-
-       ret = uniphier_emmc_load_image(host_base, dev_addr,
-                                      CONFIG_SYS_TEXT_BASE, 1);
-       if (ret) {
-               printf("failed to load image\n");
-               return ret;
-       }
-
-       ret = spl_parse_image_header(spl_image, (void *)CONFIG_SYS_TEXT_BASE);
-       if (ret)
-               return ret;
-
-       ret = uniphier_emmc_load_image(host_base, dev_addr,
-                                      spl_image->load_addr,
-                                      spl_image->size / 512);
-       if (ret) {
-               printf("failed to load image\n");
-               return ret;
-       }
-
-       return 0;
-}
-SPL_LOAD_IMAGE_METHOD("eMMC", 0, BOOT_DEVICE_BOARD, spl_board_load_image);
index dad035d03a88841586cb09bc41362101cefe37c7..1680dddd6e68c007c8a1d430ea47edba86d0d47e 100644 (file)
@@ -11,8 +11,6 @@ obj-$(CONFIG_ARCH_UNIPHIER_SLD8)      += clk-early-sld3.o clk-dram-sld3.o dpll-sld8.o
 obj-$(CONFIG_ARCH_UNIPHIER_PRO5)       += clk-early-sld3.o clk-dram-pro5.o dpll-pro5.o
 obj-$(CONFIG_ARCH_UNIPHIER_PXS2)       += clk-early-sld3.o clk-dram-pxs2.o dpll-pxs2.o
 obj-$(CONFIG_ARCH_UNIPHIER_LD6B)       += clk-early-sld3.o clk-dram-pxs2.o dpll-pxs2.o
-obj-$(CONFIG_ARCH_UNIPHIER_LD11)       += clk-early-ld11.o clk-dram-ld11.o dpll-ld11.o
-obj-$(CONFIG_ARCH_UNIPHIER_LD20)       += clk-early-ld11.o clk-dram-ld20.o dpll-ld20.o
 
 else
 
diff --git a/arch/arm/mach-uniphier/clk/clk-dram-ld11.c b/arch/arm/mach-uniphier/clk/clk-dram-ld11.c
deleted file mode 100644 (file)
index 593e11a..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2016-2017 Socionext Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <linux/io.h>
-
-#include "../init.h"
-#include "../sc64-regs.h"
-
-void uniphier_ld11_dram_clk_init(void)
-{
-       u32 tmp;
-
-       /* deassert reset */
-       tmp = readl(SC_RSTCTRL7);
-       tmp |= SC_RSTCTRL7_UMC31 | SC_RSTCTRL7_UMC30;
-       writel(tmp, SC_RSTCTRL7);
-
-       /* provide clocks */
-       tmp = readl(SC_CLKCTRL7);
-       tmp |= SC_CLKCTRL7_UMC31 | SC_CLKCTRL7_UMC30;
-       writel(tmp, SC_CLKCTRL7);
-}
diff --git a/arch/arm/mach-uniphier/clk/clk-dram-ld20.c b/arch/arm/mach-uniphier/clk/clk-dram-ld20.c
deleted file mode 100644 (file)
index 62e5acd..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2016-2017 Socionext Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <linux/io.h>
-
-#include "../init.h"
-#include "../sc64-regs.h"
-
-void uniphier_ld20_dram_clk_init(void)
-{
-       u32 tmp;
-
-       /* deassert reset */
-       tmp = readl(SC_RSTCTRL7);
-       tmp |= SC_RSTCTRL7_UMCSB | SC_RSTCTRL7_UMCA2 | SC_RSTCTRL7_UMCA1 |
-               SC_RSTCTRL7_UMCA0 | SC_RSTCTRL7_UMC32 | SC_RSTCTRL7_UMC31 |
-               SC_RSTCTRL7_UMC30;
-       writel(tmp, SC_RSTCTRL7);
-
-       /* provide clocks */
-       tmp = readl(SC_CLKCTRL7);
-       tmp |= SC_CLKCTRL7_UMCSB | SC_CLKCTRL7_UMC32 | SC_CLKCTRL7_UMC31 |
-                                                       SC_CLKCTRL7_UMC30;
-       writel(tmp, SC_CLKCTRL7);
-}
diff --git a/arch/arm/mach-uniphier/clk/clk-early-ld11.c b/arch/arm/mach-uniphier/clk/clk-early-ld11.c
deleted file mode 100644 (file)
index bb6f7a4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2016-2017 Socionext Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <linux/io.h>
-
-#include "../init.h"
-#include "../sc64-regs.h"
-
-void uniphier_ld11_early_clk_init(void)
-{
-       u32 tmp;
-
-       /* provide clocks */
-       tmp = readl(SC_CLKCTRL4);
-       tmp |= SC_CLKCTRL4_PERI;
-       writel(tmp, SC_CLKCTRL4);
-}
diff --git a/arch/arm/mach-uniphier/clk/dpll-ld11.c b/arch/arm/mach-uniphier/clk/dpll-ld11.c
deleted file mode 100644 (file)
index 7f0677c..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (C) 2016 Socionext Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include "../init.h"
-#include "../sc64-regs.h"
-#include "pll.h"
-
-int uniphier_ld11_dpll_init(const struct uniphier_board_data *bd)
-{
-       uniphier_ld20_sscpll_init(SC_DPLLCTRL, UNIPHIER_PLL_FREQ_DEFAULT, 0, 2);
-
-       return 0;
-}
diff --git a/arch/arm/mach-uniphier/clk/dpll-ld20.c b/arch/arm/mach-uniphier/clk/dpll-ld20.c
deleted file mode 100644 (file)
index 86e99c4..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include "../init.h"
-#include "../sc64-regs.h"
-#include "pll.h"
-
-int uniphier_ld20_dpll_init(const struct uniphier_board_data *bd)
-{
-       uniphier_ld20_sscpll_init(SC_DPLL0CTRL, UNIPHIER_PLL_FREQ_DEFAULT, 0, 2);
-       uniphier_ld20_sscpll_init(SC_DPLL1CTRL, UNIPHIER_PLL_FREQ_DEFAULT, 0, 2);
-       uniphier_ld20_sscpll_init(SC_DPLL2CTRL, UNIPHIER_PLL_FREQ_DEFAULT, 0, 2);
-
-       return 0;
-}
index 2ce6199988a4cc9201678ca647903518390257b6..1da33f6d80a169970aa3efc459d744a301839a26 100644 (file)
@@ -14,8 +14,6 @@ obj-$(CONFIG_ARCH_UNIPHIER_SLD8)      += umc-sld8.o \
 obj-$(CONFIG_ARCH_UNIPHIER_PRO5)       += umc-pro5.o
 obj-$(CONFIG_ARCH_UNIPHIER_PXS2)       += umc-pxs2.o
 obj-$(CONFIG_ARCH_UNIPHIER_LD6B)       += umc-pxs2.o
-obj-$(CONFIG_ARCH_UNIPHIER_LD11)       += umc-ld11.o
-obj-$(CONFIG_ARCH_UNIPHIER_LD20)       += umc-ld20.o
 
 else
 
diff --git a/arch/arm/mach-uniphier/dram/ddruqphy-regs.h b/arch/arm/mach-uniphier/dram/ddruqphy-regs.h
deleted file mode 100644 (file)
index e496af5..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2016 Socionext Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef _DDRUQPHY_REGS_H
-#define _DDRUQPHY_REGS_H
-
-#include <linux/bitops.h>
-
-#define PHY_REG_SHIFT                  2
-#define PHY_SLV_DLY_WIDTH              6
-#define PHY_BITLVL_DLY_WIDTH           6
-#define PHY_MAS_DLY_WIDTH              8
-
-#define PHY_SCL_START                  (0x40 << (PHY_REG_SHIFT))
-#define   PHY_SCL_START_GO_DONE                BIT(28)
-#define PHY_SCL_DATA_0                 (0x41 << (PHY_REG_SHIFT))
-#define PHY_SCL_DATA_1                 (0x42 << (PHY_REG_SHIFT))
-#define PHY_SCL_LATENCY                        (0x43 << (PHY_REG_SHIFT))
-#define PHY_SCL_CONFIG_1               (0x46 << (PHY_REG_SHIFT))
-#define PHY_SCL_CONFIG_2               (0x47 << (PHY_REG_SHIFT))
-#define PHY_PAD_CTRL                   (0x48 << (PHY_REG_SHIFT))
-#define PHY_DLL_RECALIB                        (0x49 << (PHY_REG_SHIFT))
-#define   PHY_DLL_RECALIB_TRIM_MASK    GENMASK(PHY_SLV_DLY_WIDTH - 1, 0)
-#define   PHY_DLL_RECALIB_INCR         BIT(27)
-#define PHY_DLL_ADRCTRL                        (0x4A << (PHY_REG_SHIFT))
-#define   PHY_DLL_ADRCTRL_TRIM_MASK    GENMASK(PHY_SLV_DLY_WIDTH - 1, 0)
-#define   PHY_DLL_ADRCTRL_INCR         BIT(9)
-#define   PHY_DLL_ADRCTRL_MDL_SHIFT    24
-#define   PHY_DLL_ADRCTRL_MDL_MASK     (GENMASK(PHY_MAS_DLY_WIDTH - 1, 0) << \
-                                               PHY_DLL_ADRCTRL_MDL_SHIFT)
-#define PHY_LANE_SEL                   (0x4B << (PHY_REG_SHIFT))
-#define   PHY_LANE_SEL_LANE_SHIFT      0
-#define   PHY_LANE_SEL_LANE_WIDTH      8
-#define   PHY_LANE_SEL_BIT_SHIFT       8
-#define   PHY_LANE_SEL_BIT_WIDTH       4
-#define PHY_DLL_TRIM_1                 (0x4C << (PHY_REG_SHIFT))
-#define PHY_DLL_TRIM_2                 (0x4D << (PHY_REG_SHIFT))
-#define PHY_DLL_TRIM_3                 (0x4E << (PHY_REG_SHIFT))
-#define PHY_SCL_MAIN_CLK_DELTA         (0x50 << (PHY_REG_SHIFT))
-#define PHY_WRLVL_AUTOINC_TRIM         (0x53 << (PHY_REG_SHIFT))
-#define PHY_WRLVL_DYN_ODT              (0x54 << (PHY_REG_SHIFT))
-#define PHY_WRLVL_ON_OFF               (0x55 << (PHY_REG_SHIFT))
-#define PHY_UNQ_ANALOG_DLL_1           (0x57 << (PHY_REG_SHIFT))
-#define PHY_UNQ_ANALOG_DLL_2           (0x58 << (PHY_REG_SHIFT))
-#define PHY_DLL_INCR_TRIM_1            (0x59 << (PHY_REG_SHIFT))
-#define PHY_DLL_INCR_TRIM_3            (0x5A << (PHY_REG_SHIFT))
-#define PHY_SCL_CONFIG_3               (0x5B << (PHY_REG_SHIFT))
-#define PHY_UNIQUIFY_TSMC_IO_1         (0x5C << (PHY_REG_SHIFT))
-#define PHY_SCL_START_ADDR             (0x62 << (PHY_REG_SHIFT))
-#define PHY_IP_DQ_DQS_BITWISE_TRIM     (0x65 << (PHY_REG_SHIFT))
-#define   PHY_IP_DQ_DQS_BITWISE_TRIM_MASK      \
-                                       GENMASK(PHY_BITLVL_DLY_WIDTH - 1, 0)
-#define   PHY_IP_DQ_DQS_BITWISE_TRIM_INC       \
-                                       BIT(PHY_BITLVL_DLY_WIDTH)
-#define   PHY_IP_DQ_DQS_BITWISE_TRIM_OVERRIDE  \
-                                       BIT(PHY_BITLVL_DLY_WIDTH + 1)
-#define PHY_DSCL_CNT                   (0x67 << (PHY_REG_SHIFT))
-#define PHY_OP_DQ_DM_DQS_BITWISE_TRIM  (0x68 << (PHY_REG_SHIFT))
-#define   PHY_OP_DQ_DM_DQS_BITWISE_TRIM_MASK   \
-                                       GENMASK(PHY_BITLVL_DLY_WIDTH - 1, 0)
-#define   PHY_OP_DQ_DM_DQS_BITWISE_TRIM_INC    \
-                                       BIT(PHY_BITLVL_DLY_WIDTH)
-#define   PHY_OP_DQ_DM_DQS_BITWISE_TRIM_OVERRIDE       \
-                                       BIT(PHY_BITLVL_DLY_WIDTH + 1)
-#define PHY_DLL_TRIM_CLK               (0x69 << (PHY_REG_SHIFT))
-#define   PHY_DLL_TRIM_CLK_MASK                GENMASK(PHY_SLV_DLY_WIDTH, 0)
-#define   PHY_DLL_TRIM_CLK_INCR                BIT(PHY_SLV_DLY_WIDTH + 1)
-#define PHY_DYNAMIC_BIT_LVL            (0x6B << (PHY_REG_SHIFT))
-#define PHY_SCL_WINDOW_TRIM            (0x6D << (PHY_REG_SHIFT))
-#define PHY_DISABLE_GATING_FOR_SCL     (0x6E << (PHY_REG_SHIFT))
-#define PHY_SCL_CONFIG_4               (0x6F << (PHY_REG_SHIFT))
-#define PHY_DYNAMIC_WRITE_BIT_LVL      (0x70 << (PHY_REG_SHIFT))
-#define PHY_VREF_TRAINING              (0x72 << (PHY_REG_SHIFT))
-#define PHY_SCL_GATE_TIMING            (0x78 << (PHY_REG_SHIFT))
-
-#endif /* _DDRUQPHY_REGS_H */
diff --git a/arch/arm/mach-uniphier/dram/umc-ld11.c b/arch/arm/mach-uniphier/dram/umc-ld11.c
deleted file mode 100644 (file)
index 9e2021a..0000000
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
- * Copyright (C) 2016 Socionext Inc.
- */
-
-#include <common.h>
-#include <linux/io.h>
-#include <linux/sizes.h>
-#include <asm/processor.h>
-
-#include "../init.h"
-#include "ddrphy-regs.h"
-#include "umc64-regs.h"
-
-#define DDR_FREQ               1600
-
-#define DRAM_CH_NR     2
-#define RANK_BLOCKS_TR 2
-
-enum dram_freq {
-       DRAM_FREQ_1600M,
-       DRAM_FREQ_NR,
-};
-
-enum dram_size {
-       DRAM_SZ_256M,
-       DRAM_SZ_512M,
-       DRAM_SZ_NR,
-};
-
-/* PHY */
-static const int rof_pos_shift_pre[RANK_BLOCKS_TR][2] = { {0, 0}, {0, 0} };
-static const int rof_neg_shift_pre[RANK_BLOCKS_TR][2] = { {0, 0}, {0, 0} };
-static const int rof_pos_shift[RANK_BLOCKS_TR][2] = { {-35, -35}, {-35, -35} };
-static const int rof_neg_shift[RANK_BLOCKS_TR][2] = { {-17, -17}, {-17, -17} };
-static const int tof_shift[RANK_BLOCKS_TR][2] = { {-50, -50}, {-50, -50} };
-
-/* Register address */
-#define PHY_ZQ0CR1     0x00000184
-#define PHY_ZQ1CR1     0x00000194
-#define PHY_ZQ2CR1     0x000001A4
-#define PHY_DX0GCR     0x000001C0
-#define PHY_DX0GTR     0x000001F0
-#define PHY_DX1GCR     0x00000200
-#define PHY_DX1GTR     0x00000230
-#define PHY_DX2GCR     0x00000240
-#define PHY_DX2GTR     0x00000270
-#define PHY_DX3GCR     0x00000280
-#define PHY_DX3GTR     0x000002B0
-
-#define PHY_DXMDLR(dx)         (0x000001EC + 0x40 * (dx))
-#define PHY_DXLCDLR0(dx)       (0x000001E0 + 0x40 * (dx))
-#define PHY_DXLCDLR1(dx)       (0x000001E4 + 0x40 * (dx))
-#define PHY_DXLCDLR2(dx)       (0x000001E8 + 0x40 * (dx))
-#define PHY_DXBDLR1(dx)                (0x000001D0 + 0x40 * (dx))
-#define PHY_DXBDLR2(dx)                (0x000001D4 + 0x40 * (dx))
-
-/* MASK */
-#define PHY_ACBD_MASK          0x00FC0000
-#define PHY_CK0BD_MASK         0x0000003F
-#define PHY_CK1BD_MASK         0x00000FC0
-#define PHY_IPRD_MASK          0x000000FF
-#define PHY_WLD_MASK(rank)     (0xFF << (8 * (rank)))
-#define PHY_DQSGD_MASK(rank)   (0xFF << (8 * (rank)))
-#define PHY_DQSGX_MASK         BIT(6)
-#define PHY_DSWBD_MASK         0x3F000000      /* bit[29:24] */
-#define PHY_DSDQOE_MASK                0x00000FFF
-
-static void ddrphy_maskwritel(u32 data, u32 mask, void __iomem *addr)
-{
-       u32 value;
-
-       value = (readl(addr) & ~(mask)) | (data & mask);
-       writel(value, addr);
-}
-
-static u32 ddrphy_maskreadl(u32 mask, void __iomem *addr)
-{
-       return readl(addr) & mask;
-}
-
-/* step of 0.5T  for PUB-byte */
-static u8 ddrphy_get_mdl(int dx, void __iomem *phy_base)
-{
-       return ddrphy_maskreadl(PHY_IPRD_MASK, phy_base + PHY_DXMDLR(dx));
-}
-
-/* Calculating step for PUB-byte */
-static int ddrphy_hpstep(int delay, int dx, void __iomem *phy_base)
-{
-       return delay * ddrphy_get_mdl(dx, phy_base) * DDR_FREQ / 1000000;
-}
-
-static void ddrphy_vt_ctrl(void __iomem *phy_base, int enable)
-{
-       u32 tmp;
-
-       tmp = readl(phy_base + PHY_PGCR1);
-
-       if (enable)
-               tmp &= ~PHY_PGCR1_INHVT;
-       else
-               tmp |= PHY_PGCR1_INHVT;
-
-       writel(tmp, phy_base + PHY_PGCR1);
-
-       if (!enable) {
-               while (!(readl(phy_base + PHY_PGSR1) & PHY_PGSR1_VTSTOP))
-                       cpu_relax();
-       }
-}
-
-static void ddrphy_set_ckoffset_qoffset(int delay_ckoffset0, int delay_ckoffset1,
-                                       int delay_qoffset, int enable,
-                                       void __iomem *phy_base)
-{
-       u8 ck_step0, ck_step1;  /* ckoffset_step for clock */
-       u8 q_step;      /*  qoffset_step for clock */
-       int dx;
-
-       dx = 2; /* use dx2 in sLD11 */
-
-       ck_step0 = ddrphy_hpstep(delay_ckoffset0, dx, phy_base);     /* CK-Offset */
-       ck_step1 = ddrphy_hpstep(delay_ckoffset1, dx, phy_base);     /* CK-Offset */
-       q_step = ddrphy_hpstep(delay_qoffset, dx, phy_base);     /*  Q-Offset */
-
-       ddrphy_vt_ctrl(phy_base, 0);
-
-       /* Q->[23:18], CK1->[11:6], CK0->bit[5:0] */
-       if (enable == 1)
-               ddrphy_maskwritel((q_step << 18) + (ck_step1 << 6) + ck_step0,
-                                 PHY_ACBD_MASK | PHY_CK1BD_MASK | PHY_CK0BD_MASK,
-                                 phy_base + PHY_ACBDLR);
-
-       ddrphy_vt_ctrl(phy_base, 1);
-}
-
-static void ddrphy_set_wl_delay_dx(int dx, int r0_delay, int r1_delay,
-                                  int enable, void __iomem *phy_base)
-{
-       int rank;
-       int delay_wl[4];
-       u32 wl_mask  = 0;   /* WriteLeveling's Mask  */
-       u32 wl_value = 0;   /* WriteLeveling's Value */
-
-       delay_wl[0] = r0_delay & 0xfff;
-       delay_wl[1] = r1_delay & 0xfff;
-       delay_wl[2] = 0;
-       delay_wl[3] = 0;
-
-       ddrphy_vt_ctrl(phy_base, 0);
-
-       for (rank = 0; rank < 4; rank++) {
-               wl_mask  |= PHY_WLD_MASK(rank);
-               /*  WriteLeveling's delay */
-               wl_value |= ddrphy_hpstep(delay_wl[rank], dx, phy_base) << (8 * rank);
-       }
-
-       if (enable == 1)
-               ddrphy_maskwritel(wl_value, wl_mask, phy_base + PHY_DXLCDLR0(dx));
-
-       ddrphy_vt_ctrl(phy_base, 1);
-}
-
-static void ddrphy_set_dqsg_delay_dx(int dx, int r0_delay, int r1_delay,
-                                    int enable, void __iomem *phy_base)
-{
-       int rank;
-       int delay_dqsg[4];
-       u32 dqsg_mask  = 0;   /* DQSGating_LCDL_delay's Mask  */
-       u32 dqsg_value = 0;   /* DQSGating_LCDL_delay's Value */
-
-       delay_dqsg[0] = r0_delay;
-       delay_dqsg[1] = r1_delay;
-       delay_dqsg[2] = 0;
-       delay_dqsg[3] = 0;
-
-       ddrphy_vt_ctrl(phy_base, 0);
-
-       for (rank = 0; rank < 4; rank++)  {
-               dqsg_mask  |= PHY_DQSGD_MASK(rank);
-                /* DQSGating's delay */
-               dqsg_value |= ddrphy_hpstep(delay_dqsg[rank], dx, phy_base) << (8 * rank);
-       }
-
-       if (enable == 1)
-               ddrphy_maskwritel(dqsg_value, dqsg_mask, phy_base + PHY_DXLCDLR2(dx));
-
-       ddrphy_vt_ctrl(phy_base, 1);
-}
-
-static void ddrphy_set_dswb_delay_dx(int dx, int delay, int enable, void __iomem *phy_base)
-{
-       u8 dswb_step;
-
-       ddrphy_vt_ctrl(phy_base, 0);
-
-       dswb_step = ddrphy_hpstep(delay, dx, phy_base);     /* DQS-BDL's delay */
-
-       if (enable == 1)
-               ddrphy_maskwritel(dswb_step << 24, PHY_DSWBD_MASK, phy_base + PHY_DXBDLR1(dx));
-
-       ddrphy_vt_ctrl(phy_base, 1);
-}
-
-static void ddrphy_set_oe_delay_dx(int dx, int dqs_delay, int dq_delay,
-                                  int enable, void __iomem *phy_base)
-{
-       u8 dqs_oe_step, dq_oe_step;
-       u32 wdata;
-
-       ddrphy_vt_ctrl(phy_base, 0);
-
-       /* OE(DQS,DQ) */
-       dqs_oe_step = ddrphy_hpstep(dqs_delay, dx, phy_base);     /* DQS-oe's delay */
-       dq_oe_step = ddrphy_hpstep(dq_delay, dx, phy_base);     /* DQ-oe's delay */
-       wdata = ((dq_oe_step<<6) + dqs_oe_step) & 0xFFF;
-
-       if (enable == 1)
-               ddrphy_maskwritel(wdata, PHY_DSDQOE_MASK, phy_base + PHY_DXBDLR2(dx));
-
-       ddrphy_vt_ctrl(phy_base, 1);
-}
-
-static void ddrphy_ext_dqsgt(void __iomem *phy_base)
-{
-       /* Extend DQSGating_window   min:+1T  max:+1T */
-       ddrphy_maskwritel(PHY_DQSGX_MASK, PHY_DQSGX_MASK, phy_base + PHY_DSGCR);
-}
-
-static void ddrphy_shift_tof_hws(void __iomem *phy_base, const int shift[][2])
-{
-       int dx, block, byte;
-       u32 lcdlr1, wdqd;
-
-       ddrphy_vt_ctrl(phy_base, 0);
-
-       for (block = 0; block < RANK_BLOCKS_TR; block++) {
-               for (byte = 0; byte < 2; byte++) {
-                       dx = block * 2 + byte;
-                       lcdlr1 = readl(phy_base + PHY_DXLCDLR1(dx));
-                       wdqd = lcdlr1 & 0xff;
-                       wdqd = clamp(wdqd + ddrphy_hpstep(shift[block][byte], dx, phy_base),
-                                    0U, 0xffU);
-                       lcdlr1 = (lcdlr1 & ~0xff) | wdqd;
-                       writel(lcdlr1, phy_base + PHY_DXLCDLR1(dx));
-                       readl(phy_base + PHY_DXLCDLR1(dx)); /* relax */
-               }
-       }
-
-       ddrphy_vt_ctrl(phy_base, 1);
-}
-
-static void ddrphy_shift_rof_hws(void __iomem *phy_base, const int pos_shift[][2],
-                                const int neg_shift[][2])
-{
-       int dx, block, byte;
-       u32 lcdlr1, rdqsd, rdqnsd;
-
-       ddrphy_vt_ctrl(phy_base, 0);
-
-       for (block = 0; block < RANK_BLOCKS_TR; block++) {
-               for (byte = 0; byte < 2; byte++) {
-                       dx = block * 2 + byte;
-                       lcdlr1 = readl(phy_base + PHY_DXLCDLR1(dx));
-
-                       /*  DQS LCDL  RDQNSD->[23:16]  RDQSD->[15:8] */
-                       rdqsd  = (lcdlr1 >> 8) & 0xff;
-                       rdqnsd = (lcdlr1 >> 16) & 0xff;
-                       rdqsd  = clamp(rdqsd + ddrphy_hpstep(pos_shift[block][byte], dx, phy_base),
-                                      0U, 0xffU);
-                       rdqnsd = clamp(rdqnsd + ddrphy_hpstep(neg_shift[block][byte], dx, phy_base),
-                                      0U, 0xffU);
-                       lcdlr1 = (lcdlr1 & ~(0xffff << 8)) | (rdqsd << 8) | (rdqnsd << 16);
-                       writel(lcdlr1, phy_base + PHY_DXLCDLR1(dx));
-                       readl(phy_base + PHY_DXLCDLR1(dx)); /* relax */
-               }
-       }
-
-       ddrphy_vt_ctrl(phy_base, 1);
-}
-
-static void ddrphy_boot_run_hws(void __iomem *phy_base)
-{
-       /* Hard Training for DIO */
-       writel(0x0000f401, phy_base + PHY_PIR);
-       while (!(readl(phy_base + PHY_PGSR0) & PHY_PGSR0_IDONE))
-               cpu_relax();
-}
-
-static void ddrphy_training(void __iomem *phy_base)
-{
-       /* DIO roffset shift before hard training */
-       ddrphy_shift_rof_hws(phy_base, rof_pos_shift_pre, rof_neg_shift_pre);
-
-       /* Hard Training for each CH */
-       ddrphy_boot_run_hws(phy_base);
-
-       /* DIO toffset shift after training */
-       ddrphy_shift_tof_hws(phy_base, tof_shift);
-
-       /* DIO roffset shift after training */
-       ddrphy_shift_rof_hws(phy_base, rof_pos_shift, rof_neg_shift);
-
-       /* Extend DQSGating window  min:+1T  max:+1T */
-       ddrphy_ext_dqsgt(phy_base);
-}
-
-static void ddrphy_init(void __iomem *phy_base, enum dram_freq freq)
-{
-       writel(0x40000000, phy_base + PHY_PIR);
-       writel(0x0300C4F1, phy_base + PHY_PGCR1);
-       writel(0x0C807D04, phy_base + PHY_PTR0);
-       writel(0x27100578, phy_base + PHY_PTR1);
-       writel(0x00083DEF, phy_base + PHY_PTR2);
-       writel(0x12061A80, phy_base + PHY_PTR3);
-       writel(0x08027100, phy_base + PHY_PTR4);
-       writel(0x9D9CBB66, phy_base + PHY_DTPR0);
-       writel(0x1a878400, phy_base + PHY_DTPR1);
-       writel(0x50025200, phy_base + PHY_DTPR2);
-       writel(0xF004641A, phy_base + PHY_DSGCR);
-       writel(0x0000040B, phy_base + PHY_DCR);
-       writel(0x00000d71, phy_base + PHY_MR0);
-       writel(0x00000006, phy_base + PHY_MR1);
-       writel(0x00000098, phy_base + PHY_MR2);
-       writel(0x00000000, phy_base + PHY_MR3);
-
-       while (!(readl(phy_base + PHY_PGSR0) & PHY_PGSR0_IDONE))
-               cpu_relax();
-
-       writel(0x00000059, phy_base + PHY_ZQ0CR1);
-       writel(0x00000019, phy_base + PHY_ZQ1CR1);
-       writel(0x00000019, phy_base + PHY_ZQ2CR1);
-       writel(0x30FC6C20, phy_base + PHY_PGCR2);
-
-       ddrphy_set_ckoffset_qoffset(119, 0, 0, 1, phy_base);
-       ddrphy_set_wl_delay_dx(0, 220, 220, 1, phy_base);
-       ddrphy_set_wl_delay_dx(1, 160, 160, 1, phy_base);
-       ddrphy_set_wl_delay_dx(2, 190, 190, 1, phy_base);
-       ddrphy_set_wl_delay_dx(3, 150, 150, 1, phy_base);
-       ddrphy_set_dqsg_delay_dx(0, 750, 750, 1, phy_base);
-       ddrphy_set_dqsg_delay_dx(1, 750, 750, 1, phy_base);
-       ddrphy_set_dqsg_delay_dx(2, 750, 750, 1, phy_base);
-       ddrphy_set_dqsg_delay_dx(3, 750, 750, 1, phy_base);
-       ddrphy_set_dswb_delay_dx(0, 0, 1, phy_base);
-       ddrphy_set_dswb_delay_dx(1, 0, 1, phy_base);
-       ddrphy_set_dswb_delay_dx(2, 0, 1, phy_base);
-       ddrphy_set_dswb_delay_dx(3, 0, 1, phy_base);
-       ddrphy_set_oe_delay_dx(0, 0, 0, 1, phy_base);
-       ddrphy_set_oe_delay_dx(1, 0, 0, 1, phy_base);
-       ddrphy_set_oe_delay_dx(2, 0, 0, 1, phy_base);
-       ddrphy_set_oe_delay_dx(3, 0, 0, 1, phy_base);
-
-       writel(0x44000E81, phy_base + PHY_DX0GCR);
-       writel(0x44000E81, phy_base + PHY_DX1GCR);
-       writel(0x44000E81, phy_base + PHY_DX2GCR);
-       writel(0x44000E81, phy_base + PHY_DX3GCR);
-       writel(0x00055002, phy_base + PHY_DX0GTR);
-       writel(0x00055002, phy_base + PHY_DX1GTR);
-       writel(0x00055010, phy_base + PHY_DX2GTR);
-       writel(0x00055010, phy_base + PHY_DX3GTR);
-       writel(0x930035C7, phy_base + PHY_DTCR);
-       writel(0x00000003, phy_base + PHY_PIR);
-       readl(phy_base + PHY_PIR);
-       while (!(readl(phy_base + PHY_PGSR0) & PHY_PGSR0_IDONE))
-               cpu_relax();
-
-       writel(0x00000181, phy_base + PHY_PIR);
-       readl(phy_base + PHY_PIR);
-       while (!(readl(phy_base + PHY_PGSR0) & PHY_PGSR0_IDONE))
-               cpu_relax();
-
-       writel(0x44181884, phy_base + PHY_DXCCR);
-       writel(0x00000001, phy_base + PHY_GPR1);
-}
-
-/* UMC */
-static const u32 umc_cmdctla[DRAM_FREQ_NR] = {0x060B0B1C};
-static const u32 umc_cmdctlb[DRAM_FREQ_NR] = {0x27201806};
-static const u32 umc_cmdctlc[DRAM_FREQ_NR] = {0x00120B04};
-static const u32 umc_cmdctle[DRAM_FREQ_NR] = {0x00680607};
-static const u32 umc_cmdctlf[DRAM_FREQ_NR] = {0x02000200};
-static const u32 umc_cmdctlg[DRAM_FREQ_NR] = {0x08080808};
-
-static const u32 umc_rdatactl[DRAM_FREQ_NR] = {0x00000810};
-static const u32 umc_wdatactl[DRAM_FREQ_NR] = {0x00000004};
-static const u32 umc_odtctl[DRAM_FREQ_NR]   = {0x02000002};
-static const u32 umc_acssetb[DRAM_CH_NR] = {0x00000200, 0x00000203};
-
-static const u32 umc_memconfch[DRAM_FREQ_NR] = {0x00023605};
-
-static int umc_dc_init(void __iomem *dc_base, enum dram_freq freq,
-                      unsigned long size, int ch)
-{
-       /* Wait for PHY Init Complete */
-       writel(umc_cmdctla[freq], dc_base + UMC_CMDCTLA);
-       writel(umc_cmdctlb[freq], dc_base + UMC_CMDCTLB);
-       writel(umc_cmdctlc[freq], dc_base + UMC_CMDCTLC);
-       writel(umc_cmdctle[freq], dc_base + UMC_CMDCTLE);
-       writel(umc_cmdctlf[freq], dc_base + UMC_CMDCTLF);
-       writel(umc_cmdctlg[freq], dc_base + UMC_CMDCTLG);
-
-       writel(umc_rdatactl[freq], dc_base + UMC_RDATACTL_D0);
-       writel(umc_rdatactl[freq], dc_base + UMC_RDATACTL_D1);
-
-       writel(umc_wdatactl[freq], dc_base + UMC_WDATACTL_D0);
-       writel(umc_wdatactl[freq], dc_base + UMC_WDATACTL_D1);
-
-       writel(umc_odtctl[freq], dc_base + UMC_ODTCTL_D0);
-       writel(umc_odtctl[freq], dc_base + UMC_ODTCTL_D1);
-
-       writel(0x00000003, dc_base + UMC_ACSSETA);
-       writel(0x00000103, dc_base + UMC_FLOWCTLG);
-       writel(umc_acssetb[ch], dc_base + UMC_ACSSETB);
-       writel(0x02020200, dc_base + UMC_SPCSETB);
-       writel(umc_memconfch[freq], dc_base + UMC_MEMCONFCH);
-       writel(0x00000002, dc_base + UMC_ACFETCHCTRL);
-
-       return 0;
-}
-
-static int umc_ch_init(void __iomem *umc_ch_base,
-                      enum dram_freq freq, unsigned long size, int ch)
-{
-       void __iomem *dc_base  = umc_ch_base;
-
-       return umc_dc_init(dc_base, freq, size, ch);
-}
-
-static void um_init(void __iomem *um_base)
-{
-       writel(0x00000001, um_base + UMC_SIORST);
-       writel(0x00000001, um_base + UMC_VO0RST);
-       writel(0x00000001, um_base + UMC_VPERST);
-       writel(0x00000001, um_base + UMC_RGLRST);
-       writel(0x00000001, um_base + UMC_A2DRST);
-       writel(0x00000001, um_base + UMC_DMDRST);
-}
-
-int uniphier_ld11_umc_init(const struct uniphier_board_data *bd)
-{
-       void __iomem *um_base = (void __iomem *)0x5B800000;
-       void __iomem *umc_ch_base = (void __iomem *)0x5BC00000;
-       void __iomem *phy_base = (void __iomem *)0x5BC01000;
-       enum dram_freq freq;
-       int ch, ret;
-
-       switch (bd->dram_freq) {
-       case 1600:
-               freq = DRAM_FREQ_1600M;
-               break;
-       default:
-               pr_err("unsupported DRAM frequency %d MHz\n", bd->dram_freq);
-               return -EINVAL;
-       }
-
-       writel(0x00000101, umc_ch_base + UMC_DIOCTLA);
-       while (!(readl(phy_base + PHY_PGSR0) & PHY_PGSR0_IDONE))
-               cpu_relax();
-
-       writel(0x00000000, umc_ch_base + UMC_DIOCTLA);
-       writel(0x00000001, umc_ch_base + UMC_DEBUGC);
-       writel(0x00000101, umc_ch_base + UMC_DIOCTLA);
-
-       writel(0x00000100, umc_ch_base + UMC_INITSET);
-       while (readl(umc_ch_base + UMC_INITSTAT) & BIT(8))
-               cpu_relax();
-
-       writel(0x00000100, umc_ch_base + 0x00200000 + UMC_INITSET);
-       while (readl(umc_ch_base + 0x00200000 + UMC_INITSTAT) & BIT(8))
-               cpu_relax();
-
-       ddrphy_init(phy_base, freq);
-
-       for (ch = 0; ch < DRAM_CH_NR; ch++) {
-               unsigned long size = bd->dram_ch[ch].size;
-               unsigned int width = bd->dram_ch[ch].width;
-
-               ret = umc_ch_init(umc_ch_base, freq, size / (width / 16), ch);
-               if (ret) {
-                       pr_err("failed to initialize UMC ch%d\n", ch);
-                       return ret;
-               }
-
-               umc_ch_base += 0x00200000;
-       }
-       ddrphy_training(phy_base);
-
-       um_init(um_base);
-
-       return 0;
-}
diff --git a/arch/arm/mach-uniphier/dram/umc-ld20.c b/arch/arm/mach-uniphier/dram/umc-ld20.c
deleted file mode 100644 (file)
index 500c1c1..0000000
+++ /dev/null
@@ -1,636 +0,0 @@
-/*
- * Copyright (C) 2016-2017 Socionext Inc.
- *
- * based on commit 5ffd75ecd4929f22361ef65a35f0331d2fbc0f35 of Diag
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <linux/bitops.h>
-#include <linux/compat.h>
-#include <linux/errno.h>
-#include <linux/io.h>
-#include <linux/sizes.h>
-#include <asm/processor.h>
-
-#include "../init.h"
-#include "ddruqphy-regs.h"
-#include "umc64-regs.h"
-
-#define DRAM_CH_NR     3
-
-enum dram_freq {
-       DRAM_FREQ_1866M,
-       DRAM_FREQ_NR,
-};
-
-enum dram_size {
-       DRAM_SZ_256M,
-       DRAM_SZ_512M,
-       DRAM_SZ_NR,
-};
-
-enum dram_board {              /* board type */
-       DRAM_BOARD_LD20_REF,    /* LD20 reference */
-       DRAM_BOARD_LD20_GLOBAL, /* LD20 TV */
-       DRAM_BOARD_LD20_C1,     /* LD20 TV C1 */
-       DRAM_BOARD_LD21_REF,    /* LD21 reference */
-       DRAM_BOARD_LD21_GLOBAL, /* LD21 TV */
-       DRAM_BOARD_NR,
-};
-
-/* PHY */
-static const int ddrphy_adrctrl[DRAM_BOARD_NR][DRAM_CH_NR] = {
-       {268 - 262, 268 - 263, 268 - 378},      /* LD20 reference */
-       {268 - 262, 268 - 263, 268 - 378},      /* LD20 TV */
-       {268 - 262, 268 - 263, 268 - 378},      /* LD20 TV C1 */
-       {268 - 212, 268 - 268, /* No CH2 */},   /* LD21 reference */
-       {268 - 212, 268 - 268, /* No CH2 */},   /* LD21 TV */
-};
-
-static const int ddrphy_dlltrimclk[DRAM_BOARD_NR][DRAM_CH_NR] = {
-       {268, 268, 268},                        /* LD20 reference */
-       {268, 268, 268},                        /* LD20 TV */
-       {189, 189, 189},                        /* LD20 TV C1 */
-       {268, 268 + 252, /* No CH2 */},         /* LD21 reference */
-       {268, 268 + 202, /* No CH2 */},         /* LD21 TV */
-};
-
-static const int ddrphy_dllrecalib[DRAM_BOARD_NR][DRAM_CH_NR] = {
-       {268 - 378, 268 - 263, 268 - 378},      /* LD20 reference */
-       {268 - 378, 268 - 263, 268 - 378},      /* LD20 TV */
-       {268 - 378, 268 - 263, 268 - 378},      /* LD20 TV C1 */
-       {268 - 212, 268 - 536, /* No CH2 */},   /* LD21 reference */
-       {268 - 212, 268 - 536, /* No CH2 */},   /* LD21 TV */
-};
-
-static const u32 ddrphy_phy_pad_ctrl[DRAM_BOARD_NR][DRAM_CH_NR] = {
-       {0x50B840B1, 0x50B840B1, 0x50B840B1},   /* LD20 reference */
-       {0x50BB40B1, 0x50BB40B1, 0x50BB40B1},   /* LD20 TV */
-       {0x50BB40B1, 0x50BB40B1, 0x50BB40B1},   /* LD20 TV C1 */
-       {0x50BB40B4, 0x50B840B1, /* No CH2 */}, /* LD21 reference */
-       {0x50BB40B4, 0x50B840B1, /* No CH2 */}, /* LD21 TV */
-};
-
-static const u32 ddrphy_scl_gate_timing[DRAM_CH_NR] = {
-       0x00000140, 0x00000180, 0x00000140
-};
-
-static const short ddrphy_op_dq_shift_val_ld20[DRAM_CH_NR][32] = {
-       {
-               2, 1, 0, 1, 2, 1, 1, 1,
-               2, 1, 1, 2, 1, 1, 1, 1,
-               1, 2, 1, 1, 1, 2, 1, 1,
-               2, 2, 0, 1, 1, 2, 2, 1,
-       },
-       {
-               1, 1, 0, 1, 2, 2, 1, 1,
-               1, 1, 1, 1, 1, 1, 1, 1,
-               1, 1, 0, 0, 1, 1, 0, 0,
-               0, 1, 1, 1, 2, 1, 2, 1,
-       },
-       {
-               2, 2, 0, 2, 1, 1, 2, 1,
-               1, 1, 0, 1, 1, -1, 1, 1,
-               2, 2, 2, 2, 1, 1, 1, 1,
-               1, 1, 1, 0, 2, 2, 1, 2,
-       },
-};
-
-static const short ddrphy_op_dq_shift_val_ld21[DRAM_CH_NR][32] = {
-       {
-               1, 1, 0, 1, 1, 1, 1, 1,
-               1, 0, 0, 0, 1, 1, 0, 2,
-               1, 1, 0, 0, 1, 1, 1, 1,
-               1, 0, 0, 0, 1, 0, 0, 1,
-       },
-       {       1, 0, 2, 1, 1, 1, 1, 0,
-               1, 0, 0, 1, 0, 1, 0, 0,
-               1, 0, 1, 0, 1, 1, 1, 0,
-               1, 1, 1, 1, 0, 1, 0, 0,
-       },
-       /* No CH2 */
-};
-
-static const short (* const ddrphy_op_dq_shift_val[DRAM_BOARD_NR])[32] = {
-       ddrphy_op_dq_shift_val_ld20,    /* LD20 reference */
-       ddrphy_op_dq_shift_val_ld20,    /* LD20 TV */
-       ddrphy_op_dq_shift_val_ld20,    /* LD20 TV C */
-       ddrphy_op_dq_shift_val_ld21,    /* LD21 reference */
-       ddrphy_op_dq_shift_val_ld21,    /* LD21 TV */
-};
-
-static const short ddrphy_ip_dq_shift_val_ld20[DRAM_CH_NR][32] = {
-       {
-               3, 3, 3, 2, 3, 2, 0, 2,
-               2, 3, 3, 1, 2, 2, 2, 2,
-               2, 2, 2, 2, 0, 1, 1, 1,
-               2, 2, 2, 2, 3, 0, 2, 2,
-       },
-       {
-               2, 2, 1, 1, -1, 1, 1, 1,
-               2, 0, 2, 2, 2, 1, 0, 2,
-               2, 1, 2, 1, 0, 1, 1, 1,
-               2, 2, 2, 2, 2, 2, 2, 2,
-       },
-       {
-               2, 2, 3, 2, 1, 2, 2, 2,
-               2, 3, 4, 2, 3, 4, 3, 3,
-               2, 2, 1, 2, 1, 1, 1, 1,
-               2, 2, 2, 2, 1, 2, 2, 1,
-       },
-};
-
-static const short ddrphy_ip_dq_shift_val_ld21[DRAM_CH_NR][32] = {
-       {
-               2, 2, 2, 2, 1, 2, 2, 2,
-               2, 3, 3, 2, 2, 2, 2, 2,
-               2, 1, 2, 2, 1, 1, 1, 1,
-               2, 2, 2, 3, 1, 2, 2, 2,
-       },
-       {
-               3, 4, 4, 1, 0, 1, 1, 1,
-               1, 2, 1, 2, 2, 3, 3, 2,
-               1, 0, 2, 1, 1, 0, 1, 0,
-               0, 1, 0, 0, 1, 1, 0, 1,
-       },
-       /* No CH2 */
-};
-
-static const short (* const ddrphy_ip_dq_shift_val[DRAM_BOARD_NR])[32] = {
-       ddrphy_ip_dq_shift_val_ld20,    /* LD20 reference */
-       ddrphy_ip_dq_shift_val_ld20,    /* LD20 TV */
-       ddrphy_ip_dq_shift_val_ld20,    /* LD20 TV C */
-       ddrphy_ip_dq_shift_val_ld21,    /* LD21 reference */
-       ddrphy_ip_dq_shift_val_ld21,    /* LD21 TV */
-};
-
-static void ddrphy_select_lane(void __iomem *phy_base, unsigned int lane,
-                              unsigned int bit)
-{
-       WARN_ON(lane >= 1 << PHY_LANE_SEL_LANE_WIDTH);
-       WARN_ON(bit >= 1 << PHY_LANE_SEL_BIT_WIDTH);
-
-       writel((bit << PHY_LANE_SEL_BIT_SHIFT) |
-              (lane << PHY_LANE_SEL_LANE_SHIFT),
-              phy_base + PHY_LANE_SEL);
-}
-
-#define DDRPHY_EFUSEMON                (void *)0x5f900118
-
-static void ddrphy_init(void __iomem *phy_base, enum dram_board board, int ch)
-{
-       writel(0x0C001001, phy_base + PHY_UNIQUIFY_TSMC_IO_1);
-       while (!(readl(phy_base + PHY_UNIQUIFY_TSMC_IO_1) & BIT(1)))
-               cpu_relax();
-
-       if (readl(DDRPHY_EFUSEMON) & BIT(ch))
-               writel(0x00000000, phy_base + PHY_UNIQUIFY_TSMC_IO_1);
-       else
-               writel(0x0C001000, phy_base + PHY_UNIQUIFY_TSMC_IO_1);
-
-       writel(0x00000000, phy_base + PHY_DLL_INCR_TRIM_3);
-       writel(0x00000000, phy_base + PHY_DLL_INCR_TRIM_1);
-       ddrphy_select_lane(phy_base, 0, 0);
-       writel(0x00000005, phy_base + PHY_DLL_TRIM_1);
-       writel(0x0000000a, phy_base + PHY_DLL_TRIM_3);
-       ddrphy_select_lane(phy_base, 6, 0);
-       writel(0x00000005, phy_base + PHY_DLL_TRIM_1);
-       writel(0x0000000a, phy_base + PHY_DLL_TRIM_3);
-       ddrphy_select_lane(phy_base, 12, 0);
-       writel(0x00000005, phy_base + PHY_DLL_TRIM_1);
-       writel(0x0000000a, phy_base + PHY_DLL_TRIM_3);
-       ddrphy_select_lane(phy_base, 18, 0);
-       writel(0x00000005, phy_base + PHY_DLL_TRIM_1);
-       writel(0x0000000a, phy_base + PHY_DLL_TRIM_3);
-       writel(0x00000001, phy_base + PHY_SCL_WINDOW_TRIM);
-       writel(0x00000000, phy_base + PHY_UNQ_ANALOG_DLL_1);
-       writel(ddrphy_phy_pad_ctrl[board][ch], phy_base + PHY_PAD_CTRL);
-       writel(0x00000070, phy_base + PHY_VREF_TRAINING);
-       writel(0x01000075, phy_base + PHY_SCL_CONFIG_1);
-       writel(0x00000501, phy_base + PHY_SCL_CONFIG_2);
-       writel(0x00000000, phy_base + PHY_SCL_CONFIG_3);
-       writel(0x000261c0, phy_base + PHY_DYNAMIC_WRITE_BIT_LVL);
-       writel(0x00000000, phy_base + PHY_SCL_CONFIG_4);
-       writel(ddrphy_scl_gate_timing[ch], phy_base + PHY_SCL_GATE_TIMING);
-       writel(0x02a000a0, phy_base + PHY_WRLVL_DYN_ODT);
-       writel(0x00840004, phy_base + PHY_WRLVL_ON_OFF);
-       writel(0x0000020d, phy_base + PHY_DLL_ADRCTRL);
-       ddrphy_select_lane(phy_base, 0, 0);
-       writel(0x0000008d, phy_base + PHY_DLL_TRIM_CLK);
-       writel(0xa800100d, phy_base + PHY_DLL_RECALIB);
-       writel(0x00005076, phy_base + PHY_SCL_LATENCY);
-}
-
-static int ddrphy_to_dly_step(void __iomem *phy_base, unsigned int freq,
-                             int delay)
-{
-       int mdl;
-
-       mdl = (readl(phy_base + PHY_DLL_ADRCTRL) & PHY_DLL_ADRCTRL_MDL_MASK) >>
-                                               PHY_DLL_ADRCTRL_MDL_SHIFT;
-
-       return DIV_ROUND_CLOSEST((long)freq * delay * mdl, 2 * 1000000L);
-}
-
-static void ddrphy_set_delay(void __iomem *phy_base, unsigned int reg,
-                            u32 mask, u32 incr, int dly_step)
-{
-       u32 tmp;
-
-       tmp = readl(phy_base + reg);
-       tmp &= ~mask;
-       tmp |= min_t(u32, abs(dly_step), mask);
-
-       if (dly_step >= 0)
-               tmp |= incr;
-       else
-               tmp &= ~incr;
-
-       writel(tmp, phy_base + reg);
-}
-
-static void ddrphy_set_dll_recalib(void __iomem *phy_base, int dly_step)
-{
-       ddrphy_set_delay(phy_base, PHY_DLL_RECALIB,
-                        PHY_DLL_RECALIB_TRIM_MASK, PHY_DLL_RECALIB_INCR,
-                        dly_step);
-}
-
-static void ddrphy_set_dll_adrctrl(void __iomem *phy_base, int dly_step)
-{
-       ddrphy_set_delay(phy_base, PHY_DLL_ADRCTRL,
-                        PHY_DLL_ADRCTRL_TRIM_MASK, PHY_DLL_ADRCTRL_INCR,
-                        dly_step);
-}
-
-static void ddrphy_set_dll_trim_clk(void __iomem *phy_base, int dly_step)
-{
-       ddrphy_select_lane(phy_base, 0, 0);
-
-       ddrphy_set_delay(phy_base, PHY_DLL_TRIM_CLK,
-                        PHY_DLL_TRIM_CLK_MASK, PHY_DLL_TRIM_CLK_INCR,
-                        dly_step);
-}
-
-static void ddrphy_init_tail(void __iomem *phy_base, enum dram_board board,
-                            unsigned int freq, int ch)
-{
-       int step;
-
-       step = ddrphy_to_dly_step(phy_base, freq, ddrphy_adrctrl[board][ch]);
-       ddrphy_set_dll_adrctrl(phy_base, step);
-
-       step = ddrphy_to_dly_step(phy_base, freq, ddrphy_dlltrimclk[board][ch]);
-       ddrphy_set_dll_trim_clk(phy_base, step);
-
-       step = ddrphy_to_dly_step(phy_base, freq, ddrphy_dllrecalib[board][ch]);
-       ddrphy_set_dll_recalib(phy_base, step);
-}
-
-static void ddrphy_shift_one_dq(void __iomem *phy_base, unsigned int reg,
-                               u32 mask, u32 incr, short shift_val)
-{
-       u32 tmp;
-       int val;
-
-       tmp = readl(phy_base + reg);
-
-       val = tmp & mask;
-       if (!(tmp & incr))
-               val = -val;
-
-       val += shift_val;
-
-       tmp &= ~(incr | mask);
-       tmp |= min_t(u32, abs(val), mask);
-       if (val >= 0)
-               tmp |= incr;
-
-       writel(tmp, phy_base + reg);
-}
-
-static void ddrphy_shift_dq(void __iomem *phy_base, unsigned int reg,
-                           u32 mask, u32 incr, u32 override,
-                           const short *shift_val_array)
-{
-       u32 tmp;
-       int dx, bit;
-
-       tmp = readl(phy_base + reg);
-       tmp |= override;
-       writel(tmp, phy_base + reg);
-
-       for (dx = 0; dx < 4; dx++) {
-               for (bit = 0; bit < 8; bit++) {
-                       ddrphy_select_lane(phy_base,
-                                          (PHY_BITLVL_DLY_WIDTH + 1) * dx,
-                                          bit);
-
-                       ddrphy_shift_one_dq(phy_base, reg, mask, incr,
-                                           shift_val_array[dx * 8 + bit]);
-               }
-       }
-
-       ddrphy_select_lane(phy_base, 0, 0);
-}
-
-static int ddrphy_training(void __iomem *phy_base, enum dram_board board,
-                          int ch)
-{
-       writel(0x0000000f, phy_base + PHY_WRLVL_AUTOINC_TRIM);
-       writel(0x00010000, phy_base + PHY_DLL_TRIM_2);
-       writel(0x50000000, phy_base + PHY_SCL_START);
-
-       while (readl(phy_base + PHY_SCL_START) & PHY_SCL_START_GO_DONE)
-               cpu_relax();
-
-       writel(0x00000000, phy_base + PHY_DISABLE_GATING_FOR_SCL);
-       writel(0xff00ff00, phy_base + PHY_SCL_DATA_0);
-       writel(0xff00ff00, phy_base + PHY_SCL_DATA_1);
-       writel(0xFBF8FFFF, phy_base + PHY_SCL_START_ADDR);
-       writel(0x11000000, phy_base + PHY_SCL_START);
-
-       while (readl(phy_base + PHY_SCL_START) & PHY_SCL_START_GO_DONE)
-               cpu_relax();
-
-       writel(0xFBF0FFFF, phy_base + PHY_SCL_START_ADDR);
-       writel(0x30500000, phy_base + PHY_SCL_START);
-
-       while (readl(phy_base + PHY_SCL_START) & PHY_SCL_START_GO_DONE)
-               cpu_relax();
-
-       writel(0x00000001, phy_base + PHY_DISABLE_GATING_FOR_SCL);
-       writel(0x00000010, phy_base + PHY_SCL_MAIN_CLK_DELTA);
-       writel(0x789b3de0, phy_base + PHY_SCL_DATA_0);
-       writel(0xf10e4a56, phy_base + PHY_SCL_DATA_1);
-       writel(0x11000000, phy_base + PHY_SCL_START);
-
-       while (readl(phy_base + PHY_SCL_START) & PHY_SCL_START_GO_DONE)
-               cpu_relax();
-
-       writel(0x34000000, phy_base + PHY_SCL_START);
-
-       while (readl(phy_base + PHY_SCL_START) & PHY_SCL_START_GO_DONE)
-               cpu_relax();
-
-       writel(0x00000003, phy_base + PHY_DISABLE_GATING_FOR_SCL);
-
-       writel(0x000261c0, phy_base + PHY_DYNAMIC_WRITE_BIT_LVL);
-       writel(0x00003270, phy_base + PHY_DYNAMIC_BIT_LVL);
-       writel(0x011BD0C4, phy_base + PHY_DSCL_CNT);
-
-       /* shift ip_dq trim */
-       ddrphy_shift_dq(phy_base,
-                       PHY_IP_DQ_DQS_BITWISE_TRIM,
-                       PHY_IP_DQ_DQS_BITWISE_TRIM_MASK,
-                       PHY_IP_DQ_DQS_BITWISE_TRIM_INC,
-                       PHY_IP_DQ_DQS_BITWISE_TRIM_OVERRIDE,
-                       ddrphy_ip_dq_shift_val[board][ch]);
-
-       /* shift op_dq trim */
-       ddrphy_shift_dq(phy_base,
-                       PHY_OP_DQ_DM_DQS_BITWISE_TRIM,
-                       PHY_OP_DQ_DM_DQS_BITWISE_TRIM_MASK,
-                       PHY_OP_DQ_DM_DQS_BITWISE_TRIM_INC,
-                       PHY_OP_DQ_DM_DQS_BITWISE_TRIM_OVERRIDE,
-                       ddrphy_op_dq_shift_val[board][ch]);
-
-       return 0;
-}
-
-/* UMC */
-static const u32 umc_initctla[DRAM_FREQ_NR] = {0x71016D11};
-static const u32 umc_initctlb[DRAM_FREQ_NR] = {0x07E390AC};
-static const u32 umc_initctlc[DRAM_FREQ_NR] = {0x00FF00FF};
-static const u32 umc_drmmr0[DRAM_FREQ_NR] = {0x00000114};
-static const u32 umc_drmmr2[DRAM_FREQ_NR] = {0x000002a0};
-
-static const u32 umc_memconf0a[DRAM_FREQ_NR][DRAM_SZ_NR] = {
-       /*  256MB       512MB */
-       {0x00000601, 0x00000801},       /* 1866 MHz */
-};
-
-static const u32 umc_memconf0b[DRAM_FREQ_NR][DRAM_SZ_NR] = {
-       /*  256MB       512MB */
-       {0x00000120, 0x00000130},       /* 1866 MHz */
-};
-
-static const u32 umc_memconfch[DRAM_FREQ_NR][DRAM_SZ_NR] = {
-       /*  256MB       512MB */
-       {0x00033603, 0x00033803},       /* 1866 MHz */
-};
-
-static const u32 umc_cmdctla[DRAM_FREQ_NR] = {0x060D0D20};
-static const u32 umc_cmdctlb[DRAM_FREQ_NR] = {0x2D211C08};
-static const u32 umc_cmdctlc[DRAM_FREQ_NR] = {0x00150C04};
-static const u32 umc_cmdctle[DRAM_FREQ_NR][DRAM_SZ_NR] = {
-       /*  256MB       512MB */
-       {0x0049071D, 0x0078071D},       /* 1866 MHz */
-};
-
-static const u32 umc_rdatactl[DRAM_FREQ_NR] = {0x00000610};
-static const u32 umc_wdatactl[DRAM_FREQ_NR] = {0x00000204};
-static const u32 umc_odtctl[DRAM_FREQ_NR] = {0x02000002};
-static const u32 umc_dataset[DRAM_FREQ_NR] = {0x04000000};
-
-static const u32 umc_flowctla[DRAM_FREQ_NR] = {0x0081E01E};
-static const u32 umc_directbusctrla[DRAM_CH_NR] = {
-       0x00000000, 0x00000001, 0x00000001
-};
-
-static void umc_poll_phy_init_complete(void __iomem *dc_base)
-{
-       /* Wait for PHY Init Complete */
-       while (!(readl(dc_base + UMC_DFISTCTLC) & BIT(0)))
-               cpu_relax();
-}
-
-static int umc_dc_init(void __iomem *dc_base, unsigned int freq,
-                      unsigned long size, int ch)
-{
-       enum dram_freq freq_e;
-       enum dram_size size_e;
-
-       switch (freq) {
-       case 1866:
-               freq_e = DRAM_FREQ_1866M;
-               break;
-       default:
-               pr_err("unsupported DRAM frequency %ud MHz\n", freq);
-               return -EINVAL;
-       }
-
-       switch (size) {
-       case 0:
-               return 0;
-       case SZ_256M:
-               size_e = DRAM_SZ_256M;
-               break;
-       case SZ_512M:
-               size_e = DRAM_SZ_512M;
-               break;
-       default:
-               pr_err("unsupported DRAM size 0x%08lx (per 16bit) for ch%d\n",
-                      size, ch);
-               return -EINVAL;
-       }
-
-       writel(0x00000001, dc_base + UMC_DFICSOVRRD);
-       writel(0x00000000, dc_base + UMC_DFITURNOFF);
-
-       writel(umc_initctla[freq_e], dc_base + UMC_INITCTLA);
-       writel(umc_initctlb[freq_e], dc_base + UMC_INITCTLB);
-       writel(umc_initctlc[freq_e], dc_base + UMC_INITCTLC);
-
-       writel(umc_drmmr0[freq_e], dc_base + UMC_DRMMR0);
-       writel(0x00000004, dc_base + UMC_DRMMR1);
-       writel(umc_drmmr2[freq_e], dc_base + UMC_DRMMR2);
-       writel(0x00000000, dc_base + UMC_DRMMR3);
-
-       writel(umc_memconf0a[freq_e][size_e], dc_base + UMC_MEMCONF0A);
-       writel(umc_memconf0b[freq_e][size_e], dc_base + UMC_MEMCONF0B);
-       writel(umc_memconfch[freq_e][size_e], dc_base + UMC_MEMCONFCH);
-       writel(0x00000000, dc_base + UMC_MEMMAPSET);
-
-       writel(umc_cmdctla[freq_e], dc_base + UMC_CMDCTLA);
-       writel(umc_cmdctlb[freq_e], dc_base + UMC_CMDCTLB);
-       writel(umc_cmdctlc[freq_e], dc_base + UMC_CMDCTLC);
-       writel(umc_cmdctle[freq_e][size_e], dc_base + UMC_CMDCTLE);
-
-       writel(umc_rdatactl[freq_e], dc_base + UMC_RDATACTL_D0);
-       writel(umc_rdatactl[freq_e], dc_base + UMC_RDATACTL_D1);
-
-       writel(umc_wdatactl[freq_e], dc_base + UMC_WDATACTL_D0);
-       writel(umc_wdatactl[freq_e], dc_base + UMC_WDATACTL_D1);
-       writel(umc_odtctl[freq_e], dc_base + UMC_ODTCTL_D0);
-       writel(umc_odtctl[freq_e], dc_base + UMC_ODTCTL_D1);
-       writel(umc_dataset[freq_e], dc_base + UMC_DATASET);
-
-       writel(0x00400020, dc_base + UMC_DCCGCTL);
-       writel(0x00000003, dc_base + UMC_ACSSETA);
-       writel(0x00000103, dc_base + UMC_FLOWCTLG);
-       writel(0x00010200, dc_base + UMC_ACSSETB);
-
-       writel(umc_flowctla[freq_e], dc_base + UMC_FLOWCTLA);
-       writel(0x00004444, dc_base + UMC_FLOWCTLC);
-       writel(0x00000000, dc_base + UMC_DFICUPDCTLA);
-
-       writel(0x00202000, dc_base + UMC_FLOWCTLB);
-       writel(0x00000000, dc_base + UMC_BSICMAPSET);
-       writel(0x00000000, dc_base + UMC_ERRMASKA);
-       writel(0x00000000, dc_base + UMC_ERRMASKB);
-
-       writel(umc_directbusctrla[ch], dc_base + UMC_DIRECTBUSCTRLA);
-
-       writel(0x00000001, dc_base + UMC_INITSET);
-       /* Wait for PHY Init Complete */
-       while (readl(dc_base + UMC_INITSTAT) & BIT(0))
-               cpu_relax();
-
-       writel(0x2A0A0A00, dc_base + UMC_SPCSETB);
-       writel(0x00000000, dc_base + UMC_DFICSOVRRD);
-
-       return 0;
-}
-
-static int umc_ch_init(void __iomem *umc_ch_base, void __iomem *phy_ch_base,
-                      enum dram_board board, unsigned int freq,
-                      unsigned long size, int ch)
-{
-       void __iomem *dc_base = umc_ch_base + 0x00011000;
-       void __iomem *phy_base = phy_ch_base;
-       int ret;
-
-       /* PHY Update Mode (ON) */
-       writel(0x8000003f, dc_base + UMC_DFIPUPDCTLA);
-
-       /* deassert PHY reset signals */
-       writel(UMC_DIOCTLA_CTL_NRST | UMC_DIOCTLA_CFG_NRST,
-              dc_base + UMC_DIOCTLA);
-
-       ddrphy_init(phy_base, board, ch);
-
-       umc_poll_phy_init_complete(dc_base);
-
-       ddrphy_init_tail(phy_base, board, freq, ch);
-
-       ret = umc_dc_init(dc_base, freq, size, ch);
-       if (ret)
-               return ret;
-
-       ret = ddrphy_training(phy_base, board, ch);
-       if (ret)
-               return ret;
-
-       return 0;
-}
-
-static void um_init(void __iomem *um_base)
-{
-       writel(0x000000ff, um_base + UMC_MBUS0);
-       writel(0x000000ff, um_base + UMC_MBUS1);
-       writel(0x000000ff, um_base + UMC_MBUS2);
-       writel(0x00000001, um_base + UMC_MBUS3);
-       writel(0x00000001, um_base + UMC_MBUS4);
-       writel(0x00000001, um_base + UMC_MBUS5);
-       writel(0x00000001, um_base + UMC_MBUS6);
-       writel(0x00000001, um_base + UMC_MBUS7);
-       writel(0x00000001, um_base + UMC_MBUS8);
-       writel(0x00000001, um_base + UMC_MBUS9);
-       writel(0x00000001, um_base + UMC_MBUS10);
-}
-
-int uniphier_ld20_umc_init(const struct uniphier_board_data *bd)
-{
-       void __iomem *um_base = (void __iomem *)0x5b600000;
-       void __iomem *umc_ch_base = (void __iomem *)0x5b800000;
-       void __iomem *phy_ch_base = (void __iomem *)0x6e200000;
-       enum dram_board board;
-       int ch, ret;
-
-       switch (UNIPHIER_BD_BOARD_GET_TYPE(bd->flags)) {
-       case UNIPHIER_BD_BOARD_LD20_REF:
-               board = DRAM_BOARD_LD20_REF;
-               break;
-       case UNIPHIER_BD_BOARD_LD20_GLOBAL:
-               board = DRAM_BOARD_LD20_GLOBAL;
-               break;
-       case UNIPHIER_BD_BOARD_LD20_C1:
-               board = DRAM_BOARD_LD20_C1;
-               break;
-       case UNIPHIER_BD_BOARD_LD21_REF:
-               board = DRAM_BOARD_LD21_REF;
-               break;
-       case UNIPHIER_BD_BOARD_LD21_GLOBAL:
-               board = DRAM_BOARD_LD21_GLOBAL;
-               break;
-       default:
-               pr_err("unsupported board type %d\n",
-                      UNIPHIER_BD_BOARD_GET_TYPE(bd->flags));
-               return -EINVAL;
-       }
-
-       for (ch = 0; ch < DRAM_CH_NR; ch++) {
-               unsigned long size = bd->dram_ch[ch].size;
-               unsigned int width = bd->dram_ch[ch].width;
-
-               if (size) {
-                       ret = umc_ch_init(umc_ch_base, phy_ch_base, board,
-                                         bd->dram_freq, size / (width / 16),
-                                         ch);
-                       if (ret) {
-                               pr_err("failed to initialize UMC ch%d\n", ch);
-                               return ret;
-                       }
-               }
-
-               umc_ch_base += 0x00200000;
-               phy_ch_base += 0x00004000;
-       }
-
-       um_init(um_base);
-
-       return 0;
-}
diff --git a/arch/arm/mach-uniphier/dram/umc64-regs.h b/arch/arm/mach-uniphier/dram/umc64-regs.h
deleted file mode 100644 (file)
index 860d04e..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2016 Socionext Inc.
- */
-
-#ifndef UMC_LD20_REGS_H
-#define UMC_LD20_REGS_H
-
-#define UMC_CMDCTLA            0x00000000
-#define UMC_CMDCTLB            0x00000004
-#define UMC_CMDCTLC            0x00000008
-#define UMC_INITCTLA           0x00000020
-#define UMC_INITCTLB           0x00000024
-#define UMC_INITCTLC           0x00000028
-#define UMC_DRMMR0             0x00000030
-#define UMC_DRMMR1             0x00000034
-#define UMC_DRMMR2             0x00000038
-#define UMC_DRMMR3             0x0000003C
-#define UMC_INITSET            0x00000040
-#define UMC_INITSTAT           0x00000044
-#define UMC_CMDCTLE            0x00000050
-#define UMC_CMDCTLF            0x00000054
-#define UMC_CMDCTLG            0x00000058
-#define UMC_SPCSETB            0x00000084
-#define   UMC_SPCSETB_AREFMD_MASK      (0x3)   /* Auto Refresh Mode */
-#define   UMC_SPCSETB_AREFMD_ARB       (0x0)   /* control by arbitor */
-#define   UMC_SPCSETB_AREFMD_CONT      (0x1)   /* control by DRAMCONT */
-#define   UMC_SPCSETB_AREFMD_REG       (0x2)   /* control by register */
-#define UMC_ACSSETA            0x000000C0
-#define UMC_ACSSETB            0x000000C4
-#define UMC_MEMCONF0A          0x00000200
-#define UMC_MEMCONF0B          0x00000204
-#define UMC_MEMCONFCH          0x00000240
-#define UMC_MEMMAPSET          0x00000250
-#define UMC_FLOWCTLA           0x00000400
-#define UMC_FLOWCTLB           0x00000404
-#define UMC_FLOWCTLC           0x00000408
-#define UMC_ACFETCHCTRL                0x00000460
-#define UMC_FLOWCTLG           0x00000508
-#define UMC_RDATACTL_D0                0x00000600
-#define UMC_WDATACTL_D0                0x00000604
-#define UMC_RDATACTL_D1                0x00000608
-#define UMC_WDATACTL_D1                0x0000060C
-#define UMC_DATASET            0x00000610
-#define UMC_ODTCTL_D0          0x00000618
-#define UMC_ODTCTL_D1          0x0000061C
-#define UMC_RESPCTL            0x00000624
-#define UMC_DIRECTBUSCTRLA     0x00000680
-#define UMC_DEBUGC             0x00000718
-#define UMC_DCCGCTL            0x00000720
-#define UMC_DICGCTLA           0x00000724
-#define UMC_DICGCTLB           0x00000728
-#define UMC_ERRMASKA           0x00000958
-#define UMC_ERRMASKB           0x0000095C
-#define UMC_BSICMAPSET         0x00000988
-#define UMC_DIOCTLA            0x00000C00
-#define   UMC_DIOCTLA_CTL_NRST         BIT(8)  /* ctl_rst_n */
-#define   UMC_DIOCTLA_CFG_NRST         BIT(0)  /* cfg_rst_n */
-#define UMC_DFISTCTLC          0x00000C18
-#define UMC_DFICUPDCTLA                0x00000C20
-#define UMC_DFIPUPDCTLA                0x00000C30
-#define UMC_DFICSOVRRD         0x00000C84
-#define UMC_DFITURNOFF          0x00000C88
-
-/* UM registers */
-#define UMC_MBUS0              0x00080004
-#define UMC_MBUS1              0x00081004
-#define UMC_MBUS2              0x00082004
-#define UMC_MBUS3              0x00000C78
-#define UMC_MBUS4              0x00000CF8
-#define UMC_MBUS5              0x00000E78
-#define UMC_MBUS6              0x00000EF8
-#define UMC_MBUS7              0x00001278
-#define UMC_MBUS8              0x000012F8
-#define UMC_MBUS9              0x00002478
-#define UMC_MBUS10             0x000024F8
-
-/* UMC1 register */
-#define UMC_SIORST             0x00000728
-#define UMC_VO0RST             0x0000073c
-#define UMC_VPERST             0x00000744
-#define UMC_RGLRST             0x00000750
-#define UMC_A2DRST             0x00000764
-#define UMC_DMDRST             0x00000770
-
-#endif /* UMC_LD20_REGS_H */
index 56f514e297f5d5ca20480f6491d4978b9d760ab3..b322628eedfa74e1e933392f7551cbaaadf26416 100644 (file)
@@ -24,13 +24,6 @@ struct uniphier_board_data {
 
 #define UNIPHIER_BD_DRAM_SPARSE                        BIT(9)
 #define UNIPHIER_BD_DDR3PLUS                   BIT(8)
-
-#define UNIPHIER_BD_BOARD_GET_TYPE(f)          ((f) & 0x7)
-#define UNIPHIER_BD_BOARD_LD20_REF             0       /* LD20 reference */
-#define UNIPHIER_BD_BOARD_LD20_GLOBAL          1       /* LD20 TV Set */
-#define UNIPHIER_BD_BOARD_LD20_C1              2       /* LD20 TV Set C1 */
-#define UNIPHIER_BD_BOARD_LD21_REF             3       /* LD21 reference */
-#define UNIPHIER_BD_BOARD_LD21_GLOBAL          4       /* LD21 TV Set */
 };
 
 const struct uniphier_board_data *uniphier_get_board_param(void);
@@ -41,8 +34,6 @@ int uniphier_pro4_init(const struct uniphier_board_data *bd);
 int uniphier_sld8_init(const struct uniphier_board_data *bd);
 int uniphier_pro5_init(const struct uniphier_board_data *bd);
 int uniphier_pxs2_init(const struct uniphier_board_data *bd);
-int uniphier_ld11_init(const struct uniphier_board_data *bd);
-int uniphier_ld20_init(const struct uniphier_board_data *bd);
 
 #if defined(CONFIG_MICRO_SUPPORT_CARD)
 void uniphier_sbc_init_admulti(void);
@@ -85,17 +76,12 @@ int uniphier_pro4_dpll_init(const struct uniphier_board_data *bd);
 int uniphier_sld8_dpll_init(const struct uniphier_board_data *bd);
 int uniphier_pro5_dpll_init(const struct uniphier_board_data *bd);
 int uniphier_pxs2_dpll_init(const struct uniphier_board_data *bd);
-int uniphier_ld11_dpll_init(const struct uniphier_board_data *bd);
-int uniphier_ld20_dpll_init(const struct uniphier_board_data *bd);
 
 void uniphier_sld3_early_clk_init(void);
-void uniphier_ld11_early_clk_init(void);
 
 void uniphier_sld3_dram_clk_init(void);
 void uniphier_pro5_dram_clk_init(void);
 void uniphier_pxs2_dram_clk_init(void);
-void uniphier_ld11_dram_clk_init(void);
-void uniphier_ld20_dram_clk_init(void);
 
 int uniphier_sld3_umc_init(const struct uniphier_board_data *bd);
 int uniphier_ld4_umc_init(const struct uniphier_board_data *bd);
@@ -103,8 +89,6 @@ int uniphier_pro4_umc_init(const struct uniphier_board_data *bd);
 int uniphier_sld8_umc_init(const struct uniphier_board_data *bd);
 int uniphier_pro5_umc_init(const struct uniphier_board_data *bd);
 int uniphier_pxs2_umc_init(const struct uniphier_board_data *bd);
-int uniphier_ld20_umc_init(const struct uniphier_board_data *bd);
-int uniphier_ld11_umc_init(const struct uniphier_board_data *bd);
 
 void uniphier_sld3_pll_init(void);
 void uniphier_ld4_pll_init(void);
@@ -125,8 +109,6 @@ unsigned int uniphier_boot_device_raw(void);
 int uniphier_have_internal_stm(void);
 int uniphier_boot_from_backend(void);
 int uniphier_pin_init(const char *pinconfig_name);
-void uniphier_smp_kick_all_cpus(void);
-void cci500_init(unsigned int nr_slaves);
 
 #undef pr_warn
 #define pr_warn(fmt, args...)  printf(fmt, ##args)
index 0079a083e838f0ebded6be1016eea193b335b036..6da5631bcacea588422ef29d24640e7f9ab68739 100644 (file)
@@ -97,26 +97,6 @@ static const struct uniphier_spl_initdata uniphier_spl_initdata[] = {
                .umc_init = uniphier_pxs2_umc_init,
        },
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_LD11)
-       {
-               .soc_id = UNIPHIER_LD11_ID,
-               .early_clk_init = uniphier_ld11_early_clk_init,
-               .dpll_init = uniphier_ld11_dpll_init,
-               .memconf_init = uniphier_memconf_2ch_init,
-               .dram_clk_init = uniphier_ld11_dram_clk_init,
-               .umc_init = uniphier_ld11_umc_init,
-       },
-#endif
-#if defined(CONFIG_ARCH_UNIPHIER_LD20)
-       {
-               .soc_id = UNIPHIER_LD20_ID,
-               .early_clk_init = uniphier_ld11_early_clk_init,
-               .dpll_init = uniphier_ld20_dpll_init,
-               .memconf_init = uniphier_memconf_3ch_init,
-               .dram_clk_init = uniphier_ld20_dram_clk_init,
-               .umc_init = uniphier_ld20_umc_init,
-       },
-#endif
 };
 UNIPHIER_DEFINE_SOCDATA_FUNC(uniphier_get_spl_initdata, uniphier_spl_initdata)
 
@@ -141,10 +121,8 @@ void spl_board_init(void)
        if (initdata->bcu_init)
                initdata->bcu_init(bd);
 
-
        initdata->early_clk_init();
 
-
 #ifdef CONFIG_SPL_SERIAL_SUPPORT
        preloader_console_init();
 #endif
@@ -168,8 +146,4 @@ void spl_board_init(void)
                pr_err("failed to init DRAM\n");
                hang();
        }
-
-#ifdef CONFIG_ARM64
-       dcache_disable();
-#endif
 }
diff --git a/configs/uniphier_ld11_defconfig b/configs/uniphier_ld11_defconfig
deleted file mode 100644 (file)
index 9601dcc..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_UNIPHIER=y
-CONFIG_SYS_TEXT_BASE=0x84000000
-CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_ARCH_UNIPHIER_LD11_SINGLE=y
-CONFIG_MICRO_SUPPORT_CARD=y
-CONFIG_DEFAULT_DEVICE_TREE="uniphier-ld11-ref"
-# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
-CONFIG_SPL=y
-CONFIG_SPL_NOR_SUPPORT=y
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_CONFIG=y
-# CONFIG_CMD_XIMG is not set
-# CONFIG_CMD_ENV_EXISTS is not set
-CONFIG_CMD_GPT=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_FPGA is not set
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_TFTPPUT=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_TIME=y
-# CONFIG_CMD_MISC is not set
-CONFIG_CMD_FAT=y
-# CONFIG_SPL_DOS_PARTITION is not set
-# CONFIG_SPL_EFI_PARTITION is not set
-CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_SPL_OF_TRANSLATE=y
-CONFIG_GPIO_UNIPHIER=y
-CONFIG_MISC=y
-CONFIG_I2C_EEPROM=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_SDMA=y
-CONFIG_MMC_SDHCI_CADENCE=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_GENERIC=y
-CONFIG_USB_STORAGE=y
diff --git a/configs/uniphier_ld20_defconfig b/configs/uniphier_ld20_defconfig
deleted file mode 100644 (file)
index b5255a6..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_UNIPHIER=y
-CONFIG_SYS_TEXT_BASE=0x84000000
-CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_ARCH_UNIPHIER_LD20_SINGLE=y
-CONFIG_MICRO_SUPPORT_CARD=y
-CONFIG_DEFAULT_DEVICE_TREE="uniphier-ld20-ref"
-# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
-CONFIG_SPL=y
-CONFIG_SPL_NOR_SUPPORT=y
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_CONFIG=y
-# CONFIG_CMD_XIMG is not set
-# CONFIG_CMD_ENV_EXISTS is not set
-CONFIG_CMD_GPT=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_FPGA is not set
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_TFTPPUT=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_TIME=y
-# CONFIG_CMD_MISC is not set
-CONFIG_CMD_FAT=y
-# CONFIG_SPL_DOS_PARTITION is not set
-# CONFIG_SPL_EFI_PARTITION is not set
-CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_SPL_OF_TRANSLATE=y
-CONFIG_GPIO_UNIPHIER=y
-CONFIG_MISC=y
-CONFIG_I2C_EEPROM=y
-CONFIG_MMC_UNIPHIER=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_CADENCE=y
-CONFIG_USB=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_STORAGE=y
index f79659c9cabdef273609b2f1afa95a541559cc09..e2f3b9a2ec23bc1761ccb515eb1d334bf0bc6acb 100644 (file)
@@ -55,11 +55,11 @@ LD6b reference board:
     $ make CROSS_COMPILE=arm-linux-gnueabihf- DEVICE_TREE=uniphier-ld6b-ref
 
 LD11 reference board:
-    $ make uniphier_ld11_defconfig
-    $ make CROSS_COMPILE=aarch64-linux-gnu-
+    $ make uniphier_v8_defconfig
+    $ make CROSS_COMPILE=aarch64-linux-gnu- DEVICE_TREE=uniphier-ld11-ref
 
 LD20 reference board:
-    $ make uniphier_ld20_defconfig
+    $ make uniphier_v8_defconfig
     $ make CROSS_COMPILE=aarch64-linux-gnu-
 
 PXs3 reference board:
index 9c2db1afc8c77f6088f86a1d3cf33eda29ffbbfe..e2b234ff14965b1e2883a6bba8f5a1a7449e425a 100644 (file)
@@ -59,12 +59,12 @@ static const struct uniphier_pinctrl_group uniphier_ld11_groups[] = {
        UNIPHIER_PINCTRL_GROUP(i2c3),
        UNIPHIER_PINCTRL_GROUP(i2c4),
        UNIPHIER_PINCTRL_GROUP(nand),
-       UNIPHIER_PINCTRL_GROUP_SPL(system_bus),
-       UNIPHIER_PINCTRL_GROUP_SPL(system_bus_cs1),
-       UNIPHIER_PINCTRL_GROUP_SPL(uart0),
-       UNIPHIER_PINCTRL_GROUP_SPL(uart1),
-       UNIPHIER_PINCTRL_GROUP_SPL(uart2),
-       UNIPHIER_PINCTRL_GROUP_SPL(uart3),
+       UNIPHIER_PINCTRL_GROUP(system_bus),
+       UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
+       UNIPHIER_PINCTRL_GROUP(uart0),
+       UNIPHIER_PINCTRL_GROUP(uart1),
+       UNIPHIER_PINCTRL_GROUP(uart2),
+       UNIPHIER_PINCTRL_GROUP(uart3),
        UNIPHIER_PINCTRL_GROUP(usb0),
        UNIPHIER_PINCTRL_GROUP(usb1),
        UNIPHIER_PINCTRL_GROUP(usb2),
@@ -78,11 +78,11 @@ static const char * const uniphier_ld11_functions[] = {
        UNIPHIER_PINMUX_FUNCTION(i2c3),
        UNIPHIER_PINMUX_FUNCTION(i2c4),
        UNIPHIER_PINMUX_FUNCTION(nand),
-       UNIPHIER_PINMUX_FUNCTION_SPL(system_bus),
-       UNIPHIER_PINMUX_FUNCTION_SPL(uart0),
-       UNIPHIER_PINMUX_FUNCTION_SPL(uart1),
-       UNIPHIER_PINMUX_FUNCTION_SPL(uart2),
-       UNIPHIER_PINMUX_FUNCTION_SPL(uart3),
+       UNIPHIER_PINMUX_FUNCTION(system_bus),
+       UNIPHIER_PINMUX_FUNCTION(uart0),
+       UNIPHIER_PINMUX_FUNCTION(uart1),
+       UNIPHIER_PINMUX_FUNCTION(uart2),
+       UNIPHIER_PINMUX_FUNCTION(uart3),
        UNIPHIER_PINMUX_FUNCTION(usb0),
        UNIPHIER_PINMUX_FUNCTION(usb1),
        UNIPHIER_PINMUX_FUNCTION(usb2),
index 0b0af1c018a9e0c6e90c9cc314c9655135e53ef8..11d5d98a5a16401c69423daacbfaadec09ed1378 100644 (file)
@@ -69,12 +69,12 @@ static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = {
        UNIPHIER_PINCTRL_GROUP(i2c4),
        UNIPHIER_PINCTRL_GROUP(nand),
        UNIPHIER_PINCTRL_GROUP(sd),
-       UNIPHIER_PINCTRL_GROUP_SPL(system_bus),
-       UNIPHIER_PINCTRL_GROUP_SPL(system_bus_cs1),
-       UNIPHIER_PINCTRL_GROUP_SPL(uart0),
-       UNIPHIER_PINCTRL_GROUP_SPL(uart1),
-       UNIPHIER_PINCTRL_GROUP_SPL(uart2),
-       UNIPHIER_PINCTRL_GROUP_SPL(uart3),
+       UNIPHIER_PINCTRL_GROUP(system_bus),
+       UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
+       UNIPHIER_PINCTRL_GROUP(uart0),
+       UNIPHIER_PINCTRL_GROUP(uart1),
+       UNIPHIER_PINCTRL_GROUP(uart2),
+       UNIPHIER_PINCTRL_GROUP(uart3),
        UNIPHIER_PINCTRL_GROUP(usb0),
        UNIPHIER_PINCTRL_GROUP(usb1),
        UNIPHIER_PINCTRL_GROUP(usb2),
@@ -91,11 +91,11 @@ static const char * const uniphier_ld20_functions[] = {
        UNIPHIER_PINMUX_FUNCTION(i2c4),
        UNIPHIER_PINMUX_FUNCTION(nand),
        UNIPHIER_PINMUX_FUNCTION(sd),
-       UNIPHIER_PINMUX_FUNCTION_SPL(system_bus),
-       UNIPHIER_PINMUX_FUNCTION_SPL(uart0),
-       UNIPHIER_PINMUX_FUNCTION_SPL(uart1),
-       UNIPHIER_PINMUX_FUNCTION_SPL(uart2),
-       UNIPHIER_PINMUX_FUNCTION_SPL(uart3),
+       UNIPHIER_PINMUX_FUNCTION(system_bus),
+       UNIPHIER_PINMUX_FUNCTION(uart0),
+       UNIPHIER_PINMUX_FUNCTION(uart1),
+       UNIPHIER_PINMUX_FUNCTION(uart2),
+       UNIPHIER_PINMUX_FUNCTION(uart3),
        UNIPHIER_PINMUX_FUNCTION(usb0),
        UNIPHIER_PINMUX_FUNCTION(usb1),
        UNIPHIER_PINMUX_FUNCTION(usb2),
index 86752d91ffeb955b6f24ce7b1cffa4716715e6bf..423e48b0037a826bf3dddc09d32443d71f01fb78 100644 (file)
@@ -78,12 +78,12 @@ static const struct uniphier_pinctrl_group uniphier_pxs3_groups[] = {
        UNIPHIER_PINCTRL_GROUP(i2c3),
        UNIPHIER_PINCTRL_GROUP(nand),
        UNIPHIER_PINCTRL_GROUP(sd),
-       UNIPHIER_PINCTRL_GROUP_SPL(system_bus),
-       UNIPHIER_PINCTRL_GROUP_SPL(system_bus_cs1),
-       UNIPHIER_PINCTRL_GROUP_SPL(uart0),
-       UNIPHIER_PINCTRL_GROUP_SPL(uart1),
-       UNIPHIER_PINCTRL_GROUP_SPL(uart2),
-       UNIPHIER_PINCTRL_GROUP_SPL(uart3),
+       UNIPHIER_PINCTRL_GROUP(system_bus),
+       UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
+       UNIPHIER_PINCTRL_GROUP(uart0),
+       UNIPHIER_PINCTRL_GROUP(uart1),
+       UNIPHIER_PINCTRL_GROUP(uart2),
+       UNIPHIER_PINCTRL_GROUP(uart3),
        UNIPHIER_PINCTRL_GROUP(usb0),
        UNIPHIER_PINCTRL_GROUP(usb1),
        UNIPHIER_PINCTRL_GROUP(usb2),
@@ -102,11 +102,11 @@ static const char * const uniphier_pxs3_functions[] = {
        UNIPHIER_PINMUX_FUNCTION(i2c3),
        UNIPHIER_PINMUX_FUNCTION(nand),
        UNIPHIER_PINMUX_FUNCTION(sd),
-       UNIPHIER_PINMUX_FUNCTION_SPL(system_bus),
-       UNIPHIER_PINMUX_FUNCTION_SPL(uart0),
-       UNIPHIER_PINMUX_FUNCTION_SPL(uart1),
-       UNIPHIER_PINMUX_FUNCTION_SPL(uart2),
-       UNIPHIER_PINMUX_FUNCTION_SPL(uart3),
+       UNIPHIER_PINMUX_FUNCTION(system_bus),
+       UNIPHIER_PINMUX_FUNCTION(uart0),
+       UNIPHIER_PINMUX_FUNCTION(uart1),
+       UNIPHIER_PINMUX_FUNCTION(uart2),
+       UNIPHIER_PINMUX_FUNCTION(uart3),
        UNIPHIER_PINMUX_FUNCTION(usb0),
        UNIPHIER_PINMUX_FUNCTION(usb1),
        UNIPHIER_PINMUX_FUNCTION(usb2),
index b8afa813250ffec840806644db10101c41203545..cc65f072bc70e7c5ddb8b88646873c68bf95506b 100644 (file)
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_SYS_MMC_ENV_PART                1
 
-#ifdef CONFIG_ARMV8_MULTIENTRY
-#define CPU_RELEASE_ADDR                       0x80000000
-#define COUNTER_FREQUENCY                      50000000
-#define CONFIG_GICV3
-#define GICD_BASE                              0x5fe00000
-#if defined(CONFIG_ARCH_UNIPHIER_LD11)
-#define GICR_BASE                              0x5fe40000
-#elif defined(CONFIG_ARCH_UNIPHIER_LD20)
-#define GICR_BASE                              0x5fe80000
-#endif
-#elif !defined(CONFIG_ARM64)
+#if !defined(CONFIG_ARM64)
 /* Time clock 1MHz */
 #define CONFIG_SYS_TIMER_RATE                  1000000
 #endif
 
 #define CONFIG_CMDLINE_EDITING         /* add command line history     */
 
-#if defined(CONFIG_ARM64) && !defined(CONFIG_ARMV8_MULTIENTRY)
+#if defined(CONFIG_ARM64)
 /* ARM Trusted Firmware */
 #define BOOT_IMAGES \
        "second_image=unph_bl.bin\0" \
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_TEXT_BASE)
 
 /* only for SPL */
-#if defined(CONFIG_ARM64)
-#define CONFIG_SPL_TEXT_BASE           0x30000000
-#elif defined(CONFIG_ARCH_UNIPHIER_SLD3) || \
+#if defined(CONFIG_ARCH_UNIPHIER_SLD3) || \
        defined(CONFIG_ARCH_UNIPHIER_LD4) || \
        defined(CONFIG_ARCH_UNIPHIER_SLD8)
 #define CONFIG_SPL_TEXT_BASE           0x00040000
 #define CONFIG_SPL_TEXT_BASE           0x00100000
 #endif
 
-#if defined(CONFIG_ARCH_UNIPHIER_LD11)
-#define CONFIG_SPL_STACK               (0x30014c00)
-#elif defined(CONFIG_ARCH_UNIPHIER_LD20)
-#define CONFIG_SPL_STACK               (0x3001c000)
-#else
 #define CONFIG_SPL_STACK               (0x00100000)
-#endif
 
 #define CONFIG_SPL_FRAMEWORK
-#ifdef CONFIG_ARM64
-#define CONFIG_SPL_BOARD_LOAD_IMAGE
-#endif
 
 #define CONFIG_SYS_NAND_U_BOOT_OFFS            0x20000
 
 
 #define CONFIG_SPL_TARGET                      "u-boot-with-spl.bin"
 #define CONFIG_SPL_MAX_FOOTPRINT               0x10000
-#if defined(CONFIG_ARCH_UNIPHIER_LD20)
-#define CONFIG_SPL_MAX_SIZE                    0x14000
-#else
 #define CONFIG_SPL_MAX_SIZE                    0x10000
-#endif
-#if defined(CONFIG_ARCH_UNIPHIER_LD11)
-#define CONFIG_SPL_BSS_START_ADDR              0x30012000
-#elif defined(CONFIG_ARCH_UNIPHIER_LD20)
-#define CONFIG_SPL_BSS_START_ADDR              0x30016000
-#endif
 #define CONFIG_SPL_BSS_MAX_SIZE                        0x2000
 
 #define CONFIG_SPL_PAD_TO                      0x20000