From patchwork Wed Jan 24 14:31:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anson Huang X-Patchwork-Id: 10181919 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 364E6601D5 for ; Wed, 24 Jan 2018 08:40:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2281528859 for ; Wed, 24 Jan 2018 08:40:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 169492886B; Wed, 24 Jan 2018 08:40:16 +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.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DATE_IN_FUTURE_03_06, DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_MED autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 B7E462886D for ; Wed, 24 Jan 2018 08:40:15 +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=69pKqzVctVIs4Hgc1r8jFJTW/6ntoZfbE5uWQCw2fJI=; b=WSxrnxvXJU4DJ7 MTLTeklzEtCuwdyEByUoWdaAHA7KbtsTGuZH1oI4R0raadZ8c7thmp9ibtb1sp9mr+ZA/ubyafEXx uZmC7PUxohQ3U93GP1Faioeg1xphl/oCDnqn/eFJn5EfXSGk6Oq0UuxxwiWlZfrYpLHNMURJzQf1z Dt9wTY/xIJEG9wyv0HPKFLj2u/i2jyQ+/mL4wHu9RV4oqXiwt7Vf9D6ZvQFmLk4M35i4ZcQVKvZ1X 7HxYLJAnf+TvYgd7BYfQXftR4rCuPmqsPsyzG50rXBYxzu0rci63NVFb/TgCb9iyzJ9rBH4EROrOk bCalHqkOZWP0hXiLV8RA==; 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 1eeGbM-0005uY-63; Wed, 24 Jan 2018 08:40:12 +0000 Received: from mail-dm3nam03on0063.outbound.protection.outlook.com ([104.47.41.63] helo=NAM03-DM3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eeGbI-0004at-To for linux-arm-kernel@lists.infradead.org; Wed, 24 Jan 2018 08:40:11 +0000 Received: from MWHPR03CA0041.namprd03.prod.outlook.com (10.174.173.158) by BLUPR03MB471.namprd03.prod.outlook.com (10.141.78.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.444.14; Wed, 24 Jan 2018 08:24:58 +0000 Received: from BL2FFO11FD045.protection.gbl (2a01:111:f400:7c09::194) by MWHPR03CA0041.outlook.office365.com (2603:10b6:301:3b::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.444.14 via Frontend Transport; Wed, 24 Jan 2018 08:24:58 +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 BL2FFO11FD045.mail.protection.outlook.com (10.173.161.207) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.428.12 via Frontend Transport; Wed, 24 Jan 2018 08:24:53 +0000 Received: from anson-OptiPlex-790.ap.freescale.net (anson-OptiPlex-790.ap.freescale.net [10.192.242.177]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w0O6rtjr002413; Tue, 23 Jan 2018 23:53:55 -0700 From: Anson Huang To: , , , , Subject: [PATCH] clk: imx: imx6sx: update cko mux options Date: Wed, 24 Jan 2018 22:31:21 +0800 Message-ID: <1516804281-19123-1-git-send-email-Anson.Huang@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131612558976414178; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(346002)(39380400002)(376002)(396003)(2980300002)(1109001)(1110001)(339900001)(199004)(189003)(15650500001)(4326008)(50226002)(59450400001)(6666003)(51416003)(5660300001)(85426001)(2201001)(86362001)(97736004)(8676002)(77096007)(26005)(336011)(81166006)(81156014)(48376002)(104016004)(110136005)(54906003)(47776003)(50466002)(305945005)(356003)(16586007)(316002)(8936002)(72206003)(498600001)(105606002)(106466001)(68736007)(53936002)(2906002)(36756003)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR03MB471; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD045; 1:5VX3MIg0YigXAO3EGABO2Y67/8/6kPWY1jyPQ2VN4xrgmVCn7cpYxwcS7mTnowZQ5SysHo524WpTUNI+AI+mXUBh99t7Ds/WWlyZX3/8wcK1JGQjEsZTNgbc/ECD4sFb MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 60965ec5-ad08-41e3-9084-08d56303f439 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(5600026)(4604075)(2017052603307); SRVR:BLUPR03MB471; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB471; 3:KrHi6VdTZse8FhgZEwjwtOro2KH9CkuL6CQnBzWMVWegwtMmydx+821UxjRdSejqOs6Epw93Y2fbco2RIXk/Gk3iNAsSI2+PmX2s0UvTPYVZ+jM9xUAc/1dXpj3CLojmRH+vQX7rGUlIVxkkKWiRW1rcfAua4kdTxN+oXdgosq9pUlw5vByE6D8Ohf6iUxSONqY+aWM/McE1tO2jIMzp/mO+TJuwIuU4ENjhjceJ7qXFlv07AI7dX372s2AXc/mUMSOn4AOksEzYJHcmTpA2QsRszEj+zlxb9lpZ04R7kDxeQZ6eJDsLknqMyFRgjW4ZxFp3bivH5lB5DS9sdnmvrHavXXPS/IGBpTrSsPLdj+M=; 25:tpAnI3Vz5i0gNv5w+vd3u93W4PrHyQZ9mJA2NKFNVVu6HQufZpOXj3yVycQufBw+MJwtZ0F+F1qDe0ntjKdyyB4IILdXAXLju+tur+/s4WLqBE2kHAE/iL5FzNCoXlUE8xwnQTOcYC05xOFizPRleT4PAPqkfoKyTFeXadnbPouPay2nSjYnrdm+s1XmQlGfZuqewu9Q4WwRbAZjbKre+Kcg7raRyY8YqbbSNgC5pkz1ZR6nhdg9xYLZsCzuQ/YpXBRpiRTXsNnNFazXBajMG2E8j5hUFcYKHSHBs2CimSNsThs3J36nJMEjS9jyun69OMieJh4VnZUPvbQkpwJAew== X-MS-TrafficTypeDiagnostic: BLUPR03MB471: X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB471; 31:ExFID9nRz24uzQoHF7M4EAL26ohXoSLI1zscYllkbZOp82nDGGhn0YOjbpt84Tq5QRrE92yRx4DX5BTBSCZYk0Zk9knP3AO7mERQTupXJuIrNNzC9+jymn5PRqWfUbBkf5oh+oc6l2WCi194opIEy7vzBsWTHM5bTfdpO0yEifycF9DBZlPApyK8BMjpZ8z60yPqqce2wEPOjE5RKpoJtihnVWjHFQ8gK3xuU4W1bAE=; 4:QOkWJr/mdFudRDawEhKzMH1e7xsipRrGre7YzdBMZicyZeHNxYLC2gS9wUKHNsMJV9uQFkf8iWiFS7V+n0R//XwhFfO+dkM2ixZY47aZYIYqsnieiN17YsliN2QbtgVMoL1JoJ7p/Vy+OU2xTdneoPVYcTkCS0iT+ZrnkvCHMatf4TxTldvqjM+a44Vnic8/D/s4UdAe2oGH3qWLQ6D+Gq929r3AhnNo4lK1ctiJvuK2GQXJ9YJFr/lYrftiZZ60kEKP6PEVlEdBWg0mzldTKTfRm90dpXn/wUXGUQbLASf8Qpy+ol6qEieBip7vzvUW 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)(3231023)(2400081)(944501161)(93006095)(93001095)(3002001)(10201501046)(6055026)(6096035)(201703131430075)(201703131448075)(201703131433075)(201703151042153)(20161123559100)(20161123561025)(20161123565025)(20161123556025)(20161123563025)(201708071742011); SRVR:BLUPR03MB471; BCL:0; PCL:0; RULEID:(400006); SRVR:BLUPR03MB471; X-Forefront-PRVS: 056297E276 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR03MB471; 23:+2McUy4uSuWhLmeZmrSL4nNerd0F23WixMQjIBiomI?= =?us-ascii?Q?oacyey6I3o1XZZVCemZeBdItKTAkZRcgW0IMBonTm4ul0GfpyYo85zT/9FpN?= =?us-ascii?Q?DnO2MmQ/nwdnBuehTsoiSFVtmfaMATEDXNEr0tZx+QDLB6yMM3KfeKHt6kp3?= =?us-ascii?Q?xH6y5PxIIJQri3R1opAjAwMeCK6KHmAGSX7SzQ7QYkCmUN0Brm/i0P79gjwG?= =?us-ascii?Q?S7h7KaCDqO7TVxq6M5qLfuibrv3T5lJdmMuMg9UrEDpGY/sa7ZgQKx6I+KdR?= =?us-ascii?Q?W6lb9vg/UtGAGyYJzl1JsPPxXhlSq+t9W7ngnWRPDv0qyG2lGT3d0NY9lvto?= =?us-ascii?Q?Dv6ObzI3OgKZWddQ81GV3zVKi5DfPZT7PRKNWZ3qWGKRXVERK8ScUh4D740x?= =?us-ascii?Q?dv96uproEVhmB2R9YdTbXnwFFV8D2Q5jvMfpzCqyHw/BZLfoO/sOqyvJbJKw?= =?us-ascii?Q?f+SJQ4IGESNJ5fQPJaF86C3I/GVaDav9MldDlNBCERH+eiMrVR55TbtEMvEr?= =?us-ascii?Q?aPO5AQ8Cc2YLnG4tchTyYqlyJTKvOIXRvnUTXhjw9ByHPrVhjObgU4lmRMSf?= =?us-ascii?Q?oY1DwnA033ozk0Qbmu229t3t6IoIq1PsVJWaRKF/gcWaYU2PNlnVKyrO91fO?= =?us-ascii?Q?Qm1FdRE8ZaoPy43FwzGB9lgGLB+td2sWKCAQ4ufN1ar0EIPj/J8OnsRGCA8s?= =?us-ascii?Q?4vgseDHXoxCyksnjb0pZUmySxhEL2gVdToKD4YxVnL6H/oQd03jA13RAEoWq?= =?us-ascii?Q?tCbm2vWuA4Op32vVYtKluyFxmoTgHZxvrpm/LoPECQ4m78qm3GG4tyRzk7qU?= =?us-ascii?Q?TJ/Qv5QanmhjXw0NrK1Em554Jxein/LOvaoJNVmd5qWj1+BB/7Nl/KZqgasS?= =?us-ascii?Q?MS04dYRiiHW1lvk3eE4jTFG3a1QWShkv04sVVisR6IUprXamYEKNPhi/PUQp?= =?us-ascii?Q?gBje8vdIO9veUXVW1DlV0uQYVqGhQrT1aNTFtSBSsG9OafTMgGIdKTBGaWNh?= =?us-ascii?Q?lhTJ3UkBh2GPJr4x1vmltR8nPht+sCsNmwEnjIn/SmmeDTUoUzHKBW6m2pgp?= =?us-ascii?Q?BVIDUN/o0IxZjIPM92OlMfIAIwichxcbJhKAJmzqu9j62XVNR+8p+fEME93s?= =?us-ascii?Q?ZyiOXZ+NwsQtpS22zj7ynW0pIw6jCq?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB471; 6:baPna3EFOO9Pv0MoqtWlZmYDzyxPdXQ6M3P8Po0mIRhSNoMDg5oX6xkolHgiHxLbKf2h5F//apRk62ClHMkD2vaOetIhS+qUIXV6vgCkqa7TVdYK2O0HalCiNzw61hvZOPTLPhDPlljl1hKAQxr+io8K9bu+JtssQ8OAAF5uqBU0Lf6KHuog/S2ISeLq4ojhwIFqH3+iOv3RRSzNH/KLcwA8f+V/F9xPuQhvzizhJ9Kvni9JLVV1lz8WPwZzJtTrI7uRCia1ptIiW6TM6a7osAc1dcIXXndg1zUfPwMcS/xOnsqzyT+PsOVRDfWbxX9YQzUL/W5rHvsyh/mLiWRXCGSt1cN8+YPndsqe5DQRwac=; 5:XSOj5p6gi0gkvd9yudCHFnnB/EhOyMQjtKgFo3OGkzKQiax4X9VMfjI7+nQ5GnLfa0x34bJW5DyHwatApw+t2bkOwrZKuF+LMaCtkR9x5KP81//teDzSQAEyoftTFClniDN0npAZaCBM3UsI1EN1yKo8skKG/aD2jiWjHS5pY1U=; 24:HF0yr8QWl0RsjYLt/zPgckS8+vc3jd374eWB1l0Uw1Qxa5sOM7yvLCwM7Hgoovkk7dczx5rtBHFUZbafQaNCIzaB5cQw56whep/p3aNqdXg=; 7:vguAhZPapL/IXPeo7TjfOeS8Vk9Nal+ewTbb+LaKi8wywPuZ0az/Zrml4u54eqhq0ebldkaZVsbUtdVMgbrHeOjzCo6JYSbBXHvh42woMhY7qXNNQOss3IGdUHsVAoWdEVURsB10pK9jmpxF2mch4PXhnLVqRLwXl+l8FwhO0BnegXAaQOMQedXoe6sQ7lyPvVY3p8d4IQQwcjq849AmKHQ70Ct6yvCObjpYlWAy2XlnGFFZDQCWlo7yFQdvcSJA SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2018 08:24:53.8974 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 60965ec5-ad08-41e3-9084-08d56303f439 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: BLUPR03MB471 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: aisheng.dong@nxp.com, linux-kernel@vger.kernel.org, Linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.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 According to latest reference manual (Rev.2, 9/2017), previous CKO1/2's mux options are incorrect, update them. Signed-off-by: Anson Huang --- drivers/clk/imx/clk-imx6sx.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/clk/imx/clk-imx6sx.c b/drivers/clk/imx/clk-imx6sx.c index e6d389e..bc3f9eb 100644 --- a/drivers/clk/imx/clk-imx6sx.c +++ b/drivers/clk/imx/clk-imx6sx.c @@ -63,17 +63,17 @@ static const char *lcdif2_sels[] = { "lcdif2_podf", "ipp_di0", "ipp_di1", "ldb_d static const char *display_sels[] = { "pll2_bus", "pll2_pfd2_396m", "pll3_usb_otg", "pll3_pfd1_540m", }; static const char *csi_sels[] = { "osc", "pll2_pfd2_396m", "pll3_120m", "pll3_pfd1_540m", }; static const char *cko1_sels[] = { - "pll3_usb_otg", "pll2_bus", "pll1_sys", "pll5_video_div", - "dummy", "ocram", "dummy", "pxp_axi", "epdc_axi", "lcdif_pix", - "epdc_pix", "ahb", "ipg", "perclk", "ckil", "pll4_audio_div", + "dummy", "dummy", "dummy", "dummy", + "vadc", "ocram", "qspi2", "m4", "enet_ahb", "lcdif2_pix", + "lcdif1_pix", "ahb", "ipg", "perclk", "ckil", "pll4_audio_div", }; static const char *cko2_sels[] = { "dummy", "mmdc_p0_fast", "usdhc4", "usdhc1", "dummy", "wrck", "ecspi_root", "dummy", "usdhc3", "pcie", "arm", "csi_core", - "lcdif_axi", "dummy", "osc", "dummy", "gpu2d_ovg_core", - "usdhc2", "ssi1", "ssi2", "ssi3", "gpu2d_core", "dummy", - "dummy", "dummy", "dummy", "esai_extal", "eim_slow", "uart_serial", - "spdif", "asrc", "dummy", + "display_axi", "dummy", "osc", "dummy", "dummy", + "usdhc2", "ssi1", "ssi2", "ssi3", "gpu_axi_podf", "dummy", + "can_podf", "lvds1_out", "qspi1", "esai_extal", "eim_slow", + "uart_serial", "spdif", "audio", "dummy", }; static const char *cko_sels[] = { "cko1", "cko2", }; static const char *lvds_sels[] = {