Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a591f5d3 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by David Woodhouse
Browse files

[MTD] [NAND] TXx9: add NDFMC support 



Add platform support for NAND Flash Memory Controller of TXx9 SoCs.

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Acked-By: default avatarRalf Bächle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent fc371a25

arch/mips/include/asm/txx9/ndfmc.h

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * (C) Copyright TOSHIBA CORPORATION 2007

 */

#ifndef __ASM_TXX9_NDFMC_H

#define __ASM_TXX9_NDFMC_H



#define NDFMC_PLAT_FLAG_USE_BSPRT	0x01

#define NDFMC_PLAT_FLAG_NO_RSTR		0x02

#define NDFMC_PLAT_FLAG_HOLDADD		0x04

#define NDFMC_PLAT_FLAG_DUMMYWRITE	0x08



struct txx9ndfmc_platform_data {

	unsigned int shift;

	unsigned int gbus_clock;

	unsigned int hold;		/* hold time in nanosecond */

	unsigned int spw;		/* strobe pulse width in nanosecond */

	unsigned int flags;

	unsigned char ch_mask;		/* available channel bitmask */

	unsigned char wp_mask;		/* write-protect bitmask */

	unsigned char wide_mask;	/* 16bit-nand bitmask */

};



void txx9_ndfmc_init(unsigned long baseaddr,

		     const struct txx9ndfmc_platform_data *plat_data);



#endif /* __ASM_TXX9_NDFMC_H */

arch/mips/include/asm/txx9/tx4938.h

+1 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ int tx4938_pcic1_map_irq(const struct pci_dev *dev, u8 slot); 
void tx4938_setup_pcierr_irq(void);

void tx4938_irq_init(void);

void tx4938_mtd_init(int ch);

void tx4938_ndfmc_init(unsigned int hold, unsigned int spw);



struct tx4938ide_platform_info {

	/*

arch/mips/include/asm/txx9/tx4939.h

+2 −0
Original line number Diff line number Diff line
@@ -542,5 +542,7 @@ int tx4939_irq(void); 
void tx4939_mtd_init(int ch);

void tx4939_ata_init(void);

void tx4939_rtc_init(void);

void tx4939_ndfmc_init(unsigned int hold, unsigned int spw,

		       unsigned char ch_mask, unsigned char wide_mask);



#endif /* __ASM_TXX9_TX4939_H */

arch/mips/txx9/generic/setup.c

+21 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <asm/txx9/generic.h>

#include <asm/txx9/pci.h>

#include <asm/txx9tmr.h>

#include <asm/txx9/ndfmc.h>

#ifdef CONFIG_CPU_TX49XX

#include <asm/txx9/tx4938.h>

#endif
@@ -691,6 +692,26 @@ void __init txx9_physmap_flash_init(int no, unsigned long addr, 
#endif

}



void __init txx9_ndfmc_init(unsigned long baseaddr,

			    const struct txx9ndfmc_platform_data *pdata)

{

#if defined(CONFIG_MTD_NAND_TXX9NDFMC) || \

	defined(CONFIG_MTD_NAND_TXX9NDFMC_MODULE)

	struct resource res = {

		.start = baseaddr,

		.end = baseaddr + 0x1000 - 1,

		.flags = IORESOURCE_MEM,

	};

	struct platform_device *pdev = platform_device_alloc("txx9ndfmc", -1);



	if (!pdev ||

	    platform_device_add_resources(pdev, &res, 1) ||

	    platform_device_add_data(pdev, pdata, sizeof(*pdata)) ||

	    platform_device_add(pdev))

		platform_device_put(pdev);

#endif

}



#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)

static DEFINE_SPINLOCK(txx9_iocled_lock);

arch/mips/txx9/generic/setup_tx4938.c

+21 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <asm/txx9tmr.h>

#include <asm/txx9pio.h>

#include <asm/txx9/generic.h>

#include <asm/txx9/ndfmc.h>

#include <asm/txx9/tx4938.h>



static void __init tx4938_wdr_init(void)
@@ -382,6 +383,26 @@ void __init tx4938_ata_init(unsigned int irq, unsigned int shift, int tune) 
		platform_device_put(pdev);

}



void __init tx4938_ndfmc_init(unsigned int hold, unsigned int spw)

{

	struct txx9ndfmc_platform_data plat_data = {

		.shift = 1,

		.gbus_clock = txx9_gbus_clock,

		.hold = hold,

		.spw = spw,

		.ch_mask = 1,

	};

	unsigned long baseaddr = TX4938_NDFMC_REG & 0xfffffffffULL;



#ifdef __BIG_ENDIAN

	baseaddr += 4;

#endif

	if ((__raw_readq(&tx4938_ccfgptr->pcfg) &

	     (TX4938_PCFG_ATA_SEL|TX4938_PCFG_ISA_SEL|TX4938_PCFG_NDF_SEL)) ==

	    TX4938_PCFG_NDF_SEL)

		txx9_ndfmc_init(baseaddr, &plat_data);

}



static void __init tx4938_stop_unused_modules(void)

{

	__u64 pcfg, rst = 0, ckd = 0;