hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJSrf9BAAoJEA0Cl+kVi2xq7WgP/1/OiO9HmRZS9KfPhHvTIWzv
 EqQD/EN17C9oCQuEGIU218BwGnzXUuf3zV4q29nxxEAqQMwx2Fd+cMkmGD+Sx+OY
 GKl36akYv0/4zvXh2epCZ8lZsZPlsGyGihHUbbhghvZYf0G60QC0oUf5jGcGsjy2
 OYqUntF+I0AUhzkwlCRSNp5fi9hzGH3zNwWEHFIsXdt1S79EpCrVckKUU6ES+gKq
 PmMgPSbttJqxIU+KQ8WdAc8xgqgJIWw1KZoOqtnLxxqKEqO6L89AT/EO5WT1+QSs
 1a3c8jkZxkVpy2j2o8DRiK6/G40sYs2AVydHzIT9k4o2WMGWeRWy6GTqDUupj2w6
 qFHkMm6QhMyiCxqwIaXzNGjfHVPcjQ8YwS6zuQHDyIzzHvm2VbbFEX+ZJpVbIjx8
 xCC00cxI+JVVJRtTm9uIuiWj4OrbP5CQvmgByglyWW0t2bRI4BX7jRTAT/87Ausz
 zq4MKhxLA/A/DPPek8gq7r7/0WQhgw1MyqVl43W287Ex5gYEOzNPfBAkPxJvYEk3
 lX5F3P++a/XFKGq/CWKuc2DhMEw3geeG66WTaCXzh1jWnDLoa9NsZrugRkwfvK4M
 dLlG/iS4LWyplzVDjIP4P+2t+SKzNxlB5nD7nQClm54t6gKThh4N9EXkBm+MS/qT
 ZeD1xfD6QCLssFa2zkf2
 =030e
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2013-12-22 14:06:14 -08:00
parent 4721f3cec1 70bacadbd0
commit 9b20d1c902
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/Kconfig
View File

@ -749,7 +749,7 @@ config ARCH_S3C64XX
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select CLKSRC_SAMSUNG_PWM select CLKSRC_SAMSUNG_PWM
select COMMON_CLK select COMMON_CLK
select CPU_V6 select CPU_V6K
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select GPIO_SAMSUNG select GPIO_SAMSUNG
select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_I2C if I2C

4
arch/arm/plat-samsung/s5p-irq-eint.c
View File

@ -16,6 +16,7 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/irqchip/arm-vic.h> #include <linux/irqchip/arm-vic.h>
#include <linux/of.h>
#include <plat/regs-irqtype.h> #include <plat/regs-irqtype.h>
@ -202,6 +203,9 @@ static int __init s5p_init_irq_eint(void)
{ {
int irq; int irq;
if (of_have_populated_dt())
return -ENODEV;
for (irq = IRQ_EINT(0); irq <= IRQ_EINT(15); irq++) for (irq = IRQ_EINT(0); irq <= IRQ_EINT(15); irq++)
irq_set_chip(irq, &s5p_irq_vic_eint); irq_set_chip(irq, &s5p_irq_vic_eint);