From patchwork Wed Oct 4 06:38:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 114737 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp5628584edb; Tue, 3 Oct 2017 23:38:43 -0700 (PDT) X-Google-Smtp-Source: AOwi7QC7Mm7CAfP+Kv65tQENYkaJ+yb8X9SIXbDsRPd2y73aXBdCySXGAXj/NQNtk4pRGDcwyIUG X-Received: by 10.101.92.67 with SMTP id v3mr17462558pgr.409.1507099123581; Tue, 03 Oct 2017 23:38:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507099123; cv=none; d=google.com; s=arc-20160816; b=OjcoD0qBk4OZJRTVKi4FCg6ptxSqeQ6/ZCeONATqDvTCk6DxJEa2SLlbOmC90DwcAu UZcNnxIb6JT2mTDkD0CUADZ/iS4gOaoLNMFkiPGgbwBYCdOqA8zdckP461RM7/tY3VPK HbX27fCLui3VZdzpFDyBTN2Rw2Oh/rOXIeBvoazIQKvZXIx8r6U2AQE0mkunNpGbw9Bb tW/kM1MuykD9TzinHL6TxjPw7p246QZhby10CVD02a5qi/pEb7ise6jwRQu7ZRHrwTo8 wIQzGS6eoN85cZH7wISMoxosCkQPLHyenzSNejavNwU//RWbr624abFNoxeWmatLSq9+ DiAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:cms-type:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=59mxdD70KO2YpJbVtA5UgzTRCvHlytEK0OofXqXXBJ0=; b=lByOiE2lpDnCZ4zi/oiX3JWWnukpKO34aUVJceabDUCIBmnZ3FmoXd2NsguhdFipKS gkBH6yP/e8C59dE7lq+OUY/OFJNffVXTogG5DSBhR6JAXjL2bU0SP3vZH2oLBSSWQET6 YUduIMN3DSswsvplNyIa/BdXdPA5o1XlvwQCKo3oXlXFfe9DJMo+naNDkF4vxQMBudgW u5ucwkFYcJ3gAjGzXWRykzArbTqTNDjdKtYB9tOaJ/nFUazrKjBrQMRRGH4gN705IbC1 eJRYURhCwA2965Gvw8PmfXGgBub36uduCwWbOs6VqfcSOHQ0Gr+ZCuG6qWp+m7zMaVwV rv2g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g18si7549630plj.743.2017.10.03.23.38.43; Tue, 03 Oct 2017 23:38:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751115AbdJDGil (ORCPT + 4 others); Wed, 4 Oct 2017 02:38:41 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:32947 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751209AbdJDGii (ORCPT ); Wed, 4 Oct 2017 02:38:38 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20171004063836euoutp0141717841ef6faaa9720f2b0f67228700~qSqlt7wmA1762917629euoutp01h; Wed, 4 Oct 2017 06:38:36 +0000 (GMT) Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20171004063836eucas1p2e67210c47e6fbe25a0524891cd1f76d5~qSqlD80jq2606726067eucas1p28; Wed, 4 Oct 2017 06:38:36 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3.samsung.com (EUCPMTA) with SMTP id 0B.74.12867.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 20171004063835eucas1p28e23131c839ad432d0e5af60fe8ad504~qSqkZn1o-1150011500eucas1p2E; Wed, 4 Oct 2017 06:38:35 +0000 (GMT) X-AuditID: cbfec7f2-f793b6d000003243-01-59d481eb71ab Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 86.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 2/7] soc: samsung: Remove Exynos4212 related dead code Date: Wed, 04 Oct 2017 08:38:23 +0200 Message-id: <20171004063828.22068-3-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+NgFlrFIsWRmVeSWpSXmKPExsWy7djPc7qvG69EGux7YmaxccZ6Vovz5zew W8w4v4/JYu2Ru+wWh9+0szqwemxa1cnm0bdlFaPH501yAcxRXDYpqTmZZalF+nYJXBkd73cx FaxTrZi7/ztzA+Mk+S5GTg4JAROJlx+6WSFsMYkL99azdTFycQgJLGWUuLR2DhtIQkjgM6PE 8sneMA0nWueyQBQtAypaeJ8RwmlgkuiY0sYMUsUmYCjR9bYLrFtEQFXic9sCdpAiZoG9jBKH pjWCJYQF3CTWzFrBAmKzABV1HFrDCGLzCthKrHi3iQlinbzE+wX3weKcAnYSfa2fWUEGSQh8 ZJV41XyAGaLIRWLTkinsELawxKvjW6BsGYnLk7tZIOx+RommVm0IewajxLm3vBC2tcTh4xfB AcAswCcxadt0oJkcQHFeiY42IYgSD4n/i75DjXGUOHShERpGExklViy6yTKBUXoBI8MqRpHU 0uLc9NRiY73ixNzi0rx0veT83E2MwBg8/e/4px2MX09YHWIU4GBU4uFt6LscKcSaWFZcmXuI UYKDWUmEt7PmSqQQb0piZVVqUX58UWlOavEhRmkOFiVxXtuotkghgfTEktTs1NSC1CKYLBMH p1QDY+GG33GT9hf/6lWOkzAItm/zWO+9+03CnttCd4V/xYdp5PvXnBY6/NJxsW3ZPefnx+9J 7W3/vl9yFcuEJU8qcg5wLzz6vXHew7s8XrPui2osq/Z9xSO51fzr5X1z9aNXJBx87bNL7zUv 45mlD7ZohOWbCPI0l27+fXLp9WfpfBcKfoV07d57/5QSS3FGoqEWc1FxIgCXjcwtvQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgluLIzCtJLcpLzFFi42I5/e/4Nd3XjVciDc62SFlsnLGe1eL8+Q3s FjPO72OyWHvkLrvF4TftrA6sHptWdbJ59G1ZxejxeZNcAHMUl01Kak5mWWqRvl0CV0bH+11M BetUK+bu/87cwDhJvouRk0NCwETiROtcFghbTOLCvfVsXYxcHEICSxglXq69wwzhNDFJPNx0 nx2kik3AUKLrbRcbiC0ioCrxuW0BO0gRs8B+RonzW58xgySEBdwk1sxaATaWBaio49AaRhCb V8BWYsW7TUwQ6+Ql3i+4DxbnFLCT6Gv9zApiCwHVTDvRyDyBkXcBI8MqRpHU0uLc9NxiI73i xNzi0rx0veT83E2MwHDZduznlh2MXe+CDzEKcDAq8fBq9FyOFGJNLCuuzD3EKMHBrCTC21lz JVKINyWxsiq1KD++qDQntfgQozQHi5I4b++e1ZFCAumJJanZqakFqUUwWSYOTqkGxrniNUa8 86TPzbx3aGXve4/c83bcX8xXb7a0CfLseqr3MFdOozqgZqPipbOpjEGsFnsU/67wb7j34tcc q/5faftf5fFdK118ISfjkvLUTx2zfsR71VrL7J249sh9tYd/z2j47Df15WTSLW17dV+PKyMj RP7XqeiMbLMfO+tVZs2fqq6678ajpUosxRmJhlrMRcWJAOOZ7uoTAgAA X-CMS-MailID: 20171004063835eucas1p28e23131c839ad432d0e5af60fe8ad504 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1B?= =?utf-8?b?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1BSam?= =?utf-8?q?sung_Electronics=1BSenior_Software_Engineer?= X-Sender-Code: =?utf-8?q?C10=1BEHQ=1BC10CD02CD027392?= CMS-TYPE: 201P X-CMS-RootMailID: 20171004063835eucas1p28e23131c839ad432d0e5af60fe8ad504 X-RootMTR: 20171004063835eucas1p28e23131c839ad432d0e5af60fe8ad504 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 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 --- Documentation/devicetree/bindings/arm/samsung/pmu.txt | 1 - drivers/soc/samsung/exynos-pmu.c | 9 --------- drivers/soc/samsung/exynos-pmu.h | 2 -- drivers/soc/samsung/exynos4-pmu.c | 13 ++----------- 4 files changed, 2 insertions(+), 23 deletions(-) -- 2.14.2 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/Documentation/devicetree/bindings/arm/samsung/pmu.txt b/Documentation/devicetree/bindings/arm/samsung/pmu.txt index bf5fc59a6938..87ed95512b63 100644 --- a/Documentation/devicetree/bindings/arm/samsung/pmu.txt +++ b/Documentation/devicetree/bindings/arm/samsung/pmu.txt @@ -4,7 +4,6 @@ Properties: - compatible : should contain two values. First value must be one from following list: - "samsung,exynos3250-pmu" - for Exynos3250 SoC, - "samsung,exynos4210-pmu" - for Exynos4210 SoC, - - "samsung,exynos4212-pmu" - for Exynos4212 SoC, - "samsung,exynos4412-pmu" - for Exynos4412 SoC, - "samsung,exynos5250-pmu" - for Exynos5250 SoC, - "samsung,exynos5260-pmu" - for Exynos5260 SoC. diff --git a/drivers/soc/samsung/exynos-pmu.c b/drivers/soc/samsung/exynos-pmu.c index bd4a76f27bc2..938f8ccfcb74 100644 --- a/drivers/soc/samsung/exynos-pmu.c +++ b/drivers/soc/samsung/exynos-pmu.c @@ -60,12 +60,6 @@ void exynos_sys_powerdown_conf(enum sys_powerdown mode) if (pmu_data->powerdown_conf_extra) pmu_data->powerdown_conf_extra(mode); - - if (pmu_data->pmu_config_extra) { - for (i = 0; pmu_data->pmu_config_extra[i].offset != PMU_TABLE_END; i++) - pmu_raw_writel(pmu_data->pmu_config_extra[i].val[mode], - pmu_data->pmu_config_extra[i].offset); - } } /* @@ -88,9 +82,6 @@ static const struct of_device_id exynos_pmu_of_device_ids[] = { }, { .compatible = "samsung,exynos4210-pmu", .data = exynos_pmu_data_arm_ptr(exynos4210_pmu_data), - }, { - .compatible = "samsung,exynos4212-pmu", - .data = exynos_pmu_data_arm_ptr(exynos4212_pmu_data), }, { .compatible = "samsung,exynos4412-pmu", .data = exynos_pmu_data_arm_ptr(exynos4412_pmu_data), diff --git a/drivers/soc/samsung/exynos-pmu.h b/drivers/soc/samsung/exynos-pmu.h index 40d4229abfb5..86b3f2f8966d 100644 --- a/drivers/soc/samsung/exynos-pmu.h +++ b/drivers/soc/samsung/exynos-pmu.h @@ -23,7 +23,6 @@ struct exynos_pmu_conf { struct exynos_pmu_data { const struct exynos_pmu_conf *pmu_config; - const struct exynos_pmu_conf *pmu_config_extra; void (*pmu_init)(void); void (*powerdown_conf)(enum sys_powerdown); @@ -36,7 +35,6 @@ extern void __iomem *pmu_base_addr; /* list of all exported SoC specific data */ extern const struct exynos_pmu_data exynos3250_pmu_data; extern const struct exynos_pmu_data exynos4210_pmu_data; -extern const struct exynos_pmu_data exynos4212_pmu_data; extern const struct exynos_pmu_data exynos4412_pmu_data; extern const struct exynos_pmu_data exynos5250_pmu_data; extern const struct exynos_pmu_data exynos5420_pmu_data; diff --git a/drivers/soc/samsung/exynos4-pmu.c b/drivers/soc/samsung/exynos4-pmu.c index bc4fa73bed11..5dbfe4e31f4c 100644 --- a/drivers/soc/samsung/exynos4-pmu.c +++ b/drivers/soc/samsung/exynos4-pmu.c @@ -90,7 +90,7 @@ static const struct exynos_pmu_conf exynos4210_pmu_config[] = { { PMU_TABLE_END,}, }; -static const struct exynos_pmu_conf exynos4x12_pmu_config[] = { +static const struct exynos_pmu_conf exynos4412_pmu_config[] = { { S5P_ARM_CORE0_LOWPWR, { 0x0, 0x0, 0x2 } }, { S5P_DIS_IRQ_CORE0, { 0x0, 0x0, 0x0 } }, { S5P_DIS_IRQ_CENTRAL0, { 0x0, 0x0, 0x0 } }, @@ -195,10 +195,6 @@ static const struct exynos_pmu_conf exynos4x12_pmu_config[] = { { S5P_GPS_ALIVE_LOWPWR, { 0x7, 0x0, 0x0 } }, { S5P_CMU_SYSCLK_ISP_LOWPWR, { 0x1, 0x0, 0x0 } }, { S5P_CMU_SYSCLK_GPS_LOWPWR, { 0x1, 0x0, 0x0 } }, - { PMU_TABLE_END,}, -}; - -static const struct exynos_pmu_conf exynos4412_pmu_config[] = { { S5P_ARM_CORE2_LOWPWR, { 0x0, 0x0, 0x2 } }, { S5P_DIS_IRQ_CORE2, { 0x0, 0x0, 0x0 } }, { S5P_DIS_IRQ_CENTRAL2, { 0x0, 0x0, 0x0 } }, @@ -212,11 +208,6 @@ const struct exynos_pmu_data exynos4210_pmu_data = { .pmu_config = exynos4210_pmu_config, }; -const struct exynos_pmu_data exynos4212_pmu_data = { - .pmu_config = exynos4x12_pmu_config, -}; - const struct exynos_pmu_data exynos4412_pmu_data = { - .pmu_config = exynos4x12_pmu_config, - .pmu_config_extra = exynos4412_pmu_config, + .pmu_config = exynos4412_pmu_config, };