Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

From Kukjin Kim:

arch/arm/mach-exynos update
- enable XHCI on exynos5
- enable Pinctrl on exynos4 and exynos5
- calling scu_enable() is only available on Cortex-A9

* tag 'exynos-arch-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: call scu_enable() only in case of cortex-A9 processor
  ARM: EXYNOS: Select PINCTRL_EXYNOS for exynos4/5 at chip level
  ARM: EXYNOS: Enable XHCI support on exynos5

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann 12 years ago
parent
aee9a50c5b b5f3c75a75
commit
402bf90df5
3 changed files with 11 additions and 6 deletions
Split View Show Diff Stats
  1. 7 3
      arch/arm/mach-exynos/Kconfig
  2. 1 1
      arch/arm/mach-exynos/platsmp.c
  3. 3 2
      drivers/pinctrl/Kconfig

+ 7 - 3
arch/arm/mach-exynos/Kconfig
View File 

@@ -17,6 +17,7 @@ config ARCH_EXYNOS4
 
 	select HAVE_ARM_SCU if SMP
 
 	select HAVE_SMP
 
 	select MIGHT_HAVE_CACHE_L2X0
 
+	select PINCTRL
 
 	help
 
 	  Samsung EXYNOS4 SoCs based systems
 
 
@@ -24,6 +25,7 @@ config ARCH_EXYNOS5
 
 	bool "SAMSUNG EXYNOS5"
 
 	select HAVE_ARM_SCU if SMP
 
 	select HAVE_SMP
 
+	select PINCTRL
 
 	help
 
 	  Samsung EXYNOS5 (Cortex-A15) SoC based systems
 
 
@@ -34,6 +36,7 @@ config CPU_EXYNOS4210
 
 	default y
 
 	depends on ARCH_EXYNOS4
 
 	select ARM_CPU_SUSPEND if PM
 
+	select PINCTRL_EXYNOS
 
 	select PM_GENERIC_DOMAINS
 
 	select S5P_PM if PM
 
 	select S5P_SLEEP if PM
 
@@ -45,6 +48,7 @@ config SOC_EXYNOS4212
 
 	bool "SAMSUNG EXYNOS4212"
 
 	default y
 
 	depends on ARCH_EXYNOS4
 
+	select PINCTRL_EXYNOS
 
 	select S5P_PM if PM
 
 	select S5P_SLEEP if PM
 
 	select SAMSUNG_DMADEV
 
@@ -55,6 +59,7 @@ config SOC_EXYNOS4412
 
 	bool "SAMSUNG EXYNOS4412"
 
 	default y
 
 	depends on ARCH_EXYNOS4
 
+	select PINCTRL_EXYNOS
 
 	select SAMSUNG_DMADEV
 
 	help
 
 	  Enable EXYNOS4412 SoC support
 
@@ -63,6 +68,7 @@ config SOC_EXYNOS5250
 
 	bool "SAMSUNG EXYNOS5250"
 
 	default y
 
 	depends on ARCH_EXYNOS5
 
+	select PINCTRL_EXYNOS
 
 	select PM_GENERIC_DOMAINS if PM
 
 	select S5P_PM if PM
 
 	select S5P_SLEEP if PM
 
@@ -78,7 +84,6 @@ config SOC_EXYNOS5440
 
 	select ARCH_HAS_OPP
 
 	select ARM_ARCH_TIMER
 
 	select AUTO_ZRELADDR
 
-	select PINCTRL
 
 	select PINCTRL_EXYNOS5440
 
 	select PM_OPP
 
 	help
 
@@ -413,8 +418,6 @@ config MACH_EXYNOS4_DT
 
 	select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
 
 	select CPU_EXYNOS4210
 
 	select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
 
-	select PINCTRL
 
-	select PINCTRL_EXYNOS
 
 	select S5P_DEV_MFC
 
 	select USE_OF
 
 	help
 
@@ -429,6 +432,7 @@ config MACH_EXYNOS5_DT
 
 	depends on ARCH_EXYNOS5
 
 	select ARM_AMBA
 
 	select CLKSRC_OF
 
+	select USB_ARCH_HAS_XHCI
 
 	select USE_OF
 
 	help
 
 	  Machine support for Samsung EXYNOS5 machine with device tree enabled.

+ 1 - 1
arch/arm/mach-exynos/platsmp.c
View File 

@@ -200,7 +200,7 @@ static void __init exynos_smp_prepare_cpus(unsigned int max_cpus)
 
 {
 
 	int i;
 
 
-	if (!(soc_is_exynos5250() || soc_is_exynos5440()))
 
+	if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
 
 		scu_enable(scu_base_addr());
 
 
 	/*

+ 3 - 2
drivers/pinctrl/Kconfig
View File 

@@ -207,12 +207,13 @@ config PINCTRL_SAMSUNG
 
 	select PINCONF
 
 
 config PINCTRL_EXYNOS
 
-	bool "Pinctrl driver data for Samsung EXYNOS SoCs"
 
-	depends on OF && GPIOLIB
 
+	bool "Pinctrl driver data for Samsung EXYNOS SoCs other than 5440"
 
+	depends on OF && GPIOLIB && ARCH_EXYNOS
 
 	select PINCTRL_SAMSUNG
 
 
 config PINCTRL_EXYNOS5440
 
 	bool "Samsung EXYNOS5440 SoC pinctrl driver"
 
+	depends on SOC_EXYNOS5440
 
 	select PINMUX
 
 	select PINCONF