diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 20:58:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 20:58:22 -0500 |
commit | e4e88f31bcb5f05f24b9ae518d4ecb44e1a7774d (patch) | |
tree | 9eef6998f5bbd1a2c999011d9e0151f00c6e7297 /arch/powerpc/platforms/83xx/mpc831x_rdb.c | |
parent | 9753dfe19a85e7e45a34a56f4cb2048bb4f50e27 (diff) | |
parent | ef88e3911c0e0301e73fa3b3b2567aabdbe17cc4 (diff) |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (185 commits)
powerpc: fix compile error with 85xx/p1010rdb.c
powerpc: fix compile error with 85xx/p1023_rds.c
powerpc/fsl: add MSI support for the Freescale hypervisor
arch/powerpc/sysdev/fsl_rmu.c: introduce missing kfree
powerpc/fsl: Add support for Integrated Flash Controller
powerpc/fsl: update compatiable on fsl 16550 uart nodes
powerpc/85xx: fix PCI and localbus properties in p1022ds.dts
powerpc/85xx: re-enable ePAPR byte channel driver in corenet32_smp_defconfig
powerpc/fsl: Update defconfigs to enable some standard FSL HW features
powerpc: Add TBI PHY node to first MDIO bus
sbc834x: put full compat string in board match check
powerpc/fsl-pci: Allow 64-bit PCIe devices to DMA to any memory address
powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit
offb: Fix setting of the pseudo-palette for >8bpp
offb: Add palette hack for qemu "standard vga" framebuffer
offb: Fix bug in calculating requested vram size
powerpc/boot: Change the WARN to INFO for boot wrapper overlap message
powerpc/44x: Fix build error on currituck platform
powerpc/boot: Change the load address for the wrapper to fit the kernel
powerpc/44x: Enable CRASH_DUMP for 440x
...
Fix up a trivial conflict in arch/powerpc/include/asm/cputime.h due to
the additional sparse-checking code for cputime_t.
Diffstat (limited to 'arch/powerpc/platforms/83xx/mpc831x_rdb.c')
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc831x_rdb.c | 43 |
1 files changed, 3 insertions, 40 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c index f859ead49a8..fa25977c52d 100644 --- a/arch/powerpc/platforms/83xx/mpc831x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c | |||
@@ -28,38 +28,13 @@ | |||
28 | */ | 28 | */ |
29 | static void __init mpc831x_rdb_setup_arch(void) | 29 | static void __init mpc831x_rdb_setup_arch(void) |
30 | { | 30 | { |
31 | #ifdef CONFIG_PCI | ||
32 | struct device_node *np; | ||
33 | #endif | ||
34 | |||
35 | if (ppc_md.progress) | 31 | if (ppc_md.progress) |
36 | ppc_md.progress("mpc831x_rdb_setup_arch()", 0); | 32 | ppc_md.progress("mpc831x_rdb_setup_arch()", 0); |
37 | 33 | ||
38 | #ifdef CONFIG_PCI | 34 | mpc83xx_setup_pci(); |
39 | for_each_compatible_node(np, "pci", "fsl,mpc8349-pci") | ||
40 | mpc83xx_add_bridge(np); | ||
41 | for_each_compatible_node(np, "pci", "fsl,mpc8314-pcie") | ||
42 | mpc83xx_add_bridge(np); | ||
43 | #endif | ||
44 | mpc831x_usb_cfg(); | 35 | mpc831x_usb_cfg(); |
45 | } | 36 | } |
46 | 37 | ||
47 | static void __init mpc831x_rdb_init_IRQ(void) | ||
48 | { | ||
49 | struct device_node *np; | ||
50 | |||
51 | np = of_find_node_by_type(NULL, "ipic"); | ||
52 | if (!np) | ||
53 | return; | ||
54 | |||
55 | ipic_init(np, 0); | ||
56 | |||
57 | /* Initialize the default interrupt mapping priorities, | ||
58 | * in case the boot rom changed something on us. | ||
59 | */ | ||
60 | ipic_set_default_priority(); | ||
61 | } | ||
62 | |||
63 | static const char *board[] __initdata = { | 38 | static const char *board[] __initdata = { |
64 | "MPC8313ERDB", | 39 | "MPC8313ERDB", |
65 | "fsl,mpc8315erdb", | 40 | "fsl,mpc8315erdb", |
@@ -74,25 +49,13 @@ static int __init mpc831x_rdb_probe(void) | |||
74 | return of_flat_dt_match(of_get_flat_dt_root(), board); | 49 | return of_flat_dt_match(of_get_flat_dt_root(), board); |
75 | } | 50 | } |
76 | 51 | ||
77 | static struct of_device_id __initdata of_bus_ids[] = { | 52 | machine_device_initcall(mpc831x_rdb, mpc83xx_declare_of_platform_devices); |
78 | { .compatible = "simple-bus" }, | ||
79 | { .compatible = "gianfar" }, | ||
80 | { .compatible = "gpio-leds", }, | ||
81 | {}, | ||
82 | }; | ||
83 | |||
84 | static int __init declare_of_platform_devices(void) | ||
85 | { | ||
86 | of_platform_bus_probe(NULL, of_bus_ids, NULL); | ||
87 | return 0; | ||
88 | } | ||
89 | machine_device_initcall(mpc831x_rdb, declare_of_platform_devices); | ||
90 | 53 | ||
91 | define_machine(mpc831x_rdb) { | 54 | define_machine(mpc831x_rdb) { |
92 | .name = "MPC831x RDB", | 55 | .name = "MPC831x RDB", |
93 | .probe = mpc831x_rdb_probe, | 56 | .probe = mpc831x_rdb_probe, |
94 | .setup_arch = mpc831x_rdb_setup_arch, | 57 | .setup_arch = mpc831x_rdb_setup_arch, |
95 | .init_IRQ = mpc831x_rdb_init_IRQ, | 58 | .init_IRQ = mpc83xx_ipic_init_IRQ, |
96 | .get_irq = ipic_get_irq, | 59 | .get_irq = ipic_get_irq, |
97 | .restart = mpc83xx_restart, | 60 | .restart = mpc83xx_restart, |
98 | .time_init = mpc83xx_time_init, | 61 | .time_init = mpc83xx_time_init, |