From patchwork Sat Jun 2 13:53:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 10444851 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 854296028E for ; Sat, 2 Jun 2018 13:53:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 680772864E for ; Sat, 2 Jun 2018 13:53:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B4ED2883F; Sat, 2 Jun 2018 13:53: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=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, 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 EBD152864E for ; Sat, 2 Jun 2018 13:53:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750793AbeFBNxk (ORCPT ); Sat, 2 Jun 2018 09:53:40 -0400 Received: from mail-qt0-f196.google.com ([209.85.216.196]:41969 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750729AbeFBNxj (ORCPT ); Sat, 2 Jun 2018 09:53:39 -0400 Received: by mail-qt0-f196.google.com with SMTP id y20-v6so9455727qto.8; Sat, 02 Jun 2018 06:53:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=WzSkbT7TnPJx4l5Xns8ZNkMlaaUWngUeWyVFuWMwv2M=; b=uFN81F4N0Droe/GD1KUvWgsFEyqWUi+NHtuZGgjy7uyBGt/fT0wAI81zFfN+8uR3/J tfce1sFSysE4w3+GfwrEWi9eE4jeOU5hLkdCw2G+11y8K7YeXOdbiP1EsPN0/F67nGVl agNDgBBwGjwyaqQL3WvCQMbyy46nsk3rZ1CIdwmdRCtM04AYGme32WTphCa4seNks/Cg 7hEVYISaN5jydF7oVbOFL/upAqKxtMrHnpS2au1mBhwMN3Zb1sWCKZeuWcwVtX17FdnT u/leztTKm1eGt6GCQ+cQF7muVmFbPz5T8k0zO+oLyJENtsJypdbMmEKXykF1qkV0hA+0 iyBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=WzSkbT7TnPJx4l5Xns8ZNkMlaaUWngUeWyVFuWMwv2M=; b=H031EU6Po8wdnhjsCr+NxtT+kbrFUA1EuSaPx2UpF3ckUzOXS46kzLZlBGpEviCXb/ dPHByTd9nynlC5Z2H820nI41pwLvFs7FoFEbv2zXOh6OFKSfkN2SrvWvboxG1aWa4aVm rVQmzGMiLGWWbwDTr91IEOYIUghnp52BWf4W7Miw7dD0hVU81sWcaidIEHkhTJPuB8T+ S1UtQCHPMt2g4GfKsuSc703p0Khc/OUX2rB3Xf//Po/ui8DnFOvt1q6olaj00N6yI1DF 9+vsh+TJoo17VY/4mGlWcoGsj2ZHwsyqIytlogQXVOiHjTsCqGJzIK1DyCQ3NG83iP0T bK5w== X-Gm-Message-State: APt69E3Wrh5vlF2ATgCH9RrFSc0G4QqBxSC9wxivWZ1KevM3z7KryA1W t8IFM5oZ6wUW4bccqV2TFQg= X-Google-Smtp-Source: ADUXVKJZC7iMBS0EejGnZ4/6+mqK1xL2ajU2rZxc5zCRt0xnhgNHTsHx/Xf3IsO5Rxd/0iIYcvFpbA== X-Received: by 2002:ac8:23e7:: with SMTP id r36-v6mr14277254qtr.228.1527947618385; Sat, 02 Jun 2018 06:53:38 -0700 (PDT) Received: from localhost.localdomain ([2804:431:b709:c201:f931:b7f:f306:d3a3]) by smtp.gmail.com with ESMTPSA id j66-v6sm15993988qtb.67.2018.06.02.06.53.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 02 Jun 2018 06:53:37 -0700 (PDT) From: Fabio Estevam To: sboyd@kernel.org Cc: michael@amarulasolutions.com, stefan.wahren@i2se.com, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, anson.huang@nxp.com, stefan@agner.ch, Fabio Estevam Subject: [PATCH] dt-bindings: clock: imx6ul: Do not change the clock definition order Date: Sat, 2 Jun 2018 10:53:29 -0300 Message-Id: <1527947609-30913-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 2.7.4 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 From: Fabio Estevam Commit f5a4670de96678 ("clk: imx: Add new clo01 and clo2 controlled by CCOSR") introduced the CLK_CLKO definitions, but didn't put them at the end of the list, which may cause dtb breakage when running an old dtb with a newer kernel. In order to avoid that, simply add the new CLK_CKO clock definitions at the end of the list. Fixes: f5a4670de96678 ("clk: imx: Add new clo01 and clo2 controlled by CCOSR") Reported-by: Stefan Wahren Signed-off-by: Fabio Estevam --- include/dt-bindings/clock/imx6ul-clock.h | 40 +++++++++++++++----------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/include/dt-bindings/clock/imx6ul-clock.h b/include/dt-bindings/clock/imx6ul-clock.h index 9564597..0aa1d9c 100644 --- a/include/dt-bindings/clock/imx6ul-clock.h +++ b/include/dt-bindings/clock/imx6ul-clock.h @@ -235,27 +235,25 @@ #define IMX6UL_CLK_CSI_PODF 222 #define IMX6UL_CLK_PLL3_120M 223 #define IMX6UL_CLK_KPP 224 -#define IMX6UL_CLK_CKO1_SEL 225 -#define IMX6UL_CLK_CKO1_PODF 226 -#define IMX6UL_CLK_CKO1 227 -#define IMX6UL_CLK_CKO2_SEL 228 -#define IMX6UL_CLK_CKO2_PODF 229 -#define IMX6UL_CLK_CKO2 230 -#define IMX6UL_CLK_CKO 231 - -/* For i.MX6ULL */ -#define IMX6ULL_CLK_ESAI_PRED 232 -#define IMX6ULL_CLK_ESAI_PODF 233 -#define IMX6ULL_CLK_ESAI_EXTAL 234 -#define IMX6ULL_CLK_ESAI_MEM 235 -#define IMX6ULL_CLK_ESAI_IPG 236 -#define IMX6ULL_CLK_DCP_CLK 237 -#define IMX6ULL_CLK_EPDC_PRE_SEL 238 -#define IMX6ULL_CLK_EPDC_SEL 239 -#define IMX6ULL_CLK_EPDC_PODF 240 -#define IMX6ULL_CLK_EPDC_ACLK 241 -#define IMX6ULL_CLK_EPDC_PIX 242 -#define IMX6ULL_CLK_ESAI_SEL 243 +#define IMX6ULL_CLK_ESAI_PRED 225 +#define IMX6ULL_CLK_ESAI_PODF 226 +#define IMX6ULL_CLK_ESAI_EXTAL 227 +#define IMX6ULL_CLK_ESAI_MEM 228 +#define IMX6ULL_CLK_ESAI_IPG 229 +#define IMX6ULL_CLK_DCP_CLK 230 +#define IMX6ULL_CLK_EPDC_PRE_SEL 231 +#define IMX6ULL_CLK_EPDC_SEL 232 +#define IMX6ULL_CLK_EPDC_PODF 233 +#define IMX6ULL_CLK_EPDC_ACLK 234 +#define IMX6ULL_CLK_EPDC_PIX 235 +#define IMX6ULL_CLK_ESAI_SEL 236 +#define IMX6UL_CLK_CKO1_SEL 237 +#define IMX6UL_CLK_CKO1_PODF 238 +#define IMX6UL_CLK_CKO1 239 +#define IMX6UL_CLK_CKO2_SEL 240 +#define IMX6UL_CLK_CKO2_PODF 241 +#define IMX6UL_CLK_CKO2 242 +#define IMX6UL_CLK_CKO 243 #define IMX6UL_CLK_END 244 #endif /* __DT_BINDINGS_CLOCK_IMX6UL_H */