From patchwork Mon Oct 2 10:32:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adriana Reus X-Patchwork-Id: 9980623 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 2A19060384 for ; Mon, 2 Oct 2017 10:32:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B6AC2837D for ; Mon, 2 Oct 2017 10:32:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 100C028986; Mon, 2 Oct 2017 10:32:50 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 8B37E2837D for ; Mon, 2 Oct 2017 10:32:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750984AbdJBKct (ORCPT ); Mon, 2 Oct 2017 06:32:49 -0400 Received: from mail-eopbgr20067.outbound.protection.outlook.com ([40.107.2.67]:14112 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751079AbdJBKcs (ORCPT ); Mon, 2 Oct 2017 06:32:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ALeuC71c35KySOiqNT9sEoszbNETMIN2UR4Fx1Tyj30=; b=JSaaV4gfzYu2oWpsQT9McQ6DoOvzOtTOE+Xl1vUr/CJ1nrqnxoa1j0C/O6ZTtxLaF542kyjJlLFmJJhlsBQBcNC0V8qFqX2KMuYqJsi88Mb7xZAlgbMu5ShxPihSp4IDXG42+V2Ltjc0k2VNO+3qIkBKZjz3mbAhrL914xQPEdE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=adriana.reus@nxp.com; Received: from fsr-ub1664-141.ea.freescale.net (192.88.146.1) by VI1PR0402MB3376.eurprd04.prod.outlook.com (2603:10a6:803:2::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Mon, 2 Oct 2017 10:32:45 +0000 From: Adriana Reus To: sboyd@codeaurora.org, mturquette@baylibre.com Cc: anson.huang@nxp.com, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, Adriana Reus Subject: [PATCH RESEND 2/2] clk: imx: imx7d: Remove ARM_M0 clock Date: Mon, 2 Oct 2017 13:32:11 +0300 Message-Id: <1506940331-16742-3-git-send-email-adriana.reus@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506940331-16742-1-git-send-email-adriana.reus@nxp.com> References: <1506940331-16742-1-git-send-email-adriana.reus@nxp.com> MIME-Version: 1.0 X-Originating-IP: [192.88.146.1] X-ClientProxiedBy: AM5P190CA0018.EURP190.PROD.OUTLOOK.COM (2603:10a6:206:14::31) To VI1PR0402MB3376.eurprd04.prod.outlook.com (2603:10a6:803:2::25) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 67af4c8d-0233-4389-887d-08d50980eb9b X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:VI1PR0402MB3376; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0402MB3376; 3:vZPAmhTdSR7pt/3oC0irP8iTvbbI/JfOhBifq4+OWMXFh/SOg/IkrYWxCFeAxP2C5UxImYxRoR1KhgMdBi8fyEO+JHefXd6mkeULZSyID2PvAfN5ddhLksHyLsw1CTQ9yHJSurCDIJvoJY0AWkp1y8XtV6EDzBdoiLfv0LTGaHIOhuBePP8hW3PGSef6hiO1E2CjXOxfhSZc7AkOyElhPmoXup1m/pw2w62txwywdJPtFv2TW/Mdlq1MI1MlBEPD; 25:7Xlp2QxOfKMSjz/WjVX1zea9eAYTAVrUWFUU6K4eHzSrDFl+dKAH7PuEQwC1gYV6Frno9m3tvb8u88gUAhkD4XuVISGNHOdkVmB9k18iUMAN1zIN30keAGPvZO4Lqyq11BckG8YsoSb0UJ86dOINX3KNtsD9OhdqWnnHeqhvlXRqOC3SMV2zGYQBf10hyMpSNr3G9lyawn6oOH83kkFlQO3xwxoM7c7FnNG255NEPyGycXoezDkney+sR8Hl62knKqcwl84Xd/YH9hm7BJyNYZWUTrw5VoSqTD4F8oQt7mUpepxBbNL6P3Bz2vUIDtTPSA7PxwpByqy9NkGEiTBA/A==; 31:FxrhkrG3qMb46H5QXmtS/g73qKxxlg/KhKGAdJXHUJsKPcZfpB3TzodyYB4g/Vmj31xkJeUlcjn3bRWvkF4wDYDZNyqPvrCcIlpXQgz1zbjabhxgxDMP3noX/WsW2lc1QGB3iiS3Qchxzri2LbjPpWnFvFSeY9V09ErI6Tcb8cLRbFPlzMBj6oUq2rfS9VHGU90hZuRIjIiTmb2xgRN5btrQOxVKwGbWE4w8UXcsiWA= X-MS-TrafficTypeDiagnostic: VI1PR0402MB3376: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0402MB3376; 20:/pd/Yrep3ufGzcql/njBO00HpKjQ+bWqR43G7NqbpV1jb8Cs9jwJ8wgwoS8ZU0ajtRwKL9U2upHMzcMnLz+Z239fjK5xZizPhkhVlO8e1JSstsvPLRX5nOShycyQwVTEUc0Tnt/bGQX62oDYBzvS5UPw9NqdQb1ZGPlI0sV7/ZAnKX8f5cCo6uoLBfvR+g+oJU9ECxEwkXxdaYeZOECP2p8GHl4eVErED1tFmxUke5QFShn5FWxZ1Eo7YsHYOsTLzI3ymOMqtjtG0guhfHm5m8NPw3SN9R3AxCGX+ToYoNZEZWDbjc25NxwKetYQephnoXiNioDVGlUVDtXHyl3+r46kH7pRNjYzS9LmNvoZl2jrRPsAeICk34cx4wjArGstWAxsH7FvZn409l8s+2K94IPHhvCSyZVzsTBIFTm6lV/bpf/Xdkv2QEZSympZbksv/1AfeJUdN+GH0rD+gAZNmjPFt9E/F2XxXCe3gBkN7OORulCnN+/Zlv73iuOL9dEp; 4:Bz5FZS6n6GlBNasStKYQ3OCa7gxH1dxgmKExoJ6DCx3z7hKWc853LaSbpnLcpZHNlON0O8phSzr162XTB9vzaqK37nQXZNzT3ZcVUoxLzto2Y9zROS1xNh1BuYSdim05tQy3U6b1LmV6ZXlpCdBDBxgWGvKsPfjcGp1IR5YarL4vevf0a4vylqZGHAhYkwqlZFklyCggEcUHGjrYk7dbAy7zVcOnVmMUnxsON1dmYP1fNg8uR6oFh/NhgRL25UlgiFSVcEScWYrPcjr+EQKtYj3EYzPE9MwagajDlrfy+K4= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(6055026)(6041248)(20161123564025)(20161123560025)(20161123562025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:VI1PR0402MB3376; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:VI1PR0402MB3376; X-Forefront-PRVS: 0448A97BF2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(376002)(346002)(199003)(189002)(478600001)(97736004)(6506006)(33646002)(66066001)(106356001)(189998001)(6666003)(48376002)(105586002)(47776003)(50466002)(36756003)(5660300001)(86362001)(2906002)(6116002)(3846002)(76176999)(68736007)(6486002)(50226002)(5003940100001)(81166006)(81156014)(8936002)(50986999)(8676002)(101416001)(4326008)(316002)(305945005)(2950100002)(7736002)(6512007)(16526017)(53936002)(25786009)(16586007)(217873001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0402MB3376; H:fsr-ub1664-141.ea.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0402MB3376; 23:fXeBIrCr3XZDm4DEakn2U9a55h+l+aGdrLg/Juu?= =?us-ascii?Q?/u2SuNxkpoXH1yvIOl0OIBdeBupc9UxYcHBgtql4qQ8Xo0CrIlZmY66Zqtfc?= =?us-ascii?Q?tBty3wtVVDBhV23udRb8tADTj3Bd4g8+3+jlDS+DKUrQI7kdaRZ47MkdLzbx?= =?us-ascii?Q?fRcIhxP30sWsqbHxf7+dm8iwby4LKyb/kxr0vgBwQxRupNmc0yYXYi+0Bcgc?= =?us-ascii?Q?ihctwCqkr/h3g5zWZ5oteqDgVp8fWb1ibNz+SvntcRCWPd/Cn8T9nxe8bxmX?= =?us-ascii?Q?ihp3x271q5481/Xya15rJGxkuQU/lhEofEoqbQb1YoUyCezLAYh4E7lf439r?= =?us-ascii?Q?FlpKdF3NTw9gxaVfGVwi5LzmKqxSiL2L4qW+N9XOTNotUfkTG59ig4FDL2a2?= =?us-ascii?Q?osX01L7aXPirL3325D6UvKftJ3/ibqYZxZkAFJw1IP17wNhW7ZX4wo1X7DlA?= =?us-ascii?Q?l80CNEt5gFVuHJZIGBO9xjW66WahNranejRBu4VMjjil7pMpKlMXvxJyN96b?= =?us-ascii?Q?XercLAFuPVsWfnlNkB9HoPrk/FmMSwFnSLIoOkdA5QT8qmUPSBwBZtIPED1f?= =?us-ascii?Q?juK+Pg09qLmZGvOhHf15Ksvvo7R9kl9SMJnvIpBG9pnVdmACDsxNqNJeojRq?= =?us-ascii?Q?JAj3RR22RBtQWHqrGzgJtjynyXrN/WqGAkJS9MN3Kzuk4j7S4gnMjR70azV7?= =?us-ascii?Q?kHaRYMpqCoQVMr2KNUZDuonfv9RYm4um0LR0LmGh86jf3pCeV+ulaG1GbKfU?= =?us-ascii?Q?jcxcQsyif742IMId6f3zfk4uLzT23rRsElUlpxVzKERkrXy+vohXMHaAeN4C?= =?us-ascii?Q?4opqBRJ6c0dGcqLMYExJXuYFREkyEB73jz+lvg1RcEc0ObODlLdXvH38SQMl?= =?us-ascii?Q?zY4ImTcRdItDm26UAHepE4kwYAk2wnZ58DLDc5zcjkG1iO16E0X7fjyytPu1?= =?us-ascii?Q?VapMECsiSO0J/xEyG9vsr0TNmQB1H5Wue7D5a6+S8Hf8EdqAoVLT1tn4FwDd?= =?us-ascii?Q?W5Wgw/isvEHdu7MdMgCCiSrlPPIxkh36CZgNi5Er7cQWbuo35vyx/dBDvY0A?= =?us-ascii?Q?qlXuQFuA47Z8q2bIK78qBeO33vcgOwjoTNB3jkKAhyrg8CtdG0A=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0402MB3376; 6:YIytp/UVyt28XWIlKD/+v0nNljaAhaULAroEcA1EVD3SAI5DOsKOLhBuEcI6F1N6Lx5/BmXUVzwVEgjpz+MDIxZ/oQh/kUiVsYgxTPIWPxXp105PvJEMXv9BrWzz0lkYhxM7FwiQKKtV4yE2uRbJCtbBXe9XSdV9xLmYuH2vJpyRmAZuqa+QJ50s0eYE/rDGTnOKWsSefLwHoVXYonK7+PYkDr7oGTK1A/qt2i5cFh46jIMh7xnugVf44cDI9HnbUgH5HzJXvqz7Oup9OJuNd1ATdh9FLFa3D1LealWXU0oy72rZ+xezcbtRp0Fo8A734+U75LNxycDc8MIYGcLN5A==; 5:Iz4F0lVgl7ur8e8GU86rNW6kI08f3YM2K3t1DTboKR3gBUFTXZNeyRcrHVVs1Eiei0MGlbetSY//UhQF83EDxFGUtamThjWUAfsEZSkrmBUvSn+db2CMneYNjGXXH2Z2nde8anz2m4Qm/csdoat/4w==; 24:ZHQbTsnuCYpxm/VCahXFbPzyjZjs1WwLAFuYSfQbUHcgf3kxGPl5KDu978NYKjRYfNn8O6horaatRbgmLF1mAO/WLMF1Y/FJZdEbpUb4TEM=; 7:8bPticAZbTxmWAroyl3wpGXNi+LcDeMAnwW3aGGI40JyNQgmbwx+epcRYZOUtChe8oQ85F/jBDGJAR2tvBfZgvEGp/+sWvY1vudZ6FnQxUlYmC+ACMzGZ0AEnCvwkIb4p0DiSfIvtkDjD8e3RmXGBJBbIj2qSsvUw+X3xcga/Bl22RxDdyjLdMYQcAyc/KV1/pRXyTWx95stLm3ASokq8CejraFUZ7VSEQlvtrsG5zE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2017 10:32:45.0314 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3376 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP IMX7d does not have an M0 Core and this particular clock doesn't seem connected to anything else. Remove this entry from the CCM driver. Signed-off-by: Adriana Reus --- drivers/clk/imx/clk-imx7d.c | 9 --------- include/dt-bindings/clock/imx7d-clock.h | 8 ++++---- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c index 0ac9b30..80dc211 100644 --- a/drivers/clk/imx/clk-imx7d.c +++ b/drivers/clk/imx/clk-imx7d.c @@ -54,11 +54,6 @@ static const char *arm_m4_sel[] = { "osc", "pll_sys_main_240m_clk", "pll_dram_533m_clk", "pll_audio_post_div", "pll_video_main_clk", "pll_usb_main_clk", }; -static const char *arm_m0_sel[] = { "osc", "pll_sys_main_120m_clk", - "pll_enet_125m_clk", "pll_sys_pfd2_135m_clk", - "pll_dram_533m_clk", "pll_audio_post_div", "pll_video_main_clk", - "pll_usb_main_clk", }; - static const char *axi_sel[] = { "osc", "pll_sys_pfd1_332m_clk", "pll_dram_533m_clk", "pll_enet_250m_clk", "pll_sys_pfd5_clk", "pll_audio_post_div", "pll_video_main_clk", "pll_sys_pfd7_clk", }; @@ -510,7 +505,6 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) clks[IMX7D_ARM_A7_ROOT_SRC] = imx_clk_mux2("arm_a7_src", base + 0x8000, 24, 3, arm_a7_sel, ARRAY_SIZE(arm_a7_sel)); clks[IMX7D_ARM_M4_ROOT_SRC] = imx_clk_mux2("arm_m4_src", base + 0x8080, 24, 3, arm_m4_sel, ARRAY_SIZE(arm_m4_sel)); - clks[IMX7D_ARM_M0_ROOT_SRC] = imx_clk_mux2("arm_m0_src", base + 0x8100, 24, 3, arm_m0_sel, ARRAY_SIZE(arm_m0_sel)); clks[IMX7D_MAIN_AXI_ROOT_SRC] = imx_clk_mux2("axi_src", base + 0x8800, 24, 3, axi_sel, ARRAY_SIZE(axi_sel)); clks[IMX7D_DISP_AXI_ROOT_SRC] = imx_clk_mux2("disp_axi_src", base + 0x8880, 24, 3, disp_axi_sel, ARRAY_SIZE(disp_axi_sel)); clks[IMX7D_ENET_AXI_ROOT_SRC] = imx_clk_mux2("enet_axi_src", base + 0x8900, 24, 3, enet_axi_sel, ARRAY_SIZE(enet_axi_sel)); @@ -582,7 +576,6 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) clks[IMX7D_ARM_A7_ROOT_CG] = imx_clk_gate3("arm_a7_cg", "arm_a7_src", base + 0x8000, 28); clks[IMX7D_ARM_M4_ROOT_CG] = imx_clk_gate3("arm_m4_cg", "arm_m4_src", base + 0x8080, 28); - clks[IMX7D_ARM_M0_ROOT_CG] = imx_clk_gate3("arm_m0_cg", "arm_m0_src", base + 0x8100, 28); clks[IMX7D_MAIN_AXI_ROOT_CG] = imx_clk_gate3("axi_cg", "axi_src", base + 0x8800, 28); clks[IMX7D_DISP_AXI_ROOT_CG] = imx_clk_gate3("disp_axi_cg", "disp_axi_src", base + 0x8880, 28); clks[IMX7D_ENET_AXI_ROOT_CG] = imx_clk_gate3("enet_axi_cg", "enet_axi_src", base + 0x8900, 28); @@ -721,7 +714,6 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) clks[IMX7D_ARM_A7_ROOT_DIV] = imx_clk_divider2("arm_a7_div", "arm_a7_cg", base + 0x8000, 0, 3); clks[IMX7D_ARM_M4_ROOT_DIV] = imx_clk_divider2("arm_m4_div", "arm_m4_cg", base + 0x8080, 0, 3); - clks[IMX7D_ARM_M0_ROOT_DIV] = imx_clk_divider2("arm_m0_div", "arm_m0_cg", base + 0x8100, 0, 3); clks[IMX7D_MAIN_AXI_ROOT_DIV] = imx_clk_divider2("axi_post_div", "axi_pre_div", base + 0x8800, 0, 6); clks[IMX7D_DISP_AXI_ROOT_DIV] = imx_clk_divider2("disp_axi_post_div", "disp_axi_pre_div", base + 0x8880, 0, 6); clks[IMX7D_ENET_AXI_ROOT_DIV] = imx_clk_divider2("enet_axi_post_div", "enet_axi_pre_div", base + 0x8900, 0, 6); @@ -793,7 +785,6 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) clks[IMX7D_ARM_A7_ROOT_CLK] = imx_clk_gate4("arm_a7_root_clk", "arm_a7_div", base + 0x4000, 0); clks[IMX7D_ARM_M4_ROOT_CLK] = imx_clk_gate4("arm_m4_root_clk", "arm_m4_div", base + 0x4010, 0); - clks[IMX7D_ARM_M0_ROOT_CLK] = imx_clk_gate4("arm_m0_root_clk", "arm_m0_div", base + 0x4020, 0); clks[IMX7D_MAIN_AXI_ROOT_CLK] = imx_clk_gate4("main_axi_root_clk", "axi_post_div", base + 0x4040, 0); clks[IMX7D_DISP_AXI_ROOT_CLK] = imx_clk_gate4("disp_axi_root_clk", "disp_axi_post_div", base + 0x4050, 0); clks[IMX7D_ENET_AXI_ROOT_CLK] = imx_clk_gate4("enet_axi_root_clk", "enet_axi_post_div", base + 0x4060, 0); diff --git a/include/dt-bindings/clock/imx7d-clock.h b/include/dt-bindings/clock/imx7d-clock.h index de62a83..e2f99ae 100644 --- a/include/dt-bindings/clock/imx7d-clock.h +++ b/include/dt-bindings/clock/imx7d-clock.h @@ -80,10 +80,10 @@ #define IMX7D_ARM_M4_ROOT_SRC 67 #define IMX7D_ARM_M4_ROOT_CG 68 #define IMX7D_ARM_M4_ROOT_DIV 69 -#define IMX7D_ARM_M0_ROOT_CLK 70 -#define IMX7D_ARM_M0_ROOT_SRC 71 -#define IMX7D_ARM_M0_ROOT_CG 72 -#define IMX7D_ARM_M0_ROOT_DIV 73 +#define IMX7D_ARM_M0_ROOT_CLK 70 /* unused */ +#define IMX7D_ARM_M0_ROOT_SRC 71 /* unused */ +#define IMX7D_ARM_M0_ROOT_CG 72 /* unused */ +#define IMX7D_ARM_M0_ROOT_DIV 73 /* unused */ #define IMX7D_MAIN_AXI_ROOT_CLK 74 #define IMX7D_MAIN_AXI_ROOT_SRC 75 #define IMX7D_MAIN_AXI_ROOT_CG 76