Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 201632
b: refs/heads/master
c: 66384ee
h: refs/heads/master
v: v3
  • Loading branch information
Uwe Kleine-König committed Jun 30, 2010
1 parent 477cac1 commit 5599492
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aa71251c5b8c673361281fbfd8be5a9ee8b9f4cc
refs/heads/master: 66384eedd900f2f6bb00e4f16c2cb770d6b0066b
2 changes: 2 additions & 0 deletions trunk/arch/arm/plat-mxc/Kconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
if ARCH_MXC

source "arch/arm/plat-mxc/devices/Kconfig"

menu "Freescale MXC Implementations"

choice
Expand Down
2 changes: 2 additions & 0 deletions trunk/arch/arm/plat-mxc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ ifdef CONFIG_SND_IMX_SOC
obj-y += ssi-fiq.o
obj-y += ssi-fiq-ksym.o
endif

obj-y += devices/
2 changes: 2 additions & 0 deletions trunk/arch/arm/plat-mxc/devices/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
config IMX_HAVE_PLATFORM_MXC_NAND
bool
1 change: 1 addition & 0 deletions trunk/arch/arm/plat-mxc/devices/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_NAND) += platform-mxc_nand.o
44 changes: 44 additions & 0 deletions trunk/arch/arm/plat-mxc/devices/platform-mxc_nand.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
* Copyright (C) 2009-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 <asm/sizes.h>
#include <mach/devices-common.h>

static struct platform_device *__init imx_add_mxc_nand(resource_size_t iobase,
int irq, const struct mxc_nand_platform_data *pdata,
resource_size_t iosize)
{
static int id = 0;

struct resource res[] = {
{
.start = iobase,
.end = iobase + iosize - 1,
.flags = IORESOURCE_MEM,
}, {
.start = irq,
.end = irq,
.flags = IORESOURCE_IRQ,
},
};

return imx_add_platform_device("mxc_nand", id++, res, ARRAY_SIZE(res),
pdata, sizeof(*pdata));
}

struct platform_device *__init imx_add_mxc_nand_v1(resource_size_t iobase,
int irq, const struct mxc_nand_platform_data *pdata)
{
return imx_add_mxc_nand(iobase, irq, pdata, SZ_4K);
}

struct platform_device *__init imx_add_mxc_nand_v21(resource_size_t iobase,
int irq, const struct mxc_nand_platform_data *pdata)
{
return imx_add_mxc_nand(iobase, irq, pdata, SZ_8K);
}
6 changes: 6 additions & 0 deletions trunk/arch/arm/plat-mxc/include/mach/devices-common.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,9 @@
struct platform_device *imx_add_platform_device(const char *name, int id,
const struct resource *res, unsigned int num_resources,
const void *data, size_t size_data);

#include <mach/mxc_nand.h>
struct platform_device *__init imx_add_mxc_nand_v1(resource_size_t iobase,
int irq, const struct mxc_nand_platform_data *pdata);
struct platform_device *__init imx_add_mxc_nand_v21(resource_size_t iobase,
int irq, const struct mxc_nand_platform_data *pdata);

0 comments on commit 5599492

Please sign in to comment.