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

Commit 3ae627b5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  ARM: mach-footbridge: add missing header file <video/vga.h>
  ARM: mach-orion5x: add missing header file <linux/vga.h>
  arm: fix compile failure in orion5x/dns323-setup.c
  at91: at91sam9261.c: fix typo in t2_clk alias for atmel_tcb.0
  ARM: S5P: fix bug in spdif_clk_get_rate
  ARM: EXYNOS4: Add restart hook for proper reboot
  ARM: EXYNOS4: Increase reset delay for USB HOST PHY
  ARM: S5P: add required chained_irq_enter/exit to gpio-int code
  ARM: EXYNOS4: add required chained_irq_enter/exit to eint code
  ARM: SAMSUNG: Add chained enrty/exit call to timer interrupt handler
  ARM: S3C64XX: Fix build break in PM debug
  ARM: S5PV210: Fix build warning
  ARM: EXYNOS4: Fix the IRQ definitions for MIPI CSIS device
  ARM: EXYNOS4: remove duplicated inclusion
  ARM: EXYNOS4: Fix wrong devname to support clkdev
  ARM: EXYNOS4: Use the correct regulator names on universal_c210
  ARM: SAMSUNG: Fix Section mismatch in samsung_bl_set()
  ARM: S5P64X0: Replace irq_gc_ack() with irq_gc_ack_set_bit()
parents d4d7b2a1 039920cc

arch/arm/mach-at91/at91sam9261.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),

	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk),

	CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk),

	CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc1_clk),

	CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),

arch/arm/mach-exynos4/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ static struct clk init_clocks_off[] = { 
		.ctrlbit	= (1 << 21),

	}, {

		.name		= "ac97",

		.id		= -1,

		.devname	= "samsung-ac97",

		.enable		= exynos4_clk_ip_peril_ctrl,

		.ctrlbit	= (1 << 27),

	}, {

arch/arm/mach-exynos4/cpu.c

+10 −1
Original line number Diff line number Diff line
@@ -24,12 +24,13 @@ 
#include <plat/exynos4.h>

#include <plat/adc-core.h>

#include <plat/sdhci.h>

#include <plat/devs.h>

#include <plat/fb-core.h>

#include <plat/fimc-core.h>

#include <plat/iic-core.h>

#include <plat/reset.h>



#include <mach/regs-irq.h>

#include <mach/regs-pmu.h>



extern int combiner_init(unsigned int combiner_nr, void __iomem *base,

			 unsigned int irq_start);
@@ -128,6 +129,11 @@ static void exynos4_idle(void) 
	local_irq_enable();

}



static void exynos4_sw_reset(void)

{

	__raw_writel(0x1, S5P_SWRESET);

}



/*

 * exynos4_map_io

 *
@@ -241,5 +247,8 @@ int __init exynos4_init(void) 
	/* set idle function */

	pm_idle = exynos4_idle;



	/* set sw_reset function */

	s5p_reset_hook = exynos4_sw_reset;



	return sysdev_register(&exynos4_sysdev);

}

arch/arm/mach-exynos4/include/mach/irqs.h

+2 −3
Original line number Diff line number Diff line
@@ -80,9 +80,8 @@ 
#define IRQ_HSMMC3		IRQ_SPI(76)

#define IRQ_DWMCI		IRQ_SPI(77)



#define IRQ_MIPICSI0		IRQ_SPI(78)



#define IRQ_MIPICSI1		IRQ_SPI(80)

#define IRQ_MIPI_CSIS0		IRQ_SPI(78)

#define IRQ_MIPI_CSIS1		IRQ_SPI(80)



#define IRQ_ONENAND_AUDI	IRQ_SPI(82)

#define IRQ_ROTATOR		IRQ_SPI(83)

arch/arm/mach-exynos4/include/mach/regs-pmu.h

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
#define S5P_USE_STANDBY_WFE1			(1 << 25)

#define S5P_USE_MASK				((0x3 << 16) | (0x3 << 24))



#define S5P_SWRESET				S5P_PMUREG(0x0400)



#define S5P_WAKEUP_STAT				S5P_PMUREG(0x0600)

#define S5P_EINT_WAKEUP_MASK			S5P_PMUREG(0x0604)

#define S5P_WAKEUP_MASK				S5P_PMUREG(0x0608)