From patchwork Sun Oct 18 05:48:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sanchayan X-Patchwork-Id: 7429611 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BCBD6BEEA4 for ; Sun, 18 Oct 2015 05:56:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ED40D20462 for ; Sun, 18 Oct 2015 05:56:08 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D60D620453 for ; Sun, 18 Oct 2015 05:56:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZnguM-0002n6-1D; Sun, 18 Oct 2015 05:53:26 +0000 Received: from mail-pa0-x233.google.com ([2607:f8b0:400e:c03::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZnguI-0002ke-9D for linux-arm-kernel@lists.infradead.org; Sun, 18 Oct 2015 05:53:23 +0000 Received: by pacfa8 with SMTP id fa8so6173651pac.1 for ; Sat, 17 Oct 2015 22:52:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=3PgJGyJY8Vn+KiIVu3gX7SjqQyEUlIibGxKwCgdU6xA=; b=ecJmqAgljY5ceTokjuM+7Kx8FF5AVZdixE1f3GkpjwxcwH0wdvH0NP7tGKDVPAnHeQ z6dZ/RX4oabX4E8homqX78lEJqHGOLWuEuJaabKsqvMvtoaqRqADLvlg43NvnoC01cc8 blBMqqiT9WMXqjLmbFn69/xunL16ptu7yzs7y4R4X5PBgS8rw2CN8/viTnkufAL0PyRc S1+LZG/XqQFuzoO2T/z9ji1zGQ3xn8Prgb/Fm3cr4QvpazBfDi5subjBeoLUp9p9bZLh nLnn0nA9DDQtz/n2WV62H/AXgeW/eh+8kE+5EGGTT/4T8FjD1SAqeAM4A/Hc7bP2ut5Z 8rzQ== X-Received: by 10.68.190.170 with SMTP id gr10mr25994542pbc.91.1445147577917; Sat, 17 Oct 2015 22:52:57 -0700 (PDT) Received: from localhost ([106.51.29.12]) by smtp.gmail.com with ESMTPSA id qr8sm25775167pbb.47.2015.10.17.22.52.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Oct 2015 22:52:56 -0700 (PDT) From: Sanchayan Maity To: shawnguo@kernel.org Subject: [PATCH] ARM: dts: vfxxx: Fix erroneous property in esdhc0 node Date: Sun, 18 Oct 2015 11:18:48 +0530 Message-Id: <4f43a337677572fbf2b2c8e27152db426e024f7a.1445146992.git.maitysanchayan@gmail.com> X-Mailer: git-send-email 2.6.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151017_225322_391589_4A564FE9 X-CRM114-Status: GOOD ( 11.68 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Sanchayan Maity , linux-kernel@vger.kernel.org, stefan@agner.ch MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Something seems to have gone wrong during the merging of the device tree changes with the following patch "ARM: dts: add property for maximum ADC clock frequencies" The property "fsl,adck-max-frequency" instead of being applied for the ADC1 node got applied to the esdhc0 node. This patch fixes it. Signed-off-by: Sanchayan Maity --- arch/arm/boot/dts/vfxxx.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi index 6736bae..a64bfe1 100644 --- a/arch/arm/boot/dts/vfxxx.dtsi +++ b/arch/arm/boot/dts/vfxxx.dtsi @@ -461,6 +461,8 @@ clock-names = "adc"; #io-channel-cells = <1>; status = "disabled"; + fsl,adck-max-frequency = <30000000>, <40000000>, + <20000000>; }; esdhc0: esdhc@400b1000 { @@ -472,8 +474,6 @@ <&clks VF610_CLK_ESDHC0>; clock-names = "ipg", "ahb", "per"; status = "disabled"; - fsl,adck-max-frequency = <30000000>, <40000000>, - <20000000>; }; esdhc1: esdhc@400b2000 {