eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'uniphier-v2020.07' of https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier

Browse Source 
UniPhier SoC updates for v2020.07

 - De-assert write protect for Denali NAND driver

 - Clean up include directives

 - Migrate to DM_ETH, and remove legacy board_eth_init()
This commit is contained in:
Tom Rini
2020-05-22 10:27:06 -04:00
parent 2fa581ba91 6cbe90486c
commit 74ce1f8c6f
46 changed files with 21 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@@ -1582,6 +1582,7 @@ config ARCH_UNIPHIER
bool "Socionext UniPhier SoCs"
select BOARD_LATE_INIT
select DM
select DM_ETH
select DM_GPIO
select DM_I2C
select DM_MMC

1
arch/arm/mach-uniphier/arm32/cache-uniphier.c
View File

@@ -5,7 +5,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <cpu_func.h>
#include <linux/io.h>
#include <linux/kernel.h>

3
arch/arm/mach-uniphier/arm32/psci.c
View File

@@ -4,9 +4,7 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <cpu_func.h>
#include <asm/cache.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/io.h>
@@ -17,6 +15,7 @@
#include <asm/processor.h>
#include <asm/psci.h>
#include <asm/secure.h>
#include <asm/system.h>
#include "../debug.h"
#include "../soc-info.h"

2
arch/arm/mach-uniphier/arm32/timer.c
View File

@@ -3,7 +3,7 @@
* Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <config.h>
#include <init.h>
#include <linux/io.h>

1
arch/arm/mach-uniphier/arm64/mem_map.c
View File

@@ -3,7 +3,6 @@
* Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <linux/types.h>
#include <asm/armv8/mmu.h>

2
arch/arm/mach-uniphier/base-address.c
View File

@@ -3,9 +3,9 @@
// Copyright (C) 2019 Socionext Inc.
// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
#include <common.h>
#include <dm/of.h>
#include <fdt_support.h>
#include <linux/errno.h>
#include <linux/io.h>
#include <linux/libfdt.h>
#include <linux/sizes.h>

1
arch/arm/mach-uniphier/board_init.c
View File

@@ -5,7 +5,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <log.h>
#include <linux/errno.h>
#include <linux/io.h>
#include <linux/printk.h>

1
arch/arm/mach-uniphier/board_late_init.c
View File

@@ -5,7 +5,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <env.h>
#include <init.h>
#include <spl.h>

2
arch/arm/mach-uniphier/boards.c
View File

@@ -4,9 +4,9 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <linux/libfdt.h>
#include <linux/kernel.h>
#include <asm/global_data.h>
#include "init.h"

1
arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
View File

@@ -4,7 +4,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <spl.h>
#include <linux/io.h>
#include <linux/kernel.h>

1
arch/arm/mach-uniphier/boot-device/boot-device-ld4.c
View File

@@ -5,7 +5,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <spl.h>
#include <linux/io.h>
#include <linux/kernel.h>

1
arch/arm/mach-uniphier/boot-device/boot-device-pro5.c
View File

@@ -4,7 +4,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <spl.h>
#include <linux/io.h>
#include <linux/kernel.h>

1
arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c
View File

@@ -4,7 +4,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <spl.h>
#include <linux/io.h>
#include <linux/kernel.h>

1
arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c
View File

@@ -4,7 +4,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <spl.h>
#include <linux/bitops.h>
#include <linux/io.h>

2
arch/arm/mach-uniphier/boot-device/boot-device.c
View File

@@ -4,12 +4,12 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <command.h>
#include <spl.h>
#include <stdio.h>
#include <linux/bitops.h>
#include <linux/bug.h>
#include <linux/errno.h>
#include <linux/io.h>
#include <linux/log2.h>

1
arch/arm/mach-uniphier/clk/clk-dram-ld4.c
View File

@@ -4,7 +4,6 @@
* Copyright (C) 2015-2017 Socionext Inc.
*/
#include <common.h>
#include <spl.h>
#include <linux/io.h>

1
arch/arm/mach-uniphier/clk/clk-dram-pxs2.c
View File

@@ -3,7 +3,6 @@
* Copyright (C) 2016-2017 Socionext Inc.
*/
#include <common.h>
#include <spl.h>
#include <linux/io.h>

1
arch/arm/mach-uniphier/clk/clk-early-ld4.c
View File

