From patchwork Tue Feb 16 06:20:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 8321731 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 2E12AC02AA for ; Tue, 16 Feb 2016 06:21:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 47DF9202E6 for ; Tue, 16 Feb 2016 06:21:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 433EF202F0 for ; Tue, 16 Feb 2016 06:21:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753784AbcBPGVS (ORCPT ); Tue, 16 Feb 2016 01:21:18 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:49276 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753683AbcBPGVP (ORCPT ); Tue, 16 Feb 2016 01:21:15 -0500 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O2M001G9MZARW20@mailout1.w1.samsung.com>; Tue, 16 Feb 2016 06:21:10 +0000 (GMT) X-AuditID: cbfec7f4-f79026d00000418a-dd-56c2bfd63987 Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id B2.0E.16778.6DFB2C65; Tue, 16 Feb 2016 06:21:10 +0000 (GMT) Received: from localhost.localdomain ([10.113.63.52]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0O2M007D6MYI9U10@eusync4.samsung.com>; Tue, 16 Feb 2016 06:21:10 +0000 (GMT) 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 v5 3/3] arm64: EXYNOS: Consolidate ARCH_EXYNOS7 symbol into ARCH_EXYNOS Date: Tue, 16 Feb 2016 15:20:32 +0900 Message-id: <1455603632-11158-4-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 2.5.0 In-reply-to: <1455603632-11158-1-git-send-email-k.kozlowski@samsung.com> References: <1455603632-11158-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRmVeSWpSXmKPExsVy+t/xa7rX9h8KMzi1nM/iwbxtbBZ/Jx1j t3i/rIfR4vqX56wW84+cY7V4/cLQov/xa2aLp5sfM1lsenyN1eJjzz1Wi8u75rBZzDi/j8ni 4ilXi1PXP7NZLNr6hd3i8Jt2VosfZ7pZLFbt+sNo8fLjCRYHYY8189Ywevz+NYnR4/2NVnaP y329TB47Z91l99i0qpPNY/OSeo8rJ5pYPfq2rGL0+LxJLoArissmJTUnsyy1SN8ugSvj9ZwW 5oIfYhUn9p1hbWBcLtzFyMkhIWAi8WDiczYIW0ziwr31QDYXh5DAUkaJRy/OskM4/xklXr4/ AFbFJmAssXn5EjBbROADs8Tn+eYgNrPAfUaJvzPVuxg5OIQFIiUa2lNBwiwCqhIPZm1kAbF5 BdwlNp2+wQRSIiEgJ7HgQjqIySngIbHrjSJIhRBQRfuds+wTGHkXMDKsYhRNLU0uKE5KzzXU K07MLS7NS9dLzs/dxAgJ+i87GBcfszrEKMDBqMTDy+FxKEyINbGsuDL3EKMEB7OSCG/CIqAQ b0piZVVqUX58UWlOavEhRmkOFiVx3rm73ocICaQnlqRmp6YWpBbBZJk4OKUaGFdzyP15/Lys +Ype8Mb/z93kxPb9+P2qsfmxvcfMJZHPNO9u3H9w3edtUsfN/BYf3mzg8/aohjfbAg+5lCUJ eUpB7g7WKQ/XrcyfGb5Xaud0Luap0z80LtY/sCfih5N+pUEZ07MdRmJFV/d6sm6NvSH6bqvB 8R+6m2YLHBY8lnu494+Y1T215zuVWIozEg21mIuKEwGuHftMdgIAAA== 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=-6.9 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 Reviewed-by: Javier Martinez Canillas Reviewed-by: Andi Shyti --- Changes since v4: 1. Added tags from: Javier, Andi. 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 21074f674bde..653662bbafeb 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -14,21 +14,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 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