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

Commit a0f266c1 authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Eric Miao
Browse files

[ARM] pxa: add nand device and clock for pxa168/pxa910 



Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 82b95ecb

arch/arm/mach-mmp/include/mach/pxa168.h

+7 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/i2c.h>

#include <mach/devices.h>

#include <plat/i2c.h>

#include <plat/pxa3xx_nand.h>



extern struct pxa_device_desc pxa168_device_uart1;

extern struct pxa_device_desc pxa168_device_uart2;
@@ -13,6 +14,7 @@ extern struct pxa_device_desc pxa168_device_pwm1; 
extern struct pxa_device_desc pxa168_device_pwm2;

extern struct pxa_device_desc pxa168_device_pwm3;

extern struct pxa_device_desc pxa168_device_pwm4;

extern struct pxa_device_desc pxa168_device_nand;



static inline int pxa168_add_uart(int id)

{
@@ -64,4 +66,9 @@ static inline int pxa168_add_pwm(int id) 


	return pxa_register_device(d, NULL, 0);

}



static inline int pxa168_add_nand(struct pxa3xx_nand_platform_data *info)

{

	return pxa_register_device(&pxa168_device_nand, info, sizeof(*info));

}

#endif /* __ASM_MACH_PXA168_H */

arch/arm/mach-mmp/include/mach/pxa910.h

+7 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/i2c.h>

#include <mach/devices.h>

#include <plat/i2c.h>

#include <plat/pxa3xx_nand.h>



extern struct pxa_device_desc pxa910_device_uart1;

extern struct pxa_device_desc pxa910_device_uart2;
@@ -13,6 +14,7 @@ extern struct pxa_device_desc pxa910_device_pwm1; 
extern struct pxa_device_desc pxa910_device_pwm2;

extern struct pxa_device_desc pxa910_device_pwm3;

extern struct pxa_device_desc pxa910_device_pwm4;

extern struct pxa_device_desc pxa910_device_nand;



static inline int pxa910_add_uart(int id)

{
@@ -64,4 +66,9 @@ static inline int pxa910_add_pwm(int id) 


	return pxa_register_device(d, NULL, 0);

}



static inline int pxa910_add_nand(struct pxa3xx_nand_platform_data *info)

{

	return pxa_register_device(&pxa910_device_nand, info, sizeof(*info));

}

#endif /* __ASM_MACH_PXA910_H */

arch/arm/mach-mmp/pxa168.c

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <mach/addr-map.h>

#include <mach/cputype.h>

#include <mach/regs-apbc.h>

#include <mach/regs-apmu.h>

#include <mach/irqs.h>

#include <mach/gpio.h>

#include <mach/dma.h>
@@ -72,6 +73,8 @@ static APBC_CLK(pwm2, PXA168_PWM2, 1, 13000000); 
static APBC_CLK(pwm3, PXA168_PWM3, 1, 13000000);

static APBC_CLK(pwm4, PXA168_PWM4, 1, 13000000);



static APMU_CLK(nand, NAND, 0x01db, 208000000);



/* device and clock bindings */

static struct clk_lookup pxa168_clkregs[] = {

	INIT_CLKREG(&clk_uart1, "pxa2xx-uart.0", NULL),
@@ -82,6 +85,7 @@ static struct clk_lookup pxa168_clkregs[] = { 
	INIT_CLKREG(&clk_pwm2, "pxa168-pwm.1", NULL),

	INIT_CLKREG(&clk_pwm3, "pxa168-pwm.2", NULL),

	INIT_CLKREG(&clk_pwm4, "pxa168-pwm.3", NULL),

	INIT_CLKREG(&clk_nand, "pxa3xx-nand", NULL),

};



static int __init pxa168_init(void)
@@ -127,3 +131,4 @@ PXA168_DEVICE(pwm1, "pxa168-pwm", 0, NONE, 0xd401a000, 0x10); 
PXA168_DEVICE(pwm2, "pxa168-pwm", 1, NONE, 0xd401a400, 0x10);

PXA168_DEVICE(pwm3, "pxa168-pwm", 2, NONE, 0xd401a800, 0x10);

PXA168_DEVICE(pwm4, "pxa168-pwm", 3, NONE, 0xd401ac00, 0x10);

PXA168_DEVICE(nand, "pxa3xx-nand", -1, NAND, 0xd4283000, 0x80, 97, 99);

arch/arm/mach-mmp/pxa910.c

+4 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ static APBC_CLK(pwm2, PXA910_PWM2, 1, 13000000); 
static APBC_CLK(pwm3, PXA910_PWM3, 1, 13000000);

static APBC_CLK(pwm4, PXA910_PWM4, 1, 13000000);



static APMU_CLK(nand, NAND, 0x01db, 208000000);



/* device and clock bindings */

static struct clk_lookup pxa910_clkregs[] = {

	INIT_CLKREG(&clk_uart1, "pxa2xx-uart.0", NULL),
@@ -120,6 +122,7 @@ static struct clk_lookup pxa910_clkregs[] = { 
	INIT_CLKREG(&clk_pwm2, "pxa910-pwm.1", NULL),

	INIT_CLKREG(&clk_pwm3, "pxa910-pwm.2", NULL),

	INIT_CLKREG(&clk_pwm4, "pxa910-pwm.3", NULL),

	INIT_CLKREG(&clk_nand, "pxa3xx-nand", NULL),

};



static int __init pxa910_init(void)
@@ -174,3 +177,4 @@ PXA910_DEVICE(pwm1, "pxa910-pwm", 0, NONE, 0xd401a000, 0x10); 
PXA910_DEVICE(pwm2, "pxa910-pwm", 1, NONE, 0xd401a400, 0x10);

PXA910_DEVICE(pwm3, "pxa910-pwm", 2, NONE, 0xd401a800, 0x10);

PXA910_DEVICE(pwm4, "pxa910-pwm", 3, NONE, 0xd401ac00, 0x10);

PXA910_DEVICE(nand, "pxa3xx-nand", -1, NAND, 0xd4283000, 0x80, 97, 99);