Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 14:10:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge git://git.denx.de/u-boot-uniphier

Browse source
This commit is contained in:
Tom Rini 2017-12-04 10:24:35 -05:00
commit 0c4d24823e
38 changed files with 46 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/include/asm/ti-common/davinci_nand.h
View file

@ -9,7 +9,7 @@
#ifndef _DAVINCI_NAND_H_ #ifndef _DAVINCI_NAND_H_
#define _DAVINCI_NAND_H_ #define _DAVINCI_NAND_H_
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#define NAND_READ_START 0x00 #define NAND_READ_START 0x00

2
arch/arm/mach-omap2/omap3/spl_id_nand.c
View file

@ -14,7 +14,7 @@
#include <common.h> #include <common.h>
#include <jffs2/load_kernel.h> #include <jffs2/load_kernel.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <linux/mtd/omap_gpmc.h> #include <linux/mtd/omap_gpmc.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>

7
arch/arm/mach-uniphier/board_init.c
View file

@ -6,17 +6,14 @@
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#include <common.h> #include <linux/errno.h>
#include <libfdt.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/printk.h>
#include "init.h" #include "init.h"
#include "micro-support-card.h" #include "micro-support-card.h"
#include "sg-regs.h"
#include "soc-info.h" #include "soc-info.h"
DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_ARCH_UNIPHIER_LD20 #ifdef CONFIG_ARCH_UNIPHIER_LD20
static void uniphier_ld20_misc_init(void) static void uniphier_ld20_misc_init(void)
{ {

2
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
View file

@ -16,7 +16,7 @@
#include <asm/arch/gpio.h> #include <asm/arch/gpio.h>
#include <asm/arch/clk.h> #include <asm/arch/clk.h>
#include <lcd.h> #include <lcd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <atmel_lcdc.h> #include <atmel_lcdc.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>

2
board/isee/igep00x0/common.c
View file

@ -8,7 +8,7 @@
#include <asm/arch/mux.h> #include <asm/arch/mux.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <jffs2/load_kernel.h> #include <jffs2/load_kernel.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include "igep00x0.h" #include "igep00x0.h"
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

2
board/isee/igep00x0/igep00x0.c
View file

@ -18,7 +18,7 @@
#include <asm/arch/mux.h> #include <asm/arch/mux.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <linux/mtd/onenand.h> #include <linux/mtd/onenand.h>
#include <jffs2/load_kernel.h> #include <jffs2/load_kernel.h>
#include <mtd_node.h> #include <mtd_node.h>

2
board/isee/igep00x0/spl.c
View file

@ -5,7 +5,7 @@
#include <asm/arch/mem.h> #include <asm/arch/mem.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <jffs2/load_kernel.h> #include <jffs2/load_kernel.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include "igep00x0.h" #include "igep00x0.h"
/* /*

2
board/logicpd/omap3som/omap3logic.c
View file

@ -26,7 +26,7 @@
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <asm/omap_musb.h> #include <asm/omap_musb.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/usb/ch9.h> #include <linux/usb/ch9.h>

2
board/mini-box/picosam9g45/picosam9g45.c
View file

@ -20,7 +20,7 @@
#include <asm/arch/gpio.h> #include <asm/arch/gpio.h>
#include <asm/arch/clk.h> #include <asm/arch/clk.h>
#include <lcd.h> #include <lcd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <atmel_lcdc.h> #include <atmel_lcdc.h>
#include <atmel_mci.h> #include <atmel_mci.h>
#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB) #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)

2
board/overo/overo.c
View file

@ -17,7 +17,7 @@
#include <ns16550.h> #include <ns16550.h>
#include <netdev.h> #include <netdev.h>
#include <twl4030.h> #include <twl4030.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/mmc_host_def.h> #include <asm/arch/mmc_host_def.h>
#include <asm/arch/mux.h> #include <asm/arch/mux.h>

2
board/siemens/taurus/taurus.c
View file

@ -26,7 +26,7 @@
#include <asm/arch/atmel_serial.h> #include <asm/arch/atmel_serial.h>
#include <asm/arch/clk.h> #include <asm/arch/clk.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <atmel_mci.h> #include <atmel_mci.h>
#include <asm/arch/at91_spi.h> #include <asm/arch/at91_spi.h>
#include <spi.h> #include <spi.h>

2
board/ti/beagle/beagle.c
View file

@ -20,7 +20,7 @@
#include <status_led.h> #include <status_led.h>
#endif #endif
#include <twl4030.h> #include <twl4030.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/mmc_host_def.h> #include <asm/arch/mmc_host_def.h>
#include <asm/arch/mux.h> #include <asm/arch/mux.h>

2
board/ti/evm/evm.c
View file

@ -25,7 +25,7 @@
#include <twl4030.h> #include <twl4030.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/omap_musb.h> #include <asm/omap_musb.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <linux/usb/ch9.h> #include <linux/usb/ch9.h>
#include <linux/usb/gadget.h> #include <linux/usb/gadget.h>
#include <linux/usb/musb.h> #include <linux/usb/musb.h>

2
cmd/jffs2.c
View file

@ -80,7 +80,7 @@
#include <cramfs/cramfs_fs.h> #include <cramfs/cramfs_fs.h>
#if defined(CONFIG_CMD_NAND) #if defined(CONFIG_CMD_NAND)
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <nand.h> #include <nand.h>
#endif #endif

2
cmd/mtdparts.c
View file

@ -81,7 +81,7 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#if defined(CONFIG_CMD_NAND) #if defined(CONFIG_CMD_NAND)
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <nand.h> #include <nand.h>
#endif #endif

2
drivers/mtd/nand/arasan_nfc.c
View file

@ -11,7 +11,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/mtd/nand_ecc.h> #include <linux/mtd/nand_ecc.h>
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>

34
drivers/mtd/nand/denali.c
View file

@ -6,14 +6,14 @@
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#include <common.h>
#include <malloc.h>
#include <nand.h>
#include <dm.h> #include <dm.h>
#include <nand.h>
#include <linux/bitfield.h> #include <linux/bitfield.h>
#include <linux/dma-direction.h> #include <linux/dma-direction.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/rawnand.h>
#include "denali.h" #include "denali.h"
@ -938,7 +938,7 @@ static int denali_erase(struct mtd_info *mtd, int page)
return irq_status & INTR__ERASE_COMP ? 0 : NAND_STATUS_FAIL; return irq_status & INTR__ERASE_COMP ? 0 : NAND_STATUS_FAIL;
} }
static int __maybe_unused denali_setup_data_interface(struct mtd_info *mtd, int chipnr, static int denali_setup_data_interface(struct mtd_info *mtd, int chipnr,
const struct nand_data_interface *conf) const struct nand_data_interface *conf)
{ {
struct denali_nand_info *denali = mtd_to_denali(mtd); struct denali_nand_info *denali = mtd_to_denali(mtd);
@ -1366,29 +1366,3 @@ free_buf:
return ret; return ret;
} }
#ifndef CONFIG_NAND_DENALI_DT
static int __board_nand_init(void)
{
struct denali_nand_info *denali;
denali = kzalloc(sizeof(*denali), GFP_KERNEL);
if (!denali)
return -ENOMEM;
/*
* In the future, these base addresses should be taken from
* Device Tree or platform data.
*/
denali->reg = (void __iomem *)CONFIG_SYS_NAND_REGS_BASE;
denali->host = (void __iomem *)CONFIG_SYS_NAND_DATA_BASE;
return denali_init(denali);
}
void board_nand_init(void)
{
if (__board_nand_init() < 0)
pr_warn("Failed to initialize Denali NAND controller.\n");
}
#endif

2
drivers/mtd/nand/denali.h
View file

@ -9,7 +9,7 @@
#define __DENALI_H__ #define __DENALI_H__
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <linux/types.h> #include <linux/types.h>
#define DEVICE_RESET 0x0 #define DEVICE_RESET 0x0

4
drivers/mtd/nand/denali_dt.c
View file

@ -5,11 +5,11 @@
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#include <common.h>
#include <clk.h> #include <clk.h>
#include <dm.h> #include <dm.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/printk.h>
#include "denali.h" #include "denali.h"
@ -118,6 +118,6 @@ void board_nand_init(void)
DM_GET_DRIVER(denali_nand_dt), DM_GET_DRIVER(denali_nand_dt),
&dev); &dev);
if (ret && ret != -ENODEV) if (ret && ret != -ENODEV)
printf("Failed to initialize Denali NAND controller. (error %d)\n", pr_err("Failed to initialize Denali NAND controller. (error %d)\n",
ret); ret);
} }

