Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76372120 authored by Michael Walle's avatar Michael Walle Committed by Andrew Lunn
Browse files

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: default avatarMichael Walle <micheal@walle.cc>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
---
v2: Add interrupts properties, although not used.
parent 278b45b0

arch/arm/boot/dts/kirkwood.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -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>;

arch/arm/mach-kirkwood/board-dt.c

+7 −1
Original line number Diff line number Diff line
@@ -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);
@@ -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[] = {