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

Commit 4a3f4233 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'samsung/fixes' of... 

Merge branch 'samsung/fixes' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into fixes
parents fcb8ce5c 5d747c6f

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)

arch/arm/mach-exynos4/irq-eint.c

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 


#include <mach/regs-gpio.h>



#include <asm/mach/irq.h>



static DEFINE_SPINLOCK(eint_lock);



static unsigned int eint0_15_data[16];
@@ -184,8 +186,11 @@ static inline void exynos4_irq_demux_eint(unsigned int start) 


static void exynos4_irq_demux_eint16_31(unsigned int irq, struct irq_desc *desc)

{

	struct irq_chip *chip = irq_get_chip(irq);

	chained_irq_enter(chip, desc);

	exynos4_irq_demux_eint(IRQ_EINT(16));

	exynos4_irq_demux_eint(IRQ_EINT(24));

	chained_irq_exit(chip, desc);

}



static void exynos4_irq_eint0_15(unsigned int irq, struct irq_desc *desc)
@@ -193,6 +198,7 @@ static void exynos4_irq_eint0_15(unsigned int irq, struct irq_desc *desc) 
	u32 *irq_data = irq_get_handler_data(irq);

	struct irq_chip *chip = irq_get_chip(irq);



	chained_irq_enter(chip, desc);

	chip->irq_mask(&desc->irq_data);



	if (chip->irq_ack)
@@ -201,6 +207,7 @@ static void exynos4_irq_eint0_15(unsigned int irq, struct irq_desc *desc) 
	generic_handle_irq(*irq_data);



	chip->irq_unmask(&desc->irq_data);

	chained_irq_exit(chip, desc);

}



int __init exynos4_init_irq_eint(void)