61464c8357
This is a large branch that contains a handful of different cleanups:
- Fixing up the I/O space remapping on PCI on ARM. This is a series
from Rob Herring that restructures how all pci devices allocate I/O
space, and it's part of the work to allow multiplatform kernels.
- A number of cleanup series for OMAP, moving and removing some
headers, sparse irq rework and in general preparation for
multiplatform.
- Final removal of all non-DT boards for Tegra, it is now
device-tree-only!
- Removal of a stale platform, nxp4008. It's an old mobile chipset
that is no longer in use, and was very likely never really used with
a mainline kernel. We have not been able to find anyone interested
in keeping it around in the kernel.
- Removal of the legacy dmaengine driver on tegra
+ A handful of other things that I haven't described above.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJQaO1fAAoJEIwa5zzehBx3IPgP/jxoO1flVGNVf0reqqyDro/w
prZmp8cNVH9uv8xG9n9vawObrMQ8M6jCJ449fEWuAZ58EXrpIPd0kkm/MOmxp8K1
LNs+q2aXxWpD488+b3RK55g3fksqZutTbn3y6HNuCoLG9l8yT/95KX4IIzfEP2Ch
1TCNHdkTbf37nTBOmKN0x1kahGpWDrOkf9ysHQq+DXAGF4uwNwtR194dqz3HbDND
hZqRq7qCLn9OwGRGNicPFoB6UcxwZ/+/+u5sX7nqPGoiPofg977mhWk1DFO15EM3
S+A6g0dZ+XLsL+fFtOl4snSmrG5Et6qTOP0/ItQJgTG+5YdCS09ohCWJwRCBHbgj
M5arOkyGFdVAlvX7cUux374sMe0AcqUsEmt79mYuBpIE+pBJaRUoCgDcs9FDZeUB
U6WcE4AkxMtW7DtmVW+mF4ls9/K6cRXgWMuHCUmt1o3m3Ly9ITT7j+ntXnD9nuYk
ndoVLR6Vxk2BzlkD0JEtg7FRAS9Wgo2DBix05qM1Qkut2iIZRhFQlqJQpNbeNdii
/3Lg/hqpAVTZKGCd+paegHez61meyFz2PB2IiE0JKANhKHRCWTWRGgKIXkGyCiXk
wJ2iRCOlMEpmpJgCBzfI32ER/hnW4s64iDjgksEwz6pEt7xCbhwgmwrpf0H0KsSF
rLroHOMqyISd/Ha52Vin
=ck1u
-----END PGP SIGNATURE-----
Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM soc general cleanups from Olof Johansson:
"This is a large branch that contains a handful of different cleanups:
- Fixing up the I/O space remapping on PCI on ARM. This is a series
from Rob Herring that restructures how all pci devices allocate I/O
space, and it's part of the work to allow multiplatform kernels.
- A number of cleanup series for OMAP, moving and removing some
headers, sparse irq rework and in general preparation for
multiplatform.
- Final removal of all non-DT boards for Tegra, it is now
device-tree-only!
- Removal of a stale platform, nxp4008. It's an old mobile chipset
that is no longer in use, and was very likely never really used
with a mainline kernel. We have not been able to find anyone
interested in keeping it around in the kernel.
- Removal of the legacy dmaengine driver on tegra
+ A handful of other things that I haven't described above."
Fix up some conflicts with the staging tree (and because nxp4008 was
removed)
* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (184 commits)
ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6
ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus
ARM: mmp: using for_each_set_bit to simplify the code
ARM: tegra: harmony: fix ldo7 regulator-name
ARM: OMAP2+: Make omap4-keypad.h local
ARM: OMAP2+: Make l4_3xxx.h local
ARM: OMAP2+: Make l4_2xxx.h local
ARM: OMAP2+: Make l3_3xxx.h local
ARM: OMAP2+: Make l3_2xxx.h local
ARM: OMAP1: Move irda.h from plat to mach
ARM: OMAP2+: Make hdq1w.h local
ARM: OMAP2+: Make gpmc-smsc911x.h local
ARM: OMAP2+: Make gpmc-smc91x.h local
ARM: OMAP1: Move flash.h from plat to mach
ARM: OMAP2+: Make debug-devices.h local
ARM: OMAP1: Move board-voiceblue.h from plat to mach
ARM: OMAP1: Move board-sx1.h from plat to mach
ARM: OMAP2+: Make omap-wakeupgen.h local
ARM: OMAP2+: Make omap-secure.h local
ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local
...
136 lines
3 KiB
C
136 lines
3 KiB
C
/*
|
|
* wdt.c
|
|
*
|
|
* DSP-BIOS Bridge driver support functions for TI OMAP processors.
|
|
*
|
|
* IO dispatcher for a shared memory channel driver.
|
|
*
|
|
* Copyright (C) 2010 Texas Instruments, Inc.
|
|
*
|
|
* This package is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
*/
|
|
#include <linux/types.h>
|
|
|
|
#include <dspbridge/dbdefs.h>
|
|
#include <dspbridge/dspdeh.h>
|
|
#include <dspbridge/dev.h>
|
|
#include <dspbridge/_chnl_sm.h>
|
|
#include <dspbridge/wdt.h>
|
|
#include <dspbridge/host_os.h>
|
|
|
|
|
|
#define OMAP34XX_WDT3_BASE (0x49000000 + 0x30000)
|
|
#define INT_34XX_WDT3_IRQ (36 + NR_IRQS)
|
|
|
|
static struct dsp_wdt_setting dsp_wdt;
|
|
|
|
void dsp_wdt_dpc(unsigned long data)
|
|
{
|
|
struct deh_mgr *deh_mgr;
|
|
dev_get_deh_mgr(dev_get_first(), &deh_mgr);
|
|
if (deh_mgr)
|
|
bridge_deh_notify(deh_mgr, DSP_WDTOVERFLOW, 0);
|
|
}
|
|
|
|
irqreturn_t dsp_wdt_isr(int irq, void *data)
|
|
{
|
|
u32 value;
|
|
/* ack wdt3 interrupt */
|
|
value = __raw_readl(dsp_wdt.reg_base + OMAP3_WDT3_ISR_OFFSET);
|
|
__raw_writel(value, dsp_wdt.reg_base + OMAP3_WDT3_ISR_OFFSET);
|
|
|
|
tasklet_schedule(&dsp_wdt.wdt3_tasklet);
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
int dsp_wdt_init(void)
|
|
{
|
|
int ret = 0;
|
|
|
|
dsp_wdt.sm_wdt = NULL;
|
|
dsp_wdt.reg_base = ioremap(OMAP34XX_WDT3_BASE, SZ_4K);
|
|
if (!dsp_wdt.reg_base)
|
|
return -ENOMEM;
|
|
|
|
tasklet_init(&dsp_wdt.wdt3_tasklet, dsp_wdt_dpc, 0);
|
|
|
|
dsp_wdt.fclk = clk_get(NULL, "wdt3_fck");
|
|
|
|
if (!IS_ERR(dsp_wdt.fclk)) {
|
|
dsp_wdt.iclk = clk_get(NULL, "wdt3_ick");
|
|
if (IS_ERR(dsp_wdt.iclk)) {
|
|
clk_put(dsp_wdt.fclk);
|
|
dsp_wdt.fclk = NULL;
|
|
ret = -EFAULT;
|
|
}
|
|
} else
|
|
ret = -EFAULT;
|
|
|
|
if (!ret)
|
|
ret = request_irq(INT_34XX_WDT3_IRQ, dsp_wdt_isr, 0,
|
|
"dsp_wdt", &dsp_wdt);
|
|
|
|
/* Disable at this moment, it will be enabled when DSP starts */
|
|
if (!ret)
|
|
disable_irq(INT_34XX_WDT3_IRQ);
|
|
|
|
return ret;
|
|
}
|
|
|
|
void dsp_wdt_sm_set(void *data)
|
|
{
|
|
dsp_wdt.sm_wdt = data;
|
|
dsp_wdt.sm_wdt->wdt_overflow = 5; /* in seconds */
|
|
}
|
|
|
|
|
|
void dsp_wdt_exit(void)
|
|
{
|
|
free_irq(INT_34XX_WDT3_IRQ, &dsp_wdt);
|
|
tasklet_kill(&dsp_wdt.wdt3_tasklet);
|
|
|
|
if (dsp_wdt.fclk)
|
|
clk_put(dsp_wdt.fclk);
|
|
if (dsp_wdt.iclk)
|
|
clk_put(dsp_wdt.iclk);
|
|
|
|
dsp_wdt.fclk = NULL;
|
|
dsp_wdt.iclk = NULL;
|
|
dsp_wdt.sm_wdt = NULL;
|
|
|
|
if (dsp_wdt.reg_base)
|
|
iounmap(dsp_wdt.reg_base);
|
|
dsp_wdt.reg_base = NULL;
|
|
}
|
|
|
|
void dsp_wdt_enable(bool enable)
|
|
{
|
|
u32 tmp;
|
|
static bool wdt_enable;
|
|
|
|
if (wdt_enable == enable || !dsp_wdt.fclk || !dsp_wdt.iclk)
|
|
return;
|
|
|
|
wdt_enable = enable;
|
|
|
|
if (enable) {
|
|
clk_enable(dsp_wdt.fclk);
|
|
clk_enable(dsp_wdt.iclk);
|
|
dsp_wdt.sm_wdt->wdt_setclocks = 1;
|
|
tmp = __raw_readl(dsp_wdt.reg_base + OMAP3_WDT3_ISR_OFFSET);
|
|
__raw_writel(tmp, dsp_wdt.reg_base + OMAP3_WDT3_ISR_OFFSET);
|
|
enable_irq(INT_34XX_WDT3_IRQ);
|
|
} else {
|
|
disable_irq(INT_34XX_WDT3_IRQ);
|
|
dsp_wdt.sm_wdt->wdt_setclocks = 0;
|
|
clk_disable(dsp_wdt.iclk);
|
|
clk_disable(dsp_wdt.fclk);
|
|
}
|
|
}
|