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

Commit 6a2a2b85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull arm-soc bug fixes from Olof Johansson:

 - A set of OMAP fixes, about half of them PM/clock related, the rest
   scattered over the platform code but all small and targeted to real
   bugs.
 - Two small i.MX fixes for SSI device clock setup.

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: clk-imx35: Fix SSI clock registration
  ARM: clk-imx25: Fix SSI clock registration
  ARM: OMAP4: Fix array size for irq_target_cpu
  ARM: OMAP4: hwmod data: temporarily comment out data for the sl2if IP block
  ARM: OMAP: hwmod code: Disable module when hwmod enable fails
  ARM: OMAP3: hwmod data: fix iva2 reset info
  ARM: OMAP3xxx: clockdomain: fix software supervised wakeup/sleep
  ARM: OMAP2+: am33xx: Fix the timer fck clock naming convention
  ARM: OMAP: Config fix for omap3-touchbook board
  ARM: OMAP: sram: skip the first 16K on OMAP3 HS
  ARM: OMAP: sram: fix OMAP4 errata handling
  ARM: OMAP: timer: obey the !CONFIG_OMAP_32K_TIMER
parents 5e88083f 2bc733e8

arch/arm/mach-imx/clk-imx25.c

+2 −4
Original line number Diff line number Diff line
@@ -222,10 +222,8 @@ int __init mx25_clocks_init(void) 
	clk_register_clkdev(clk[lcdc_ipg], "ipg", "imx-fb.0");

	clk_register_clkdev(clk[lcdc_ahb], "ahb", "imx-fb.0");

	clk_register_clkdev(clk[wdt_ipg], NULL, "imx2-wdt.0");

	clk_register_clkdev(clk[ssi1_ipg_per], "per", "imx-ssi.0");

	clk_register_clkdev(clk[ssi1_ipg], "ipg", "imx-ssi.0");

	clk_register_clkdev(clk[ssi2_ipg_per], "per", "imx-ssi.1");

	clk_register_clkdev(clk[ssi2_ipg], "ipg", "imx-ssi.1");

	clk_register_clkdev(clk[ssi1_ipg], NULL, "imx-ssi.0");

	clk_register_clkdev(clk[ssi2_ipg], NULL, "imx-ssi.1");

	clk_register_clkdev(clk[esdhc1_ipg_per], "per", "sdhci-esdhc-imx25.0");

	clk_register_clkdev(clk[esdhc1_ipg], "ipg", "sdhci-esdhc-imx25.0");

	clk_register_clkdev(clk[esdhc1_ahb], "ahb", "sdhci-esdhc-imx25.0");

arch/arm/mach-imx/clk-imx35.c

+2 −4
Original line number Diff line number Diff line
@@ -230,10 +230,8 @@ int __init mx35_clocks_init() 
	clk_register_clkdev(clk[ipu_gate], NULL, "mx3_sdc_fb");

	clk_register_clkdev(clk[owire_gate], NULL, "mxc_w1");

	clk_register_clkdev(clk[sdma_gate], NULL, "imx35-sdma");

	clk_register_clkdev(clk[ipg], "ipg", "imx-ssi.0");

	clk_register_clkdev(clk[ssi1_div_post], "per", "imx-ssi.0");

	clk_register_clkdev(clk[ipg], "ipg", "imx-ssi.1");

	clk_register_clkdev(clk[ssi2_div_post], "per", "imx-ssi.1");

	clk_register_clkdev(clk[ssi1_gate], NULL, "imx-ssi.0");

	clk_register_clkdev(clk[ssi2_gate], NULL, "imx-ssi.1");

	/* i.mx35 has the i.mx21 type uart */

	clk_register_clkdev(clk[uart1_gate], "per", "imx21-uart.0");

	clk_register_clkdev(clk[ipg], "ipg", "imx21-uart.0");

arch/arm/mach-omap2/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -232,10 +232,11 @@ config MACH_OMAP3_PANDORA 
	select OMAP_PACKAGE_CBB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config MACH_OMAP3_TOUCHBOOK

config MACH_TOUCHBOOK

	bool "OMAP3 Touch Book"

	depends on ARCH_OMAP3

	default y

	select OMAP_PACKAGE_CBB



config MACH_OMAP_3430SDP

	bool "OMAP 3430 SDP board"

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ obj-$(CONFIG_MACH_OMAP_3630SDP) += board-zoom-display.o 
obj-$(CONFIG_MACH_CM_T35)		+= board-cm-t35.o

obj-$(CONFIG_MACH_CM_T3517)		+= board-cm-t3517.o

obj-$(CONFIG_MACH_IGEP0020)		+= board-igep0020.o

obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)	+= board-omap3touchbook.o

obj-$(CONFIG_MACH_TOUCHBOOK)		+= board-omap3touchbook.o

obj-$(CONFIG_MACH_OMAP_4430SDP)		+= board-4430sdp.o

obj-$(CONFIG_MACH_OMAP4_PANDA)		+= board-omap4panda.o

arch/arm/mach-omap2/clock33xx_data.c

+7 −7
Original line number Diff line number Diff line
@@ -1036,13 +1036,13 @@ static struct omap_clk am33xx_clks[] = { 
	CLK(NULL,	"mmu_fck",		&mmu_fck,	CK_AM33XX),

	CLK(NULL,	"smartreflex0_fck",	&smartreflex0_fck,	CK_AM33XX),

	CLK(NULL,	"smartreflex1_fck",	&smartreflex1_fck,	CK_AM33XX),

	CLK(NULL,	"gpt1_fck",		&timer1_fck,	CK_AM33XX),

	CLK(NULL,	"gpt2_fck",		&timer2_fck,	CK_AM33XX),

	CLK(NULL,	"gpt3_fck",		&timer3_fck,	CK_AM33XX),

	CLK(NULL,	"gpt4_fck",		&timer4_fck,	CK_AM33XX),

	CLK(NULL,	"gpt5_fck",		&timer5_fck,	CK_AM33XX),

	CLK(NULL,	"gpt6_fck",		&timer6_fck,	CK_AM33XX),

	CLK(NULL,	"gpt7_fck",		&timer7_fck,	CK_AM33XX),

	CLK(NULL,	"timer1_fck",		&timer1_fck,	CK_AM33XX),

	CLK(NULL,	"timer2_fck",		&timer2_fck,	CK_AM33XX),

	CLK(NULL,	"timer3_fck",		&timer3_fck,	CK_AM33XX),

	CLK(NULL,	"timer4_fck",		&timer4_fck,	CK_AM33XX),

	CLK(NULL,	"timer5_fck",		&timer5_fck,	CK_AM33XX),

	CLK(NULL,	"timer6_fck",		&timer6_fck,	CK_AM33XX),

	CLK(NULL,	"timer7_fck",		&timer7_fck,	CK_AM33XX),

	CLK(NULL,	"usbotg_fck",		&usbotg_fck,	CK_AM33XX),

	CLK(NULL,	"ieee5000_fck",		&ieee5000_fck,	CK_AM33XX),

	CLK(NULL,	"wdt1_fck",		&wdt1_fck,	CK_AM33XX),