Skip to content

Commit e4b87e5

Browse files
trinitrini
committed
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
2 parents 3290733 + 2eda892 commit e4b87e5

37 files changed

+321
-802
lines changed

‎arch/arm/include/asm/arch-am33xx/cpu.h

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -78,58 +78,7 @@
7878

7979
#ifndef __KERNEL_STRICT_NAMES
8080
#ifndef __ASSEMBLY__
81-
struct gpmc_cs {
82-
u32 config1; /* 0x00 */
83-
u32 config2; /* 0x04 */
84-
u32 config3; /* 0x08 */
85-
u32 config4; /* 0x0C */
86-
u32 config5; /* 0x10 */
87-
u32 config6; /* 0x14 */
88-
u32 config7; /* 0x18 */
89-
u32 nand_cmd; /* 0x1C */
90-
u32 nand_adr; /* 0x20 */
91-
u32 nand_dat; /* 0x24 */
92-
u8 res[8]; /* blow up to 0x30 byte */
93-
};
94-
95-
struct bch_res_0_3 {
96-
u32 bch_result_x[4];
97-
};
98-
99-
struct gpmc {
100-
u8 res1[0x10];
101-
u32 sysconfig; /* 0x10 */
102-
u8 res2[0x4];
103-
u32 irqstatus; /* 0x18 */
104-
u32 irqenable; /* 0x1C */
105-
u8 res3[0x20];
106-
u32 timeout_control; /* 0x40 */
107-
u8 res4[0xC];
108-
u32 config; /* 0x50 */
109-
u32 status; /* 0x54 */
110-
u8 res5[0x8]; /* 0x58 */
111-
struct gpmc_cs cs[8]; /* 0x60, 0x90, .. */
112-
u8 res6[0x14]; /* 0x1E0 */
113-
u32 ecc_config; /* 0x1F4 */
114-
u32 ecc_control; /* 0x1F8 */
115-
u32 ecc_size_config; /* 0x1FC */
116-
u32 ecc1_result; /* 0x200 */
117-
u32 ecc2_result; /* 0x204 */
118-
u32 ecc3_result; /* 0x208 */
119-
u32 ecc4_result; /* 0x20C */
120-
u32 ecc5_result; /* 0x210 */
121-
u32 ecc6_result; /* 0x214 */
122-
u32 ecc7_result; /* 0x218 */
123-
u32 ecc8_result; /* 0x21C */
124-
u32 ecc9_result; /* 0x220 */
125-
u8 res7[12]; /* 0x224 */
126-
u32 testmomde_ctrl; /* 0x230 */
127-
u8 res8[12]; /* 0x234 */
128-
struct bch_res_0_3 bch_result_0_3[2]; /* 0x240 */
129-
};
13081

131-
/* Used for board specific gpmc initialization */
132-
extern struct gpmc *gpmc_cfg;
13382

13483
#ifndef CONFIG_AM43XX
13584
/* Encapsulating core pll registers */

‎arch/arm/include/asm/arch-am33xx/omap_gpmc.h

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎arch/arm/include/asm/arch-am33xx/sys_proto.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#ifndef _SYS_PROTO_H_
1212
#define _SYS_PROTO_H_
13+
#include <linux/mtd/omap_gpmc.h>
1314
#include <asm/arch/cpu.h>
1415

1516
#define BOARD_REV_ID 0x0