@@ -4,7 +4,6 @@
* Copyright (C) 2015-2017 Socionext Inc.
*/
#include <common.h>
#include <spl.h>
#include <linux/io.h>

1
arch/arm/mach-uniphier/clk/clk-ld11.c
View File

@@ -3,7 +3,6 @@
* Copyright (C) 2016 Socionext Inc.
*/
#include <common.h>
#include <spl.h>
#include <linux/bitops.h>
#include <linux/delay.h>

1
arch/arm/mach-uniphier/clk/dpll-ld4.c
View File

@@ -4,7 +4,6 @@
* Copyright (C) 2015-2016 Socionext Inc.
*/
#include <common.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/io.h>

1
arch/arm/mach-uniphier/clk/dpll-pro4.c
View File

@@ -4,7 +4,6 @@
* Copyright (C) 2015-2016 Socionext Inc.
*/
#include <common.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/io.h>

1
arch/arm/mach-uniphier/debug-uart/debug-uart.c
View File

@@ -3,7 +3,6 @@
* Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <debug_uart.h>
#include <linux/io.h>
#include <linux/serial_reg.h>

1
arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
View File

@@ -4,7 +4,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <command.h>
#include <stdio.h>
#include <linux/io.h>

1
arch/arm/mach-uniphier/dram/cmd_ddrphy.c
View File

@@ -5,7 +5,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <command.h>
#include <stdio.h>
#include <linux/io.h>

1
arch/arm/mach-uniphier/dram/ddrphy-training.c
View File

@@ -4,7 +4,6 @@
* Copyright (C) 2015-2016 Socionext Inc.
*/
#include <log.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/errno.h>

1
arch/arm/mach-uniphier/dram/umc-ld4.c
View File

@@ -5,7 +5,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <linux/errno.h>
#include <linux/io.h>
#include <linux/sizes.h>

1
arch/arm/mach-uniphier/dram/umc-pro4.c
View File

@@ -5,7 +5,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <linux/errno.h>
#include <linux/io.h>
#include <linux/sizes.h>

2
arch/arm/mach-uniphier/dram/umc-pxs2.c
View File

@@ -7,8 +7,6 @@
* Copyright (C) 2015 Socionext Inc.
*/
#include <init.h>
#include <log.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/errno.h>

1
arch/arm/mach-uniphier/dram/umc-sld8.c
View File

@@ -5,7 +5,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <linux/errno.h>
#include <linux/io.h>
#include <linux/sizes.h>

2
arch/arm/mach-uniphier/dram_init.c
View File

@@ -5,7 +5,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <init.h>
#include <linux/errno.h>
#include <linux/io.h>
@@ -13,6 +12,7 @@
#include <linux/printk.h>
#include <linux/sizes.h>
#include <asm/global_data.h>
#include <asm/u-boot.h>
#include "init.h"
#include "sg-regs.h"

2
arch/arm/mach-uniphier/fdt-fixup.c
View File

@@ -4,11 +4,11 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <fdt_support.h>
#include <fdtdec.h>
#include <jffs2/load_kernel.h>
#include <mtd_node.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/printk.h>

1
arch/arm/mach-uniphier/memconf.c
View File

@@ -5,7 +5,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <linux/errno.h>
#include <linux/io.h>
#include <linux/sizes.h>

19
arch/arm/mach-uniphier/micro-support-card.c
View File

@@ -5,14 +5,13 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <fdt_support.h>
#include <log.h>
#include <net.h>
#include <config.h>
#include <dm/of.h>
#include <fdt_support.h>
#include <linux/ctype.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <asm/global_data.h>
#include "micro-support-card.h"
@@ -108,18 +107,6 @@ void support_card_init(void)
support_card_show_revision();
}
#if defined(CONFIG_SMC911X)
#include <netdev.h>
int board_eth_init(bd_t *bis)
{
if (!support_card_found)
return 0;
return smc911x_initialize(0, (unsigned long)support_card_base + SMC911X_OFFSET);
}
#endif
#if defined(CONFIG_MTD_NOR_FLASH)
#include <mtd/cfi_flash.h>

1
arch/arm/mach-uniphier/mmc-boot-mode.c
View File

@@ -4,7 +4,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <mmc.h>
#include <spl.h>

