From patchwork Sat Jun 2 14:02:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 10444871 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 2533C602BD for ; Sat, 2 Jun 2018 14:02:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 028ED28A4A for ; Sat, 2 Jun 2018 14:02:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6B8C28A4D; Sat, 2 Jun 2018 14:02:14 +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 BC83828A4A for ; Sat, 2 Jun 2018 14:02:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750793AbeFBOCN (ORCPT ); Sat, 2 Jun 2018 10:02:13 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:44719 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750740AbeFBOCM (ORCPT ); Sat, 2 Jun 2018 10:02:12 -0400 Received: by mail-qk0-f195.google.com with SMTP id 185-v6so22021524qkk.11; Sat, 02 Jun 2018 07:02:12 -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=bsXcZ8rYWy1R8HaFh+q119sP3V1K8yAcP1Dmee/f/GA=; b=pbY4ZPA1fehBTxOb4YY5z12lX7hDlbtoY/pZWs1nvzX8jaMzKQN2XKo9ncUuHFZ8xi 32ZmTgVHULDl2QBQ+OvZmXmBUDvDVMMGsXnYQESlAvOrvzHZmCYFiGIBmGe82+/SLtyv cPLjlhUxiiX8IFef0x5SgH1tQQ/T1YqpLblplHr0h6pAruRWFOpdyoU6Zb5dQJIiIaGw Vzzdd3kRGXTIB+46Z32ot7vTTigrybb1MXsSe9bSN/CDvFRsGPi5fuQSgX2uvKIbekPQ 5p6ozfDcPsenhHkLY0qpbjIEnbkCqhWtVqCvyIek0eeQYyjJwgf+8xIV5egZG680QAEx 4C3w== 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=bsXcZ8rYWy1R8HaFh+q119sP3V1K8yAcP1Dmee/f/GA=; b=jRK2Ih+22kROmN3D3+9BMLBDqKYd7GjvHWbD2F9awoUx5GOg7wu75nYm28S3hmY/T3 xS/yiSL+tXfJVk65VTgc9m+AakeL9pr+595kLdG3uXkyKaDi2xLBBP15+F+AB9ffSAnx so7/YB7XQN1eMhGyk2lofSmIZzN7kYI1I8KMxOlaBjNfHJ2Ohju6qYehdEyrobYQ04cr dTObiTrSIxnwyCmBJqkkCmsgz1msEsWI8GdjfrRmlbW0ZXVdQbaJ25RnM5hJ9LbhVM33 6xhhiYbLDbrNzskdJffXYC4CmkCcTqauSvwBj4wVby9pm3kEUgextlH+o/4LidYBLzfY 7O6Q== X-Gm-Message-State: APt69E2/kkZs4IxiwAdS+WgjgHetxsNZei0WLoS8D4+E6AiOuq4etlQb PpJAKB2VI1oMr5/dNwhkxOE= X-Google-Smtp-Source: ADUXVKI5lvRBhsLgXM6AdgQ7p7Qem2TK3bi5lDkw+4Cnvnw4nDM571YqtD3rpphZC1EKeMsHinPSUw== X-Received: by 2002:a37:1563:: with SMTP id f96-v6mr13758617qkh.150.1527948131744; Sat, 02 Jun 2018 07:02:11 -0700 (PDT) Received: from localhost.localdomain ([2804:431:b709:c201:f931:b7f:f306:d3a3]) by smtp.gmail.com with ESMTPSA id v22-v6sm12403907qtg.46.2018.06.02.07.02.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 02 Jun 2018 07:02:11 -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 v2] dt-bindings: clock: imx6ul: Do not change the clock definition order Date: Sat, 2 Jun 2018 11:02:02 -0300 Message-Id: <1527948122-32092-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 f5a4670de966 ("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: f5a4670de966 ("clk: imx: Add new clo01 and clo2 controlled by CCOSR") Reported-by: Stefan Wahren Signed-off-by: Fabio Estevam Acked-by: Rob Herring Reviewed-by: Stefan Agner --- Changes since v1: - Use 12 char for the commit id 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 */