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

Commit 1e7bad0f authored by Andrew Lunn's avatar Andrew Lunn
Browse files

ARM: Orion: DTify the watchdog timer. 



Add device tree support to the Orion watchdog timer, and enable its
use in the kirkwood devices using device tree.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Acked-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@googlemail.com>
Tested-by: default avatarSimon Baatz <gmbnomis@gmail.com>
parent e91cac0a

Documentation/devicetree/bindings/watchdog/marvel.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
* Marvell Orion Watchdog Time



Required Properties:



- Compatibility : "marvell,orion-wdt"

- reg		: Address of the timer registers



Example:



	wdt@20300 {

		compatible = "marvell,orion-wdt";

		reg = <0x20300 0x28>;

		status = "okay";

	};

arch/arm/boot/dts/kirkwood.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -70,6 +70,12 @@ 
			status = "disabled";

		};



		wdt@20300 {

			compatible = "marvell,orion-wdt";

			reg = <0x20300 0x28>;

			status = "okay";

		};



		nand@3000000 {

			#address-cells = <1>;

			#size-cells = <1>;

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

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("marvell,orion-spi", 0xf1010600, "orion_spi.0", NULL),

	OF_DEV_AUXDATA("marvell,mv64xxx-i2c", 0xf1011000, "mv64xxx_i2c.0",

		       NULL),

	OF_DEV_AUXDATA("marvell,orion-wdt", 0xf1020300, "orion_wdt", NULL),

	{},

};
@@ -55,7 +56,6 @@ static void __init kirkwood_dt_init(void) 
	kirkwood_clk_init();



	/* internal devices that every board has */

	kirkwood_wdt_init();

	kirkwood_xor0_init();

	kirkwood_xor1_init();

	kirkwood_crypto_init();

drivers/watchdog/orion_wdt.c

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/io.h>

#include <linux/spinlock.h>

#include <linux/clk.h>

#include <linux/of.h>

#include <mach/bridge-regs.h>



/*
@@ -295,6 +296,12 @@ static void orion_wdt_shutdown(struct platform_device *pdev) 
		orion_wdt_disable();

}



static const struct of_device_id orion_wdt_of_match_table[] __devinitdata = {

	{ .compatible = "marvell,orion-wdt", },

	{},

};

MODULE_DEVICE_TABLE(of, orion_wdt_of_match_table);



static struct platform_driver orion_wdt_driver = {

	.probe		= orion_wdt_probe,

	.remove		= __devexit_p(orion_wdt_remove),
@@ -302,6 +309,7 @@ static struct platform_driver orion_wdt_driver = { 
	.driver		= {

		.owner	= THIS_MODULE,

		.name	= "orion_wdt",

		.of_match_table = of_match_ptr(orion_wdt_of_match_table),

	},

};