From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754892AbcAYAux (ORCPT ); Sun, 24 Jan 2016 19:50:53 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:49073 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752589AbcAYAuq (ORCPT ); Sun, 24 Jan 2016 19:50:46 -0500 X-AuditID: cbfec7f5-f79b16d000005389-4b-56a5716295da From: Krzysztof Kozlowski To: Michael Turquette , Stephen Boyd , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-clk@vger.kernel.org Cc: Catalin Marinas , Will Deacon , Kukjin Kim , Sylwester Nawrocki , Tomasz Figa , Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Kevin Hilman , Krzysztof Kozlowski Subject: [RESEND v2 2/2] arm64: EXYNOS: Consolidate ARCH_EXYNOS7 symbol into ARCH_EXYNOS Date: Mon, 25 Jan 2016 09:50:21 +0900 Message-id: <1453683021-6998-3-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1453683021-6998-1-git-send-email-k.kozlowski@samsung.com> References: <1453683021-6998-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOLMWRmVeSWpSXmKPExsVy+t/xq7pJhUvDDCY9V7P4O+kYu8X7ZT2M FvOPnGO1eP3C0KL/8Wtmi6ebHzNZbHp8jdXiY889VovLu+awWcw4v4/J4uIpV4tT1z+zWRx+ 085q8eNMN4vFql1/GC1efjzB4iDgsWbeGkaP378mMXq8v9HK7nG5r5fJY+esu+wem1Z1snls XlLvceVEE6tH35ZVjB6fN8kFcEVx2aSk5mSWpRbp2yVwZfxZ/46l4J9IxZ2/E5kaGG8KdjFy ckgImEi09B1jhLDFJC7cW8/WxcjFISSwlFHi7sz/LBDOf0aJ7y+vs4BUsQkYS2xevgSsSkTg EqPE0nNfwaqYBVqZJVpO/WAFqRIWiJI49mcvcxcjBweLgKrEjI1sIGFeATeJBT232SHWyUmc PDYZrJxTwF1i+c5nbCDlQkA1F+anTWDkXcDIsIpRNLU0uaA4KT3XSK84Mbe4NC9dLzk/dxMj JLi/7mBceszqEKMAB6MSD6+l2tIwIdbEsuLK3EOMEhzMSiK8l7KAQrwpiZVVqUX58UWlOanF hxilOViUxHln7nofIiSQnliSmp2aWpBaBJNl4uCUamAs8csLn5H8V2Gez8GJGVv9Zp5asf16 t5rh/bQtF1Tnr1B1nsPuN5ehVVKkeba7ufqDWa9dtFxjJu1PimFZkHkt8cXmdfXND35/F75i ZdvLxnrYpoupUXrCVfWNF+Zw1fuLWDMJ/Jn1Mtj81n3bE/cOpcvVnli9MNh+pdy+0g73T5P2 69W/fpmvxFKckWioxVxUnAgAAsRty2oCAAA= 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 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 4043c35962cc..64f1116640bc 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -13,21 +13,14 @@ 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_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 bdd7aa358d2a..a396fa7c69a5 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