Skip to content

Commit

Permalink
ARM: kirkwood: use devicetree for orion-spi
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Michael Walle authored and Andrew Lunn committed Jul 27, 2012
1 parent 278b45b commit 7637212
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
10 changes: 10 additions & 0 deletions arch/arm/boot/dts/kirkwood.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,16 @@
interrupts = <53>;
};

spi@10600 {
compatible = "marvell,orion-spi";
#address-cells = <1>;
#size-cells = <0>;
cell-index = <0>;
interrupts = <23>;
reg = <0x10600 0x28>;
status = "disabled";
};

nand@3000000 {
#address-cells = <1>;
#size-cells = <1>;
Expand Down
8 changes: 7 additions & 1 deletion arch/arm/mach-kirkwood/board-dt.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ static struct of_device_id kirkwood_dt_match_table[] __initdata = {
{ }
};

struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = {
OF_DEV_AUXDATA("marvell,orion-spi", 0xf1010600, "orion_spi.0", NULL),
{},
};

static void __init kirkwood_dt_init(void)
{
pr_info("Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk);
Expand Down Expand Up @@ -69,7 +74,8 @@ static void __init kirkwood_dt_init(void)
if (of_machine_is_compatible("raidsonic,ib-nas62x0"))
ib62x0_init();

of_platform_populate(NULL, kirkwood_dt_match_table, NULL, NULL);
of_platform_populate(NULL, kirkwood_dt_match_table,
kirkwood_auxdata_lookup, NULL);
}

static const char *kirkwood_dt_board_compat[] = {
Expand Down

0 comments on commit 7637212

Please sign in to comment.