LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: uniphier: remove workaround for the NAND write protect 

This workaround was previously needed for LD4, Pro4, sLD8, Pro5
SoCs. The boot ROM does not touch this register for PXs2/LD6b or
later.

Now that the reset signal of the Denali NAND controller is always
asserted in board_init() then deasserted in the driver, the
WRITE_PROTECT register gets back to the default value, which means
the write protect is deasserted.

This workaround can go away entirely.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2020-02-14 20:54:41 +09:00
parent ce4e9ff4d2
commit 1320fa2e55
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,25 +14,9 @@
#include <stdio.h> #include <stdio.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/printk.h> #include <linux/printk.h>
#include <../drivers/mtd/nand/raw/denali.h>
#include "init.h" #include "init.h"
static void nand_denali_wp_disable(void)
{
#ifdef CONFIG_NAND_DENALI
/*
* Since the boot rom enables the write protection for NAND boot mode,
* it must be disabled somewhere for "nand write", "nand erase", etc.
* The workaround is here to not disturb the Denali NAND controller
* driver just for a really SoC-specific thing.
*/
void __iomem *denali_reg = (void __iomem *)CONFIG_SYS_NAND_REGS_BASE;
writel(WRITE_PROTECT__FLAG, denali_reg + WRITE_PROTECT);
#endif
}
static void uniphier_set_env_fdt_file(void) static void uniphier_set_env_fdt_file(void)
{ {
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -114,7 +98,6 @@ int board_late_init(void)
case BOOT_DEVICE_NAND: case BOOT_DEVICE_NAND:
printf("NAND Boot"); printf("NAND Boot");
env_set("bootdev", "nand"); env_set("bootdev", "nand");
nand_denali_wp_disable();
break; break;
case BOOT_DEVICE_NOR: case BOOT_DEVICE_NOR:
printf("NOR Boot"); printf("NOR Boot");