2
drivers/mtd/nand/denali_spl.c
View file

@ -8,7 +8,7 @@
#include <common.h> #include <common.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include "denali.h" #include "denali.h"
#define DENALI_MAP01 (1 << 26) /* read/write pages in PIO */ #define DENALI_MAP01 (1 << 26) /* read/write pages in PIO */

2
drivers/mtd/nand/fsl_elbc_nand.c
View file

@ -13,7 +13,7 @@
#include <nand.h> #include <nand.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <linux/mtd/nand_ecc.h> #include <linux/mtd/nand_ecc.h>
#include <asm/io.h> #include <asm/io.h>

2
drivers/mtd/nand/fsl_ifc_nand.c
View file

@ -12,7 +12,7 @@
#include <nand.h> #include <nand.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <linux/mtd/nand_ecc.h> #include <linux/mtd/nand_ecc.h>
#include <asm/io.h> #include <asm/io.h>

2
drivers/mtd/nand/fsl_ifc_spl.c
View file

@ -10,7 +10,7 @@
#include <common.h> #include <common.h>
#include <asm/io.h> #include <asm/io.h>
#include <fsl_ifc.h> #include <fsl_ifc.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#ifdef CONFIG_CHAIN_OF_TRUST #ifdef CONFIG_CHAIN_OF_TRUST
#include <fsl_validate.h> #include <fsl_validate.h>
#endif #endif

