diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-30 01:02:32 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-30 01:02:32 -0400 |
commit | 7e3f36c3e107bd76b6709e358b1e7c703fb6f81a (patch) | |
tree | 16d542955f2c2a3c8c84fde34be773610b65dee1 | |
parent | 1caca371e80b0d40352512806368f6ff43e2cf52 (diff) | |
parent | ff349103964d43c28b7b80bdecf7ace0113b3dda (diff) |
Merge commit 'jwb/next' into next
-rw-r--r-- | arch/powerpc/boot/dts/canyonlands.dts | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/glacier.dts | 4 | ||||
-rw-r--r-- | arch/powerpc/kernel/cputable.c | 118 | ||||
-rw-r--r-- | arch/powerpc/platforms/40x/Kconfig | 16 | ||||
-rw-r--r-- | drivers/mtd/maps/Kconfig | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/redwood.c | 43 | ||||
-rw-r--r-- | drivers/net/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/smc91x.h | 37 |
8 files changed, 117 insertions, 109 deletions
diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts index cd56bb5b347b..5806ef0b860b 100644 --- a/arch/powerpc/boot/dts/canyonlands.dts +++ b/arch/powerpc/boot/dts/canyonlands.dts | |||
@@ -270,7 +270,7 @@ | |||
270 | clock-frequency = <0>; /* Filled in by U-Boot */ | 270 | clock-frequency = <0>; /* Filled in by U-Boot */ |
271 | current-speed = <0>; /* Filled in by U-Boot */ | 271 | current-speed = <0>; /* Filled in by U-Boot */ |
272 | interrupt-parent = <&UIC1>; | 272 | interrupt-parent = <&UIC1>; |
273 | interrupts = <0x1d 0x4>; | 273 | interrupts = <28 0x4>; |
274 | }; | 274 | }; |
275 | 275 | ||
276 | UART3: serial@ef600600 { | 276 | UART3: serial@ef600600 { |
@@ -281,7 +281,7 @@ | |||
281 | clock-frequency = <0>; /* Filled in by U-Boot */ | 281 | clock-frequency = <0>; /* Filled in by U-Boot */ |
282 | current-speed = <0>; /* Filled in by U-Boot */ | 282 | current-speed = <0>; /* Filled in by U-Boot */ |
283 | interrupt-parent = <&UIC1>; | 283 | interrupt-parent = <&UIC1>; |
284 | interrupts = <0x1e 0x4>; | 284 | interrupts = <29 0x4>; |
285 | }; | 285 | }; |
286 | 286 | ||
287 | IIC0: i2c@ef600700 { | 287 | IIC0: i2c@ef600700 { |
diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts index d62a4fb6f93c..e618fc4cbc9e 100644 --- a/arch/powerpc/boot/dts/glacier.dts +++ b/arch/powerpc/boot/dts/glacier.dts | |||
@@ -259,7 +259,7 @@ | |||
259 | clock-frequency = <0>; /* Filled in by U-Boot */ | 259 | clock-frequency = <0>; /* Filled in by U-Boot */ |
260 | current-speed = <0>; /* Filled in by U-Boot */ | 260 | current-speed = <0>; /* Filled in by U-Boot */ |
261 | interrupt-parent = <&UIC1>; | 261 | interrupt-parent = <&UIC1>; |
262 | interrupts = <0x1d 0x4>; | 262 | interrupts = <28 0x4>; |
263 | }; | 263 | }; |
264 | 264 | ||
265 | UART3: serial@ef600600 { | 265 | UART3: serial@ef600600 { |
@@ -270,7 +270,7 @@ | |||
270 | clock-frequency = <0>; /* Filled in by U-Boot */ | 270 | clock-frequency = <0>; /* Filled in by U-Boot */ |
271 | current-speed = <0>; /* Filled in by U-Boot */ | 271 | current-speed = <0>; /* Filled in by U-Boot */ |
272 | interrupt-parent = <&UIC1>; | 272 | interrupt-parent = <&UIC1>; |
273 | interrupts = <0x1e 0x4>; | 273 | interrupts = <29 0x4>; |
274 | }; | 274 | }; |
275 | 275 | ||
276 | IIC0: i2c@ef600700 { | 276 | IIC0: i2c@ef600700 { |
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 87aa0f3c6047..65e2b4e10f97 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
@@ -1364,10 +1364,10 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
1364 | .machine_check = machine_check_4xx, | 1364 | .machine_check = machine_check_4xx, |
1365 | .platform = "ppc405", | 1365 | .platform = "ppc405", |
1366 | }, | 1366 | }, |
1367 | { /* 405EX */ | 1367 | { /* 405EX Rev. A/B with Security */ |
1368 | .pvr_mask = 0xffff0004, | 1368 | .pvr_mask = 0xffff000f, |
1369 | .pvr_value = 0x12910004, | 1369 | .pvr_value = 0x12910007, |
1370 | .cpu_name = "405EX", | 1370 | .cpu_name = "405EX Rev. A/B", |
1371 | .cpu_features = CPU_FTRS_40X, | 1371 | .cpu_features = CPU_FTRS_40X, |
1372 | .cpu_user_features = PPC_FEATURE_32 | | 1372 | .cpu_user_features = PPC_FEATURE_32 | |
1373 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, | 1373 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, |
@@ -1377,10 +1377,114 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
1377 | .machine_check = machine_check_4xx, | 1377 | .machine_check = machine_check_4xx, |
1378 | .platform = "ppc405", | 1378 | .platform = "ppc405", |
1379 | }, | 1379 | }, |
1380 | { /* 405EXr */ | 1380 | { /* 405EX Rev. C without Security */ |
1381 | .pvr_mask = 0xffff0004, | 1381 | .pvr_mask = 0xffff000f, |
1382 | .pvr_value = 0x1291000d, | ||
1383 | .cpu_name = "405EX Rev. C", | ||
1384 | .cpu_features = CPU_FTRS_40X, | ||
1385 | .cpu_user_features = PPC_FEATURE_32 | | ||
1386 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, | ||
1387 | .mmu_features = MMU_FTR_TYPE_40x, | ||
1388 | .icache_bsize = 32, | ||
1389 | .dcache_bsize = 32, | ||
1390 | .machine_check = machine_check_4xx, | ||
1391 | .platform = "ppc405", | ||
1392 | }, | ||
1393 | { /* 405EX Rev. C with Security */ | ||
1394 | .pvr_mask = 0xffff000f, | ||
1395 | .pvr_value = 0x1291000f, | ||
1396 | .cpu_name = "405EX Rev. C", | ||
1397 | .cpu_features = CPU_FTRS_40X, | ||
1398 | .cpu_user_features = PPC_FEATURE_32 | | ||
1399 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, | ||
1400 | .mmu_features = MMU_FTR_TYPE_40x, | ||
1401 | .icache_bsize = 32, | ||
1402 | .dcache_bsize = 32, | ||
1403 | .machine_check = machine_check_4xx, | ||
1404 | .platform = "ppc405", | ||
1405 | }, | ||
1406 | { /* 405EX Rev. D without Security */ | ||
1407 | .pvr_mask = 0xffff000f, | ||
1408 | .pvr_value = 0x12910003, | ||
1409 | .cpu_name = "405EX Rev. D", | ||
1410 | .cpu_features = CPU_FTRS_40X, | ||
1411 | .cpu_user_features = PPC_FEATURE_32 | | ||
1412 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, | ||
1413 | .mmu_features = MMU_FTR_TYPE_40x, | ||
1414 | .icache_bsize = 32, | ||
1415 | .dcache_bsize = 32, | ||
1416 | .machine_check = machine_check_4xx, | ||
1417 | .platform = "ppc405", | ||
1418 | }, | ||
1419 | { /* 405EX Rev. D with Security */ | ||
1420 | .pvr_mask = 0xffff000f, | ||
1421 | .pvr_value = 0x12910005, | ||
1422 | .cpu_name = "405EX Rev. D", | ||
1423 | .cpu_features = CPU_FTRS_40X, | ||
1424 | .cpu_user_features = PPC_FEATURE_32 | | ||
1425 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, | ||
1426 | .mmu_features = MMU_FTR_TYPE_40x, | ||
1427 | .icache_bsize = 32, | ||
1428 | .dcache_bsize = 32, | ||
1429 | .machine_check = machine_check_4xx, | ||
1430 | .platform = "ppc405", | ||
1431 | }, | ||
1432 | { /* 405EXr Rev. A/B without Security */ | ||
1433 | .pvr_mask = 0xffff000f, | ||
1434 | .pvr_value = 0x12910001, | ||
1435 | .cpu_name = "405EXr Rev. A/B", | ||
1436 | .cpu_features = CPU_FTRS_40X, | ||
1437 | .cpu_user_features = PPC_FEATURE_32 | | ||
1438 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, | ||
1439 | .mmu_features = MMU_FTR_TYPE_40x, | ||
1440 | .icache_bsize = 32, | ||
1441 | .dcache_bsize = 32, | ||
1442 | .machine_check = machine_check_4xx, | ||
1443 | .platform = "ppc405", | ||
1444 | }, | ||
1445 | { /* 405EXr Rev. C without Security */ | ||
1446 | .pvr_mask = 0xffff000f, | ||
1447 | .pvr_value = 0x12910009, | ||
1448 | .cpu_name = "405EXr Rev. C", | ||
1449 | .cpu_features = CPU_FTRS_40X, | ||
1450 | .cpu_user_features = PPC_FEATURE_32 | | ||
1451 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, | ||
1452 | .mmu_features = MMU_FTR_TYPE_40x, | ||
1453 | .icache_bsize = 32, | ||
1454 | .dcache_bsize = 32, | ||
1455 | .machine_check = machine_check_4xx, | ||
1456 | .platform = "ppc405", | ||
1457 | }, | ||
1458 | { /* 405EXr Rev. C with Security */ | ||
1459 | .pvr_mask = 0xffff000f, | ||
1460 | .pvr_value = 0x1291000b, | ||
1461 | .cpu_name = "405EXr Rev. C", | ||
1462 | .cpu_features = CPU_FTRS_40X, | ||
1463 | .cpu_user_features = PPC_FEATURE_32 | | ||
1464 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, | ||
1465 | .mmu_features = MMU_FTR_TYPE_40x, | ||
1466 | .icache_bsize = 32, | ||
1467 | .dcache_bsize = 32, | ||
1468 | .machine_check = machine_check_4xx, | ||
1469 | .platform = "ppc405", | ||
1470 | }, | ||
1471 | { /* 405EXr Rev. D without Security */ | ||
1472 | .pvr_mask = 0xffff000f, | ||
1382 | .pvr_value = 0x12910000, | 1473 | .pvr_value = 0x12910000, |
1383 | .cpu_name = "405EXr", | 1474 | .cpu_name = "405EXr Rev. D", |
1475 | .cpu_features = CPU_FTRS_40X, | ||
1476 | .cpu_user_features = PPC_FEATURE_32 | | ||
1477 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, | ||
1478 | .mmu_features = MMU_FTR_TYPE_40x, | ||
1479 | .icache_bsize = 32, | ||
1480 | .dcache_bsize = 32, | ||
1481 | .machine_check = machine_check_4xx, | ||
1482 | .platform = "ppc405", | ||
1483 | }, | ||
1484 | { /* 405EXr Rev. D with Security */ | ||
1485 | .pvr_mask = 0xffff000f, | ||
1486 | .pvr_value = 0x12910002, | ||
1487 | .cpu_name = "405EXr Rev. D", | ||
1384 | .cpu_features = CPU_FTRS_40X, | 1488 | .cpu_features = CPU_FTRS_40X, |
1385 | .cpu_user_features = PPC_FEATURE_32 | | 1489 | .cpu_user_features = PPC_FEATURE_32 | |
1386 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, | 1490 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, |
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig index ec64264f7a50..b72176434ebe 100644 --- a/arch/powerpc/platforms/40x/Kconfig +++ b/arch/powerpc/platforms/40x/Kconfig | |||
@@ -71,22 +71,6 @@ config MAKALU | |||
71 | help | 71 | help |
72 | This option enables support for the AMCC PPC405EX board. | 72 | This option enables support for the AMCC PPC405EX board. |
73 | 73 | ||
74 | #config REDWOOD_5 | ||
75 | # bool "Redwood-5" | ||
76 | # depends on 40x | ||
77 | # default n | ||
78 | # select STB03xxx | ||
79 | # help | ||
80 | # This option enables support for the IBM STB04 evaluation board. | ||
81 | |||
82 | #config REDWOOD_6 | ||
83 | # bool "Redwood-6" | ||
84 | # depends on 40x | ||
85 | # default n | ||
86 | # select STB03xxx | ||
87 | # help | ||
88 | # This option enables support for the IBM STBx25xx evaluation board. | ||
89 | |||
90 | #config SYCAMORE | 74 | #config SYCAMORE |
91 | # bool "Sycamore" | 75 | # bool "Sycamore" |
92 | # depends on 40x | 76 | # depends on 40x |
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index f22bc9f05ddb..6629d09f3b38 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
@@ -321,7 +321,7 @@ config MTD_CFI_FLAGADM | |||
321 | 321 | ||
322 | config MTD_REDWOOD | 322 | config MTD_REDWOOD |
323 | tristate "CFI Flash devices mapped on IBM Redwood" | 323 | tristate "CFI Flash devices mapped on IBM Redwood" |
324 | depends on MTD_CFI && ( REDWOOD_4 || REDWOOD_5 || REDWOOD_6 ) | 324 | depends on MTD_CFI |
325 | help | 325 | help |
326 | This enables access routines for the flash chips on the IBM | 326 | This enables access routines for the flash chips on the IBM |
327 | Redwood board. If you have one of these boards and would like to | 327 | Redwood board. If you have one of these boards and would like to |
diff --git a/drivers/mtd/maps/redwood.c b/drivers/mtd/maps/redwood.c index 933c0b63b016..d2c9db00db0c 100644 --- a/drivers/mtd/maps/redwood.c +++ b/drivers/mtd/maps/redwood.c | |||
@@ -22,8 +22,6 @@ | |||
22 | 22 | ||
23 | #include <asm/io.h> | 23 | #include <asm/io.h> |
24 | 24 | ||
25 | #if !defined (CONFIG_REDWOOD_6) | ||
26 | |||
27 | #define WINDOW_ADDR 0xffc00000 | 25 | #define WINDOW_ADDR 0xffc00000 |
28 | #define WINDOW_SIZE 0x00400000 | 26 | #define WINDOW_SIZE 0x00400000 |
29 | 27 | ||
@@ -69,47 +67,6 @@ static struct mtd_partition redwood_flash_partitions[] = { | |||
69 | } | 67 | } |
70 | }; | 68 | }; |
71 | 69 | ||
72 | #else /* CONFIG_REDWOOD_6 */ | ||
73 | /* FIXME: the window is bigger - armin */ | ||
74 | #define WINDOW_ADDR 0xff800000 | ||
75 | #define WINDOW_SIZE 0x00800000 | ||
76 | |||
77 | #define RW_PART0_OF 0 | ||
78 | #define RW_PART0_SZ 0x400000 /* 4 MiB data */ | ||
79 | #define RW_PART1_OF RW_PART0_OF + RW_PART0_SZ | ||
80 | #define RW_PART1_SZ 0x10000 /* 64K VPD */ | ||
81 | #define RW_PART2_OF RW_PART1_OF + RW_PART1_SZ | ||
82 | #define RW_PART2_SZ 0x400000 - (0x10000 + 0x20000) | ||
83 | #define RW_PART3_OF RW_PART2_OF + RW_PART2_SZ | ||
84 | #define RW_PART3_SZ 0x20000 | ||
85 | |||
86 | static struct mtd_partition redwood_flash_partitions[] = { | ||
87 | { | ||
88 | .name = "Redwood filesystem", | ||
89 | .offset = RW_PART0_OF, | ||
90 | .size = RW_PART0_SZ | ||
91 | }, | ||
92 | { | ||
93 | .name = "Redwood OpenBIOS Vital Product Data", | ||
94 | .offset = RW_PART1_OF, | ||
95 | .size = RW_PART1_SZ, | ||
96 | .mask_flags = MTD_WRITEABLE /* force read-only */ | ||
97 | }, | ||
98 | { | ||
99 | .name = "Redwood kernel", | ||
100 | .offset = RW_PART2_OF, | ||
101 | .size = RW_PART2_SZ | ||
102 | }, | ||
103 | { | ||
104 | .name = "Redwood OpenBIOS", | ||
105 | .offset = RW_PART3_OF, | ||
106 | .size = RW_PART3_SZ, | ||
107 | .mask_flags = MTD_WRITEABLE /* force read-only */ | ||
108 | } | ||
109 | }; | ||
110 | |||
111 | #endif /* CONFIG_REDWOOD_6 */ | ||
112 | |||
113 | struct map_info redwood_flash_map = { | 70 | struct map_info redwood_flash_map = { |
114 | .name = "IBM Redwood", | 71 | .name = "IBM Redwood", |
115 | .size = WINDOW_SIZE, | 72 | .size = WINDOW_SIZE, |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ce2fcdd4ab90..313d3060fc1d 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -913,7 +913,7 @@ config SMC91X | |||
913 | tristate "SMC 91C9x/91C1xxx support" | 913 | tristate "SMC 91C9x/91C1xxx support" |
914 | select CRC32 | 914 | select CRC32 |
915 | select MII | 915 | select MII |
916 | depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \ | 916 | depends on ARM || M32R || SUPERH || \ |
917 | MIPS || BLACKFIN || MN10300 || COLDFIRE | 917 | MIPS || BLACKFIN || MN10300 || COLDFIRE |
918 | help | 918 | help |
919 | This is a driver for SMC's 91x series of Ethernet chipsets, | 919 | This is a driver for SMC's 91x series of Ethernet chipsets, |
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 8d2772cc42f2..ee747919a766 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
@@ -83,43 +83,6 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg) | |||
83 | } | 83 | } |
84 | } | 84 | } |
85 | 85 | ||
86 | #elif defined(CONFIG_REDWOOD_5) || defined(CONFIG_REDWOOD_6) | ||
87 | |||
88 | /* We can only do 16-bit reads and writes in the static memory space. */ | ||
89 | #define SMC_CAN_USE_8BIT 0 | ||
90 | #define SMC_CAN_USE_16BIT 1 | ||
91 | #define SMC_CAN_USE_32BIT 0 | ||
92 | #define SMC_NOWAIT 1 | ||
93 | |||
94 | #define SMC_IO_SHIFT 0 | ||
95 | |||
96 | #define SMC_inw(a, r) in_be16((volatile u16 *)((a) + (r))) | ||
97 | #define SMC_outw(v, a, r) out_be16((volatile u16 *)((a) + (r)), v) | ||
98 | #define SMC_insw(a, r, p, l) \ | ||
99 | do { \ | ||
100 | unsigned long __port = (a) + (r); \ | ||
101 | u16 *__p = (u16 *)(p); \ | ||
102 | int __l = (l); \ | ||
103 | insw(__port, __p, __l); \ | ||
104 | while (__l > 0) { \ | ||
105 | *__p = swab16(*__p); \ | ||
106 | __p++; \ | ||
107 | __l--; \ | ||
108 | } \ | ||
109 | } while (0) | ||
110 | #define SMC_outsw(a, r, p, l) \ | ||
111 | do { \ | ||
112 | unsigned long __port = (a) + (r); \ | ||
113 | u16 *__p = (u16 *)(p); \ | ||
114 | int __l = (l); \ | ||
115 | while (__l > 0) { \ | ||
116 | /* Believe it or not, the swab isn't needed. */ \ | ||
117 | outw( /* swab16 */ (*__p++), __port); \ | ||
118 | __l--; \ | ||
119 | } \ | ||
120 | } while (0) | ||
121 | #define SMC_IRQ_FLAGS (0) | ||
122 | |||
123 | #elif defined(CONFIG_SA1100_PLEB) | 86 | #elif defined(CONFIG_SA1100_PLEB) |
124 | /* We can only do 16-bit reads and writes in the static memory space. */ | 87 | /* We can only do 16-bit reads and writes in the static memory space. */ |
125 | #define SMC_CAN_USE_8BIT 1 | 88 | #define SMC_CAN_USE_8BIT 1 |