From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967094AbcA1AgQ (ORCPT ); Wed, 27 Jan 2016 19:36:16 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:64137 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966892AbcA1Afz (ORCPT ); Wed, 27 Jan 2016 19:35:55 -0500 X-AuditID: cbfec7f4-f79026d00000418a-91-56a962688337 From: Krzysztof Kozlowski To: Kukjin Kim , Krzysztof Kozlowski , Catalin Marinas , Will Deacon , Michael Turquette , Stephen Boyd , Sylwester Nawrocki , Tomasz Figa , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-clk@vger.kernel.org Cc: Arnd Bergmann , Olof Johansson , Kevin Hilman , Alim Akhtar , Pankaj Dubey , Chanwoo Choi Subject: [PATCH v4 3/3] arm64: EXYNOS: Consolidate ARCH_EXYNOS7 symbol into ARCH_EXYNOS Date: Thu, 28 Jan 2016 09:35:24 +0900 Message-id: <1453941324-15742-4-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1453941324-15742-1-git-send-email-k.kozlowski@samsung.com> References: <1453941324-15742-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrGLMWRmVeSWpSXmKPExsVy+t/xa7oZSSvDDBbMYbV4MG8bm8XfScfY Ld4v62G0uP7lOavF/CPnWC1evzC06H/8mtni6ebHTBabHl9jtfjYc4/V4vKuOWwWM87vY7K4 eMrV4tT1z2wWi7Z+Ybc4/Kad1eLHmW4Wi1W7/jBavPx4gsVB2GPNvDWMHr9/TWL0eH+jld3j cl8vk8fOWXfZPTat6mTz2Lyk3uPKiSZWj74tqxg9Pm+SC+CK4rJJSc3JLEst0rdL4Mpo/rCH ueCxaEXbj6mMDYxLhboYOTkkBEwkOm9cZ4SwxSQu3FvP1sXIxSEksJRR4mB7C5Tzn1Hiwdv9 rCBVbALGEpuXL2EDsUUEPjBLfJ5vDmIzC9xnlPg7Ux3EFhaIlPjXvJ8dxGYRUJXY8uMWM4jN K+Au0broMDvENjmJk8cmg83kFPCQuLHwFlhcCKjm/ZQXLBMYeRcwMqxiFE0tTS4oTkrPNdQr TswtLs1L10vOz93ECAn9LzsYFx+zOsQowMGoxMPLELUyTIg1say4MvcQowQHs5II72YnoBBv SmJlVWpRfnxRaU5q8SFGaQ4WJXHeubvehwgJpCeWpGanphakFsFkmTg4pRoY9bZqqzUU6P9k 8Po98UqhlNgzY0n1pcaNWtk3t1xjeHvxxI2/TwIfBmVkb/6z8qdiFOuJamOxg/kZOfGtcZcU /J9PY7Of+t5XwnOtqMvhORczJsQHrezrCU6sX7Tz354LxWd9Pz34waL8e9nr3XZ7dhfKK94S Zzoxz4jrpu7t9Y9mNvApVs47rcRSnJFoqMVcVJwIABkL77F5AgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The ARMv8 Exynos family SoCs in Linux kernel are currently: - Exynos5433 (controlled by ARCH_EXYNOS), - Exynos7 (controlled by ARCH_EXYNOS7). It duplicates Kconfig symbols unnecessarily, so consolidate them into one ARCH_EXYNOS. Future SoCs could fall also under the ARCH_EXYNOS symbol. The commit should not bring any visible functional change. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Chanwoo Choi Reviewed-by: Pankaj Dubey Tested-by: Alim Akhtar Reviewed-by: Tomasz Figa --- Changes since v3: 1. Rebase on next-20160127. Changes since v2: 1. None Changes since v1: 1. Minor cleanups after Tomasz's comments. 2. Added tags: Chanwoo's, Pankaj's, Alim's and Tomasz's. --- arch/arm64/Kconfig.platforms | 11 ++--------- arch/arm64/boot/dts/exynos/Makefile | 2 +- arch/arm64/configs/defconfig | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 83ac9316a432..36e1233493d6 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -14,22 +14,15 @@ config ARCH_BERLIN This enables support for Marvell Berlin SoC Family config ARCH_EXYNOS - bool - help - This enables support for Samsung Exynos SoC family - -config ARCH_EXYNOS7 - bool "ARMv8 based Samsung Exynos7" - select ARCH_EXYNOS + bool "ARMv8 based Samsung Exynos SoC family" select COMMON_CLK select COMMON_CLK_SAMSUNG select HAVE_S3C2410_WATCHDOG if WATCHDOG select HAVE_S3C_RTC if RTC_CLASS select PINCTRL select PINCTRL_EXYNOS - help - This enables support for Samsung Exynos7 SoC family + This enables support for ARMv8 based Samsung Exynos SoC family. config ARCH_LAYERSCAPE bool "ARMv8 based Freescale Layerscape SoC family" diff --git a/arch/arm64/boot/dts/exynos/Makefile b/arch/arm64/boot/dts/exynos/Makefile index 20310e5b6d6f..50c9b9383cfa 100644 --- a/arch/arm64/boot/dts/exynos/Makefile +++ b/arch/arm64/boot/dts/exynos/Makefile @@ -1,4 +1,4 @@ -dtb-$(CONFIG_ARCH_EXYNOS7) += exynos7-espresso.dtb +dtb-$(CONFIG_ARCH_EXYNOS) += exynos7-espresso.dtb always := $(dtb-y) subdir-y := $(dts-dirs) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 18ca9fb9e65f..331a843cf122 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -33,7 +33,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_IOSCHED_DEADLINE is not set CONFIG_ARCH_BCM_IPROC=y CONFIG_ARCH_BERLIN=y -CONFIG_ARCH_EXYNOS7=y +CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_LAYERSCAPE=y CONFIG_ARCH_HISI=y CONFIG_ARCH_MEDIATEK=y -- 1.9.1