From patchwork Thu Nov 15 15:11:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 10684573 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7F78113BB for ; Thu, 15 Nov 2018 15:12:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6AD7E2CA46 for ; Thu, 15 Nov 2018 15:12:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 629AC2CABB; Thu, 15 Nov 2018 15:12:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB3362CA8B for ; Thu, 15 Nov 2018 15:12:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388019AbeKPBUc (ORCPT ); Thu, 15 Nov 2018 20:20:32 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:58207 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387839AbeKPBUc (ORCPT ); Thu, 15 Nov 2018 20:20:32 -0500 Received: from epcas2p4.samsung.com (unknown [182.195.41.56]) by mailout2.samsung.com (KnoxPortal) with ESMTP id 20181115151214epoutp0273fe3d85d7e7cca1f2537c1f1cc23251~nVOO3D96-2710927109epoutp02g; Thu, 15 Nov 2018 15:12:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.samsung.com 20181115151214epoutp0273fe3d85d7e7cca1f2537c1f1cc23251~nVOO3D96-2710927109epoutp02g DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1542294734; bh=fwr7eg+826CJd5XoKqdnGmWJiDrlNkTW8iv/lAOZXKE=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=S8psAK/X4FGv/8c0wTzlGf4zaDiudGAEfrSDGp/ULS5cfFfLH47gxLz2HZWq2v8L1 9MiXOk+xUMrwruybJiJzfXnpzo71GH16/gzF8IbpAvTEZRXrb9Mj8KOW6ApptElaI9 yDxi1EXF7kmgaG16QrH+WyLQ801VH/rGp9RJBs70= Received: from epsmges2p2.samsung.com (unknown [182.195.42.70]) by epcas2p4.samsung.com (KnoxPortal) with ESMTP id 20181115151213epcas2p453f12062298bb318f64cbc352b6791bd~nVONmNbjn0103801038epcas2p4U; Thu, 15 Nov 2018 15:12:13 +0000 (GMT) Received: from epcas2p4.samsung.com ( [182.195.41.56]) by epsmges2p2.samsung.com (Symantec Messaging Gateway) with SMTP id FB.0C.04407.CCC8DEB5; Fri, 16 Nov 2018 00:12:12 +0900 (KST) Received: from epsmgms2p2new.samsung.com (unknown [182.195.42.143]) by epcas2p4.samsung.com (KnoxPortal) with ESMTP id 20181115151211epcas2p4fdc719d354f2a732f70667ccbd8f1bae~nVOMN5m880889608896epcas2p4f; Thu, 15 Nov 2018 15:12:11 +0000 (GMT) X-AuditID: b6c32a46-7a1ff70000001137-23-5bed8ccc8a07 Received: from epmmp2 ( [203.254.227.17]) by epsmgms2p2new.samsung.com (Symantec Messaging Gateway) with SMTP id 91.28.03702.BCC8DEB5; Fri, 16 Nov 2018 00:12:11 +0900 (KST) Received: from AMDC3058.DIGITAL.local ([106.120.53.102]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PI8006WJQ7YQ380@mmp2.samsung.com>; Fri, 16 Nov 2018 00:12:11 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Krzysztof Kozlowski Cc: Arnd Bergmann , Marek Szyprowski , Kukjin Kim , Markus Reichl , Andrzej Hajda , Chanwoo Choi , Javier Martinez Canillas , Pankaj Dubey , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com Subject: [PATCH 1/9] ARM: EXYNOS: remove secondary startup initialization from smp_prepare_cpus Date: Thu, 15 Nov 2018 16:11:30 +0100 Message-id: <1542294698-17470-2-git-send-email-b.zolnierkie@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAzWRb0gTcRjH++1uu3M5u6bULw1fDIKUNBsGZ5n0QuSCoojepJQd7pjSpms3 TQ1USNKWZBmZlIWV9mc5p3PmsjLclkuzmbk0V+vfwGFlEo6UiZnnzXef5/t8H55/OCJ1odF4 Xr6O0ebTKplIjD62x5EJQzXTWUk+awrpaXMJycW6fozsaDAJyfGAX0jerr8PyFrfT4QcHm7H SLNvTEiO9jSKyIbhXgE55ZgHpNHhxcg7XQFsr4RaCNYByvOpnDIbzouozuZyaqb3vYi6aDEA atYcewjLFKcqGFVeEaPdnnZCnBuo7MM0HknxV+OSqALcWKsHYTgkkuGM6Z5QD8S4lLAC+NGj B3wwB6BJHxSsuiaCoyjHUqIdwLPGct4UBNDcM4JxCRGxC16uMgCOo4g4OL44J+QYIV4isNkN OY4kaNjzu29Zx3GU2AJdr3WcLCEo6Fy6jvK9YuFA/5WV0jBiH+x+U4VwvSDhEEHfnDFkSocP 9B8QniPhD6cF4zkGTho6AF9wDcBfwRaUD0wAtg71h9bZDe3OkdB0EbDavohxE0FCAqvPSXkL BSe9f0J3aQRw1G9DL4FNTWCNAWxgNKxaybByjTyRpdVsYb4yMadAbQYrX47PsIJm134bIHAg C5cknZ7OkgrpIrZEbQMQR2RRkoyyZUmioEtKGW1BtrZQxbA2EIOjso2SbzE3s6SEktYxJxlG w2hXswI8LLoCWJ6+bQ1XRNSmbK6XX231vxpoUVcNPgRJ9vlnO7+/P/IE5vxLPbC+2bGtt7jY m54AGPnnhqOyY1sr+46fmkq+1SUsS6Vn2nR/ZxO+CEC86kyt0u1WPE+vfxcVqLF6LU0LY3vU 67qz7xqdgwcvOHyH08SPXJ2CiY7EF7JMt58tlaFsLr0jHtGy9H/Vfrai4QIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrELMWRmVeSWpSXmKPExsVy+t9jQd3TPW+jDeZ/l7e4te4cq8XfScfY LTbOWM9qcf3Lc1aLhdOWM1r0P37NbHH+/AZ2i02Pr7FaXN41h81ixvl9TBYvj/xgtFh75C67 xaKtX9gdeD1+/5rE6HHrTr3HplWdbB6bl9R7vN93lc2jb8sqRo/Pm+QC2KO4bFJSczLLUov0 7RK4Mr60HGQvuMVb8WDtf7YGxtncXYycHBICJhI3f11m6WLk4hASWMco8f54KzOE84tRouf3 RxaQKjYBK4mJ7asYQWwRAU2J63+/s4IUMQscZZb4PGE7M0hCWCBRYuXGD0ANHBwsAqoS506X gIR5BTwkjv+fxQKxTU7i5LHJrCA2p4CnxPaz7WCtQkA1n/+eYZ/AyLOAkWEVo2RqQXFuem6x UYFRXmq5XnFibnFpXrpecn7uJkZgSG47rNW/g/HxkvhDjAIcjEo8vAblb6OFWBPLiitzDzFK cDArifC61QGFeFMSK6tSi/Lji0pzUosPMUpzsCiJ8/LnH4sUEkhPLEnNTk0tSC2CyTJxcEo1 MNbH8X7pbmbcvHHB25zpqqyX0p61JH4pYbp5cf5MJs2GDYyrpcIvPGq/71EmJvjqVuCKvx80 D0Xu/xd2JfR3UwmLgrO1u2OPR/Oc+TNcW2c7brpXobH2/v9V2vX+/CsEjtQrNEoY86fwBdx5 feGe5CuZWY18XBdehen/2r/ZW1Xy1DJOWS7uQCWW4oxEQy3mouJEALTMJKRFAgAA X-CMS-MailID: 20181115151211epcas2p4fdc719d354f2a732f70667ccbd8f1bae X-Msg-Generator: CA CMS-TYPE: 102P X-CMS-RootMailID: 20181115151211epcas2p4fdc719d354f2a732f70667ccbd8f1bae References: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Pankaj Dubey We are taking care of setting secondary cpu boot address in exynos_boot_secondary just before sending ipi to secondary CPUs, so we can safely remove this setting from smp_prepare_cpus. Signed-off-by: Pankaj Dubey Reviewed-by: Krzysztof Kozlowski Signed-off-by: Bartlomiej Zolnierkiewicz --- arch/arm/mach-exynos/platsmp.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index 6a1e682..c39ffd2 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -397,38 +397,12 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) static void __init exynos_smp_prepare_cpus(unsigned int max_cpus) { - int i; - exynos_sysram_init(); exynos_set_delayed_reset_assertion(true); if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) exynos_scu_enable(); - - /* - * Write the address of secondary startup into the - * system-wide flags register. The boot monitor waits - * until it receives a soft interrupt, and then the - * secondary CPU branches to this address. - * - * Try using firmware operation first and fall back to - * boot register if it fails. - */ - for (i = 1; i < max_cpus; ++i) { - unsigned long boot_addr; - u32 mpidr; - u32 core_id; - int ret; - - mpidr = cpu_logical_map(i); - core_id = MPIDR_AFFINITY_LEVEL(mpidr, 0); - boot_addr = __pa_symbol(exynos4_secondary_startup); - - ret = exynos_set_boot_addr(core_id, boot_addr); - if (ret) - break; - } } #ifdef CONFIG_HOTPLUG_CPU From patchwork Thu Nov 15 15:11:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 10684575 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2158117EE for ; Thu, 15 Nov 2018 15:12:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3BB82CA7C for ; Thu, 15 Nov 2018 15:12:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F27FF2CA76; Thu, 15 Nov 2018 15:12:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 965962CA99 for ; Thu, 15 Nov 2018 15:12:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388571AbeKPBUh (ORCPT ); Thu, 15 Nov 2018 20:20:37 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:38369 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387839AbeKPBUh (ORCPT ); Thu, 15 Nov 2018 20:20:37 -0500 Received: from epcas1p3.samsung.com (unknown [182.195.41.47]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20181115151218epoutp0408a7a164bd2d8666d609c69d0a92cf3d~nVOSe3vG01320613206epoutp046; Thu, 15 Nov 2018 15:12:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20181115151218epoutp0408a7a164bd2d8666d609c69d0a92cf3d~nVOSe3vG01320613206epoutp046 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1542294738; bh=kI6p2vhZEB2TrffD0NC5XE86qwf1DYaZqTO2jCgozeE=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=ubOOTg9Gf3Zd+yuluBGo5tH/pECDaWn0/1ju4+1j3KOxpCHb+ayRKXa73fBRevj7H 2wVGgZ5QmJinxbmBmhYkbfYg1CAdKcpel2BGhJryVUXR8K8lat03hWkTDP37leDHf8 a0+CMJL3LZWA5/C0Wf+bGoyHt31iuZ2iwDb9xaDw= Received: from epsmges1p3.samsung.com (unknown [182.195.42.55]) by epcas1p1.samsung.com (KnoxPortal) with ESMTP id 20181115151217epcas1p1f188cdb4992f4f511d0faef1fbad73ae~nVORxM3-E0985709857epcas1p13; Thu, 15 Nov 2018 15:12:17 +0000 (GMT) Received: from epcas1p1.samsung.com ( [182.195.41.45]) by epsmges1p3.samsung.com (Symantec Messaging Gateway) with SMTP id 0D.D3.04072.1DC8DEB5; Fri, 16 Nov 2018 00:12:17 +0900 (KST) Received: from epsmgms2p1new.samsung.com (unknown [182.195.42.142]) by epcas1p3.samsung.com (KnoxPortal) with ESMTP id 20181115151216epcas1p3413d9586bf941aa086bfc5cd620d45d9~nVORKx0RF3140631406epcas1p30; Thu, 15 Nov 2018 15:12:16 +0000 (GMT) X-AuditID: b6c32a37-887ff70000000fe8-3e-5bed8cd110bf Received: from epmmp2 ( [203.254.227.17]) by epsmgms2p1new.samsung.com (Symantec Messaging Gateway) with SMTP id 44.B9.03701.0DC8DEB5; Fri, 16 Nov 2018 00:12:16 +0900 (KST) Received: from AMDC3058.DIGITAL.local ([106.120.53.102]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PI8006WJQ7YQ380@mmp2.samsung.com>; Fri, 16 Nov 2018 00:12:16 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Krzysztof Kozlowski Cc: Arnd Bergmann , Marek Szyprowski , Kukjin Kim , Markus Reichl , Andrzej Hajda , Chanwoo Choi , Javier Martinez Canillas , Pankaj Dubey , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com, Grant Likely , Rob Herring , Linus Walleij Subject: [PATCH 2/9] soc: samsung: add exynos chipid driver support Date: Thu, 15 Nov 2018 16:11:31 +0100 Message-id: <1542294698-17470-3-git-send-email-b.zolnierkie@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrOIsWRmVeSWpSXmKPExsWy7bCmru7FnrfRBtNXSlncWneO1eLvpGPs FhtnrGe1uP7lOavFqzMb2SwWTlvOaNH/+DWzxfnzG9gtpvxZzmSx6fE1VovLu+awWcw4v4/J 4uWRH4wWa4/cZbdYtPULu0Xr3iPsDgIev39NYvS4dafeY9OqTjaPO9f2sHlsXlLv8X7fVTaP vi2rGD1+vtTx+LxJLoAzissmJTUnsyy1SN8ugSvj9fwnTAXzdCp6dl9ga2DsV+1i5OSQEDCR +Dj9PHsXIxeHkMAORok77a/YIJzvjBLfl0xmham6PvM6VGIDo8SFs1NZQBJCAr8YJWbtVgGx 2QSsJCa2r2IEsUUENCWu//3OCtLALLCXRWJaUxcbSEJYwFli6bQ+MJtFQFXi8uMzzCA2r4CH xNVNvewQ2+QkTh6D2Mwp4Cmx/Ww7M8ggCYHXbBJL73WwQRS5SLx+vpUFwhaWeHV8C1AzB5At LXHpqC1E/XRGiTe/lrJAOOsZJdacOcYE0WAtcfj4RbANzAJ8Eu++9rBCNPNKdLQJQZR4SNw/ eoUF4uU5jBLHlixjmsAouYCRYRWjWGpBcW56arFhgbFecWJucWleul5yfu4mRnD0a5nvYNxw zucQowAHoxIPr0H522gh1sSy4srcQ4wSHMxKIrxudUAh3pTEyqrUovz4otKc1OJDjNIcLEri vE+k5kYLCaQnlqRmp6YWpBbBZJk4OKUaGOudFqi6fngY///QipM11XPnHf165+T/lwuylpus c/DknOhtIvDChmlCmmRLxZLlptxPi2d8l+6qMrFta/LnS7oxbUW+eX3Ep7Om27u5DihqN1gG KQf96pPKuvOr5731wqliXzbcFej8XHnMyvvm09kfGqxOfdj5oSjps2p2zIfQI3P0JtVkZyqx FGckGmoxFxUnAgDyvJg9+gIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNLMWRmVeSWpSXmKPExsVy+t9jQd0LPW+jDVbs0bG4te4cq8XfScfY LTbOWM9qcf3Lc1aLV2c2slksnLac0aL/8Wtmi/PnN7BbTPmznMli0+NrrBaXd81hs5hxfh+T xcsjPxgt1h65y26xaOsXdovWvUfYHQQ8fv+axOhx6069x6ZVnWwed67tYfPYvKTe4/2+q2we fVtWMXr8fKnj8XmTXABnFJdNSmpOZllqkb5dAlfG6/lPmArm6VT07L7A1sDYr9rFyMkhIWAi cX3mdbYuRi4OIYF1jBJnjv1lhnB+MUo8PfKeFaSKTcBKYmL7KkYQW0RAU+L63++sIEXMAntZ JPa8vQeWEBZwllg6rY8NxGYRUJW4/PgMM4jNK+AhcXVTLzvEOjmJk8cmgw3lFPCU2H62HaxG CKjm898z7BMYeRYwMqxilEwtKM5Nzy02KjDMSy3XK07MLS7NS9dLzs/dxAgM4m2Htfp2MN5f En+IUYCDUYmH16D8bbQQa2JZcWXuIUYJDmYlEV63OqAQb0piZVVqUX58UWlOavEhRmkOFiVx 3tt5xyKFBNITS1KzU1MLUotgskwcnFINjFFv07IvfuUvTy5KOdn6zS7w5vc7b/QfH5r49d2a Kab9Wzb6fbzVll6mXa21TXTa9QcvEieZLTgcWrLlT6x+zwf/Ge8nnLN9t+zL42uJ9012iuna XNgRcfbKrJpTQQJ3EjrPOCSffyo9/4zlhUCzc2Vuxt9mx+1MOm8cL6Wfemhx6s5q8aLPj28q sRRnJBpqMRcVJwIAUk0gs14CAAA= X-CMS-MailID: 20181115151216epcas1p3413d9586bf941aa086bfc5cd620d45d9 X-Msg-Generator: CA CMS-TYPE: 101P X-CMS-RootMailID: 20181115151216epcas1p3413d9586bf941aa086bfc5cd620d45d9 References: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Pankaj Dubey Exynos SoCs have Chipid, for identification of product IDs and SoC revisions. This patch intends to provide initialization code for all these functionalities, at the same time it provides some sysfs entries for accessing these information to user-space. This driver uses existing binding for exynos-chipid. Changes by Bartlomiej: - fixed return values on errors - removed bogus kfree_const() - added missing Exynos4210 EVT0 id - converted code to use EXYNOS_MASK define - fixed np use after of_node_put() - fixed too early use of dev_info() - made driver fail for unknown SoC-s - added SPDX tag - updated Copyrights Cc: Grant Likely Cc: Rob Herring Cc: Linus Walleij Signed-off-by: Pankaj Dubey [m.szyprowski: for suggestion and code snippet of product_id_to_soc_id] Signed-off-by: Marek Szyprowski Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/soc/samsung/Kconfig | 5 ++ drivers/soc/samsung/Makefile | 1 + drivers/soc/samsung/exynos-chipid.c | 111 ++++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 drivers/soc/samsung/exynos-chipid.c diff --git a/drivers/soc/samsung/Kconfig b/drivers/soc/samsung/Kconfig index 2186285..2905f52 100644 --- a/drivers/soc/samsung/Kconfig +++ b/drivers/soc/samsung/Kconfig @@ -7,6 +7,11 @@ menuconfig SOC_SAMSUNG if SOC_SAMSUNG +config EXYNOS_CHIPID + bool "Exynos Chipid controller driver" if COMPILE_TEST + depends on ARCH_EXYNOS || COMPILE_TEST + select SOC_BUS + config EXYNOS_PMU bool "Exynos PMU controller driver" if COMPILE_TEST depends on ARCH_EXYNOS || ((ARM || ARM64) && COMPILE_TEST) diff --git a/drivers/soc/samsung/Makefile b/drivers/soc/samsung/Makefile index 29f294b..c2a8fbc 100644 --- a/drivers/soc/samsung/Makefile +++ b/drivers/soc/samsung/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_EXYNOS_CHIPID) += exynos-chipid.o obj-$(CONFIG_EXYNOS_PMU) += exynos-pmu.o obj-$(CONFIG_EXYNOS_PMU_ARM_DRIVERS) += exynos3250-pmu.o exynos4-pmu.o \ diff --git a/drivers/soc/samsung/exynos-chipid.c b/drivers/soc/samsung/exynos-chipid.c new file mode 100644 index 0000000..5cb0188 --- /dev/null +++ b/drivers/soc/samsung/exynos-chipid.c @@ -0,0 +1,111 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * http://www.samsung.com/ + * + * EXYNOS - CHIP ID support + * Author: Pankaj Dubey + * Author: Bartlomiej Zolnierkiewicz + */ + +#include +#include +#include +#include +#include +#include +#include + +#define EXYNOS_SUBREV_MASK (0xF << 4) +#define EXYNOS_MAINREV_MASK (0xF << 0) +#define EXYNOS_REV_MASK (EXYNOS_SUBREV_MASK | EXYNOS_MAINREV_MASK) +#define EXYNOS_MASK 0xFFFFF000 + +static const struct exynos_soc_id { + const char *name; + unsigned int id; +} soc_ids[] = { + { "EXYNOS3250", 0xE3472000 }, + { "EXYNOS4210", 0x43200000 }, /* EVT0 revision */ + { "EXYNOS4210", 0x43210000 }, + { "EXYNOS4212", 0x43220000 }, + { "EXYNOS4412", 0xE4412000 }, + { "EXYNOS5250", 0x43520000 }, + { "EXYNOS5260", 0xE5260000 }, + { "EXYNOS5410", 0xE5410000 }, + { "EXYNOS5420", 0xE5420000 }, + { "EXYNOS5440", 0xE5440000 }, + { "EXYNOS5800", 0xE5422000 }, + { "EXYNOS7420", 0xE7420000 }, + { "EXYNOS5433", 0xE5433000 }, +}; + +static const char * __init product_id_to_soc_id(unsigned int product_id) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(soc_ids); i++) + if ((product_id & EXYNOS_MASK) == soc_ids[i].id) + return soc_ids[i].name; + return NULL; +} + +int __init exynos_chipid_early_init(void) +{ + struct soc_device_attribute *soc_dev_attr; + void __iomem *exynos_chipid_base; + struct soc_device *soc_dev; + struct device_node *root; + struct device_node *np; + u32 product_id; + u32 revision; + + /* look up for chipid node */ + np = of_find_compatible_node(NULL, NULL, "samsung,exynos4210-chipid"); + if (!np) + return -ENODEV; + + exynos_chipid_base = of_iomap(np, 0); + of_node_put(np); + + if (!exynos_chipid_base) { + pr_err("Failed to map SoC chipid\n"); + return -ENXIO; + } + + product_id = readl_relaxed(exynos_chipid_base); + revision = product_id & EXYNOS_REV_MASK; + iounmap(exynos_chipid_base); + + soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); + if (!soc_dev_attr) + return -ENOMEM; + + soc_dev_attr->family = "Samsung Exynos"; + + root = of_find_node_by_path("/"); + of_property_read_string(root, "model", &soc_dev_attr->machine); + of_node_put(root); + + soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%x", revision); + soc_dev_attr->soc_id = product_id_to_soc_id(product_id); + if (!soc_dev_attr->soc_id) { + pr_err("Unknown SoC\n"); + return -ENODEV; + } + + /* please note that the actual registration will be deferred */ + soc_dev = soc_device_register(soc_dev_attr); + if (IS_ERR(soc_dev)) { + kfree(soc_dev_attr->revision); + kfree(soc_dev_attr); + return PTR_ERR(soc_dev); + } + + /* it is too early to use dev_info() here (soc_dev is NULL) */ + pr_info("soc soc0: Exynos: CPU[%s] PRO_ID[0x%x] REV[0x%x] Detected\n", + soc_dev_attr->soc_id, product_id, revision); + + return 0; +} +early_initcall(exynos_chipid_early_init); From patchwork Thu Nov 15 15:11:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 10684577 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A9F6217EE for ; Thu, 15 Nov 2018 15:12:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98F9B2CA41 for ; Thu, 15 Nov 2018 15:12:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C5062CA4C; Thu, 15 Nov 2018 15:12:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 107322CA83 for ; Thu, 15 Nov 2018 15:12:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388589AbeKPBUk (ORCPT ); Thu, 15 Nov 2018 20:20:40 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:35675 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726432AbeKPBUj (ORCPT ); Thu, 15 Nov 2018 20:20:39 -0500 Received: from epcas2p2.samsung.com (unknown [182.195.41.54]) by mailout1.samsung.com (KnoxPortal) with ESMTP id 20181115151222epoutp014a29004e76fe15d07e7979ef7595892e~nVOWZJQ-S0564405644epoutp01g; Thu, 15 Nov 2018 15:12:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.samsung.com 20181115151222epoutp014a29004e76fe15d07e7979ef7595892e~nVOWZJQ-S0564405644epoutp01g DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1542294742; bh=GpBHhxFllghOSCtnxruKtLvFXzlEL/7kNI6p7ER0EuQ=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=uopQ+OEzFMcOJS0qZMQ/wD14Rv4ujsmcmCNqw8tuSUeiyhp5Yl76iZolI73N3qefd GgnN6EFJ3+ztOQlJ9ReGolsIuWNEmH0E04C6XSwNjjCPg1kqcrOh503+ERFDeqmRjf THXuSNzfcCdcKwvvGKob1oqUx2CcWwGT4CPKVUmE= Received: from epsmges2p3.samsung.com (unknown [182.195.42.71]) by epcas2p1.samsung.com (KnoxPortal) with ESMTP id 20181115151221epcas2p1e6bf67b49f6f701e288c196c91fc5317~nVOVxHpRj2500425004epcas2p1s; Thu, 15 Nov 2018 15:12:21 +0000 (GMT) Received: from epcas2p3.samsung.com ( [182.195.41.55]) by epsmges2p3.samsung.com (Symantec Messaging Gateway) with SMTP id 9B.64.04218.5DC8DEB5; Fri, 16 Nov 2018 00:12:21 +0900 (KST) Received: from epsmgms2p2new.samsung.com (unknown [182.195.42.143]) by epcas2p1.samsung.com (KnoxPortal) with ESMTP id 20181115151221epcas2p17b8bbb240f70fdd7c5ecf1c0c27de35f~nVOVQKa1S1292412924epcas2p1p; Thu, 15 Nov 2018 15:12:21 +0000 (GMT) X-AuditID: b6c32a47-be1ff7000000107a-4b-5bed8cd5faad Received: from epmmp2 ( [203.254.227.17]) by epsmgms2p2new.samsung.com (Symantec Messaging Gateway) with SMTP id B2.28.03702.5DC8DEB5; Fri, 16 Nov 2018 00:12:21 +0900 (KST) Received: from AMDC3058.DIGITAL.local ([106.120.53.102]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PI8006WJQ7YQ380@mmp2.samsung.com>; Fri, 16 Nov 2018 00:12:21 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Krzysztof Kozlowski Cc: Arnd Bergmann , Marek Szyprowski , Kukjin Kim , Markus Reichl , Andrzej Hajda , Chanwoo Choi , Javier Martinez Canillas , Pankaj Dubey , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com Subject: [PATCH 3/9] ARM: EXYNOS: enable exynos_chipid for ARCH_EXYNOS Date: Thu, 15 Nov 2018 16:11:32 +0100 Message-id: <1542294698-17470-4-git-send-email-b.zolnierkie@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrHIsWRmVeSWpSXmKPExsWy7bCmue7VnrfRBudOGljcWneO1eLvpGPs FhtnrGe1uP7lOavFwmnLGS36H79mtjh/fgO7xabH11gtLu+aw2Yx4/w+JouXR34wWqw9cpfd YtHWL+wOvB6/f01i9Lh1p95j06pONo/NS+o93u+7yubRt2UVo8fnTXIB7FFcNimpOZllqUX6 dglcGdefZxYsZqv4cXQBawPjctYuRk4OCQETicdXjjJ1MXJxCAnsYJS437SPGcL5zijxbuVU uKrW640sEIkNjBIT5k2CavnFKPHl+n92kCo2ASuJie2rGEFsEQFNiet/v4N1MwscZZZYckUC xBYWcJPoPXQbKM7BwSKgKtF+0h8kzCvgIXHr106oZXISJ49NBrM5BTwltp9tB7tIQuAAm0TL lodQRS4Sy3f3s0DYwhKvjm9hh7ClJZ6t2sgI0TCdUeLNr6UsEM56Rok1Z44xQVRZSxw+fhHq Oj6JjsN/2UEukhDglehoE4Io8ZC48nktI8SXcxglfp3ZwzSBUXIBI8MqRrHUguLc9NRiowJj veLE3OLSvHS95PzcTYzgWNZy38G47ZzPIUYBDkYlHl6D8rfRQqyJZcWVuYcYJTiYlUR43eqA QrwpiZVVqUX58UWlOanFhxilOViUxHkfSs+NFhJITyxJzU5NLUgtgskycXBKNTCmd1YHHZnU x77o3yyF0H0mvCrzRWPDy87/tc2bvWf5JP7jDUrfe+Ywfn2/WP3Ea7lkozUxzlbCan0v790+ LLj/5jP/8M3Guw5ISP2Rn/lhe8pevpLH5klvn67iCOOTezDRhdlW5NK/kvv1Xe/CXS2ui32c VTQxveOL8Ck1plUnVx0tlivX29KoxFKckWioxVxUnAgA1V72weECAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrALMWRmVeSWpSXmKPExsVy+t9jQd2rPW+jDf695LW4te4cq8XfScfY LTbOWM9qcf3Lc1aLhdOWM1r0P37NbHH+/AZ2i02Pr7FaXN41h81ixvl9TBYvj/xgtFh75C67 xaKtX9gdeD1+/5rE6HHrTr3HplWdbB6bl9R7vN93lc2jb8sqRo/Pm+QC2KO4bFJSczLLUov0 7RK4Mq4/zyxYzFbx4+gC1gbG5axdjJwcEgImEq3XG1lAbCGBdYwSy2bIdDFyAdm/GCXmXzgC lmATsJKY2L6KEcQWEdCUuP73OytIEbPAUWaJzxO2M4MkhAXcJHoP3QZKcHCwCKhKtJ/0Bwnz CnhI3Pq1E2qZnMTJY5PBbE4BT4ntZ9uZIRZ7SHz+e4Z9AiPPAkaGVYySqQXFuem5xUYFRnmp 5XrFibnFpXnpesn5uZsYgeG47bBW/w7Gx0viDzEKcDAq8fAalL+NFmJNLCuuzD3EKMHBrCTC 61YHFOJNSaysSi3Kjy8qzUktPsQozcGiJM7Ln38sUkggPbEkNTs1tSC1CCbLxMEp1cAY/v/C Q0/Xqkn7+X++59TJe8iv2m521efftSV57Sf1105+e9lFzdruIWsQs6xNfzgjM7OPVNfSx8de 8YVPjOM81qqzk8/+19efj8PzwgUUv9ervp0dmWUkvpWl36tqwV/16+eFEqTcyquPnn1kPeHB 9itxMjFlyxMYepv59lscsRCfvjliZbESS3FGoqEWc1FxIgDZpOusQwIAAA== X-CMS-MailID: 20181115151221epcas2p17b8bbb240f70fdd7c5ecf1c0c27de35f X-Msg-Generator: CA CMS-TYPE: 102P X-CMS-RootMailID: 20181115151221epcas2p17b8bbb240f70fdd7c5ecf1c0c27de35f References: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Pankaj Dubey As now we have chipid driver to initialize SoC related information let's include it in build by default. Signed-off-by: Pankaj Dubey Reviewed-by: Krzysztof Kozlowski Signed-off-by: Bartlomiej Zolnierkiewicz --- arch/arm/mach-exynos/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index b40963c..e3e63aa 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -13,6 +13,7 @@ menuconfig ARCH_EXYNOS select ARM_AMBA select ARM_GIC select COMMON_CLK_SAMSUNG + select EXYNOS_CHIPID select EXYNOS_THERMAL select EXYNOS_PMU select EXYNOS_SROM From patchwork Thu Nov 15 15:11:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 10684579 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 46A3F13BB for ; Thu, 15 Nov 2018 15:12:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3749B2CA0F for ; Thu, 15 Nov 2018 15:12:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 354F42CA95; Thu, 15 Nov 2018 15:12:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D06702CA0F for ; Thu, 15 Nov 2018 15:12:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388590AbeKPBUp (ORCPT ); Thu, 15 Nov 2018 20:20:45 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:38399 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726432AbeKPBUp (ORCPT ); Thu, 15 Nov 2018 20:20:45 -0500 Received: from epcas2p3.samsung.com (unknown [182.195.41.55]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20181115151227epoutp0467cfab910f50b3cf6c960533d5290cf5~nVOapOAJn1320613206epoutp048; Thu, 15 Nov 2018 15:12:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20181115151227epoutp0467cfab910f50b3cf6c960533d5290cf5~nVOapOAJn1320613206epoutp048 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1542294747; bh=5GbDmz+oy4esatK4+k1/hnhgzRRda1luQ/7q8+U3NQY=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=j3omjP0Ld5bTDM0BBWQK9aIakXowOe+K82gdQOLkf885G6LE68Ao3jY1U7PUlofGD JCIGuW/XG6mcnW/zZrRY1iJMOk2QLR2OP6o4paEuCTXlQzRmbjTh1Vyb/iI6iVtEyK z4sbNDtSv2GpLyi+17noN8FSwgMKtZWCysmVphss= Received: from epsmges2p3.samsung.com (unknown [182.195.42.71]) by epcas2p1.samsung.com (KnoxPortal) with ESMTP id 20181115151226epcas2p16826183e4bc68aefa84950e6a67eabf7~nVOZyj6Qr2502025020epcas2p1t; Thu, 15 Nov 2018 15:12:26 +0000 (GMT) Received: from epcas2p2.samsung.com ( [182.195.41.54]) by epsmges2p3.samsung.com (Symantec Messaging Gateway) with SMTP id ED.64.04218.ADC8DEB5; Fri, 16 Nov 2018 00:12:26 +0900 (KST) Received: from epsmgms2p2new.samsung.com (unknown [182.195.42.143]) by epcas2p4.samsung.com (KnoxPortal) with ESMTP id 20181115151225epcas2p4244fba019e0509d480f7953a05097105~nVOZcWuXU0890008900epcas2p4z; Thu, 15 Nov 2018 15:12:25 +0000 (GMT) X-AuditID: b6c32a47-bf9ff7000000107a-52-5bed8cdaaac4 Received: from epmmp2 ( [203.254.227.17]) by epsmgms2p2new.samsung.com (Symantec Messaging Gateway) with SMTP id 93.28.03702.9DC8DEB5; Fri, 16 Nov 2018 00:12:25 +0900 (KST) Received: from AMDC3058.DIGITAL.local ([106.120.53.102]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PI8006WJQ7YQ380@mmp2.samsung.com>; Fri, 16 Nov 2018 00:12:25 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Krzysztof Kozlowski Cc: Arnd Bergmann , Marek Szyprowski , Kukjin Kim , Markus Reichl , Andrzej Hajda , Chanwoo Choi , Javier Martinez Canillas , Pankaj Dubey , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com Subject: [PATCH 4/9] ARM64: EXYNOS: enable exynos_chipid for ARCH_EXYNOS Date: Thu, 15 Nov 2018 16:11:33 +0100 Message-id: <1542294698-17470-5-git-send-email-b.zolnierkie@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrAIsWRmVeSWpSXmKPExsWy7bCmme6tnrfRBu9fs1rcWneO1eLvpGPs FhtnrGe1uP7lOavFwmnLGS36H79mtjh/fgO7xabH11gtLu+aw2Yx4/w+JouXR34wWqw9cpfd YtHWL+wOvB6/f01i9Lh1p95j06pONo/NS+o93u+7yubRt2UVo8fnTXIB7FFcNimpOZllqUX6 dglcGXN2r2IqmMZWsfvubuYGxgWsXYycHBICJhLvH84Asrk4hAR2MEocvLwIyvnOKDHl6xM2 mKoJ098yQSQ2MEo8WzCLDcL5xShx7NspRpAqNgEriYntq8BsEQFNiet/v4PtYBY4yiyx5IoE iC0s4CFx9tUjJhCbRUBV4u22ecwgNi9QfOabiSwQ2+QkTh6bDNbLKeApsf1sOzPIMgmBA2wS 284fgjrJReJi6zx2CFtY4tXxLVC2tMSzVRsZIRqmM0q8+bWUBcJZzyix5swxJogqa4nDxy9C nccn0XH4L1A3B1CcV6KjTQiixEPiZvMnqDfnMEoc+rqceQKj5AJGhlWMYqkFxbnpqcVGBcZ6 xYm5xaV56XrJ+bmbGMHxrOW+g3HbOZ9DjAIcjEo8vAblb6OFWBPLiitzDzFKcDArifC61QGF eFMSK6tSi/Lji0pzUosPMUpzsCiJ8z6UnhstJJCeWJKanZpakFoEk2Xi4JRqYNw/s4JXNbPr 78/vk+UclNqjFpf+VGXx2Hk5xb3t5BGn//lSd39deJLYLzV5p4rFsfXXbs6a6HeQUX+S4/S+ nPz0wuePOV/0HPp09OPPQAnxhbu6D6ut2reuQq7N5+CunI8bji3Pu+z+WFNj9vLp1zvub7vv tbA7reHym5fW3ZdD+jOUXoVUdG5TYinOSDTUYi4qTgQAjWLWfOMCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMLMWRmVeSWpSXmKPExsVy+t9jQd2bPW+jDf5/1LS4te4cq8XfScfY LTbOWM9qcf3Lc1aLhdOWM1r0P37NbHH+/AZ2i02Pr7FaXN41h81ixvl9TBYvj/xgtFh75C67 xaKtX9gdeD1+/5rE6HHrTr3HplWdbB6bl9R7vN93lc2jb8sqRo/Pm+QC2KO4bFJSczLLUov0 7RK4MubsXsVUMI2tYvfd3cwNjAtYuxg5OSQETCQmTH/L1MXIxSEksI5RYu/cacwQzi9GiRdP tjKBVLEJWElMbF/FCGKLCGhKXP/7nRWkiFngKLPE5wnbmUESwgIeEmdfPQJrYBFQlXi7bR5Y nBcoPvPNRBaIdXISJ49NBlvNKeApsf1sO1iNEFDN579n2Ccw8ixgZFjFKJlaUJybnltsVGCU l1quV5yYW1yal66XnJ+7iREYlNsOa/XvYHy8JP4QowAHoxIPr0H522gh1sSy4srcQ4wSHMxK IrxudUAh3pTEyqrUovz4otKc1OJDjNIcLErivPz5xyKFBNITS1KzU1MLUotgskwcnFINjP3a f082rDwQvfDQvo2nNkoen+MTYfGf2froty+ioaY+j7q2tDTFnXqgPH+dPZ+beXOX2zzTw+wn 9OOkVI+krTmzUYbXK/6w1F8VB7uuYqMi9uyI8zZLeT7c9D74+9k9PpObx0Od7ye+fzjbpIax 4cPy0/kv7WTObbVLDZ9Rc+HL8uZANluJJCWW4oxEQy3mouJEAHZj+bRGAgAA X-CMS-MailID: 20181115151225epcas2p4244fba019e0509d480f7953a05097105 X-Msg-Generator: CA CMS-TYPE: 102P X-CMS-RootMailID: 20181115151225epcas2p4244fba019e0509d480f7953a05097105 References: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Pankaj Dubey This patch enables exynos_chipid driver for ARCH_EXYNOS based SoC. Signed-off-by: Pankaj Dubey Signed-off-by: Bartlomiej Zolnierkiewicz --- arch/arm64/Kconfig.platforms | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 51bc479..84b88ab7 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -62,6 +62,7 @@ config ARCH_BRCMSTB config ARCH_EXYNOS bool "ARMv8 based Samsung Exynos SoC family" select COMMON_CLK_SAMSUNG + select EXYNOS_CHIPID select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS select EXYNOS_PMU select HAVE_S3C2410_WATCHDOG if WATCHDOG From patchwork Thu Nov 15 15:11:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 10684581 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D5A4917EE for ; Thu, 15 Nov 2018 15:12:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ADE5C2CA95 for ; Thu, 15 Nov 2018 15:12:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A209E2CA9C; Thu, 15 Nov 2018 15:12:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F19192CA7C for ; Thu, 15 Nov 2018 15:12:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388643AbeKPBUv (ORCPT ); Thu, 15 Nov 2018 20:20:51 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:32294 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726432AbeKPBUv (ORCPT ); Thu, 15 Nov 2018 20:20:51 -0500 Received: from epcas1p3.samsung.com (unknown [182.195.41.47]) by mailout3.samsung.com (KnoxPortal) with ESMTP id 20181115151232epoutp03f2dfe7bcfbad44cc813a245cb124a65e~nVOfuLCmV0615306153epoutp03Y; Thu, 15 Nov 2018 15:12:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout3.samsung.com 20181115151232epoutp03f2dfe7bcfbad44cc813a245cb124a65e~nVOfuLCmV0615306153epoutp03Y DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1542294752; bh=Zwvrb0xVGcBCepsy/h/dxj+AxrEAQoLbTBAwD7D7+nQ=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=EWPsBUgyEOqXvkLR540q8OzMXhJwG7yjgdvRiTTwqREkpkn91GzBIAQ3feXbozPKa B37trxH10nOyh8N3ezDl9D3mk/TktgzAWWOC2ONDqJDSsiy7HTSC8SVxjVB5o1f8S0 5RGs/ch/W0FCc6YSZBdKpKxUgdmny/YjJRFsrDWo= Received: from epsmges1p1.samsung.com (unknown [182.195.42.53]) by epcas1p3.samsung.com (KnoxPortal) with ESMTP id 20181115151231epcas1p312124b572725dc3ea1f490203c00058b~nVOeYc_-53140631406epcas1p35; Thu, 15 Nov 2018 15:12:31 +0000 (GMT) Received: from epcas1p2.samsung.com ( [182.195.41.46]) by epsmges1p1.samsung.com (Symantec Messaging Gateway) with SMTP id 2F.85.04072.EDC8DEB5; Fri, 16 Nov 2018 00:12:30 +0900 (KST) Received: from epsmgms2p1new.samsung.com (unknown [182.195.42.142]) by epcas1p3.samsung.com (KnoxPortal) with ESMTP id 20181115151230epcas1p35afa7ac09774a6e6256523b3a77453c3~nVOdfL7FU2045420454epcas1p3b; Thu, 15 Nov 2018 15:12:30 +0000 (GMT) X-AuditID: b6c32a35-3f1ff70000000fe8-4d-5bed8cdee5eb Received: from epmmp2 ( [203.254.227.17]) by epsmgms2p1new.samsung.com (Symantec Messaging Gateway) with SMTP id B5.B9.03701.DDC8DEB5; Fri, 16 Nov 2018 00:12:30 +0900 (KST) Received: from AMDC3058.DIGITAL.local ([106.120.53.102]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PI8006WJQ7YQ380@mmp2.samsung.com>; Fri, 16 Nov 2018 00:12:29 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Krzysztof Kozlowski Cc: Arnd Bergmann , Marek Szyprowski , Kukjin Kim , Markus Reichl , Andrzej Hajda , Chanwoo Choi , Javier Martinez Canillas , Pankaj Dubey , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com Subject: [PATCH 5/9] ARM: EXYNOS: use chipid driver Date: Thu, 15 Nov 2018 16:11:34 +0100 Message-id: <1542294698-17470-6-git-send-email-b.zolnierkie@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrDIsWRmVeSWpSXmKPExsWy7bCmnu69nrfRBiefWFrcWneO1eLvpGPs FhtnrGe1uP7lOavFwmnLGS36H79mtjh/fgO7xabH11gtLu+aw2Yx4/w+JouXR34wWqw9cpfd YtHWL+wOvB6/f01i9Lh1p95j06pONo/NS+o93u+7yubRt2UVo8fnTXIB7FFcNimpOZllqUX6 dglcGbv3/WItWGxb8e/XDdYGxrlGXYwcHBICJhLXbhd0MXJxCAnsYJQ4c2QZcxcjJ5DznVHi /ztrEBukZtGXWewQRRsYJeauOckG4fxilHh27AY7SBWbgJXExPZVjCC2iICmxPW/31lBbGaB o8wSS65IgGwTFjCWOLxMBiTMIqAq8enbThYQm1fAQ+Ls705GiGVyEiePTQZr5RTwlNh+tp0Z ZJeEwAk2ieedK5ghilwkTrTPhGoQlnh1fAs7xDfSEpeO2kLUT2eUePNrKQuEs55RYs2ZY0wQ DdYSh49fhDqOT+Ld1x5WiGZeiY42IYgSD4mdc3axQDw5h1HiyrMrbBMYJRcwMqxiFEstKM5N Ty02LDDUK07MLS7NS9dLzs/dxAiOYy3THYxTzvkcYhTgYFTi4TUofxstxJpYVlyZe4hRgoNZ SYTXrQ4oxJuSWFmVWpQfX1Sak1p8iFGag0VJnPeJ1NxoIYH0xJLU7NTUgtQimCwTB6dUA2Oq asaW0+nthwQ0Gi4Wzjpc8Iq37t5htbQkTwMvyUUfgu0fPzktJ5sd/P3QnlXH29Lqmpfwrz3+ L56RmTlPPkMof+tPmXmvG/lWGOXN0z//6czbur1L5//efne1Z+WivzeOdYTxN7V0voxj2Xmw +Kza7buy085eEA9W/L/b8qXNxy2JW002mh9XYinOSDTUYi4qTgQAYlQWtN8CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrELMWRmVeSWpSXmKPExsVy+t9jQd17PW+jDdo6mS1urTvHavF30jF2 i40z1rNaXP/ynNVi4bTljBb9j18zW5w/v4HdYtPja6wWl3fNYbOYcX4fk8XLIz8YLdYeuctu sWjrF3YHXo/fvyYxety6U++xaVUnm8fmJfUe7/ddZfPo27KK0ePzJrkA9igum5TUnMyy1CJ9 uwSujN37frEWLLat+PfrBmsD41yjLkZODgkBE4lFX2axdzFycQgJrGOU6JrWwAjh/GKUWP7r IiNIFZuAlcTE9lVgtoiApsT1v99ZQYqYBY4yS3yesJ25i5GDQ1jAWOLwMhmQGhYBVYlP33ay gNi8Ah4SZ393MkJsk5M4eWwyK4jNKeApsf1sOzOILQRU8/nvGfYJjDwLGBlWMUqmFhTnpucW GxUY5qWW6xUn5haX5qXrJefnbmIEhuS2w1p9OxjvL4k/xCjAwajEw2tQ/jZaiDWxrLgy9xCj BAezkgivWx1QiDclsbIqtSg/vqg0J7X4EKM0B4uSOO/tvGORQgLpiSWp2ampBalFMFkmDk6p Bsbtf8/dtNWZ/+lgsdfjD1oK819+PPSjm2NuqsynkCnu/669dbs92XmK7LOvus9feSwp2mvz cJbmT5b3nOvi+mcfDWvvmL5dIIiFZ0dffPWH9rtLUr9NZ3m6efqfTfPzhU5kl1mn3pwUxyfI Is2b5x26Z3r3mqUMm8X3Re8/49q4+uksZe9Dn57HK7EUZyQaajEXFScCAKHRXYhFAgAA X-CMS-MailID: 20181115151230epcas1p35afa7ac09774a6e6256523b3a77453c3 X-Msg-Generator: CA CMS-TYPE: 101P X-CMS-RootMailID: 20181115151230epcas1p35afa7ac09774a6e6256523b3a77453c3 References: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add soc_dev_is_exynos*() helpers and use them instead of soc_is_exynos*() ones. Signed-off-by: Bartlomiej Zolnierkiewicz --- arch/arm/mach-exynos/common.h | 6 ++++++ arch/arm/mach-exynos/exynos.c | 39 +++++++++++++++++++++++++++++++++++++++ arch/arm/mach-exynos/firmware.c | 8 ++++---- arch/arm/mach-exynos/platsmp.c | 12 ++++++------ arch/arm/mach-exynos/pm.c | 17 +++++++++-------- 5 files changed, 64 insertions(+), 18 deletions(-) diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index 1b8699e..20d205e 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h @@ -9,8 +9,14 @@ #ifndef __ARCH_ARM_MACH_EXYNOS_COMMON_H #define __ARCH_ARM_MACH_EXYNOS_COMMON_H +#include #include +extern bool soc_dev_is_exynos3250(void); +extern bool soc_dev_is_exynos4210_rev11(void); +extern bool soc_dev_is_exynos4412(void); +extern bool soc_dev_is_exynos542x(void); + #define EXYNOS3250_SOC_ID 0xE3472000 #define EXYNOS3_SOC_MASK 0xFFFFF000 diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index 865dcc4..463e457 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c @@ -24,6 +24,45 @@ #include "common.h" +static const struct soc_device_attribute exynos3250_soc_id[] = { + { .soc_id = "EXYNOS3250" }, + { /* sentinel */ } +}; + +static const struct soc_device_attribute exynos4210_rev11_soc_id[] = { + { .soc_id = "EXYNOS4210", .revision = "11" }, + { /* sentinel */ } +}; + +static const struct soc_device_attribute exynos4412_soc_id[] = { + { .soc_id = "EXYNOS4412" }, + { /* sentinel */ } +}; + +static const struct soc_device_attribute exynos542x_soc_id[] = { + { .soc_id = "EXYNOS5420" }, + { .soc_id = "EXYNOS5800" }, + { /* sentinel */ } +}; + +#define SOC_DEV_IS_EXYNOS(ver) \ +bool soc_dev_is_exynos##ver(void) \ +{ \ + static bool init_done, is_exynos##ver; \ + \ + if (!init_done) { \ + is_exynos##ver = !!soc_device_match(exynos##ver##_soc_id); \ + init_done = true; \ + } \ + \ + return is_exynos##ver; \ +} + +SOC_DEV_IS_EXYNOS(3250); +SOC_DEV_IS_EXYNOS(4210_rev11); +SOC_DEV_IS_EXYNOS(4412); +SOC_DEV_IS_EXYNOS(542x); + static struct platform_device exynos_cpuidle = { .name = "exynos_cpuidle", #ifdef CONFIG_ARM_EXYNOS_CPUIDLE diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c index d602e3b..d526d5e 100644 --- a/arch/arm/mach-exynos/firmware.c +++ b/arch/arm/mach-exynos/firmware.c @@ -40,7 +40,7 @@ static int exynos_do_idle(unsigned long mode) writel_relaxed(__pa_symbol(exynos_cpu_resume_ns), sysram_ns_base_addr + 0x24); writel_relaxed(EXYNOS_AFTR_MAGIC, sysram_ns_base_addr + 0x20); - if (soc_is_exynos3250()) { + if (soc_dev_is_exynos3250()) { flush_cache_all(); exynos_smc(SMC_CMD_SAVE, OP_TYPE_CORE, SMC_POWERSTATE_IDLE, 0); @@ -61,7 +61,7 @@ static int exynos_cpu_boot(int cpu) * Exynos3250 doesn't need to send smc command for secondary CPU boot * because Exynos3250 removes WFE in secure mode. */ - if (soc_is_exynos3250()) + if (soc_dev_is_exynos3250()) return 0; /* @@ -85,7 +85,7 @@ static int exynos_set_cpu_boot_addr(int cpu, unsigned long boot_addr) * additional offset for every CPU, with Exynos4412 being the only * exception. */ - if (soc_is_exynos4412()) + if (soc_dev_is_exynos4412()) boot_reg += 4 * cpu; writel_relaxed(boot_addr, boot_reg); @@ -101,7 +101,7 @@ static int exynos_get_cpu_boot_addr(int cpu, unsigned long *boot_addr) boot_reg = sysram_ns_base_addr + 0x1c; - if (soc_is_exynos4412()) + if (soc_dev_is_exynos4412()) boot_reg += 4 * cpu; *boot_addr = readl_relaxed(boot_reg); diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index c39ffd2..e2ba70f 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -88,7 +88,7 @@ void exynos_cpu_power_down(int cpu) { u32 core_conf; - if (cpu == 0 && (soc_is_exynos5420() || soc_is_exynos5800())) { + if (cpu == 0 && soc_dev_is_exynos542x()) { /* * Bypass power down for CPU0 during suspend. Check for * the SYS_PWR_REG value to decide if we are suspending @@ -115,7 +115,7 @@ void exynos_cpu_power_up(int cpu) { u32 core_conf = S5P_CORE_LOCAL_PWR_EN; - if (soc_is_exynos3250()) + if (soc_dev_is_exynos3250()) core_conf |= S5P_CORE_AUTOWAKEUP_EN; pmu_raw_writel(core_conf, @@ -185,7 +185,7 @@ void exynos_scu_enable(void) static void __iomem *cpu_boot_reg_base(void) { - if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_1_1) + if (soc_dev_is_exynos4210_rev11()) return pmu_base_addr + S5P_INFORM5; return sysram_base_addr; } @@ -197,9 +197,9 @@ static inline void __iomem *cpu_boot_reg(int cpu) boot_reg = cpu_boot_reg_base(); if (!boot_reg) return IOMEM_ERR_PTR(-ENODEV); - if (soc_is_exynos4412()) + if (soc_dev_is_exynos4412()) boot_reg += 4*cpu; - else if (soc_is_exynos5420() || soc_is_exynos5800()) + else if (soc_dev_is_exynos542x()) boot_reg += 4; return boot_reg; } @@ -371,7 +371,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) call_firmware_op(cpu_boot, core_id); - if (soc_is_exynos3250()) + if (soc_dev_is_exynos3250()) dsb_sev(); else arch_send_wakeup_ipi_mask(cpumask_of(cpu)); diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 48e7fb3..88c1bce 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -120,7 +120,7 @@ int exynos_pm_central_resume(void) static void exynos_set_wakeupmask(long mask) { pmu_raw_writel(mask, S5P_WAKEUP_MASK); - if (soc_is_exynos3250()) + if (soc_dev_is_exynos3250()) pmu_raw_writel(0x0, S5P_WAKEUP_MASK2); } @@ -135,7 +135,8 @@ static int exynos_aftr_finisher(unsigned long flags) { int ret; - exynos_set_wakeupmask(soc_is_exynos3250() ? 0x40003ffe : 0x0000ff3e); + exynos_set_wakeupmask(soc_dev_is_exynos3250() ? 0x40003ffe + : 0x0000ff3e); /* Set value of power down register for aftr mode */ exynos_sys_powerdown_conf(SYS_AFTR); @@ -156,12 +157,12 @@ void exynos_enter_aftr(void) cpu_pm_enter(); - if (soc_is_exynos3250()) + if (soc_dev_is_exynos3250()) exynos_set_boot_flag(cpuid, C2_STATE); exynos_pm_central_suspend(); - if (soc_is_exynos4412()) { + if (soc_dev_is_exynos4412()) { /* Setting SEQ_OPTION register */ pmu_raw_writel(S5P_USE_STANDBY_WFI0 | S5P_USE_STANDBY_WFE0, S5P_CENTRAL_SEQ_OPTION); @@ -177,7 +178,7 @@ void exynos_enter_aftr(void) exynos_pm_central_resume(); - if (soc_is_exynos3250()) + if (soc_dev_is_exynos3250()) exynos_clear_boot_flag(cpuid, C2_STATE); cpu_pm_exit(); @@ -248,7 +249,7 @@ static int exynos_cpu0_enter_aftr(void) while (exynos_cpu_power_state(1) != S5P_CORE_LOCAL_PWR_EN) cpu_relax(); - if (soc_is_exynos3250()) { + if (soc_dev_is_exynos3250()) { while (!pmu_raw_readl(S5P_PMU_SPARE2) && !atomic_read(&cpu1_wakeup)) cpu_relax(); @@ -278,7 +279,7 @@ static int exynos_cpu0_enter_aftr(void) static int exynos_wfi_finisher(unsigned long flags) { - if (soc_is_exynos3250()) + if (soc_dev_is_exynos3250()) flush_cache_all(); cpu_do_idle(); @@ -300,7 +301,7 @@ static int exynos_cpu1_powerdown(void) */ exynos_cpu_power_down(1); - if (soc_is_exynos3250()) + if (soc_dev_is_exynos3250()) pmu_raw_writel(0, S5P_PMU_SPARE2); ret = cpu_suspend(0, exynos_wfi_finisher); From patchwork Thu Nov 15 15:11:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 10684583 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 595D917EE for ; Thu, 15 Nov 2018 15:12:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4AD6C2CA8A for ; Thu, 15 Nov 2018 15:12:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E2012CAA2; Thu, 15 Nov 2018 15:12:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A41F72CA6C for ; Thu, 15 Nov 2018 15:12:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388667AbeKPBUy (ORCPT ); Thu, 15 Nov 2018 20:20:54 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:58259 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388615AbeKPBUw (ORCPT ); Thu, 15 Nov 2018 20:20:52 -0500 Received: from epcas1p2.samsung.com (unknown [182.195.41.46]) by mailout2.samsung.com (KnoxPortal) with ESMTP id 20181115151236epoutp021293842fd5b2373005a8a4dc87ed6c06~nVOjP3iw62573825738epoutp02H; Thu, 15 Nov 2018 15:12:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.samsung.com 20181115151236epoutp021293842fd5b2373005a8a4dc87ed6c06~nVOjP3iw62573825738epoutp02H DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1542294756; bh=69RbD6GTi1cC4wdBdTW6otNhXoInfb9R1q91ZnYeExc=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=FMG11F9Kdz0c8OIC0UE78aCIQPPMavE0cFr/d+sUi1MSfNHoQZh7OWpHE46FcY06V FnUmwYH/YIStCh2UEiVqcO3FjGEzNeRj3ehvZDH1zDLypZuppcIkeyT7xu50v9ZlWZ zKBektNytTV0jyqgkTJ2m3vwgx48i4aLiTz4RgN8= Received: from epsmges1p3.samsung.com (unknown [182.195.42.55]) by epcas1p3.samsung.com (KnoxPortal) with ESMTP id 20181115151235epcas1p32a5c7c399985b92ca0f61f1a9f127649~nVOiuJM961924719247epcas1p3P; Thu, 15 Nov 2018 15:12:35 +0000 (GMT) Received: from epcas1p1.samsung.com ( [182.195.41.45]) by epsmges1p3.samsung.com (Symantec Messaging Gateway) with SMTP id 10.E3.04072.3EC8DEB5; Fri, 16 Nov 2018 00:12:35 +0900 (KST) Received: from epsmgms2p1new.samsung.com (unknown [182.195.42.142]) by epcas1p2.samsung.com (KnoxPortal) with ESMTP id 20181115151234epcas1p2006b64ae88567526c855869758ff8b9c~nVOhlq8D01093210932epcas1p2Y; Thu, 15 Nov 2018 15:12:34 +0000 (GMT) X-AuditID: b6c32a37-887ff70000000fe8-5c-5bed8ce3c38b Received: from epmmp2 ( [203.254.227.17]) by epsmgms2p1new.samsung.com (Symantec Messaging Gateway) with SMTP id 96.B9.03701.2EC8DEB5; Fri, 16 Nov 2018 00:12:34 +0900 (KST) Received: from AMDC3058.DIGITAL.local ([106.120.53.102]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PI8006WJQ7YQ380@mmp2.samsung.com>; Fri, 16 Nov 2018 00:12:34 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Krzysztof Kozlowski Cc: Arnd Bergmann , Marek Szyprowski , Kukjin Kim , Markus Reichl , Andrzej Hajda , Chanwoo Choi , Javier Martinez Canillas , Pankaj Dubey , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com Subject: [PATCH 6/9] ARM: EXYNOS: remove soc_is_exynos*() macros Date: Thu, 15 Nov 2018 16:11:35 +0100 Message-id: <1542294698-17470-7-git-send-email-b.zolnierkie@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrHIsWRmVeSWpSXmKPExsWy7bCmru7jnrfRBrMmaFjcWneO1eLvpGPs FhtnrGe1uP7lOavFwmnLGS36H79mtjh/fgO7xabH11gtLu+aw2Yx4/w+JouXR34wWqw9cpfd YtHWL+wOvB6/f01i9Lh1p95j06pONo/NS+o93u+7yubRt2UVo8fnTXIB7FFcNimpOZllqUX6 dglcGXM2fGIs+Cxa8XrlYeYGxn7hLkZODgkBE4lP+4+wdjFycQgJ7GCU6J1wngUkISTwnVHi 25YimKK3E78xQRRtYJRY33iXDcL5xSixatNKNpAqNgEriYntqxhBbBEBTYnrf7+zgtjMAkeZ JZZckQCxhQUcJC4ceQNWwyKgKvH2ZxsTiM0r4CHx4/dfVohtchInj00GszkFPCW2n21nBlkm IXCATeL81DksEEUuEjc3f2CDsIUlXh3fwt7FyAFkS0tcOmoLUT+dUeLNr6UsEM56Rok1Z44x QTRYSxw+fhHqOj6Jd197WCGaeSU62oQgSjwkJj5cwAjx5Rygl1+8Y5vAKLmAkWEVo1hqQXFu emqxYYGxXnFibnFpXrpecn7uJkZwLGuZ72DccM7nEKMAB6MSD69B+dtoIdbEsuLK3EOMEhzM SiK8bnVAId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rxPpOZGCwmkJ5akZqemFqQWwWSZODilGhgX K/yv5rl0TjpzYd3p9docyzM3X7Y4fblGVzwbGK13rA15G50Xr78/YctsOb0n0So619L6dPZk HF4ZMufWBB3jhqp//Syzrhr0v/n/evPh0+ePBJU3/Qx17FbhyM8+pSbNdKL0abejj/79DTaO 8u7zL6s+KTi1ZtpXhy9ba3n2ZewuV1eSP6nEUpyRaKjFXFScCABkiw7Y4QIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrELMWRmVeSWpSXmKPExsVy+t9jQd1HPW+jDV69lLC4te4cq8XfScfY LTbOWM9qcf3Lc1aLhdOWM1r0P37NbHH+/AZ2i02Pr7FaXN41h81ixvl9TBYvj/xgtFh75C67 xaKtX9gdeD1+/5rE6HHrTr3HplWdbB6bl9R7vN93lc2jb8sqRo/Pm+QC2KO4bFJSczLLUov0 7RK4MuZs+MRY8Fm04vXKw8wNjP3CXYycHBICJhJvJ35jArGFBNYxSnz7y9bFyAVk/2KU+H54 MTtIgk3ASmJi+ypGEFtEQFPi+t/vrCBFzAJHmSU+T9jODJIQFnCQuHDkDVgRi4CqxNufbWBT eQU8JH78/ssKsU1O4uSxyWA2p4CnxPaz7cwQmz0kPv89wz6BkWcBI8MqRsnUguLc9NxiowLD vNRyveLE3OLSvHS95PzcTYzAkNx2WKtvB+P9JfGHGAU4GJV4eA3K30YLsSaWFVfmHmKU4GBW EuF1qwMK8aYkVlalFuXHF5XmpBYfYpTmYFES572ddyxSSCA9sSQ1OzW1ILUIJsvEwSnVwCi2 8MZtszr3ltuikfpbH4qseLIqnJ1lCVNI4A+h21+33uQWOJ/6eYaL2o6DV27fF5l97WbDQstj W67ZbtFPsfDVl9J8us35WqaOTfVjwzONob2zMwpLp9aL2ZxaclCfVWfphz8WsaJ8dYVHNjIH mymwn1hTJyenEhPT26cS5RZ/TTb29ju/SiWW4oxEQy3mouJEAIHxlDdFAgAA X-CMS-MailID: 20181115151234epcas1p2006b64ae88567526c855869758ff8b9c X-Msg-Generator: CA CMS-TYPE: 101P X-CMS-RootMailID: 20181115151234epcas1p2006b64ae88567526c855869758ff8b9c References: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove no longer needed soc_is_exynos*() macros & co. Signed-off-by: Bartlomiej Zolnierkiewicz --- arch/arm/mach-exynos/common.h | 71 ------------------------------------------- 1 file changed, 71 deletions(-) diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index 20d205e..1dfd434 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h @@ -17,81 +17,10 @@ extern bool soc_dev_is_exynos4412(void); extern bool soc_dev_is_exynos542x(void); -#define EXYNOS3250_SOC_ID 0xE3472000 -#define EXYNOS3_SOC_MASK 0xFFFFF000 - -#define EXYNOS4210_CPU_ID 0x43210000 -#define EXYNOS4412_CPU_ID 0xE4412200 -#define EXYNOS4_CPU_MASK 0xFFFE0000 - -#define EXYNOS5250_SOC_ID 0x43520000 -#define EXYNOS5410_SOC_ID 0xE5410000 -#define EXYNOS5420_SOC_ID 0xE5420000 -#define EXYNOS5800_SOC_ID 0xE5422000 -#define EXYNOS5_SOC_MASK 0xFFFFF000 - -extern unsigned long samsung_cpu_id; - -#define IS_SAMSUNG_CPU(name, id, mask) \ -static inline int is_samsung_##name(void) \ -{ \ - return ((samsung_cpu_id & mask) == (id & mask)); \ -} - -IS_SAMSUNG_CPU(exynos3250, EXYNOS3250_SOC_ID, EXYNOS3_SOC_MASK) -IS_SAMSUNG_CPU(exynos4210, EXYNOS4210_CPU_ID, EXYNOS4_CPU_MASK) -IS_SAMSUNG_CPU(exynos4412, EXYNOS4412_CPU_ID, EXYNOS4_CPU_MASK) -IS_SAMSUNG_CPU(exynos5250, EXYNOS5250_SOC_ID, EXYNOS5_SOC_MASK) -IS_SAMSUNG_CPU(exynos5410, EXYNOS5410_SOC_ID, EXYNOS5_SOC_MASK) -IS_SAMSUNG_CPU(exynos5420, EXYNOS5420_SOC_ID, EXYNOS5_SOC_MASK) -IS_SAMSUNG_CPU(exynos5800, EXYNOS5800_SOC_ID, EXYNOS5_SOC_MASK) - -#if defined(CONFIG_SOC_EXYNOS3250) -# define soc_is_exynos3250() is_samsung_exynos3250() -#else -# define soc_is_exynos3250() 0 -#endif - -#if defined(CONFIG_CPU_EXYNOS4210) -# define soc_is_exynos4210() is_samsung_exynos4210() -#else -# define soc_is_exynos4210() 0 -#endif - -#if defined(CONFIG_SOC_EXYNOS4412) -# define soc_is_exynos4412() is_samsung_exynos4412() -#else -# define soc_is_exynos4412() 0 -#endif - #define EXYNOS4210_REV_0 (0x0) #define EXYNOS4210_REV_1_0 (0x10) #define EXYNOS4210_REV_1_1 (0x11) -#if defined(CONFIG_SOC_EXYNOS5250) -# define soc_is_exynos5250() is_samsung_exynos5250() -#else -# define soc_is_exynos5250() 0 -#endif - -#if defined(CONFIG_SOC_EXYNOS5410) -# define soc_is_exynos5410() is_samsung_exynos5410() -#else -# define soc_is_exynos5410() 0 -#endif - -#if defined(CONFIG_SOC_EXYNOS5420) -# define soc_is_exynos5420() is_samsung_exynos5420() -#else -# define soc_is_exynos5420() 0 -#endif - -#if defined(CONFIG_SOC_EXYNOS5800) -# define soc_is_exynos5800() is_samsung_exynos5800() -#else -# define soc_is_exynos5800() 0 -#endif - extern u32 cp15_save_diag; extern u32 cp15_save_power; From patchwork Thu Nov 15 15:11:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 10684585 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B7F5613BB for ; Thu, 15 Nov 2018 15:12:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A95C52CA91 for ; Thu, 15 Nov 2018 15:12:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A72E22CA93; Thu, 15 Nov 2018 15:12:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CB6B2C9DE for ; Thu, 15 Nov 2018 15:12:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388694AbeKPBU6 (ORCPT ); Thu, 15 Nov 2018 20:20:58 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:35720 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388042AbeKPBU6 (ORCPT ); Thu, 15 Nov 2018 20:20:58 -0500 Received: from epcas2p3.samsung.com (unknown [182.195.41.55]) by mailout1.samsung.com (KnoxPortal) with ESMTP id 20181115151241epoutp019cd3cc2d2447bf64356a4496d8fcb06e~nVOoKZ5w-0617906179epoutp01R; Thu, 15 Nov 2018 15:12:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.samsung.com 20181115151241epoutp019cd3cc2d2447bf64356a4496d8fcb06e~nVOoKZ5w-0617906179epoutp01R DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1542294761; bh=JBJR81GnQ7cDGFh+5OLXFWkoCbExnC+5nkP6rmhEZgg=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=Kbm/FROGASnyGfp1S9Nj4TD/gDK79qsdqdHXvmdea5qwARcP+vJNQPOEc+BYoM0q3 iI3aVLIW3HjsZ2UnydjUa0LMC974zLT7LXw0sVl1/uq4bpYmaJooFh+81DEfac4KDj EJmRNt3AQG5R91erUfsIBj/Q11gsV5+QG1ZB4c10= Received: from epsmges2p2.samsung.com (unknown [182.195.42.70]) by epcas2p3.samsung.com (KnoxPortal) with ESMTP id 20181115151240epcas2p3b99ee0c45bb26570563668924f0217cd~nVOm1GJvK2217522175epcas2p3L; Thu, 15 Nov 2018 15:12:40 +0000 (GMT) Received: from epcas2p3.samsung.com ( [182.195.41.55]) by epsmges2p2.samsung.com (Symantec Messaging Gateway) with SMTP id 32.2C.04407.8EC8DEB5; Fri, 16 Nov 2018 00:12:40 +0900 (KST) Received: from epsmgms2p2new.samsung.com (unknown [182.195.42.143]) by epcas2p1.samsung.com (KnoxPortal) with ESMTP id 20181115151238epcas2p1dd0da525c3cd2a7a4d153ced264b5b8f~nVOlpdmNH3092430924epcas2p1G; Thu, 15 Nov 2018 15:12:38 +0000 (GMT) X-AuditID: b6c32a46-7a1ff70000001137-4f-5bed8ce82408 Received: from epmmp2 ( [203.254.227.17]) by epsmgms2p2new.samsung.com (Symantec Messaging Gateway) with SMTP id F4.28.03702.6EC8DEB5; Fri, 16 Nov 2018 00:12:38 +0900 (KST) Received: from AMDC3058.DIGITAL.local ([106.120.53.102]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PI8006WJQ7YQ380@mmp2.samsung.com>; Fri, 16 Nov 2018 00:12:38 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Krzysztof Kozlowski Cc: Arnd Bergmann , Marek Szyprowski , Kukjin Kim , Markus Reichl , Andrzej Hajda , Chanwoo Choi , Javier Martinez Canillas , Pankaj Dubey , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com Subject: [PATCH 7/9] ARM: SAMSUNG: remove samsung_rev() Date: Thu, 15 Nov 2018 16:11:36 +0100 Message-id: <1542294698-17470-8-git-send-email-b.zolnierkie@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrHIsWRmVeSWpSXmKPExsWy7bCmue6LnrfRBt/2slncWneO1eLvpGPs FhtnrGe1uP7lOavFwmnLGS36H79mtjh/fgO7xabH11gtLu+aw2Yx4/w+JouXR34wWqw9cpfd YtHWL+wOvB6/f01i9Lh1p95j06pONo/NS+o93u+7yubRt2UVo8fnTXIB7FFcNimpOZllqUX6 dglcGZsndjEWzFOpuDBrGlsD4065LkZODgkBE4kpr7YzdjFycQgJ7GCUeP94IxOE851R4saF T4wwVU/XfoWq2sAocXnGahaQhJDAL0aJxom1IDabgJXExPZVYA0iApoS1/9+ZwWxmQWOMkss uSIBYgsLmEs8fLSWGcRmEVCV2P1hAVg9r4CHxJ0bE9gglslJnDw2GayXU8BTYvvZdmaQxRIC R9gkLvTdBGrgAHJcJCZct4eoF5Z4dXwLO4QtLfFs1UZGiPrpjBJvfi1lgXDWM0qsOXOMCaLK WuLw8YtQ1/FJdBz+yw4xlFeio00IosRD4smEKWwQH89hlNi5agXLBEbJBYwMqxjFUguKc9NT i40KjPSKE3OLS/PS9ZLzczcxgmNZy20H45JzPocYBTgYlXh4DcrfRguxJpYVV+YeYpTgYFYS 4XWrAwrxpiRWVqUW5ccXleakFh9ilOZgURLnfSg9N1pIID2xJDU7NbUgtQgmy8TBKdXAKP9g d9jioEOWqtksPVb7rttH9ZaLt3QFbfuz9W5g/8rlFov81r199vzX20NVAcliia7blpS+1OiY /LT0MM8J9UknJeOM67fMjajkP7zz/eF5h0odc26/ua1w1iu3zkmMcVlVe0je4WXHZvVz2Dos EtYwW7Ho5FWdlAKNCxff7aypX3n+gVxyuBJLcUaioRZzUXEiANAVkdfhAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMLMWRmVeSWpSXmKPExsVy+t9jQd1nPW+jDe5MMra4te4cq8XfScfY LTbOWM9qcf3Lc1aLhdOWM1r0P37NbHH+/AZ2i02Pr7FaXN41h81ixvl9TBYvj/xgtFh75C67 xaKtX9gdeD1+/5rE6HHrTr3HplWdbB6bl9R7vN93lc2jb8sqRo/Pm+QC2KO4bFJSczLLUov0 7RK4MjZP7GIsmKdScWHWNLYGxp1yXYycHBICJhJP135l7GLk4hASWMcosexUE5Tzi1GifdVf FpAqNgEriYntqxhBbBEBTYnrf7+zghQxCxxllvg8YTszSEJYwFzi4aO1YDaLgKrE7g8LwBp4 BTwk7tyYwAaxTk7i5LHJrCA2p4CnxPaz7WD1QkA1n/+eYZ/AyLOAkWEVo2RqQXFuem6xUYFR Xmq5XnFibnFpXrpecn7uJkZgUG47rNW/g/HxkvhDjAIcjEo8vAblb6OFWBPLiitzDzFKcDAr ifC61QGFeFMSK6tSi/Lji0pzUosPMUpzsCiJ8/LnH4sUEkhPLEnNTk0tSC2CyTJxcEo1MK6b ePRx2NcSFYkP6bYvTJYLqwjLrPA+ErM59eM2X50SP5/rSwKOeOr+9Uu4uayhJeCHWMSS/XcF w2969WwNy/f//vXy3qi362T3lfruNAkV1DkoLtv3+uvhKH12nU+pT1SmfpnPMuXd0sCF1zc4 1izve7qucZ0x9/F2+6KX4YnsVZfT9vIfSlBiKc5INNRiLipOBADMn1QpRgIAAA== X-CMS-MailID: 20181115151238epcas2p1dd0da525c3cd2a7a4d153ced264b5b8f X-Msg-Generator: CA CMS-TYPE: 102P X-CMS-RootMailID: 20181115151238epcas2p1dd0da525c3cd2a7a4d153ced264b5b8f References: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP * Add soc_dev_is_exynos4210_rev11() helper. * Convert exynos_boot_vector_{addr,flag}() to use chipid driver. * Remove no longer needed samsung_rev() & co. Signed-off-by: Bartlomiej Zolnierkiewicz --- arch/arm/mach-exynos/common.h | 6 +----- arch/arm/mach-exynos/exynos.c | 6 ++++++ arch/arm/mach-exynos/pm.c | 8 ++++---- arch/arm/plat-samsung/cpu.c | 10 ---------- arch/arm/plat-samsung/include/plat/cpu.h | 2 -- 5 files changed, 11 insertions(+), 21 deletions(-) diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index 1dfd434..322d6eb 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h @@ -13,14 +13,11 @@ #include extern bool soc_dev_is_exynos3250(void); +extern bool soc_dev_is_exynos4210_rev10(void); extern bool soc_dev_is_exynos4210_rev11(void); extern bool soc_dev_is_exynos4412(void); extern bool soc_dev_is_exynos542x(void); -#define EXYNOS4210_REV_0 (0x0) -#define EXYNOS4210_REV_1_0 (0x10) -#define EXYNOS4210_REV_1_1 (0x11) - extern u32 cp15_save_diag; extern u32 cp15_save_power; @@ -81,7 +78,6 @@ static inline void exynos_scu_enable(void) { } extern void exynos_set_delayed_reset_assertion(bool enable); -extern unsigned int samsung_rev(void); extern void exynos_core_restart(u32 core_id); extern int exynos_set_boot_addr(u32 core_id, unsigned long boot_addr); extern int exynos_get_boot_addr(u32 core_id, unsigned long *boot_addr); diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index 463e457..ca367b7 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c @@ -29,6 +29,11 @@ { /* sentinel */ } }; +static const struct soc_device_attribute exynos4210_rev10_soc_id[] = { + { .soc_id = "EXYNOS4210", .revision = "10" }, + { /* sentinel */ } +}; + static const struct soc_device_attribute exynos4210_rev11_soc_id[] = { { .soc_id = "EXYNOS4210", .revision = "11" }, { /* sentinel */ } @@ -59,6 +64,7 @@ } SOC_DEV_IS_EXYNOS(3250); +SOC_DEV_IS_EXYNOS(4210_rev10); SOC_DEV_IS_EXYNOS(4210_rev11); SOC_DEV_IS_EXYNOS(4412); SOC_DEV_IS_EXYNOS(542x); diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 88c1bce..0109dc4 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -26,18 +26,18 @@ static inline void __iomem *exynos_boot_vector_addr(void) { - if (samsung_rev() == EXYNOS4210_REV_1_1) + if (soc_dev_is_exynos4210_rev11()) return pmu_base_addr + S5P_INFORM7; - else if (samsung_rev() == EXYNOS4210_REV_1_0) + else if (soc_dev_is_exynos4210_rev10()) return sysram_base_addr + 0x24; return pmu_base_addr + S5P_INFORM0; } static inline void __iomem *exynos_boot_vector_flag(void) { - if (samsung_rev() == EXYNOS4210_REV_1_1) + if (soc_dev_is_exynos4210_rev11()) return pmu_base_addr + S5P_INFORM6; - else if (samsung_rev() == EXYNOS4210_REV_1_0) + else if (soc_dev_is_exynos4210_rev10()) return sysram_base_addr + 0x20; return pmu_base_addr + S5P_INFORM1; } diff --git a/arch/arm/plat-samsung/cpu.c b/arch/arm/plat-samsung/cpu.c index e1ba88b..c633a24 100644 --- a/arch/arm/plat-samsung/cpu.c +++ b/arch/arm/plat-samsung/cpu.c @@ -14,13 +14,6 @@ #include unsigned long samsung_cpu_id; -static unsigned int samsung_cpu_rev; - -unsigned int samsung_rev(void) -{ - return samsung_cpu_rev; -} -EXPORT_SYMBOL(samsung_rev); void __init s3c64xx_init_cpu(void) { @@ -34,15 +27,12 @@ void __init s3c64xx_init_cpu(void) samsung_cpu_id = readl_relaxed(S3C_VA_SYS + 0xA1C); } - samsung_cpu_rev = 0; - pr_info("Samsung CPU ID: 0x%08lx\n", samsung_cpu_id); } void __init s5p_init_cpu(const void __iomem *cpuid_addr) { samsung_cpu_id = readl_relaxed(cpuid_addr); - samsung_cpu_rev = samsung_cpu_id & 0xFF; pr_info("Samsung CPU ID: 0x%08lx\n", samsung_cpu_id); } diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h index fadcddb..02d7f99 100644 --- a/arch/arm/plat-samsung/include/plat/cpu.h +++ b/arch/arm/plat-samsung/include/plat/cpu.h @@ -111,8 +111,6 @@ extern void s3c_init_cpu(unsigned long idcode, extern void s3c64xx_init_cpu(void); extern void s5p_init_cpu(const void __iomem *cpuid_addr); -extern unsigned int samsung_rev(void); - extern void s3c24xx_init_uarts(struct s3c2410_uartcfg *cfg, int no); extern void s3c24xx_init_clocks(int xtal); From patchwork Thu Nov 15 15:11:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 10684589 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6BC4217EE for ; Thu, 15 Nov 2018 15:12:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D3EB2CA6B for ; Thu, 15 Nov 2018 15:12:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B03A2CAA1; Thu, 15 Nov 2018 15:12:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D5D612CA6B for ; Thu, 15 Nov 2018 15:12:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388724AbeKPBVE (ORCPT ); Thu, 15 Nov 2018 20:21:04 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:32322 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388042AbeKPBVD (ORCPT ); Thu, 15 Nov 2018 20:21:03 -0500 Received: from epcas1p1.samsung.com (unknown [182.195.41.45]) by mailout3.samsung.com (KnoxPortal) with ESMTP id 20181115151245epoutp0309b65af1737959b62796cdaf78b6b2ca~nVOrxDkmp0615306153epoutp03Z; Thu, 15 Nov 2018 15:12:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout3.samsung.com 20181115151245epoutp0309b65af1737959b62796cdaf78b6b2ca~nVOrxDkmp0615306153epoutp03Z DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1542294765; bh=53jrnAIEHMLD+N9qBU0mnqtaMu0kY4ai74T8GgiAMks=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=WBkP5uz/W0kugZUb4DeX3S2kj5wEKylIVH3XP0u4snHGiAGf/xub5A/3VxxI5e4/K aukZ+UO2+j1esuWZsGerztKaJVRABvSR4PdGzNpDclUR6evVgeINbsJs3GV+gVwpCF etfpViLvcm5XS+yEepE3YFiw41GujIqtyajU+POk= Received: from epsmges1p4.samsung.com (unknown [182.195.42.56]) by epcas1p1.samsung.com (KnoxPortal) with ESMTP id 20181115151244epcas1p1e844a94abe3a03cacc9ffa78b525446b~nVOq-rit83268032680epcas1p1C; Thu, 15 Nov 2018 15:12:44 +0000 (GMT) Received: from epcas1p3.samsung.com ( [182.195.41.47]) by epsmges1p4.samsung.com (Symantec Messaging Gateway) with SMTP id E7.FF.04149.CEC8DEB5; Fri, 16 Nov 2018 00:12:44 +0900 (KST) Received: from epsmgms2p1new.samsung.com (unknown [182.195.42.142]) by epcas1p3.samsung.com (KnoxPortal) with ESMTP id 20181115151243epcas1p382a3d1704a8ee0d1b0e0b7d214d11ec4~nVOpyKR7r3141131411epcas1p3u; Thu, 15 Nov 2018 15:12:43 +0000 (GMT) X-AuditID: b6c32a38-653ff70000001035-f2-5bed8cece776 Received: from epmmp2 ( [203.254.227.17]) by epsmgms2p1new.samsung.com (Symantec Messaging Gateway) with SMTP id 77.B9.03701.BEC8DEB5; Fri, 16 Nov 2018 00:12:43 +0900 (KST) Received: from AMDC3058.DIGITAL.local ([106.120.53.102]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PI8006WJQ7YQ380@mmp2.samsung.com>; Fri, 16 Nov 2018 00:12:43 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Krzysztof Kozlowski Cc: Arnd Bergmann , Marek Szyprowski , Kukjin Kim , Markus Reichl , Andrzej Hajda , Chanwoo Choi , Javier Martinez Canillas , Pankaj Dubey , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com Subject: [PATCH 8/9] ARM: SAMSUNG: remove s5p_init_cpu() Date: Thu, 15 Nov 2018 16:11:37 +0100 Message-id: <1542294698-17470-9-git-send-email-b.zolnierkie@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPIsWRmVeSWpSXmKPExsWy7bCmvu6bnrfRBp83y1ncWneO1eLvpGPs FhtnrGe1uP7lOavFwmnLGS36H79mtjh/fgO7xabH11gtLu+aw2Yx4/w+JouXR34wWqw9cpfd YtHWL+wOvB6/f01i9Lh1p95j06pONo/NS+o93u+7yubRt2UVo8fnTXIB7FFcNimpOZllqUX6 dglcGffv3GEvWClRsXDebeYGxk0iXYycHBICJhJzb31n6WLk4hAS2MEoceDjNkYI5zujxNFP d1hgqmYd+w9VtYFR4sXOHiYI5xejxNtFy1hBqtgErCQmtq9iBLFFBDQlrv/9DhZnFjjKLLHk igSILSxgIXFm1xpmEJtFQFXi6MEXYDavgIfErDV7mSC2yUmcPDYZrJdTwFNi+9l2ZpBlEgJH 2CRuvDzDClHkIjFl+2KoBmGJV8e3sHcxcgDZ0hKXjtpC1E9nlHjzaykLhLOeUWLNmWNQDdYS h49fhLqOT+Ld1x5WiGZeiY42IYgSD4k1a05Aw2IOo8SRzlnsExglFzAyrGIUSy0ozk1PLTYs MNErTswtLs1L10vOz93ECI5mLYsdjHvO+RxiFOBgVOLhNSh/Gy3EmlhWXJl7iFGCg1lJhNet DijEm5JYWZValB9fVJqTWnyIUZqDRUmc94nU3GghgfTEktTs1NSC1CKYLBMHp1QDo9GCR2cM vjtkhEx/2p0vmRh7WHJS0sE3tkkfNDju71zQJOy6LTd0xq+il+dvREy8dON/U4qIPs/rOXeF z6S43WF9PfN65PbTt4vC/V7JnTAJyaqMne4tXTCH+ZO+QfqNZ6pflFMm7VdU3Fju4HNsnvOp O/0RtxpEZtvIS21W/Sqkfv634fMzR5RYijMSDbWYi4oTAdebtJ3iAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMLMWRmVeSWpSXmKPExsVy+t9jQd3XPW+jDbrn8VrcWneO1eLvpGPs FhtnrGe1uP7lOavFwmnLGS36H79mtjh/fgO7xabH11gtLu+aw2Yx4/w+JouXR34wWqw9cpfd YtHWL+wOvB6/f01i9Lh1p95j06pONo/NS+o93u+7yubRt2UVo8fnTXIB7FFcNimpOZllqUX6 dglcGffv3GEvWClRsXDebeYGxk0iXYycHBICJhKzjv1n6WLk4hASWMcoMfnqUnYI5xejxIrz 25lAqtgErCQmtq9iBLFFBDQlrv/9zgpSxCxwlFni84TtzCAJYQELiTO71oDZLAKqEkcPvgCz eQU8JGat2csEsU5O4uSxyawgNqeAp8T2s+1gNUJANZ//nmGfwMizgJFhFaNkakFxbnpusVGB YV5quV5xYm5xaV66XnJ+7iZGYFBuO6zVt4Px/pL4Q4wCHIxKPLwG5W+jhVgTy4orcw8xSnAw K4nwutUBhXhTEiurUovy44tKc1KLDzFKc7AoifPezjsWKSSQnliSmp2aWpBaBJNl4uCUamDc zpvaXn+svEsiPvqDt5PQ3l1ujZP1WssPfTmuZFHFqf7dsVzpO0vi83dbHLufxdoXG5iaTLyX aWvKc+zcq/kWi2byf7zS9F/MaIFo9fkCwxIW69NO9eKmMSf5ur4ytEVKiDsdmXD4Y5+q2b2K mtN3zn/xFLZIO35Pet61sokND234X/s5/lRiKc5INNRiLipOBAD+V+SjRgIAAA== X-CMS-MailID: 20181115151243epcas1p382a3d1704a8ee0d1b0e0b7d214d11ec4 X-Msg-Generator: CA CMS-TYPE: 101P X-CMS-RootMailID: 20181115151243epcas1p382a3d1704a8ee0d1b0e0b7d214d11ec4 References: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove no longer needed s5p_init_cpu() & co. Signed-off-by: Bartlomiej Zolnierkiewicz --- arch/arm/mach-exynos/exynos.c | 28 ---------------------------- arch/arm/plat-samsung/cpu.c | 7 ------- arch/arm/plat-samsung/include/plat/cpu.h | 1 - arch/arm/plat-samsung/include/plat/map-s5p.h | 2 -- 4 files changed, 38 deletions(-) diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index ca367b7..d98574c 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c @@ -20,7 +20,6 @@ #include #include -#include #include "common.h" @@ -99,36 +98,9 @@ void __init exynos_sysram_init(void) } } -static int __init exynos_fdt_map_chipid(unsigned long node, const char *uname, - int depth, void *data) -{ - struct map_desc iodesc; - const __be32 *reg; - int len; - - if (!of_flat_dt_is_compatible(node, "samsung,exynos4210-chipid")) - return 0; - - reg = of_get_flat_dt_prop(node, "reg", &len); - if (reg == NULL || len != (sizeof(unsigned long) * 2)) - return 0; - - iodesc.pfn = __phys_to_pfn(be32_to_cpu(reg[0])); - iodesc.length = be32_to_cpu(reg[1]) - 1; - iodesc.virtual = (unsigned long)S5P_VA_CHIPID; - iodesc.type = MT_DEVICE; - iotable_init(&iodesc, 1); - return 1; -} - static void __init exynos_init_io(void) { debug_ll_io_init(); - - of_scan_flat_dt(exynos_fdt_map_chipid, NULL); - - /* detect cpu id and rev. */ - s5p_init_cpu(S5P_VA_CHIPID); } /* diff --git a/arch/arm/plat-samsung/cpu.c b/arch/arm/plat-samsung/cpu.c index c633a24..8acba21 100644 --- a/arch/arm/plat-samsung/cpu.c +++ b/arch/arm/plat-samsung/cpu.c @@ -29,10 +29,3 @@ void __init s3c64xx_init_cpu(void) pr_info("Samsung CPU ID: 0x%08lx\n", samsung_cpu_id); } - -void __init s5p_init_cpu(const void __iomem *cpuid_addr) -{ - samsung_cpu_id = readl_relaxed(cpuid_addr); - - pr_info("Samsung CPU ID: 0x%08lx\n", samsung_cpu_id); -} diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h index 02d7f99..93ecd71 100644 --- a/arch/arm/plat-samsung/include/plat/cpu.h +++ b/arch/arm/plat-samsung/include/plat/cpu.h @@ -109,7 +109,6 @@ extern void s3c_init_cpu(unsigned long idcode, extern void s3c24xx_init_io(struct map_desc *mach_desc, int size); extern void s3c64xx_init_cpu(void); -extern void s5p_init_cpu(const void __iomem *cpuid_addr); extern void s3c24xx_init_uarts(struct s3c2410_uartcfg *cfg, int no); diff --git a/arch/arm/plat-samsung/include/plat/map-s5p.h b/arch/arm/plat-samsung/include/plat/map-s5p.h index d69a0ca..3812085 100644 --- a/arch/arm/plat-samsung/include/plat/map-s5p.h +++ b/arch/arm/plat-samsung/include/plat/map-s5p.h @@ -9,8 +9,6 @@ #ifndef __ASM_PLAT_MAP_S5P_H #define __ASM_PLAT_MAP_S5P_H __FILE__ -#define S5P_VA_CHIPID S3C_ADDR(0x02000000) - #define VA_VIC(x) (S3C_VA_IRQ + ((x) * 0x10000)) #define VA_VIC0 VA_VIC(0) #define VA_VIC1 VA_VIC(1) From patchwork Thu Nov 15 15:11:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 10684591 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 09EFA13BB for ; Thu, 15 Nov 2018 15:12:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFBE82CA19 for ; Thu, 15 Nov 2018 15:12:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE15F2CA90; Thu, 15 Nov 2018 15:12:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C63F2CA6D for ; Thu, 15 Nov 2018 15:12:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388749AbeKPBVH (ORCPT ); Thu, 15 Nov 2018 20:21:07 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:38444 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388042AbeKPBVH (ORCPT ); Thu, 15 Nov 2018 20:21:07 -0500 Received: from epcas2p2.samsung.com (unknown [182.195.41.54]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20181115151250epoutp047712ac6fad4a401567e456e2059a6a42~nVOwe1ozT1479214792epoutp04Z; Thu, 15 Nov 2018 15:12:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20181115151250epoutp047712ac6fad4a401567e456e2059a6a42~nVOwe1ozT1479214792epoutp04Z DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1542294770; bh=5bmAVkGkwX7ChC6XKRyGxkygWUDheHbVXN9lZuKBLao=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=p24eNzeg3yC21AVJQof3tlffWSv/4Wy1Z3jkBPl5lyB/BZ5X4gToPm09L08O9JLGa ZOPVKn+n7rmb9NYC0u3sj5UVs18ZnMV/5CKYAFdrfWDkD1v3Cv/9VsSCXiHGsL/+9Z Dj0mIkvImJvJiJ8l/uN4SKVpeck4vXfzS49773qQ= Received: from epsmges2p1.samsung.com (unknown [182.195.42.69]) by epcas2p2.samsung.com (KnoxPortal) with ESMTP id 20181115151248epcas2p2b6910e3be6e14524965a1e9c2714d96e~nVOvEpGrK0712507125epcas2p2w; Thu, 15 Nov 2018 15:12:48 +0000 (GMT) Received: from epcas2p1.samsung.com ( [182.195.41.53]) by epsmges2p1.samsung.com (Symantec Messaging Gateway) with SMTP id 06.DB.04410.0FC8DEB5; Fri, 16 Nov 2018 00:12:48 +0900 (KST) Received: from epsmgms2p2new.samsung.com (unknown [182.195.42.143]) by epcas2p4.samsung.com (KnoxPortal) with ESMTP id 20181115151247epcas2p4053da2cb28b2414156d2fd0530059c0d~nVOt2EBYB1347513475epcas2p49; Thu, 15 Nov 2018 15:12:47 +0000 (GMT) X-AuditID: b6c32a45-a01ff7000000113a-ee-5bed8cf04fdf Received: from epmmp2 ( [203.254.227.17]) by epsmgms2p2new.samsung.com (Symantec Messaging Gateway) with SMTP id D5.28.03702.FEC8DEB5; Fri, 16 Nov 2018 00:12:47 +0900 (KST) Received: from AMDC3058.DIGITAL.local ([106.120.53.102]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PI8006WJQ7YQ380@mmp2.samsung.com>; Fri, 16 Nov 2018 00:12:47 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Krzysztof Kozlowski Cc: Arnd Bergmann , Marek Szyprowski , Kukjin Kim , Markus Reichl , Andrzej Hajda , Chanwoo Choi , Javier Martinez Canillas , Pankaj Dubey , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com Subject: [PATCH 9/9] ARM: EXYNOS: remove include Date: Thu, 15 Nov 2018 16:11:38 +0100 Message-id: <1542294698-17470-10-git-send-email-b.zolnierkie@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrDIsWRmVeSWpSXmKPExsWy7bCmqe6HnrfRBl/WW1jcWneO1eLvpGPs FhtnrGe1uP7lOavFwmnLGS36H79mtjh/fgO7xabH11gtLu+aw2Yx4/w+JouXR34wWqw9cpfd YtHWL+wOvB6/f01i9Lh1p95j06pONo/NS+o93u+7yubRt2UVo8fnTXIB7FFcNimpOZllqUX6 dglcGZ/7pQru8FbcnzuRqYHxHHcXIyeHhICJxM6WK6xdjFwcQgI7GCU6tn6Dcr4zSizetI4N pqr/x1x2iMQGRon1k1YzQTi/GCV+flvADlLFJmAlMbF9FSOILSKgKXH973dWEJtZ4CizxJIr EiC2sICtxMP7R5i7GDk4WARUJXavUgYJ8wp4SqyasJsdYpmcxMljk8FaOYHi28+2M0PEj7BJ dPwvg7BdJN4/v8UCYQtLvDq+BapXWuLZqo2MILdJCExnlHjzaykLhLOeUWLNmWNMEFXWEoeP X4Q6jk+i4/BfdpCDJAR4JTrahCBKPCRWfnwKNlRIYA6jxP3GygmMkgsYGVYxiqUWFOempxYb FRjqFSfmFpfmpesl5+duYgTHsZbrDsYZ53wOMQpwMCrx8BqUv40WYk0sK67MPcQowcGsJMLr VgcU4k1JrKxKLcqPLyrNSS0+xCjNwaIkzvtIem60kEB6YklqdmpqQWoRTJaJg1OqgXHxgttm 1dzuR1ds9Xlo8Ng57GzjrmM+PXUbX67XkZdWcj3tLV7w9PEbhaY5ZWsXLfwi73n17sIpwdxL vLgOG71cdSFuOvtZ+6kKjVtsjrQUWyyWWXRUwjbj//1sHu+m/69mCyn/2FrbJ9uUYcteLs94 cYHC4gdnpR6JFJ769P1z24Iy+Yov2z4psRRnJBpqMRcVJwIAQ8Gw398CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrILMWRmVeSWpSXmKPExsVy+t9jQd33PW+jDVY/U7a4te4cq8XfScfY LTbOWM9qcf3Lc1aLhdOWM1r0P37NbHH+/AZ2i02Pr7FaXN41h81ixvl9TBYvj/xgtFh75C67 xaKtX9gdeD1+/5rE6HHrTr3HplWdbB6bl9R7vN93lc2jb8sqRo/Pm+QC2KO4bFJSczLLUov0 7RK4Mj73SxXc4a24P3ciUwPjOe4uRk4OCQETif4fc9m7GLk4hATWMUpsXLCTFcL5xSjR/KOL BaSKTcBKYmL7KkYQW0RAU+L63+9gRcwCR5klPk/YzgySEBawlXh4/wiQzcHBIqAqsXuVMkiY V8BTYtWE3ewQ2+QkTh6bzApicwLFt59tB2sVEvCQ+Pz3DPsERp4FjAyrGCVTC4pz03OLjQqM 8lLL9YoTc4tL89L1kvNzNzECA3LbYa3+HYyPl8QfYhTgYFTi4TUofxstxJpYVlyZe4hRgoNZ SYTXrQ4oxJuSWFmVWpQfX1Sak1p8iFGag0VJnJc//1ikkEB6YklqdmpqQWoRTJaJg1OqgVFp J8vM272MPxJtu79ONj4g5+DouoOvklntwbHGM0EVyWrsS2xEoww9jz3rTyhzOSRwddkDs0Qu Yy7WP+ozOh58eiajqRx1lvv6ncSA3Yp70tZcfJ79+SNbWlzZutc5IoKZ75s3zg++KGPpLfOF dYODhcyrwkOmUcrrtrCvmnneeILl341XnimxFGckGmoxFxUnAgAR/UPmRAIAAA== X-CMS-MailID: 20181115151247epcas2p4053da2cb28b2414156d2fd0530059c0d X-Msg-Generator: CA CMS-TYPE: 102P X-CMS-RootMailID: 20181115151247epcas2p4053da2cb28b2414156d2fd0530059c0d References: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove no longer needed include. Signed-off-by: Bartlomiej Zolnierkiewicz --- arch/arm/mach-exynos/exynos.c | 2 -- arch/arm/mach-exynos/include/mach/map.h | 18 ------------------ arch/arm/mach-exynos/platsmp.c | 2 -- 3 files changed, 22 deletions(-) delete mode 100644 arch/arm/mach-exynos/include/mach/map.h diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index d98574c..d29f241 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c @@ -19,8 +19,6 @@ #include #include -#include - #include "common.h" static const struct soc_device_attribute exynos3250_soc_id[] = { diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h deleted file mode 100644 index 22ebe36..0000000 --- a/arch/arm/mach-exynos/include/mach/map.h +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. - * http://www.samsung.com/ - * - * EXYNOS - Memory map definitions - */ - -#ifndef __ASM_ARCH_MAP_H -#define __ASM_ARCH_MAP_H __FILE__ - -#include - -#include - -#define EXYNOS_PA_CHIPID 0x10000000 - -#endif /* __ASM_ARCH_MAP_H */ diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index e2ba70f..56e2554 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -22,8 +22,6 @@ #include #include -#include - #include "common.h" extern void exynos4_secondary_startup(void);