Commit 9b20d1c9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dev' of... 

Merge tag 'samsung-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc

From Kukjin Kim:

Samsung updates for v3.14
- Skip eint_init() for pinctrl-exynos because of re-executing
- Use CPU_V6K for S3C64XX(ARM1176JZF-s) instead of CPU_V6

* tag 'samsung-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: S3C64XX: Select CPU_V6K instead of CPU_V6
  ARM: SAMSUNG: if detected device tree skip irq init for S5P

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4721f3ce 70bacadb

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ config ARCH_S3C64XX 
	select CLKDEV_LOOKUP

	select CLKSRC_SAMSUNG_PWM

	select COMMON_CLK

	select CPU_V6

	select CPU_V6K

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_S3C2410_I2C if I2C

arch/arm/plat-samsung/s5p-irq-eint.c

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/device.h>

#include <linux/gpio.h>

#include <linux/irqchip/arm-vic.h>

#include <linux/of.h>



#include <plat/regs-irqtype.h>
@@ -202,6 +203,9 @@ static int __init s5p_init_irq_eint(void) 
{

	int irq;



	if (of_have_populated_dt())

		return -ENODEV;



	for (irq = IRQ_EINT(0); irq <= IRQ_EINT(15); irq++)

		irq_set_chip(irq, &s5p_irq_vic_eint);

CRA Git | Maintained and supported by SUSTech CRA and CCSE