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

Commit 3e0113a8 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Wim Van Sebroeck
Browse files

watchdog: ep93xx: Convert the watchdog driver into a platform device. 



Convert the ep93xx watchdog driver into a platform device and
remove it's dependency on <mach/hardware.h>.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarRyan Mallon <rmallon@gmail.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@iki.fi>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 0197c1c4

arch/arm/mach-ep93xx/core.c

+15 −0
Original line number Diff line number Diff line
@@ -845,6 +845,20 @@ void __init ep93xx_register_ac97(void) 
	platform_device_register(&ep93xx_pcm_device);

}



/*************************************************************************

 * EP93xx Watchdog

 *************************************************************************/

static struct resource ep93xx_wdt_resources[] = {

	DEFINE_RES_MEM(EP93XX_WATCHDOG_PHYS_BASE, 0x08),

};



static struct platform_device ep93xx_wdt_device = {

	.name		= "ep93xx-wdt",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(ep93xx_wdt_resources),

	.resource	= ep93xx_wdt_resources,

};



void __init ep93xx_init_devices(void)

{

	/* Disallow access to MaverickCrunch initially */
@@ -860,6 +874,7 @@ void __init ep93xx_init_devices(void) 
	platform_device_register(&ep93xx_rtc_device);

	platform_device_register(&ep93xx_ohci_device);

	platform_device_register(&ep93xx_leds);

	platform_device_register(&ep93xx_wdt_device);

}



void ep93xx_restart(char mode, const char *cmd)

arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ 
#define EP93XX_SYSCON_SYSCFG_LCSN1	(1<<0)

#define EP93XX_SYSCON_SWLOCK		EP93XX_SYSCON_REG(0xc0)



#define EP93XX_WATCHDOG_PHYS_BASE	EP93XX_APB_PHYS(0x00140000)

#define EP93XX_WATCHDOG_BASE		EP93XX_APB_IOMEM(0x00140000)

drivers/watchdog/ep93xx_wdt.c

+37 −14
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/platform_device.h>

#include <linux/module.h>

#include <linux/fs.h>

#include <linux/miscdevice.h>
@@ -32,7 +33,6 @@ 
#include <linux/timer.h>

#include <linux/uaccess.h>

#include <linux/io.h>

#include <mach/hardware.h>



#define WDT_VERSION	"0.3"
@@ -42,6 +42,7 @@ 
static bool nowayout = WATCHDOG_NOWAYOUT;

static int timeout = WDT_TIMEOUT;



static void __iomem *mmio_base;

static struct timer_list timer;

static unsigned long next_heartbeat;

static unsigned long wdt_status;
@@ -50,26 +51,25 @@ static unsigned long boot_status; 
#define WDT_IN_USE		0

#define WDT_OK_TO_CLOSE		1



#define EP93XX_WDT_REG(x)	(EP93XX_WATCHDOG_BASE + (x))

#define EP93XX_WDT_WATCHDOG	EP93XX_WDT_REG(0x00)

#define EP93XX_WDT_WDSTATUS	EP93XX_WDT_REG(0x04)

#define EP93XX_WATCHDOG		0x00

#define EP93XX_WDSTATUS		0x04



/* reset the wdt every ~200ms */

#define WDT_INTERVAL (HZ/5)



static void wdt_enable(void)

{

	__raw_writew(0xaaaa, EP93XX_WDT_WATCHDOG);

	writel(0xaaaa, mmio_base + EP93XX_WATCHDOG);

}



static void wdt_disable(void)

{

	__raw_writew(0xaa55, EP93XX_WDT_WATCHDOG);

	writel(0xaa55, mmio_base + EP93XX_WATCHDOG);

}



static inline void wdt_ping(void)

{

	__raw_writew(0x5555, EP93XX_WDT_WATCHDOG);

	writel(0x5555, mmio_base + EP93XX_WATCHDOG);

}



static void wdt_startup(void)
@@ -206,17 +206,31 @@ static void ep93xx_timer_ping(unsigned long data) 
	mod_timer(&timer, jiffies + WDT_INTERVAL);

}



static int __init ep93xx_wdt_init(void)

static int __devinit ep93xx_wdt_probe(struct platform_device *pdev)

{

	struct resource *res;

	unsigned long val;

	int err;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -ENXIO;



	if (!devm_request_mem_region(&pdev->dev, res->start,

				     resource_size(res), pdev->name))

		return -EBUSY;



	mmio_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));

	if (!mmio_base)

		return -ENXIO;



	err = misc_register(&ep93xx_wdt_miscdev);



	boot_status = __raw_readl(EP93XX_WDT_WATCHDOG) & 0x01 ? 1 : 0;

	val = readl(mmio_base + EP93XX_WATCHDOG);

	boot_status = val & 0x01 ? 1 : 0;



	pr_info("EP93XX watchdog, driver version " WDT_VERSION "%s\n",

		(__raw_readl(EP93XX_WDT_WATCHDOG) & 0x08)

		? " (nCS1 disable detected)" : "");

		(val & 0x08) ? " (nCS1 disable detected)" : "");



	if (timeout < 1 || timeout > 3600) {

		timeout = WDT_TIMEOUT;
@@ -228,14 +242,23 @@ static int __init ep93xx_wdt_init(void) 
	return err;

}



static void __exit ep93xx_wdt_exit(void)

static int __devexit ep93xx_wdt_remove(struct platform_device *pdev)

{

	wdt_shutdown();

	misc_deregister(&ep93xx_wdt_miscdev);

	return 0;

}



module_init(ep93xx_wdt_init);

module_exit(ep93xx_wdt_exit);

static struct platform_driver ep93xx_wdt_driver = {

	.driver		= {

		.owner	= THIS_MODULE,

		.name	= "ep93xx-wdt",

	},

	.probe		= ep93xx_wdt_probe,

	.remove		= __devexit_p(ep93xx_wdt_remove),

};



module_platform_driver(ep93xx_wdt_driver);



module_param(nowayout, bool, 0);

MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");