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

Commit c07978b3 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 fixes from Olof Johansson:
 "Another week, another batch of fixes.

  All are small, contained, targeted fixes for explicit problems --
  mostly build and boot failures across i.MX, OMAP, Renesas/Shmobile and
  Samsung."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: imx6q: fix suspend regression caused by common clk migration
  ARM: OMAP4470: Fix OMAP4470 boot failure
  ARM: EXYNOS: Fix EXYNOS_DEV_DMA Kconfig entry
  ARM: OMAP2+: nand: fix build error when CONFIG_MTD_ONENAND_OMAP2=n
  ARM: shmobile: r8a7779: Route all interrupts to ARM
  ARM: shmobile: kzm9d: use late init machine hook
  ARM: shmobile: kzm9g: use late init machine hook
  ARM: mach-shmobile: armadillo800eva: Use late init machine hook
  ARM: SAMSUNG: Fix for S3C2412 EBI memory mapping
  ARM: mach-shmobile: add missing GPIO IRQ configuration on mackerel
  ARM: mach-shmobile: Fix build when SMP is enabled and EMEV2 is not enabled
  ARM: shmobile: sh7372: bugfix: chclr_offset base
  ARM: shmobile: sh73a0: bugfix: SY-DMAC number
  ARM: SAMSUNG: Should check for IS_ERR(clk) instead of NULL
parents 4f0f4af5 5d5474df

arch/arm/mach-exynos/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ config MACH_SMDKV310 
	select EXYNOS_DEV_SYSMMU

	select EXYNOS4_DEV_AHCI

	select SAMSUNG_DEV_KEYPAD

	select EXYNOS4_DEV_DMA

	select EXYNOS_DEV_DMA

	select SAMSUNG_DEV_PWM

	select EXYNOS4_DEV_USB_OHCI

	select EXYNOS4_SETUP_FIMD0
@@ -264,7 +264,7 @@ config MACH_UNIVERSAL_C210 
	select S5P_DEV_ONENAND

	select S5P_DEV_TV

	select EXYNOS_DEV_SYSMMU

	select EXYNOS4_DEV_DMA

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_DRM

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_I2C1
@@ -303,7 +303,7 @@ config MACH_NURI 
	select S5P_DEV_MFC

	select S5P_DEV_USB_EHCI

	select S5P_SETUP_MIPIPHY

	select EXYNOS4_DEV_DMA

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_DRM

	select EXYNOS4_SETUP_FIMC

	select EXYNOS4_SETUP_FIMD0
@@ -341,7 +341,7 @@ config MACH_ORIGEN 
	select SAMSUNG_DEV_PWM

	select EXYNOS_DEV_DRM

	select EXYNOS_DEV_SYSMMU

	select EXYNOS4_DEV_DMA

	select EXYNOS_DEV_DMA

	select EXYNOS4_DEV_USB_OHCI

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_SDHCI

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

+4 −2
Original line number Diff line number Diff line
@@ -152,13 +152,14 @@ enum mx6q_clks { 
	ssi2, ssi3, uart_ipg, uart_serial, usboh3, usdhc1, usdhc2, usdhc3,

	usdhc4, vdo_axi, vpu_axi, cko1, pll1_sys, pll2_bus, pll3_usb_otg,

	pll4_audio, pll5_video, pll6_mlb, pll7_usb_host, pll8_enet, ssi1_ipg,

	ssi2_ipg, ssi3_ipg, clk_max

	ssi2_ipg, ssi3_ipg, rom,

	clk_max

};



static struct clk *clk[clk_max];



static enum mx6q_clks const clks_init_on[] __initconst = {

	mmdc_ch0_axi, mmdc_ch1_axi,

	mmdc_ch0_axi, rom,

};



int __init mx6q_clocks_init(void)
@@ -364,6 +365,7 @@ int __init mx6q_clocks_init(void) 
	clk[gpmi_bch]     = imx_clk_gate2("gpmi_bch",      "usdhc4",            base + 0x78, 26);

	clk[gpmi_io]      = imx_clk_gate2("gpmi_io",       "enfc",              base + 0x78, 28);

	clk[gpmi_apb]     = imx_clk_gate2("gpmi_apb",      "usdhc3",            base + 0x78, 30);

	clk[rom]          = imx_clk_gate2("rom",           "ahb",               base + 0x7c, 0);

	clk[sata]         = imx_clk_gate2("sata",          "ipg",               base + 0x7c, 4);

	clk[sdma]         = imx_clk_gate2("sdma",          "ahb",               base + 0x7c, 6);

	clk[spba]         = imx_clk_gate2("spba",          "ipg",               base + 0x7c, 12);

arch/arm/mach-omap2/board-flash.c

+0 −5
Original line number Diff line number Diff line
@@ -97,11 +97,6 @@ __init board_onenand_init(struct mtd_partition *onenand_parts, 


	gpmc_onenand_init(&board_onenand_data);

}

#else

void

__init board_onenand_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs)

{

}

#endif /* CONFIG_MTD_ONENAND_OMAP2 || CONFIG_MTD_ONENAND_OMAP2_MODULE */



#if defined(CONFIG_MTD_NAND_OMAP2) || \

arch/arm/mach-omap2/clock44xx_data.c

+4 −1
Original line number Diff line number Diff line
@@ -3417,9 +3417,12 @@ int __init omap4xxx_clk_init(void) 
	if (cpu_is_omap443x()) {

		cpu_mask = RATE_IN_4430;

		cpu_clkflg = CK_443X;

	} else if (cpu_is_omap446x()) {

	} else if (cpu_is_omap446x() || cpu_is_omap447x()) {

		cpu_mask = RATE_IN_4460 | RATE_IN_4430;

		cpu_clkflg = CK_446X | CK_443X;



		if (cpu_is_omap447x())

			pr_warn("WARNING: OMAP4470 clock data incomplete!\n");

	} else {

		return 0;

	}

arch/arm/mach-shmobile/board-armadillo800eva.c

+1 −0
Original line number Diff line number Diff line
@@ -779,6 +779,7 @@ DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva") 
	.init_irq	= r8a7740_init_irq,

	.handle_irq	= shmobile_handle_irq_intc,

	.init_machine	= eva_init,

	.init_late	= shmobile_init_late,

	.timer		= &shmobile_timer,

	.dt_compat	= eva_boards_compat_dt,

MACHINE_END