summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-03-08 22:53:27 -0800
committerOlof Johansson <olof@lixom.net>2014-03-08 22:53:27 -0800
commitba0e1fa928e6e7a47d54008b1a701b02a858d0e4 (patch)
tree1678c0ca4697b7e698a0a162481eca28272758a1 /include
parentcfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff)
parent29525484cd2524a31ee0924831ab43b46ea6ebe1 (diff)
downloadlinux-stable-ba0e1fa928e6e7a47d54008b1a701b02a858d0e4.tar.gz
linux-stable-ba0e1fa928e6e7a47d54008b1a701b02a858d0e4.tar.bz2
linux-stable-ba0e1fa928e6e7a47d54008b1a701b02a858d0e4.zip
Merge branch 'integrator/multiplatform-base' into next/cleanup2
* integrator/multiplatform-base: ARM: integrator: select GPIO block ARM: integrator: register the IM-PD1 VIC ARM: integrator: use managed resources for the IM-PD1 irqchip: support cascaded VICs irqchip: vic: update the base IRQ member correctly clk: versatile: respect parent rate in ICST clock clk: versatile: pass a parent to the ICST clock ARM: integrator: switch to fetch clocks from device tree ARM: SP804: make Integrator/CP timer pick clock from DT ARM: integrator: define clocks in the device trees
Diffstat (limited to 'include')
-rw-r--r--include/linux/irqchip/arm-vic.h6
-rw-r--r--include/linux/platform_data/clk-integrator.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/irqchip/arm-vic.h b/include/linux/irqchip/arm-vic.h
index e3c82dc95756..ba46c794b4e5 100644
--- a/include/linux/irqchip/arm-vic.h
+++ b/include/linux/irqchip/arm-vic.h
@@ -29,8 +29,10 @@
struct device_node;
struct pt_regs;
-void __vic_init(void __iomem *base, int irq_start, u32 vic_sources,
- u32 resume_sources, struct device_node *node);
+void __vic_init(void __iomem *base, int parent_irq, int irq_start,
+ u32 vic_sources, u32 resume_sources, struct device_node *node);
void vic_init(void __iomem *base, unsigned int irq_start, u32 vic_sources, u32 resume_sources);
+int vic_init_cascaded(void __iomem *base, unsigned int parent_irq,
+ u32 vic_sources, u32 resume_sources);
#endif
diff --git a/include/linux/platform_data/clk-integrator.h b/include/linux/platform_data/clk-integrator.h
index 280edac9d0a5..addd48cac625 100644
--- a/include/linux/platform_data/clk-integrator.h
+++ b/include/linux/platform_data/clk-integrator.h
@@ -1,3 +1,2 @@
-void integrator_clk_init(bool is_cp);
void integrator_impd1_clk_init(void __iomem *base, unsigned int id);
void integrator_impd1_clk_exit(unsigned int id);