2
drivers/mtd/nand/mxs_nand.c
View file

@ -15,7 +15,7 @@
#include <common.h> #include <common.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <linux/types.h> #include <linux/types.h>
#include <malloc.h> #include <malloc.h>
#include <linux/errno.h> #include <linux/errno.h>

2
drivers/mtd/nand/nand_base.c
View file

@ -37,7 +37,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/compat.h> #include <linux/compat.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <linux/mtd/nand_ecc.h> #include <linux/mtd/nand_ecc.h>
#include <linux/mtd/nand_bch.h> #include <linux/mtd/nand_bch.h>
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS

2
drivers/mtd/nand/nand_bbt.c
View file

@ -62,7 +62,7 @@
#include <linux/compat.h> #include <linux/compat.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/bbm.h> #include <linux/mtd/bbm.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/string.h> #include <linux/string.h>

2
drivers/mtd/nand/nand_bch.c
View file

@ -13,7 +13,7 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <linux/mtd/nand_bch.h> #include <linux/mtd/nand_bch.h>
#include <linux/bch.h> #include <linux/bch.h>
#include <malloc.h> #include <malloc.h>

2
drivers/mtd/nand/nand_ids.c
View file

@ -7,7 +7,7 @@
* *
*/ */
#include <common.h> #include <common.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#define LP_OPTIONS NAND_SAMSUNG_LP_OPTIONS #define LP_OPTIONS NAND_SAMSUNG_LP_OPTIONS

2
drivers/mtd/nand/nand_timings.c
View file

