From patchwork Mon Mar 12 14:59:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonard Crestez X-Patchwork-Id: 10276765 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 C1B506038F for ; Mon, 12 Mar 2018 16:57:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3D2828CDC for ; Mon, 12 Mar 2018 16:57:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A688128DF2; Mon, 12 Mar 2018 16:57:02 +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=-1.9 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 11FD528CDC for ; Mon, 12 Mar 2018 16:57:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=/JDMHJnBw1BEyTWpP4EIapawzJMN6ceai4bba27sdMw=; b=DcHuJ5wakM7F3i 4zwDs+p3Vgbju3RH1LAGfvsCvuwaM8oXoasgmEdxDBtx7sBBrFUZ7h7D56QKI8QUoiBGpTI5mKQtF Dkf/fsGElB+OZrKgGgtrCfHbEiitF4vUkUlL1j2ztnaPZe0BuBDpAI+BsEmZ05mLuhGyyMLsXWanB wqiqNGsvh8Es96pkymUyWEA4AZnFOEzftLolPG+A/QJoZC5QYI5kYUCQ78MELu8CCukl9CiWsV8nZ KyIXuLE7A3u5tAquvmRqrJZYknqk4adPQGnuoDsdvBtivGDTZ0Oy7gBrPzlw7jpKbYcBkU+Hitu1X dOrctyVoYN0Nisfa0yYw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1evQkq-0003kg-Hq; Mon, 12 Mar 2018 16:56:56 +0000 Received: from mail-cys01nam02on0043.outbound.protection.outlook.com ([104.47.37.43] helo=NAM02-CY1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1evQjt-00034I-UZ for linux-arm-kernel@lists.infradead.org; Mon, 12 Mar 2018 16:56:08 +0000 Received: from BYAPR03CA0010.namprd03.prod.outlook.com (2603:10b6:a02:a8::23) by MWHPR03MB3165.namprd03.prod.outlook.com (2603:10b6:301:3c::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Mon, 12 Mar 2018 16:55:43 +0000 Received: from BL2FFO11FD018.protection.gbl (2a01:111:f400:7c09::110) by BYAPR03CA0010.outlook.office365.com (2603:10b6:a02:a8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.567.14 via Frontend Transport; Mon, 12 Mar 2018 16:55:43 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; lists.infradead.org; dkim=none (message not signed) header.d=none;lists.infradead.org; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD018.mail.protection.outlook.com (10.173.161.36) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.527.18 via Frontend Transport; Mon, 12 Mar 2018 16:55:42 +0000 Received: from localhost.localdomain (fsr-ub1664-115 [134.27.109.22] (may be forged)) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w2CExTCn032699; Mon, 12 Mar 2018 07:59:29 -0700 From: Leonard Crestez To: Shawn Guo Subject: [PATCH] clk: imx6ull: Add epdc_podf instead of sim_podf Date: Mon, 12 Mar 2018 16:59:25 +0200 Message-ID: <64c4bc079a59002931a92e00b38b455d957ce169.1520866479.git.leonard.crestez@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131653473432780083; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:CAL; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(39380400002)(376002)(346002)(396003)(2980300002)(1110001)(1109001)(339900001)(189003)(199004)(4326008)(97736004)(104016004)(6862004)(36756003)(6666003)(26826003)(107886003)(498600001)(106466001)(118296001)(2906002)(47776003)(53936002)(68736007)(59450400001)(26005)(305945005)(86362001)(105606002)(956003)(50466002)(356003)(51416003)(5660300001)(316002)(85426001)(49486002)(48376002)(54906003)(8936002)(8676002)(81156014)(50226002)(81166006)(336012)(1857600001)(16586007)(32563001)(42866002); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB3165; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD018; 1:RnEaNZB1m8QoCIBZfSQ7wODUhlpAp9DCb5spyje/6vWEzH72S9EEIFBIvpFuWhbIKmvYLmyVv0OS6DDtOsorJ8yK7WkICh2+ksJ5okbToUfBI44pvn/OHZe3QgtIvrEz MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0b873e71-52f6-49ef-3d33-08d5883a17df X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(5600026)(4604075)(2017052603328); SRVR:MWHPR03MB3165; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB3165; 3:I1zM+D3eDU1eQZX5VVTKLDmc3swmEZj5XYUGO5aP2v8JZnf7SuP50XS7DvVq8MPtvv2dd6nHbo3RH/OZb0pT1inYTwRAQu8FzJl3Z6WC2P78KlrZrKzcdGANPu4zFSg3euWpSDl0wnZvj9wZ2fVlDv2CJ5ssXduDiqPIMAbOXINscZut1ESjW7SXGZcjOzggYg2pda378S7UC3meMnN+WFYrlpOZfe6XkV9xZUWGSDGq4MN7e+lUx47O/SygVDLYGAzpeMzqLGyQZr2+BvIqYJCE/CYWho1erZk9wVSzKhdN2jj0RD6NPuuh+i75vFS+zhZP56gvS4jhvIk6xD6tfONTLA76vBZma9QdlgiVpvQ=; 25:iD2EWXnBroGDZ6q/8bXUL9/S3bEhFU46lQY58m1WzqCmWNgVfkzo+err6xR1SO636gCvRxPHwxxQ4KDtdTRhYK3uy9uduCBAPtUuPolitLdtKM3c77J1h+xjEMoe/7VWelxih3qXtUpvXSf/vgnR6U2cyCU1FGSv9ZTjwr3ppN/44AYGlYQMr1R1vxAQf7eOVxVvyo4KxmXID116DqwxgwN24t+OI+BzqLDfi1birZCQ6SpZuJ9qiVeRY9VEKFskNrGGz3hvxH14sygMt953MDgxElREekEoOqZKT9GpVMguPbFs5FyX7Yrok5t+PZ87cnedmIDrN2JKSX0xuQhFTA== X-MS-TrafficTypeDiagnostic: MWHPR03MB3165: X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB3165; 31:Cu1z7m2E4iuKxH1e53W1mll+eH0ycevK1FtaSsQy4xhSH7q1osWLQ3Ekcst6n1c6YcmGR5vSI+fBYuP1cufbwMO4pMLevPNsCYUJvrBLTBTRnTMeU+RiLTwLEMHisWSUK5iGUdjlvjWWUCIo8sCvHJikq1XQ77TAda8+AYkRj3EN8EwA23Yi0HvJ8X2t+n/JvXyGmL5NcjhHmPs6cX8UZvyy9Fifx6EhfJOLU5OlQiY=; 4:z5IowG4ocQOAWB37w5xe6qE1r2sUyBc7wcpf7FnxY3ctRbSZj0eNu9yyGpg+bsMV6o6WCi0hdGXAYhpOZ4sI6yw0iyaiz91VVKfrweASATFBxPgoh524jelg5a8XlGioJSSvlB3/4cGCGSxJay2iHEmFedEmd+K1TQ1gxzb4XZNwFRNt55QBBJ+zWQfOL9tawbB2S7anPcC+lZFyiC0LEYj/GuFw4/U2YiJXal3sWI/lH1B99Ny7S304m1wLxu5Day4CGdatuoH3DUL+8tqb/zMtXFTTmFv12K3miY0KL4hb/PAGAJUmoEthcuYENxKd X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231220)(944501244)(52105095)(6055026)(6096035)(20161123563025)(20161123565025)(20161123559100)(201703131430075)(201703131448075)(201703131433075)(201703151042153)(20161123561025)(20161123556025)(201708071742011); SRVR:MWHPR03MB3165; BCL:0; PCL:0; RULEID:(400006); SRVR:MWHPR03MB3165; X-Forefront-PRVS: 06098A2863 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB3165; 23:OaM0f74R0oNTtBqCHxwkzbBev3Z+5bS74bYVn/Edx?= =?us-ascii?Q?avju2z4wGF9PkNY2FuVi+3nATSeLi/9l6ny/dK8ay8afx7DgxOBM2UvTd2AV?= =?us-ascii?Q?mk5uLWtvNcbcaxqXRH48wQjcIs2Ubd3jJNSAi0SoQ+72V2MLn/6QjH437r9J?= =?us-ascii?Q?VnIME9NhViVn87XF80byJof3GPXh89LY0cdeiGnUdWDhTf2nAV4WSrUr+2Vt?= =?us-ascii?Q?2n5/5X0R9/erCsFty6qibjFeWeZlTnWwvEhdr91A/8qeAcH3YVxq/T39WuR/?= =?us-ascii?Q?epD0RX+Kp8G1/3Ofp+ACCvDFfMdaTzZZal/6paTpTYNh8PGKwoxBxPCRt4nq?= =?us-ascii?Q?4H5cwG1IeGgKpG9ZJUJVVBdPHjUSsovCV7roUKhrO/l4RKuEpLMQzSf+em//?= =?us-ascii?Q?boN1DwmXXGJSFhL0eE2LXH6zl4hNln4JtqFjTWlJ4hMMp1MF7oqJ6p6zgS2c?= =?us-ascii?Q?yziYzrKMTgoPdIUHqks94yhcBOFHCCbVAw/3tjETcadlGkM7Z7j/li1Yj2Tj?= =?us-ascii?Q?uyP6r10zIzYNeK+KM5jI+o61fLRHO/kOoR2Bckhd6S7cUa/qL0Hk06wJ1Xwh?= =?us-ascii?Q?ljliUC+gq+hGwJrmJJF3xZwlvdHNiR1yM8XFGxPopsNp/1NpxyImp6+NqfMy?= =?us-ascii?Q?XKToFq4p5KKd9qgwZTTrJExywQJuW0YmckqZsPaGB4Xm4yf/cKUZS3VZMf80?= =?us-ascii?Q?UuNREb2QRAKVehXsziyNRESRgoLJKcGDIs+rkj8GjLAn/isTOSNuQmHPipmL?= =?us-ascii?Q?SJu5MUq8RsPJi6KL3fAU3rzwUTq2udU1jnsR702G/T1ICqRd+bkN4IaozyUk?= =?us-ascii?Q?PuKlRtMxboynWeVtDRWptK8MrjYjmqTTm92Moe9aeP7TB6v0Qksodus4Is0y?= =?us-ascii?Q?OSMlFyGYnhSJlQVhLq7QuTpfb3+5nHNnYw2+uLCA7mMmJAeuU4sNo8XRk1Or?= =?us-ascii?Q?qT0ea5v1KdzypGwBmhCocO3FmzyDUK6paZFO94BdW7X33w4SuBfzwemJR5ap?= =?us-ascii?Q?HM1Oikrslxiqxl3H1mma9ST6BCQ8jfJlJnxElejnZampdbziC5lfTrcHVmxK?= =?us-ascii?Q?AmQ6Dj5XQyzLfJIw2REJd9Qr9Z8PdSjFENdCWsBgcwe6NSbGiAtpsIBsA7MF?= =?us-ascii?Q?mvaTXGG1/t4FrIGNrZ3JBrXhawU/sCaJVNjYziOQoSzRw65PfmpNvlN6P4H/?= =?us-ascii?Q?4o6gS5Z9NXqn9I=3D?= X-Microsoft-Antispam-Message-Info: ehZiODV5+0ypLX7h0iFyV42Y3IWi04cgsAX4gW0xmwTeamaJdiBjOZK7XPRKppVFe/6ytsSo8HvFUy/tTzk9QkG6MXiX8ja5TfOz14S8hWycHHKq280p7awfdHEPxuXszOIapjNm7wehX7a4m77PrZr80RfOeG7Gko2H0did1HBSiT9zYPfgdhzCxqKmuFbg X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB3165; 6:vFfKQQUHoKB0UJ3uUQONhSdTwasphKfpTGCzdeCADdz1MC7T6Wuq6NrSWICvrguCV5N7ccrlVJy0/+sHQFobQKJ5XUDtyBCgtnCgDMePVd+8+AjFhbFlJE2hfyUcLT38A36NSm/YXPT7XuzTewZclEdzOV03zRNiqtHEP64FLTiwqyVlun6o1sBPfrAUYgmIX7N3k5eqALUi0IIV1bj2OvACx2Purt2vCx+ZNVSN6Jh4NuJ/XAXK8n786FgviWXMv4qdgEcoj+M53DKuImEon+6+8KoZk24labIZLAaB5W/6HAz3sl/uXWqIpf3mgTJz3EozNgOHGfYwCrcRnECCRn4IuwTlthNh0pjImWKZ20E=; 5:lAXBVu2AGM7n1vBsYqr7aHBZuSZv30lry1zCAKz4dKppdFJgQsEUSNXAIrgU+DgTkPSj8yNLme2r+pMNTu2n64gM4h31WI/nuInfGW3gbOTe5c5gcYGAMJ1kCn70QbvOWHSfIavullr0ORrp03pAauuK9lhzDM39JfhNE4vm5R4=; 24:iWjUzjA/wMzuTWcmBcW4Ci9czbmfub5Q7hKCs5zgnDRzMmvTmcn/cQHrTtrB0utZglSlR3kI65KtnMLpkCRaUtNscvxN5GHGJ5R1Vqrqu5M=; 7:DOhX3IwQ39TRK/72eyFVhqyfy5i39nM47KbVGWhtKRdFieLwvwELCRN5jEVI7adT9YdELz1vr/yaeG4T4Jsm0c62tzEEDSLRzwj3jnXG2gfjKbCP9LOCd6799vRNP3kr27USJ/qdMOUiFwZaFSViruFvQpCpZ2cJgH2lNMOEIzuYqhScR6rrHnMrb+thEJ6mM8I/CXH7WmvE8/QYSSNw5kueaOwKSw/ROmM+4yJJBGatoBN8UNmXjCFiPZ9JKkU6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2018 16:55:42.7008 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0b873e71-52f6-49ef-3d33-08d5883a17df X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR03MB3165 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180312_095558_716889_7A7F8920 X-CRM114-Status: GOOD ( 14.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dong Aisheng , Jacky Bai , linux-imx@nxp.com, kernel@pengutronix.de, Fabio Estevam , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This is one of the differences between 6ul and 6ull: imx6ull has no sim but has epdc and this clock is redefined on the same bit. This can be verified in the Reference Manuals. Signed-off-by: Leonard Crestez --- drivers/clk/imx/clk-imx6ul.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c index 85c1181..114ecbb 100644 --- a/drivers/clk/imx/clk-imx6ul.c +++ b/drivers/clk/imx/clk-imx6ul.c @@ -308,7 +308,10 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node) clks[IMX6UL_CLK_SAI2_PODF] = imx_clk_divider("sai2_podf", "sai2_pred", base + 0x2c, 0, 6); clks[IMX6UL_CLK_SPDIF_PRED] = imx_clk_divider("spdif_pred", "spdif_sel", base + 0x30, 25, 3); clks[IMX6UL_CLK_SPDIF_PODF] = imx_clk_divider("spdif_podf", "spdif_pred", base + 0x30, 22, 3); - clks[IMX6UL_CLK_SIM_PODF] = imx_clk_divider("sim_podf", "sim_pre_sel", base + 0x34, 12, 3); + if (clk_on_imx6ul()) + clks[IMX6UL_CLK_SIM_PODF] = imx_clk_divider("sim_podf", "sim_pre_sel", base + 0x34, 12, 3); + else if (clk_on_imx6ull()) + clks[IMX6ULL_CLK_EPDC_PODF] = imx_clk_divider("epdc_podf", "epdc_pre_sel", base + 0x34, 12, 3); clks[IMX6UL_CLK_ECSPI_PODF] = imx_clk_divider("ecspi_podf", "ecspi_sel", base + 0x38, 19, 6); clks[IMX6UL_CLK_LCDIF_PRED] = imx_clk_divider("lcdif_pred", "lcdif_pre_sel", base + 0x38, 12, 3); clks[IMX6UL_CLK_CSI_PODF] = imx_clk_divider("csi_podf", "csi_sel", base + 0x3c, 11, 3);