1
arch/arm/mach-uniphier/mmc-first-dev.c
View File

@@ -4,7 +4,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <command.h>
#include <env.h>
#include <mmc.h>

1
arch/arm/mach-uniphier/nand-reset.c
View File

@@ -4,7 +4,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <log.h>
#include <linux/errno.h>
#include <dm.h>
#include <dm/uclass-internal.h>

1
arch/arm/mach-uniphier/pinctrl-glue.c
View File

@@ -4,7 +4,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <linux/errno.h>
#include <dm.h>
#include <dm/pinctrl.h>

1
arch/arm/mach-uniphier/reset.c
View File

@@ -5,7 +5,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <cpu_func.h>
#include <linux/io.h>
#include <asm/secure.h>

1
arch/arm/mach-uniphier/sbc/sbc-ld11.c
View File

@@ -3,7 +3,6 @@
* Copyright (C) 2016-2017 Socionext Inc.
*/
#include <common.h>
#include <spl.h>
#include <linux/io.h>

1
arch/arm/mach-uniphier/sbc/sbc.c
View File

@@ -5,7 +5,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <linux/io.h>
#include <asm/global_data.h>

1
arch/arm/mach-uniphier/spl_board_init.c
View File

@@ -4,7 +4,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#include <common.h>
#include <debug_uart.h>
#include <hang.h>
#include <spl.h>

1
configs/uniphier_ld4_sld8_defconfig
View File

@@ -52,7 +52,6 @@ CONFIG_NAND_DENALI_DT=y
CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
CONFIG_SPL_NAND_DENALI=y
CONFIG_SMC911X=y
CONFIG_SMC911X_BASE=0x0
CONFIG_SMC911X_32_BIT=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y

1
configs/uniphier_v7_defconfig
View File

@@ -51,7 +51,6 @@ CONFIG_MTD_RAW_NAND=y
CONFIG_NAND_DENALI_DT=y
CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
CONFIG_SPL_NAND_DENALI=y
CONFIG_DM_ETH=y
CONFIG_SNI_AVE=y
CONFIG_SPI=y
CONFIG_DM_SPI=y

1
configs/uniphier_v8_defconfig
View File

@@ -50,7 +50,6 @@ CONFIG_SYS_FLASH_CFI=y
CONFIG_MTD_RAW_NAND=y
CONFIG_NAND_DENALI_DT=y
CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
CONFIG_DM_ETH=y
CONFIG_SNI_AVE=y
CONFIG_PINCONF=y
CONFIG_SPI=y

18
drivers/mtd/nand/raw/Kconfig
View File

@@ -121,15 +121,6 @@ config NAND_DENALI_DT
Enable the driver for NAND flash on platforms using a Denali NAND
controller as a DT device.
config NAND_DENALI_SPARE_AREA_SKIP_BYTES
int "Number of bytes skipped in OOB area"
depends on NAND_DENALI
range 0 63
help
This option specifies the number of bytes to skip from the beginning
of OOB area before last ECC sector data starts. This is potentially
used to preserve the bad block marker in the OOB area.
config NAND_LPC32XX_SLC
bool "Support LPC32XX_SLC controller"
help
@@ -404,6 +395,15 @@ config SPL_NAND_DENALI
This is a small implementation of the Denali NAND controller
for use on SPL.
config NAND_DENALI_SPARE_AREA_SKIP_BYTES
int "Number of bytes skipped in OOB area"
depends on SPL_NAND_DENALI
range 0 63
help
This option specifies the number of bytes to skip from the beginning
of OOB area before last ECC sector data starts. This is potentially
used to preserve the bad block marker in the OOB area.
config SPL_NAND_SIMPLE
bool "Use simple SPL NAND driver"
depends on !SPL_NAND_AM33XX_BCH

1
drivers/mtd/nand/raw/denali.c
View File

@@ -1095,6 +1095,7 @@ static void denali_hw_init(struct denali_nand_info *denali)
iowrite32(CHIP_EN_DONT_CARE__FLAG, denali->reg + CHIP_ENABLE_DONT_CARE);
iowrite32(0xffff, denali->reg + SPARE_AREA_MARKER);
iowrite32(WRITE_PROTECT__FLAG, denali->reg + WRITE_PROTECT);
}
int denali_calc_ecc_bytes(int step_size, int strength)