From patchwork Wed Oct 4 06:38:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9983893 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DD1D160237 for ; Wed, 4 Oct 2017 06:38:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D135628A83 for ; Wed, 4 Oct 2017 06:38:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5D1C28A8A; Wed, 4 Oct 2017 06:38:41 +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=-6.9 required=2.0 tests=BAYES_00,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 AD58D28A7A for ; Wed, 4 Oct 2017 06:38:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751259AbdJDGij (ORCPT ); Wed, 4 Oct 2017 02:38:39 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:54533 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751203AbdJDGii (ORCPT ); Wed, 4 Oct 2017 02:38:38 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20171004063836euoutp02ce56956137e4cff05ee4903c144bf845~qSqlrc7LS3044430444euoutp02c; Wed, 4 Oct 2017 06:38:36 +0000 (GMT) Received: from eusmges2.samsung.com (unknown [203.254.199.241]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20171004063836eucas1p12c09e6bfb72db17971dc3fc881663eb4~qSqk819bO1724617246eucas1p1k; Wed, 4 Oct 2017 06:38:36 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2.samsung.com (EUCPMTA) with SMTP id 6D.D6.12907.BE184D95; Wed, 4 Oct 2017 07:38:35 +0100 (BST) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20171004063835eucas1p2d9c25263cbae0b9d57f1af2dfcfcdcd6~qSqkIaVNB0934209342eucas1p2U; Wed, 4 Oct 2017 06:38:35 +0000 (GMT) X-AuditID: cbfec7f1-f793a6d00000326b-13-59d481ebcabe Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 06.88.20118.BE184D95; Wed, 4 Oct 2017 07:38:35 +0100 (BST) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OXA00MT7D47C980@eusync4.samsung.com>; Wed, 04 Oct 2017 07:38:35 +0100 (BST) From: Marek Szyprowski To: linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Sylwester Nawrocki , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz Subject: [PATCH 1/7] ARM: EXYNOS: Remove Exynos4212 related dead code Date: Wed, 04 Oct 2017 08:38:22 +0200 Message-id: <20171004063828.22068-2-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.14.2 In-reply-to: <20171004063828.22068-1-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrFIsWRmVeSWpSXmKPExsWy7djP87qvG69EGvRu0bfYOGM9q8X58xvY LWac38dksfbIXXaLw2/aWR1YPTat6mTz6NuyitHj8ya5AOYoLpuU1JzMstQifbsEroyHV16w FvzXqTj5o4elgfGSWhcjJ4eEgInExT+f2SFsMYkL99azgdhCAksZJRbfdu1i5AKyPzNKrHjz nRGm4VBbNzNEYhmjxPTbT9ggnAYmiY4pbcwgVWwChhJdb7vARokIqEp8blvADlLELLCXUeLQ tEawhLCAq8Txff/BbBagov+LnoPZvAK2Ep8/3mWDWCcv8X7BfbDVnAJ2En2tn1lBBkkIfGSV WD9pAwtEkYvEuhunoe4Tlnh1fAvUQzISlyd3Q9X0M0o0tWpD2DMYJc695YWwrSUOH7/ICmIz C/BJTNo2HegDDqA4r0RHmxBEiYfEmvOLoMY7Stw4sooR4uOJjBL//51nmsAovYCRYRWjSGpp cW56arGRXnFibnFpXrpecn7uJkZgDJ7+d/zjDsb3J6wOMQpwMCrx8Db0XY4UYk0sK67MPcQo wcGsJMLbWXMlUog3JbGyKrUoP76oNCe1+BCjNAeLkjivbVRbpJBAemJJanZqakFqEUyWiYNT qoGRUfuNV+cVl3UqF8UsA1XXnD22e/NaTwW/IqNjV6Ucv37NUD7ee6ZX+fD73CshdqrbT0de 4l06/5e5EONLA06rbY51F29YKfzac6PySqjrxJL1hztKXseobbi51OVJ1nQu7YdT0y+1S7cb P5Zdf7O7Kbfxwr/lag1szZuOy3bu4/Wu3iLfMGuZEktxRqKhFnNRcSIAN1xD8L0CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgluLIzCtJLcpLzFFi42I5/e/4Nd3XjVciDXZt5LDYOGM9q8X58xvY LWac38dksfbIXXaLw2/aWR1YPTat6mTz6NuyitHj8ya5AOYoLpuU1JzMstQifbsEroyHV16w FvzXqTj5o4elgfGSWhcjJ4eEgInEobZuZghbTOLCvfVsXYxcHEICSxglTky5ywLhNDFJPNx0 nx2kik3AUKLrbRcbiC0ioCrxuW0BO0gRs8B+RonzW5+BjRIWcJU4vu8/WBELUNH/Rc/BbF4B W4nPH++yQayTl3i/4D4jiM0pYCfR1/qZFcQWAqqZdqKReQIj7wJGhlWMIqmlxbnpucVGesWJ ucWleel6yfm5mxiB4bLt2M8tOxi73gUfYhTgYFTi4dXouRwpxJpYVlyZe4hRgoNZSYS3s+ZK pBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXHe3j2rI4UE0hNLUrNTUwtSi2CyTBycUg2Mx+WNEp6y udyTcD2c9KVOuJptHuu6kLRUgfprDJu7VJb4bHMS0OVMDFPJ4DTiU//z2vZJdJ7TY+NNW8ID lX8Kfpc8lW3VcXxWLHdt5fsJzOtWNnIoRTscjojduk33mO2UeTdqjr4M8/l48ZbkZMmvr7++ 7/v1Pk9m19vbiWc4XmXk/GJa/P28EktxRqKhFnNRcSIAuaszFBMCAAA= X-CMS-MailID: 20171004063835eucas1p2d9c25263cbae0b9d57f1af2dfcfcdcd6 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRs=?= =?UTF-8?B?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRtT?= =?UTF-8?B?YW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-CMS-RootMailID: 20171004063835eucas1p2d9c25263cbae0b9d57f1af2dfcfcdcd6 X-RootMTR: 20171004063835eucas1p2d9c25263cbae0b9d57f1af2dfcfcdcd6 References: <20171004063828.22068-1-m.szyprowski@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 Support for Exynos4212 SoCs has been removed by commit bca9085e0ae9 ("ARM: dts: exynos: remove Exynos4212 support (dead code)"), so there is no need to keep remaining dead code related to this SoC version. Signed-off-by: Marek Szyprowski --- arch/arm/mach-exynos/Kconfig | 5 ----- arch/arm/mach-exynos/common.h | 11 +---------- arch/arm/mach-exynos/exynos.c | 2 -- arch/arm/mach-exynos/firmware.c | 5 ----- arch/arm/mach-exynos/pm.c | 3 +-- arch/arm/mach-exynos/suspend.c | 4 ---- 6 files changed, 2 insertions(+), 28 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 0a99140b6ba2..44fa753bd79c 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -85,11 +85,6 @@ config CPU_EXYNOS4210 default y depends on ARCH_EXYNOS4 -config SOC_EXYNOS4212 - bool "SAMSUNG EXYNOS4212" - default y - depends on ARCH_EXYNOS4 - config SOC_EXYNOS4412 bool "SAMSUNG EXYNOS4412" default y diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index 9424a8a9f308..3f715524c9d6 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h @@ -18,7 +18,6 @@ #define EXYNOS3_SOC_MASK 0xFFFFF000 #define EXYNOS4210_CPU_ID 0x43210000 -#define EXYNOS4212_CPU_ID 0x43220000 #define EXYNOS4412_CPU_ID 0xE4412200 #define EXYNOS4_CPU_MASK 0xFFFE0000 @@ -39,7 +38,6 @@ static inline int is_samsung_##name(void) \ IS_SAMSUNG_CPU(exynos3250, EXYNOS3250_SOC_ID, EXYNOS3_SOC_MASK) IS_SAMSUNG_CPU(exynos4210, EXYNOS4210_CPU_ID, EXYNOS4_CPU_MASK) -IS_SAMSUNG_CPU(exynos4212, EXYNOS4212_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) @@ -59,12 +57,6 @@ IS_SAMSUNG_CPU(exynos5800, EXYNOS5800_SOC_ID, EXYNOS5_SOC_MASK) # define soc_is_exynos4210() 0 #endif -#if defined(CONFIG_SOC_EXYNOS4212) -# define soc_is_exynos4212() is_samsung_exynos4212() -#else -# define soc_is_exynos4212() 0 -#endif - #if defined(CONFIG_SOC_EXYNOS4412) # define soc_is_exynos4412() is_samsung_exynos4412() #else @@ -105,8 +97,7 @@ IS_SAMSUNG_CPU(exynos5800, EXYNOS5800_SOC_ID, EXYNOS5_SOC_MASK) # define soc_is_exynos5800() 0 #endif -#define soc_is_exynos4() (soc_is_exynos4210() || soc_is_exynos4212() || \ - soc_is_exynos4412()) +#define soc_is_exynos4() (soc_is_exynos4210() || soc_is_exynos4412()) #define soc_is_exynos5() (soc_is_exynos5250() || soc_is_exynos5410() || \ soc_is_exynos5420() || soc_is_exynos5800()) diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index c404c15ad07f..9a9caac1125a 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c @@ -195,7 +195,6 @@ static void __init exynos_dt_machine_init(void) exynos_cpuidle.dev.platform_data = &cpuidle_coupled_exynos_data; #endif if (of_machine_is_compatible("samsung,exynos4210") || - of_machine_is_compatible("samsung,exynos4212") || (of_machine_is_compatible("samsung,exynos4412") && of_machine_is_compatible("samsung,trats2")) || of_machine_is_compatible("samsung,exynos3250") || @@ -208,7 +207,6 @@ static char const *const exynos_dt_compat[] __initconst = { "samsung,exynos3250", "samsung,exynos4", "samsung,exynos4210", - "samsung,exynos4212", "samsung,exynos4412", "samsung,exynos5", "samsung,exynos5250", diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c index e81a78b125d9..2a51e4603a6f 100644 --- a/arch/arm/mach-exynos/firmware.c +++ b/arch/arm/mach-exynos/firmware.c @@ -70,12 +70,7 @@ static int exynos_cpu_boot(int cpu) /* * The second parameter of SMC_CMD_CPU1BOOT command means CPU id. - * But, Exynos4212 has only one secondary CPU so second parameter - * isn't used for informing secure firmware about CPU id. */ - if (soc_is_exynos4212()) - cpu = 0; - exynos_smc(SMC_CMD_CPU1BOOT, cpu, 0, 0); return 0; } diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 1a7e5b5d08d8..c9740d96db9e 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -167,8 +167,7 @@ void exynos_enter_aftr(void) exynos_pm_central_suspend(); - if (of_machine_is_compatible("samsung,exynos4212") || - of_machine_is_compatible("samsung,exynos4412")) { + if (of_machine_is_compatible("samsung,exynos4412")) { /* Setting SEQ_OPTION register */ pmu_raw_writel(S5P_USE_STANDBY_WFI0 | S5P_USE_STANDBY_WFE0, S5P_CENTRAL_SEQ_OPTION); diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c index b529ba04ed16..370d37ded7e7 100644 --- a/arch/arm/mach-exynos/suspend.c +++ b/arch/arm/mach-exynos/suspend.c @@ -225,7 +225,6 @@ static int __init exynos_pmu_irq_init(struct device_node *node, EXYNOS_PMU_IRQ(exynos3250_pmu_irq, "samsung,exynos3250-pmu"); EXYNOS_PMU_IRQ(exynos4210_pmu_irq, "samsung,exynos4210-pmu"); -EXYNOS_PMU_IRQ(exynos4212_pmu_irq, "samsung,exynos4212-pmu"); EXYNOS_PMU_IRQ(exynos4412_pmu_irq, "samsung,exynos4412-pmu"); EXYNOS_PMU_IRQ(exynos5250_pmu_irq, "samsung,exynos5250-pmu"); EXYNOS_PMU_IRQ(exynos5420_pmu_irq, "samsung,exynos5420-pmu"); @@ -616,9 +615,6 @@ static const struct of_device_id exynos_pmu_of_device_ids[] __initconst = { }, { .compatible = "samsung,exynos4210-pmu", .data = &exynos4_pm_data, - }, { - .compatible = "samsung,exynos4212-pmu", - .data = &exynos4_pm_data, }, { .compatible = "samsung,exynos4412-pmu", .data = &exynos4_pm_data,