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

Commit b0c4845c authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: imx: Change the way nand devices are registered (imx25) 



Make use of new mechanism to register a nand device.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 1f8d721c

arch/arm/mach-mx25/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -4,5 +4,6 @@ comment "MX25 platforms:" 




config MACH_MX25_3DS

config MACH_MX25_3DS

	bool "Support MX25PDK (3DS) Platform"

	bool "Support MX25PDK (3DS) Platform"

	select IMX_HAVE_PLATFORM_MXC_NAND





endif
 
endif

arch/arm/mach-mx25/devices-imx25.h

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

 * Copyright (C) 2010 Pengutronix

 * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>

 *

 * 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.

 */

#include <mach/mx25.h>

#include <mach/devices-common.h>



#define imx25_add_mxc_nand(pdata)	\

	imx_add_mxc_nand_v21(MX25_NFC_BASE_ADDR, MX25_INT_NANDFC, pdata)

arch/arm/mach-mx25/devices.c

+0 −20
Original line number Original line Diff line number Diff line
@@ -439,26 +439,6 @@ struct platform_device mx25_fec_device = { 
	.resource	= mx25_fec_resources,

	.resource	= mx25_fec_resources,

};

};





static struct resource mxc_nand_resources[] = {

	{

		.start	= MX25_NFC_BASE_ADDR,

		.end	= MX25_NFC_BASE_ADDR + 0x1fff,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= MX25_INT_NANDFC,

		.end	= MX25_INT_NANDFC,

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device mxc_nand_device = {

	.name		= "mxc_nand",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(mxc_nand_resources),

	.resource	= mxc_nand_resources,

};



static struct resource mx25_rtc_resources[] = {

static struct resource mx25_rtc_resources[] = {

	{

	{

		.start	= MX25_DRYICE_BASE_ADDR,

		.start	= MX25_DRYICE_BASE_ADDR,

arch/arm/mach-mx25/devices.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ extern struct platform_device mxc_i2c_device0; 
extern struct platform_device mxc_i2c_device1;

extern struct platform_device mxc_i2c_device1;

extern struct platform_device mxc_i2c_device2;

extern struct platform_device mxc_i2c_device2;

extern struct platform_device mx25_fec_device;

extern struct platform_device mx25_fec_device;

extern struct platform_device mxc_nand_device;

extern struct platform_device mx25_rtc_device;

extern struct platform_device mx25_rtc_device;

extern struct platform_device mx25_fb_device;

extern struct platform_device mx25_fb_device;

extern struct platform_device mxc_wdt;
 
extern struct platform_device mxc_wdt;

arch/arm/mach-mx25/mach-mx25_3ds.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -40,11 +40,12 @@ 
#include <mach/common.h>

#include <mach/common.h>

#include <mach/imx-uart.h>

#include <mach/imx-uart.h>

#include <mach/mx25.h>

#include <mach/mx25.h>

#include <mach/mxc_nand.h>

#include <mach/imxfb.h>

#include <mach/imxfb.h>

#include "devices.h"

#include <mach/iomux-mx25.h>

#include <mach/iomux-mx25.h>





#include "devices-imx25.h"

#include "devices.h"



static struct imxuart_platform_data uart_pdata = {

static struct imxuart_platform_data uart_pdata = {

	.flags = IMXUART_HAVE_RTSCTS,

	.flags = IMXUART_HAVE_RTSCTS,

};

};
@@ -109,7 +110,8 @@ static void __init mx25pdk_fec_reset(void) 
	gpio_set_value(FEC_RESET_B_GPIO, 1);

	gpio_set_value(FEC_RESET_B_GPIO, 1);

}

}





static struct mxc_nand_platform_data mx25pdk_nand_board_info = {

static const struct mxc_nand_platform_data

mx25pdk_nand_board_info __initconst = {

	.width		= 1,

	.width		= 1,

	.hw_ecc		= 1,

	.hw_ecc		= 1,

	.flash_bbt	= 1,

	.flash_bbt	= 1,
@@ -150,7 +152,7 @@ static void __init mx25pdk_init(void) 




	mxc_register_device(&mxc_uart_device0, &uart_pdata);

	mxc_register_device(&mxc_uart_device0, &uart_pdata);

	mxc_register_device(&mxc_usbh2, NULL);

	mxc_register_device(&mxc_usbh2, NULL);

	mxc_register_device(&mxc_nand_device, &mx25pdk_nand_board_info);

	imx25_add_mxc_nand(&mx25pdk_nand_board_info);

	mxc_register_device(&mx25_rtc_device, NULL);

	mxc_register_device(&mx25_rtc_device, NULL);

	mxc_register_device(&mx25_fb_device, &mx25pdk_fb_pdata);

	mxc_register_device(&mx25_fb_device, &mx25pdk_fb_pdata);