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

Commit 2064ba23 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

[MIPS] TXx9 watchdog support for rbhma3100,rbhma4200,rbhma4500 



This patch adds support for txx9wdt driver to rbhma3100, rbhma4200 and
rbhma4500 platform.

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 68efdb81

arch/mips/configs/jmr3927_defconfig

+14 −1
Original line number Diff line number Diff line
@@ -464,7 +464,6 @@ CONFIG_SERIAL_TXX9_STDSERIAL=y 
CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256

# CONFIG_IPMI_HANDLER is not set

# CONFIG_WATCHDOG is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_RTC is not set

# CONFIG_R3964 is not set
@@ -482,6 +481,20 @@ CONFIG_DEVPORT=y 
# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

# CONFIG_WATCHDOG_NOWAYOUT is not set



#

# Watchdog Device Drivers

#

# CONFIG_SOFT_WATCHDOG is not set

CONFIG_TXX9_WDT=y



#

# PCI-based Watchdog Cards

#

# CONFIG_PCIPCWATCHDOG is not set

# CONFIG_WDTPCI is not set



#

# Multifunction device drivers

arch/mips/configs/rbhma4200_defconfig

+14 −1
Original line number Diff line number Diff line
@@ -431,7 +431,6 @@ CONFIG_UNIX98_PTYS=y 
CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256

# CONFIG_IPMI_HANDLER is not set

# CONFIG_WATCHDOG is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_RTC is not set

# CONFIG_R3964 is not set
@@ -449,6 +448,20 @@ CONFIG_DEVPORT=y 
# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

# CONFIG_WATCHDOG_NOWAYOUT is not set



#

# Watchdog Device Drivers

#

# CONFIG_SOFT_WATCHDOG is not set

CONFIG_TXX9_WDT=m



#

# PCI-based Watchdog Cards

#

# CONFIG_PCIPCWATCHDOG is not set

# CONFIG_WDTPCI is not set



#

# Multifunction device drivers

arch/mips/configs/rbhma4500_defconfig

+14 −1
Original line number Diff line number Diff line
@@ -450,7 +450,6 @@ CONFIG_UNIX98_PTYS=y 
CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256

# CONFIG_IPMI_HANDLER is not set

# CONFIG_WATCHDOG is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_RTC is not set

# CONFIG_R3964 is not set
@@ -479,6 +478,20 @@ CONFIG_SPI_AT25=y 
# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

# CONFIG_WATCHDOG_NOWAYOUT is not set



#

# Watchdog Device Drivers

#

# CONFIG_SOFT_WATCHDOG is not set

CONFIG_TXX9_WDT=m



#

# PCI-based Watchdog Cards

#

# CONFIG_PCIPCWATCHDOG is not set

# CONFIG_WDTPCI is not set



#

# Multifunction device drivers

arch/mips/jmr3927/rbhma3100/setup.c

+55 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/delay.h>

#include <linux/pm.h>

#include <linux/platform_device.h>

#include <linux/clk.h>

#ifdef CONFIG_SERIAL_TXX9

#include <linux/serial_core.h>

#endif
@@ -233,6 +234,8 @@ static void __init tx3927_setup(void) 
	tx3927_ccfgptr->ccfg &= ~TX3927_CCFG_BEOW;

	/* Disable PCI snoop */

	tx3927_ccfgptr->ccfg &= ~TX3927_CCFG_PSNP;

	/* do reset on watchdog */

	tx3927_ccfgptr->ccfg |= TX3927_CCFG_WR;



#ifdef DO_WRITE_THROUGH

	/* Enable PCI SNOOP - with write through only */
@@ -383,3 +386,55 @@ static int __init jmr3927_rtc_init(void) 
	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

}

device_initcall(jmr3927_rtc_init);



/* Watchdog support */



static int __init txx9_wdt_init(unsigned long base)

{

	struct resource res = {

		.start	= base,

		.end	= base + 0x100 - 1,

		.flags	= IORESOURCE_MEM,

	};

	struct platform_device *dev =

		platform_device_register_simple("txx9wdt", -1, &res, 1);

	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

}



static int __init jmr3927_wdt_init(void)

{

	return txx9_wdt_init(TX3927_TMR_REG(2));

}

device_initcall(jmr3927_wdt_init);



/* Minimum CLK support */



struct clk *clk_get(struct device *dev, const char *id)

{

	if (!strcmp(id, "imbus_clk"))

		return (struct clk *)JMR3927_IMCLK;

	return ERR_PTR(-ENOENT);

}

EXPORT_SYMBOL(clk_get);



int clk_enable(struct clk *clk)

{

	return 0;

}

EXPORT_SYMBOL(clk_enable);



void clk_disable(struct clk *clk)

{

}

EXPORT_SYMBOL(clk_disable);



unsigned long clk_get_rate(struct clk *clk)

{

	return (unsigned long)clk;

}

EXPORT_SYMBOL(clk_get_rate);



void clk_put(struct clk *clk)

{

}

EXPORT_SYMBOL(clk_put);

arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c

+55 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include <linux/pci.h>

#include <linux/pm.h>

#include <linux/platform_device.h>

#include <linux/clk.h>



#include <asm/bootinfo.h>

#include <asm/io.h>
@@ -803,6 +804,8 @@ void __init plat_mem_setup(void) 
		}



	/* CCFG */

	/* do reset on watchdog */

	tx4927_ccfgptr->ccfg |= TX4927_CCFG_WR;

	/* enable Timeout BusError */

	if (tx4927_ccfg_toeon)

		tx4927_ccfgptr->ccfg |= TX4927_CCFG_TOE;
@@ -944,3 +947,55 @@ static int __init rbtx4927_ne_init(void) 
	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

}

device_initcall(rbtx4927_ne_init);



/* Watchdog support */



static int __init txx9_wdt_init(unsigned long base)

{

	struct resource res = {

		.start	= base,

		.end	= base + 0x100 - 1,

		.flags	= IORESOURCE_MEM,

	};

	struct platform_device *dev =

		platform_device_register_simple("txx9wdt", -1, &res, 1);

	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

}



static int __init rbtx4927_wdt_init(void)

{

	return txx9_wdt_init(TX4927_TMR_REG(2) & 0xfffffffffULL);

}

device_initcall(rbtx4927_wdt_init);



/* Minimum CLK support */



struct clk *clk_get(struct device *dev, const char *id)

{

	if (!strcmp(id, "imbus_clk"))

		return (struct clk *)50000000;

	return ERR_PTR(-ENOENT);

}

EXPORT_SYMBOL(clk_get);



int clk_enable(struct clk *clk)

{

	return 0;

}

EXPORT_SYMBOL(clk_enable);



void clk_disable(struct clk *clk)

{

}

EXPORT_SYMBOL(clk_disable);



unsigned long clk_get_rate(struct clk *clk)

{

	return (unsigned long)clk;

}

EXPORT_SYMBOL(clk_get_rate);



void clk_put(struct clk *clk)

{

}

EXPORT_SYMBOL(clk_put);