From 1e6f8e3c92fbbcd5bcca860c4db4eef2052aa79f Mon Sep 17 00:00:00 2001 From: Sonic Zhang Date: Mon, 27 Jan 2014 18:23:54 +0800 Subject: pinctrl: Move pint PM storage structure out of blackfin architecture. It is better to keep this structure in the pinctrl-adi2 driver. Signed-off-by: Sonic Zhang Signed-off-by: Linus Walleij --- arch/blackfin/include/asm/irq.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'arch') diff --git a/arch/blackfin/include/asm/irq.h b/arch/blackfin/include/asm/irq.h index 2fd04f10cc26..89de539ed010 100644 --- a/arch/blackfin/include/asm/irq.h +++ b/arch/blackfin/include/asm/irq.h @@ -20,15 +20,6 @@ /* SYS_IRQS and NR_IRQS are defined in */ #include -/* - * pm save bfin pint registers - */ -struct adi_pm_pint_save { - u32 assign; - u32 edge_set; - u32 invert_set; -}; - #if ANOMALY_05000244 && defined(CONFIG_BFIN_ICACHE) # define NOP_PAD_ANOMALY_05000244 "nop; nop;" #else -- cgit v1.2.3-70-g09d2 From 0c002ef8caeff728d4015082cbe998cfdd57f1e0 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Thu, 20 Feb 2014 15:49:29 +0100 Subject: ARM: shmobile: r8a7791 dtsi: Fix typo in msiof2 clock output name Introduced in commit cded80f869aef94853e056ab9c21e305b0c26138 ("ARM: shmobile: r8a7791: Add MSIOF clocks in device tree"). Signed-off-by: Geert Uytterhoeven Acked-by: Laurent Pinchart Signed-off-by: Linus Walleij --- arch/arm/boot/dts/r8a7791.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi index 19c65509a22d..3b075dd19b51 100644 --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi @@ -429,7 +429,7 @@ R8A7791_CLK_MSIOF1 R8A7791_CLK_SCIFB2 >; clock-output-names = - "scifa2", "scifa1", "scifa0", "misof2", "scifb0", + "scifa2", "scifa1", "scifa0", "msiof2", "scifb0", "scifb1", "msiof1", "scifb2"; }; mstp3_clks: mstp3_clks@e615013c { -- cgit v1.2.3-70-g09d2