From patchwork Fri Nov 20 00:12:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 7662601 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D202CBF90C for ; Fri, 20 Nov 2015 00:14:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA08C2053E for ; Fri, 20 Nov 2015 00:14:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B522203B6 for ; Fri, 20 Nov 2015 00:14:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161610AbbKTAOe (ORCPT ); Thu, 19 Nov 2015 19:14:34 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:13512 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161066AbbKTAON (ORCPT ); Thu, 19 Nov 2015 19:14:13 -0500 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NY3004WR7BN76A0@mailout4.w1.samsung.com>; Fri, 20 Nov 2015 00:14:11 +0000 (GMT) X-AuditID: cbfec7f4-f79026d00000418a-85-564e65d2f2bd Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id C4.EE.16778.2D56E465; Fri, 20 Nov 2015 00:14:10 +0000 (GMT) Received: from localhost.localdomain ([10.252.80.64]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NY3009UF7B47750@eusync1.samsung.com>; Fri, 20 Nov 2015 00:14:10 +0000 (GMT) From: Krzysztof Kozlowski To: Sylwester Nawrocki , Tomasz Figa , Michael Turquette , Stephen Boyd , linux-samsung-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Catalin Marinas , Will Deacon , Kukjin Kim , Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Kevin Hilman , devicetree@vger.kernel.org, Alim Akhtar Cc: Pankaj Dubey , Krzysztof Kozlowski Subject: [PATCH v2 2/2] arm64: EXYNOS: Consolidate ARCH_EXYNOS7 symbol into ARCH_EXYNOS Date: Fri, 20 Nov 2015 09:12:41 +0900 Message-id: <1447978361-18010-3-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1447978361-18010-1-git-send-email-k.kozlowski@samsung.com> References: <1447978361-18010-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrGLMWRmVeSWpSXmKPExsVy+t/xy7qXUv3CDCbe1LN4MG8bm8XfScfY Ld4v62G0mH/kHKvF6xeGFv2PXzNbfD28gtFi0+NrrBYfe+6xWlzeNYfNYsb5fUwWF0+5Wpy6 /pnNYtHWL+wWh9+0s1r8ONPNYrFq1x9Gi5cfT7A4CHmsmbeG0eP3r0mMHu9vtLJ7XO7rZfLY Oesuu8emVZ1sHneu7WHz2Lyk3uPKiSZWj74tqxg9Pm+SC+CO4rJJSc3JLEst0rdL4Mr4s/4d S8E/kYo7fycyNTDeFOxi5OSQEDCR2Ph3GxuELSZx4d56IJuLQ0hgKaPE6yu/2SGc/4wS/z9f YgKpYhMwlti8fAlYlYjAWRaJpvPzGbsYOTiYBWIkbpzIA6kRFoiUaHuwGGwqi4CqRMeBw8wg Nq+Au8S7u/uZILbJSZw8NpkVxOYU8JBY8nA1mC0EVLP08BqWCYy8CxgZVjGKppYmFxQnpeca 6hUn5haX5qXrJefnbmKEhP6XHYyLj1kdYhTgYFTi4W0Q9wsTYk0sK67MPcQowcGsJMK71A8o xJuSWFmVWpQfX1Sak1p8iFGag0VJnHfurvchQgLpiSWp2ampBalFMFkmDk6pBsZKu7QVchPO quTtEu9fKi7S8Ldij2/l4j9X71zLbnjquKZ6hvGy8tZ7K4TN4rQe/m2Y/jFoo1jilHfRAV7r JeW/9N4WPJbxS0g3srSkNPvsk6umsg9qJy2Z7W3IsnGT7Ix27eA563j+vgmPmnrd5W2j7hb1 jZJRW3vyVb7vnBW36HS4+ts1xbJKLMUZiYZazEXFiQDH3u9OeQIAAA== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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