‎arch/arm/include/asm/arch-omap3/cpu.h

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -77,59 +77,7 @@ struct ctrl_id {
7777
#define GPMC_CONFIG_CS0_BASE (GPMC_BASE + GPMC_CONFIG_CS0)
7878

7979
#ifndef __KERNEL_STRICT_NAMES
80-
#ifndef __ASSEMBLY__
81-
struct gpmc_cs {
82-
u32 config1; /* 0x00 */
83-
u32 config2; /* 0x04 */
84-
u32 config3; /* 0x08 */
85-
u32 config4; /* 0x0C */
86-
u32 config5; /* 0x10 */
87-
u32 config6; /* 0x14 */
88-
u32 config7; /* 0x18 */
89-
u32 nand_cmd; /* 0x1C */
90-
u32 nand_adr; /* 0x20 */
91-
u32 nand_dat; /* 0x24 */
92-
u8 res[8]; /* blow up to 0x30 byte */
93-
};
94-
95-
struct bch_res_0_3 {
96-
u32 bch_result_x[4];
97-
};
98-
99-
struct gpmc {
100-
u8 res1[0x10];
101-
u32 sysconfig; /* 0x10 */
102-
u8 res2[0x4];
103-
u32 irqstatus; /* 0x18 */
104-
u32 irqenable; /* 0x1C */
105-
u8 res3[0x20];
106-
u32 timeout_control; /* 0x40 */
107-
u8 res4[0xC];
108-
u32 config; /* 0x50 */
109-
u32 status; /* 0x54 */
110-
u8 res5[0x8]; /* 0x58 */
111-
struct gpmc_cs cs[8]; /* 0x60, 0x90, .. */
112-
u8 res6[0x14]; /* 0x1E0 */
113-
u32 ecc_config; /* 0x1F4 */
114-
u32 ecc_control; /* 0x1F8 */
115-
u32 ecc_size_config; /* 0x1FC */
116-
u32 ecc1_result; /* 0x200 */
117-
u32 ecc2_result; /* 0x204 */
118-
u32 ecc3_result; /* 0x208 */
119-
u32 ecc4_result; /* 0x20C */
120-
u32 ecc5_result; /* 0x210 */
121-
u32 ecc6_result; /* 0x214 */
122-
u32 ecc7_result; /* 0x218 */
123-
u32 ecc8_result; /* 0x21C */
124-
u32 ecc9_result; /* 0x220 */
125-
u8 res7[0x1C]; /* fill up to 0x240 */
126-
struct bch_res_0_3 bch_result_0_3[7]; /* 0x240 */
127-
};
128-
129-
/* Used for board specific gpmc initialization */
130-
extern struct gpmc *gpmc_cfg;
131-
132-
#else /* __ASSEMBLY__ */
80+
#ifdef __ASSEMBLY__
13381
#define GPMC_CONFIG1 0x00
13482
#define GPMC_CONFIG2 0x04
13583
#define GPMC_CONFIG3 0x08

‎arch/arm/include/asm/arch-omap3/mem.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,16 @@ enum {
419419
#define NET_GPMC_CONFIG6 0x00000FCF
420420
#define NET_GPMC_CONFIG7 0x00000f6c
421421

422+
/* GPMC CS configuration for an SMSC LAN9221 ethernet controller */
423+
#define NET_LAN9221_GPMC_CONFIG1 0x00001000
424+
#define NET_LAN9221_GPMC_CONFIG2 0x00060700
425+
#define NET_LAN9221_GPMC_CONFIG3 0x00020201
426+
#define NET_LAN9221_GPMC_CONFIG4 0x06000700
427+
#define NET_LAN9221_GPMC_CONFIG5 0x0006090A
428+
#define NET_LAN9221_GPMC_CONFIG6 0x87030000
429+
#define NET_LAN9221_GPMC_CONFIG7 0x00000f6c
430+
431+
422432
/* max number of GPMC Chip Selects */
423433
#define GPMC_MAX_CS 8
424434
/* max number of GPMC regs */

‎arch/arm/include/asm/arch-omap3/omap_gpmc.h

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎arch/arm/include/asm/arch-omap3/sys_proto.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88
#ifndef _SYS_PROTO_H_
99
#define _SYS_PROTO_H_
10+
#include <linux/mtd/omap_gpmc.h>
1011

1112
typedef struct {
1213
u32 mtype;

‎arch/arm/include/asm/arch-omap4/cpu.h

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -14,51 +14,6 @@
1414

1515
#ifndef __KERNEL_STRICT_NAMES
1616
#ifndef __ASSEMBLY__
17-
struct gpmc_cs {
18-
u32 config1; /* 0x00 */
19-
u32 config2; /* 0x04 */
20-
u32 config3; /* 0x08 */
21-
u32 config4; /* 0x0C */
22-
u32 config5; /* 0x10 */
23-
u32 config6; /* 0x14 */
24-
u32 config7; /* 0x18 */
25-
u32 nand_cmd; /* 0x1C */
26-
u32 nand_adr; /* 0x20 */
27-
u32 nand_dat; /* 0x24 */
28-
u8 res[8]; /* blow up to 0x30 byte */
29-
};
30-
31-
struct gpmc {
32-
u8 res1[0x10];
33-
u32 sysconfig; /* 0x10 */
34-
u8 res2[0x4];
35-
u32 irqstatus; /* 0x18 */
36-
u32 irqenable; /* 0x1C */
37-
u8 res3[0x20];
38-
u32 timeout_control; /* 0x40 */
39-
u8 res4[0xC];
40-
u32 config; /* 0x50 */
41-
u32 status; /* 0x54 */
42-
u8 res5[0x8]; /* 0x58 */
43-
struct gpmc_cs cs[8]; /* 0x60, 0x90, .. */
44-
u8 res6[0x14]; /* 0x1E0 */
45-
u32 ecc_config; /* 0x1F4 */
46-
u32 ecc_control; /* 0x1F8 */
47-
u32 ecc_size_config; /* 0x1FC */
48-
u32 ecc1_result; /* 0x200 */
49-
u32 ecc2_result; /* 0x204 */
50-
u32 ecc3_result; /* 0x208 */
51-
u32 ecc4_result; /* 0x20C */
52-
u32 ecc5_result; /* 0x210 */
53-
u32 ecc6_result; /* 0x214 */
54-
u32 ecc7_result; /* 0x218 */
55-
u32 ecc8_result; /* 0x21C */
56-
u32 ecc9_result; /* 0x220 */
57-
};
58-
59-
/* Used for board specific gpmc initialization */
60-
extern struct gpmc *gpmc_cfg;
61-
6217
struct gptimer {
6318
u32 tidr; /* 0x00 r */
6419
u8 res[0xc];

‎arch/arm/include/asm/arch-omap4/sys_proto.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <asm/arch/clock.h>
1313
#include <asm/io.h>
1414
#include <asm/omap_common.h>
15+
#include <linux/mtd/omap_gpmc.h>
1516
#include <asm/arch/mux_omap4.h>
1617

1718
DECLARE_GLOBAL_DATA_PTR;

‎arch/arm/include/asm/arch-omap5/cpu.h

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -16,51 +16,6 @@
1616

1717
#ifndef __KERNEL_STRICT_NAMES
1818
#ifndef __ASSEMBLY__
19-
struct gpmc_cs {
20-
u32 config1; /* 0x00 */
21-
u32 config2; /* 0x04 */
22-
u32 config3; /* 0x08 */
23-
u32 config4; /* 0x0C */
24-
u32 config5; /* 0x10 */
25-
u32 config6; /* 0x14 */
26-
u32 config7; /* 0x18 */
27-
u32 nand_cmd; /* 0x1C */
28-
u32 nand_adr; /* 0x20 */
29-
u32 nand_dat; /* 0x24 */
30-
u8 res[8]; /* blow up to 0x30 byte */
31-
};
32-
33-
struct gpmc {
34-
u8 res1[0x10];
35-
u32 sysconfig; /* 0x10 */
36-
u8 res2[0x4];
37-
u32 irqstatus; /* 0x18 */
38-
u32 irqenable; /* 0x1C */
39-
u8 res3[0x20];
40-
u32 timeout_control; /* 0x40 */
41-
u8 res4[0xC];
42-
u32 config; /* 0x50 */
43-
u32 status; /* 0x54 */
44-
u8 res5[0x8]; /* 0x58 */
45-
struct gpmc_cs cs[8]; /* 0x60, 0x90, .. */
46-
u8 res6[0x14]; /* 0x1E0 */
47-
u32 ecc_config; /* 0x1F4 */
48-
u32 ecc_control; /* 0x1F8 */
49-
u32 ecc_size_config; /* 0x1FC */
50-
u32 ecc1_result; /* 0x200 */
51-
u32 ecc2_result; /* 0x204 */
52-
u32 ecc3_result; /* 0x208 */
53-
u32 ecc4_result; /* 0x20C */
54-
u32 ecc5_result; /* 0x210 */
55-
u32 ecc6_result; /* 0x214 */
56-
u32 ecc7_result; /* 0x218 */
57-
u32 ecc8_result; /* 0x21C */
58-
u32 ecc9_result; /* 0x220 */
59-
};
60-
61-
/* Used for board specific gpmc initialization */
62-
extern struct gpmc *gpmc_cfg;
63-
6419
struct gptimer {
6520
u32 tidr; /* 0x00 r */
6621
u8 res1[0xc];

‎arch/arm/include/asm/arch-omap5/sys_proto.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <asm/io.h>
1313
#include <asm/arch/clock.h>
1414
#include <asm/omap_common.h>
15+
#include <linux/mtd/omap_gpmc.h>
1516
#include <asm/arch/clock.h>
1617

1718
DECLARE_GLOBAL_DATA_PTR;

0 commit comments

Comments
 (0)