diff options
| author | Michael Walle <michael@walle.cc> | 2012-06-06 14:30:57 -0400 |
|---|---|---|
| committer | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 10:48:22 -0400 |
| commit | 763721205eaa14f097694a3b65f87b74ba6dfe40 (patch) | |
| tree | 9f69048efe9d67a61d5f23d795279ac763370e68 /arch | |
| parent | 278b45b06bf721b7cf5de67a0126786c60c720e6 (diff) | |
ARM: kirkwood: use devicetree for orion-spi
Populate the devices with auxdata to set the device names which are used by
clkdev to lookup the clocks.
Signed-off-by: Michael Walle <micheal@walle.cc>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
v2: Add interrupts properties, although not used.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood.dtsi | 10 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/board-dt.c | 8 |
2 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index cbaa7b6eb5da..3aaad7d147de 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi | |||
| @@ -60,6 +60,16 @@ | |||
| 60 | interrupts = <53>; | 60 | interrupts = <53>; |
| 61 | }; | 61 | }; |
| 62 | 62 | ||
| 63 | spi@10600 { | ||
| 64 | compatible = "marvell,orion-spi"; | ||
| 65 | #address-cells = <1>; | ||
| 66 | #size-cells = <0>; | ||
| 67 | cell-index = <0>; | ||
| 68 | interrupts = <23>; | ||
| 69 | reg = <0x10600 0x28>; | ||
| 70 | status = "disabled"; | ||
| 71 | }; | ||
| 72 | |||
| 63 | nand@3000000 { | 73 | nand@3000000 { |
| 64 | #address-cells = <1>; | 74 | #address-cells = <1>; |
| 65 | #size-cells = <1>; | 75 | #size-cells = <1>; |
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index 27ac3d84016b..8f8da5d9a8dd 100644 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c | |||
| @@ -26,6 +26,11 @@ static struct of_device_id kirkwood_dt_match_table[] __initdata = { | |||
| 26 | { } | 26 | { } |
| 27 | }; | 27 | }; |
| 28 | 28 | ||
| 29 | struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = { | ||
| 30 | OF_DEV_AUXDATA("marvell,orion-spi", 0xf1010600, "orion_spi.0", NULL), | ||
| 31 | {}, | ||
| 32 | }; | ||
| 33 | |||
| 29 | static void __init kirkwood_dt_init(void) | 34 | static void __init kirkwood_dt_init(void) |
| 30 | { | 35 | { |
| 31 | pr_info("Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk); | 36 | pr_info("Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk); |
| @@ -69,7 +74,8 @@ static void __init kirkwood_dt_init(void) | |||
| 69 | if (of_machine_is_compatible("raidsonic,ib-nas62x0")) | 74 | if (of_machine_is_compatible("raidsonic,ib-nas62x0")) |
| 70 | ib62x0_init(); | 75 | ib62x0_init(); |
| 71 | 76 | ||
| 72 | of_platform_populate(NULL, kirkwood_dt_match_table, NULL, NULL); | 77 | of_platform_populate(NULL, kirkwood_dt_match_table, |
| 78 | kirkwood_auxdata_lookup, NULL); | ||
| 73 | } | 79 | } |
| 74 | 80 | ||
| 75 | static const char *kirkwood_dt_board_compat[] = { | 81 | static const char *kirkwood_dt_board_compat[] = { |
