* [PATCH v2 1/3] ARM: EXYNOS: Consolidate Kconfig entries
2014-05-23 15:19 [PATCH v2 0/3] Exynos multi-platform support Sachin Kamat
@ 2014-05-23 15:19 ` Sachin Kamat
2014-05-23 15:19 ` [PATCH v2 2/3] ARM: EXYNOS: Enable multi-platform build support Sachin Kamat
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Sachin Kamat @ 2014-05-23 15:19 UTC (permalink / raw)
To: linux-arm-kernel
Instead of repeating the Kconfig entries for every SoC, move them under
ARCH_EXYNOS4 and 5 and move the entries common to both 4 and 5 under
ARCH_EXYNOS.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
No changes since v1
---
arch/arm/Kconfig | 10 ++++++++++
arch/arm/mach-exynos/Kconfig | 45 ++++--------------------------------------
2 files changed, 14 insertions(+), 41 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index eae853bb7ee5..b8d47ca91406 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -832,18 +832,28 @@ config ARCH_S5PV210
config ARCH_EXYNOS
bool "Samsung EXYNOS"
+ select ARCH_HAS_BANDGAP
select ARCH_HAS_CPUFREQ
select ARCH_HAS_HOLES_MEMORYMODEL
select ARCH_REQUIRE_GPIOLIB
select ARCH_SPARSEMEM_ENABLE
+ select ARM_AMBA
select ARM_GIC
+ select CLKSRC_OF
select COMMON_CLK_SAMSUNG
select CPU_V7
select GENERIC_CLOCKEVENTS
+ select HAVE_ARM_SCU if SMP
select HAVE_S3C2410_I2C if I2C
select HAVE_S3C2410_WATCHDOG if WATCHDOG
select HAVE_S3C_RTC if RTC_CLASS
+ select HAVE_SMP
select NEED_MACH_MEMORY_H
+ select PINCTRL
+ select PINCTRL_EXYNOS
+ select PM_GENERIC_DOMAINS if PM_RUNTIME
+ select S5P_DEV_MFC
+ select SAMSUNG_DMADEV
select SPARSE_IRQ
select SRAM
select USE_OF
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 1602abce6ec0..138070e42aa9 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -14,30 +14,20 @@ menu "SAMSUNG EXYNOS SoCs Support"
config ARCH_EXYNOS4
bool "SAMSUNG EXYNOS4"
default y
- select ARM_AMBA
- select CLKSRC_OF
+ select ARM_CPU_SUSPEND if PM_SLEEP
select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
select CPU_EXYNOS4210
select GIC_NON_BANKED
select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
- select HAVE_ARM_SCU if SMP
- select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
- select PINCTRL
- select PM_GENERIC_DOMAINS if PM_RUNTIME
- select S5P_DEV_MFC
help
- Samsung EXYNOS4 SoCs based systems
+ Samsung EXYNOS4 (Cortex-A9) SoC based systems
config ARCH_EXYNOS5
bool "SAMSUNG EXYNOS5"
- select ARM_AMBA
- select CLKSRC_OF
- select HAVE_ARM_SCU if SMP
- select HAVE_SMP
- select PINCTRL
+ default y
help
- Samsung EXYNOS5 (Cortex-A15) SoC based systems
+ Samsung EXYNOS5 (Cortex-A15/A7) SoC based systems
comment "EXYNOS SoCs"
@@ -45,59 +35,32 @@ config CPU_EXYNOS4210
bool "SAMSUNG EXYNOS4210"
default y
depends on ARCH_EXYNOS4
- select ARCH_HAS_BANDGAP
- select ARM_CPU_SUSPEND if PM_SLEEP
- select PINCTRL_EXYNOS
- select SAMSUNG_DMADEV
- help
- Enable EXYNOS4210 CPU support
config SOC_EXYNOS4212
bool "SAMSUNG EXYNOS4212"
default y
depends on ARCH_EXYNOS4
- select ARCH_HAS_BANDGAP
- select PINCTRL_EXYNOS
- select SAMSUNG_DMADEV
- help
- Enable EXYNOS4212 SoC support
config SOC_EXYNOS4412
bool "SAMSUNG EXYNOS4412"
default y
depends on ARCH_EXYNOS4
- select ARCH_HAS_BANDGAP
- select PINCTRL_EXYNOS
- select SAMSUNG_DMADEV
- help
- Enable EXYNOS4412 SoC support
config SOC_EXYNOS5250
bool "SAMSUNG EXYNOS5250"
default y
depends on ARCH_EXYNOS5
- select ARCH_HAS_BANDGAP
- select PINCTRL_EXYNOS
- select PM_GENERIC_DOMAINS if PM_RUNTIME
- select S5P_DEV_MFC
- select SAMSUNG_DMADEV
- help
- Enable EXYNOS5250 SoC support
config SOC_EXYNOS5420
bool "SAMSUNG EXYNOS5420"
default y
depends on ARCH_EXYNOS5
- select PM_GENERIC_DOMAINS if PM_RUNTIME
- help
- Enable EXYNOS5420 SoC support
config SOC_EXYNOS5440
bool "SAMSUNG EXYNOS5440"
default y
depends on ARCH_EXYNOS5
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
- select ARCH_HAS_BANDGAP
select ARCH_HAS_OPP
select HAVE_ARM_ARCH_TIMER
select AUTO_ZRELADDR
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 2/3] ARM: EXYNOS: Enable multi-platform build support
2014-05-23 15:19 [PATCH v2 0/3] Exynos multi-platform support Sachin Kamat
2014-05-23 15:19 ` [PATCH v2 1/3] ARM: EXYNOS: Consolidate Kconfig entries Sachin Kamat
@ 2014-05-23 15:19 ` Sachin Kamat
2014-05-23 15:19 ` [PATCH v2 3/3] ARM: multi_v7_defconfig: Enable Exynos platform Sachin Kamat
2014-05-23 19:17 ` [PATCH v2 0/3] Exynos multi-platform support Arnd Bergmann
3 siblings, 0 replies; 8+ messages in thread
From: Sachin Kamat @ 2014-05-23 15:19 UTC (permalink / raw)
To: linux-arm-kernel
From: Arnd Bergmann <arnd@arndb.de>
This makes it possible to enable the Exynos platform as part of a
multiplatform kernel.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
Changes since v1:
Dropped duplicate config symbols as suggested by Arnd.
Updated commit log.
---
arch/arm/Kconfig | 30 ------------------------------
arch/arm/mach-exynos/Kconfig | 21 +++++++++++++++++++++
arch/arm/mach-exynos/Makefile | 2 ++
arch/arm/plat-samsung/Makefile | 3 +++
4 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b8d47ca91406..a2a0153c94e7 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -830,36 +830,6 @@ config ARCH_S5PV210
help
Samsung S5PV210/S5PC110 series based systems
-config ARCH_EXYNOS
- bool "Samsung EXYNOS"
- select ARCH_HAS_BANDGAP
- select ARCH_HAS_CPUFREQ
- select ARCH_HAS_HOLES_MEMORYMODEL
- select ARCH_REQUIRE_GPIOLIB
- select ARCH_SPARSEMEM_ENABLE
- select ARM_AMBA
- select ARM_GIC
- select CLKSRC_OF
- select COMMON_CLK_SAMSUNG
- select CPU_V7
- select GENERIC_CLOCKEVENTS
- select HAVE_ARM_SCU if SMP
- select HAVE_S3C2410_I2C if I2C
- select HAVE_S3C2410_WATCHDOG if WATCHDOG
- select HAVE_S3C_RTC if RTC_CLASS
- select HAVE_SMP
- select NEED_MACH_MEMORY_H
- select PINCTRL
- select PINCTRL_EXYNOS
- select PM_GENERIC_DOMAINS if PM_RUNTIME
- select S5P_DEV_MFC
- select SAMSUNG_DMADEV
- select SPARSE_IRQ
- select SRAM
- select USE_OF
- help
- Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5)
-
config ARCH_DAVINCI
bool "TI DaVinci"
select ARCH_HAS_HOLES_MEMORYMODEL
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 138070e42aa9..7035131a1c99 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -7,6 +7,27 @@
# Configuration options for the EXYNOS4
+config ARCH_EXYNOS
+ bool "Samsung EXYNOS" if ARCH_MULTI_V7
+ select ARCH_HAS_BANDGAP
+ select ARCH_HAS_CPUFREQ
+ select ARCH_HAS_HOLES_MEMORYMODEL
+ select ARCH_REQUIRE_GPIOLIB
+ select ARM_AMBA
+ select ARM_GIC
+ select COMMON_CLK_SAMSUNG
+ select HAVE_ARM_SCU if SMP
+ select HAVE_S3C2410_I2C if I2C
+ select HAVE_S3C2410_WATCHDOG if WATCHDOG
+ select HAVE_S3C_RTC if RTC_CLASS
+ select PINCTRL
+ select PINCTRL_EXYNOS
+ select PM_GENERIC_DOMAINS if PM_RUNTIME
+ select S5P_DEV_MFC
+ select SRAM
+ help
+ Support for SAMSUNG EXYNOS SoCs (EXYNOS4/5)
+
if ARCH_EXYNOS
menu "SAMSUNG EXYNOS SoCs Support"
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
index df809039b017..6f3608602bfa 100644
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@ -5,6 +5,8 @@
#
# Licensed under GPLv2
+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include
+
obj-y :=
obj-m :=
obj-n :=
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 25c826ed3b65..5e5beaa9ae15 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -4,6 +4,9 @@
#
# Licensed under GPLv2
+ccflags-$(CONFIG_ARCH_MULTI_V7) += -I$(srctree)/$(src)/include
+ccflags-$(CONFIG_ARCH_EXYNOS) += -I$(srctree)/arch/arm/mach-exynos/include
+
obj-y :=
obj-m :=
obj-n := dummy.o
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 3/3] ARM: multi_v7_defconfig: Enable Exynos platform
2014-05-23 15:19 [PATCH v2 0/3] Exynos multi-platform support Sachin Kamat
2014-05-23 15:19 ` [PATCH v2 1/3] ARM: EXYNOS: Consolidate Kconfig entries Sachin Kamat
2014-05-23 15:19 ` [PATCH v2 2/3] ARM: EXYNOS: Enable multi-platform build support Sachin Kamat
@ 2014-05-23 15:19 ` Sachin Kamat
2014-05-23 19:17 ` [PATCH v2 0/3] Exynos multi-platform support Arnd Bergmann
3 siblings, 0 replies; 8+ messages in thread
From: Sachin Kamat @ 2014-05-23 15:19 UTC (permalink / raw)
To: linux-arm-kernel
Enable Exynos platform and its related IPs.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
No changes since v1.
---
arch/arm/configs/multi_v7_defconfig | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 6a27f90ab7bc..bbdcadf642b6 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -48,6 +48,7 @@ CONFIG_ARCH_SPEAR13XX=y
CONFIG_MACH_SPEAR1310=y
CONFIG_MACH_SPEAR1340=y
CONFIG_ARCH_STI=y
+CONFIG_ARCH_EXYNOS=y
CONFIG_ARCH_SUNXI=y
CONFIG_ARCH_SIRF=y
CONFIG_ARCH_TEGRA=y
@@ -72,6 +73,7 @@ CONFIG_PCI_MSI=y
CONFIG_PCI_MVEBU=y
CONFIG_PCI_TEGRA=y
CONFIG_SMP=y
+CONFIG_NR_CPUS=8
CONFIG_HIGHPTE=y
CONFIG_CMA=y
CONFIG_ARM_APPENDED_DTB=y
@@ -160,6 +162,8 @@ CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_DW=y
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_SAMSUNG=y
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SERIAL_SIRFSOC=y
CONFIG_SERIAL_SIRFSOC_CONSOLE=y
CONFIG_SERIAL_TEGRA=y
@@ -183,6 +187,7 @@ CONFIG_I2C_MUX=y
CONFIG_I2C_MUX_PCA954x=y
CONFIG_I2C_MUX_PINCTRL=y
CONFIG_I2C_DESIGNWARE_PLATFORM=y
+CONFIG_I2C_EXYNOS5=y
CONFIG_I2C_MV64XXX=y
CONFIG_I2C_SIRF=y
CONFIG_I2C_TEGRA=y
@@ -218,6 +223,7 @@ CONFIG_MFD_AS3722=y
CONFIG_MFD_CROS_EC=y
CONFIG_MFD_CROS_EC_SPI=y
CONFIG_MFD_MAX8907=y
+CONFIG_MFD_SEC_CORE=y
CONFIG_MFD_PALMAS=y
CONFIG_MFD_TPS65090=y
CONFIG_MFD_TPS6586X=y
@@ -228,6 +234,8 @@ CONFIG_REGULATOR_AS3722=y
CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_MAX8907=y
CONFIG_REGULATOR_PALMAS=y
+CONFIG_REGULATOR_S2MPS11=y
+CONFIG_REGULATOR_S5M8767=y
CONFIG_REGULATOR_TPS51632=y
CONFIG_REGULATOR_TPS62360=y
CONFIG_REGULATOR_TPS65090=y
@@ -284,12 +292,16 @@ CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ESDHC_IMX=y
CONFIG_MMC_SDHCI_PXAV3=y
CONFIG_MMC_SDHCI_TEGRA=y
+CONFIG_MMC_SDHCI_S3C=y
CONFIG_MMC_SDHCI_DOVE=y
CONFIG_MMC_SDHCI_SPEAR=y
+CONFIG_MMC_SDHCI_S3C_DMA=y
CONFIG_MMC_SDHCI_BCM_KONA=y
CONFIG_MMC_OMAP=y
CONFIG_MMC_OMAP_HS=y
CONFIG_MMC_MVSDIO=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_EXYNOS=y
CONFIG_EDAC=y
CONFIG_EDAC_MM_EDAC=y
CONFIG_EDAC_HIGHBANK_MC=y
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 0/3] Exynos multi-platform support
2014-05-23 15:19 [PATCH v2 0/3] Exynos multi-platform support Sachin Kamat
` (2 preceding siblings ...)
2014-05-23 15:19 ` [PATCH v2 3/3] ARM: multi_v7_defconfig: Enable Exynos platform Sachin Kamat
@ 2014-05-23 19:17 ` Arnd Bergmann
2014-05-23 19:48 ` Kukjin Kim
3 siblings, 1 reply; 8+ messages in thread
From: Arnd Bergmann @ 2014-05-23 19:17 UTC (permalink / raw)
To: linux-arm-kernel
On Friday 23 May 2014, Sachin Kamat wrote:
> The patches in this series were earlier sent as part of other
> series. Now that the other patches have been merged, re-sending
> these after rebasing them on linux-next (20140523).
> Tested on Exynos4210, 4412, 5250 and 5420 based boards.
>
> A particular change in this series is the removal of single platform
> support for Exynos as suggested by Arnd and Olof (patch 2/3). With
> this change certain features (drivers) which are not yet multi-platform
> aware like cpufreq, devfreq and DRM based gscaler will not be available
> now.
Acked-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH v2 0/3] Exynos multi-platform support
2014-05-23 19:17 ` [PATCH v2 0/3] Exynos multi-platform support Arnd Bergmann
@ 2014-05-23 19:48 ` Kukjin Kim
2014-05-23 21:02 ` Tomasz Figa
0 siblings, 1 reply; 8+ messages in thread
From: Kukjin Kim @ 2014-05-23 19:48 UTC (permalink / raw)
To: linux-arm-kernel
On 05/24/14 04:17, Arnd Bergmann wrote:
> On Friday 23 May 2014, Sachin Kamat wrote:
>> The patches in this series were earlier sent as part of other
>> series. Now that the other patches have been merged, re-sending
>> these after rebasing them on linux-next (20140523).
>> Tested on Exynos4210, 4412, 5250 and 5420 based boards.
>>
>> A particular change in this series is the removal of single platform
>> support for Exynos as suggested by Arnd and Olof (patch 2/3). With
>> this change certain features (drivers) which are not yet multi-platform
>> aware like cpufreq, devfreq and DRM based gscaler will not be available
>> now.
>
>
> Acked-by: Arnd Bergmann<arnd@arndb.de>
Yes, it's time to move on exynos multiplatform and we can't wait for
more perfect something. Anyway if any problems, let's fix them after
this. Will apply this whole series.
Thanks,
Kukjin
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 0/3] Exynos multi-platform support
2014-05-23 19:48 ` Kukjin Kim
@ 2014-05-23 21:02 ` Tomasz Figa
2014-05-25 21:33 ` Kukjin Kim
0 siblings, 1 reply; 8+ messages in thread
From: Tomasz Figa @ 2014-05-23 21:02 UTC (permalink / raw)
To: linux-arm-kernel
Hi Kukjin,
On 23.05.2014 21:48, Kukjin Kim wrote:
> On 05/24/14 04:17, Arnd Bergmann wrote:
>> On Friday 23 May 2014, Sachin Kamat wrote:
>>> The patches in this series were earlier sent as part of other
>>> series. Now that the other patches have been merged, re-sending
>>> these after rebasing them on linux-next (20140523).
>>> Tested on Exynos4210, 4412, 5250 and 5420 based boards.
>>>
>>> A particular change in this series is the removal of single platform
>>> support for Exynos as suggested by Arnd and Olof (patch 2/3). With
>>> this change certain features (drivers) which are not yet multi-platform
>>> aware like cpufreq, devfreq and DRM based gscaler will not be available
>>> now.
>>
>>
>> Acked-by: Arnd Bergmann<arnd@arndb.de>
>
> Yes, it's time to move on exynos multiplatform and we can't wait for
> more perfect something. Anyway if any problems, let's fix them after
> this. Will apply this whole series.
I have tested v1 of this series on Exynos4210-TRATS and
Exynos4412-TRATS2 boards and they seemed to work fine with added two
patches that are already on the ML:
- [PATCH v2] cpufreq: exynos: Fix driver compilation with
ARCH_MULTIPLATFORM,
- [PATCH] drm/exynos/fimd: allow multiplatform configuration.
Not tested too extensively, but primary features (boot, display, USB
gadget, cpufreq) seem to work at first glance with the above patches.
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 0/3] Exynos multi-platform support
2014-05-23 21:02 ` Tomasz Figa
@ 2014-05-25 21:33 ` Kukjin Kim
0 siblings, 0 replies; 8+ messages in thread
From: Kukjin Kim @ 2014-05-25 21:33 UTC (permalink / raw)
To: linux-arm-kernel
On 05/24/14 06:02, Tomasz Figa wrote:
> Hi Kukjin,
>
Hi,
> On 23.05.2014 21:48, Kukjin Kim wrote:
>> On 05/24/14 04:17, Arnd Bergmann wrote:
>>> On Friday 23 May 2014, Sachin Kamat wrote:
>>>> The patches in this series were earlier sent as part of other
>>>> series. Now that the other patches have been merged, re-sending
>>>> these after rebasing them on linux-next (20140523).
>>>> Tested on Exynos4210, 4412, 5250 and 5420 based boards.
>>>>
>>>> A particular change in this series is the removal of single platform
>>>> support for Exynos as suggested by Arnd and Olof (patch 2/3). With
>>>> this change certain features (drivers) which are not yet multi-platform
>>>> aware like cpufreq, devfreq and DRM based gscaler will not be available
>>>> now.
>>>
>>>
>>> Acked-by: Arnd Bergmann<arnd@arndb.de>
>>
>> Yes, it's time to move on exynos multiplatform and we can't wait for
>> more perfect something. Anyway if any problems, let's fix them after
>> this. Will apply this whole series.
>
> I have tested v1 of this series on Exynos4210-TRATS and
> Exynos4412-TRATS2 boards and they seemed to work fine with added two
> patches that are already on the ML:
> - [PATCH v2] cpufreq: exynos: Fix driver compilation with
> ARCH_MULTIPLATFORM,
Hmm...yeah, Thomas re-submitted v5 but the patches are depending on
others which are not yet decided to apply for 3.16...maybe it can be
upstreamed in 3.17?...
> - [PATCH] drm/exynos/fimd: allow multiplatform configuration.
>
> Not tested too extensively, but primary features (boot, display, USB
> gadget, cpufreq) seem to work at first glance with the above patches.
>
Thanks for your test and OK, I'll queue this with multiplatform patches.
- Kukjin
^ permalink raw reply [flat|nested] 8+ messages in thread