@ -10,7 +10,7 @@
*/ */
#include <common.h> #include <common.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
static const struct nand_data_interface onfi_sdr_timings[] = { static const struct nand_data_interface onfi_sdr_timings[] = {
/* Mode 0 */ /* Mode 0 */

2
drivers/mtd/nand/pxa3xx_nand.c
View file

@ -15,7 +15,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/cpu.h> #include <asm/arch/cpu.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <linux/types.h> #include <linux/types.h>
#include "pxa3xx_nand.h" #include "pxa3xx_nand.h"

2
drivers/mtd/nand/sunxi_nand.c
View file

@ -32,7 +32,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/io.h> #include <linux/io.h>

2
drivers/mtd/nand/vf610_nfc.c
View file

@ -26,7 +26,7 @@
#include <malloc.h> #include <malloc.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <nand.h> #include <nand.h>

2
drivers/mtd/nand/zynq_nand.c
View file

@ -13,7 +13,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <nand.h> #include <nand.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/mtd/nand_ecc.h> #include <linux/mtd/nand_ecc.h>
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>

2
fs/yaffs2/yaffs_mtdif.c
View file

@ -22,7 +22,7 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
static inline void translate_spare2oob(const struct yaffs_spare *spare, u8 *oob) static inline void translate_spare2oob(const struct yaffs_spare *spare, u8 *oob)

2
include/linux/mtd/fsl_upm.h
View file

@ -10,7 +10,7 @@
#ifndef __LINUX_MTD_NAND_FSL_UPM #ifndef __LINUX_MTD_NAND_FSL_UPM
#define __LINUX_MTD_NAND_FSL_UPM #define __LINUX_MTD_NAND_FSL_UPM
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
#define FSL_UPM_WAIT_RUN_PATTERN 0x1 #define FSL_UPM_WAIT_RUN_PATTERN 0x1
#define FSL_UPM_WAIT_WRITE_BYTE 0x2 #define FSL_UPM_WAIT_WRITE_BYTE 0x2

2
include/linux/mtd/fsmc_nand.h
View file

@ -8,7 +8,7 @@
#ifndef __FSMC_NAND_H__ #ifndef __FSMC_NAND_H__
#define __FSMC_NAND_H__ #define __FSMC_NAND_H__
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
struct fsmc_regs { struct fsmc_regs {
u32 ctrl; /* 0x00 */ u32 ctrl; /* 0x00 */

10
include/linux/mtd/nand.h → include/linux/mtd/rawnand.h
View file

@ -1,6 +1,4 @@
/* /*
* linux/include/linux/mtd/nand.h
*
* Copyright © 2000-2010 David Woodhouse <dwmw2@infradead.org> * Copyright © 2000-2010 David Woodhouse <dwmw2@infradead.org>
* Steven J. Hill <sjhill@realitydiluted.com> * Steven J. Hill <sjhill@realitydiluted.com>
* Thomas Gleixner <tglx@linutronix.de> * Thomas Gleixner <tglx@linutronix.de>
@ -13,8 +11,8 @@
* Changelog: * Changelog:
* See git changelog. * See git changelog.
*/ */
#ifndef __LINUX_MTD_NAND_H #ifndef __LINUX_MTD_RAWNAND_H
#define __LINUX_MTD_NAND_H #define __LINUX_MTD_RAWNAND_H
#include <config.h> #include <config.h>
@ -22,6 +20,7 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/flashchip.h> #include <linux/mtd/flashchip.h>
#include <linux/mtd/bbm.h> #include <linux/mtd/bbm.h>
#include <asm/cache.h>
struct mtd_info; struct mtd_info;
struct nand_flash_dev; struct nand_flash_dev;
@ -1270,5 +1269,4 @@ int nand_maximize_ecc(struct nand_chip *chip,
/* Reset and initialize a NAND device */ /* Reset and initialize a NAND device */
int nand_reset(struct nand_chip *chip, int chipnr); int nand_reset(struct nand_chip *chip, int chipnr);
#endif /* __LINUX_MTD_RAWNAND_H */
#endif /* __LINUX_MTD_NAND_H */

2
include/nand.h
View file

@ -32,7 +32,7 @@ unsigned long nand_size(void);
#include <linux/compat.h> #include <linux/compat.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h>
int nand_mtd_to_devnum(struct mtd_info *mtd); int nand_mtd_to_devnum(struct mtd_info *mtd);