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

Commit 78a0bc3d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'board' of git://github.com/hzhuang1/linux into next/boards 

* 'board' of git://github.com/hzhuang1/linux

:
  ARM: ttc_dkb: add nand support

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0d7614f0 0f74da3f

arch/arm/mach-mmp/ttc_dkb.c

+10 −0
Original line number Diff line number Diff line
@@ -177,12 +177,22 @@ static struct mv_usb_platform_data ttc_usb_pdata = { 
#endif

#endif



#ifdef CONFIG_MTD_NAND_PXA3xx

static struct pxa3xx_nand_platform_data dkb_nand_info = {

	.enable_arbiter = 1,

	.num_cs = 1,

};

#endif



static void __init ttc_dkb_init(void)

{

	mfp_config(ARRAY_AND_SIZE(ttc_dkb_pin_config));



	/* on-chip devices */

	pxa910_add_uart(1);

#ifdef CONFIG_MTD_NAND_PXA3xx

	pxa910_add_nand(&dkb_nand_info);

#endif



	/* off-chip devices */

	pxa910_add_twsi(0, NULL, ARRAY_AND_SIZE(ttc_dkb_i2c_info));