From patchwork Mon Jul 31 12:05:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9871683 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 CBBBA602F0 for ; Mon, 31 Jul 2017 12:06:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BAD7028563 for ; Mon, 31 Jul 2017 12:06:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE3BE285C4; Mon, 31 Jul 2017 12:06:25 +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=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE autolearn=unavailable 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 1E32B28563 for ; Mon, 31 Jul 2017 12:06:24 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=iclLJPn1Kje7jEuTEhPRIC7OJPYoXX+wEnGgcaLo16w=; b=N3Z 5W3GgoCvxzSsSD5zkExeP2LT78Gns8J+tuWWu0hzUwXZ1mLLK9zXHB1PYIkWGimpQoutLJGEzTncg E21Lth435Y9cAUAXnCRDVdG2367klUN7ZiwZiDt39w7A2K+QRx72e/d/FWh7WCIVYgRyY4d105H6x zFhT2VT2FB0GbcEEAe2GQxPzZTV8d1jqFjJw2mMzPdW3hpaeEzoLMCRsvik3BCKGJf3eXMv7jPLYK b201wJB4C6pw4/kKPpmLyoCz+43v8UxFrL4Dlmy+YnH39KtHuZVR1efbzio+Aqj7p9LB11ViMPC2p XXAte3dCZZYBnvV9z1AA205GdwOJ6gA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dc9Sn-0006M4-FB; Mon, 31 Jul 2017 12:06:21 +0000 Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dc9Sj-00069s-Bl for linux-arm-kernel@lists.infradead.org; Mon, 31 Jul 2017 12:06:19 +0000 Received: by mail-wr0-x22c.google.com with SMTP id k71so124720587wrc.2 for ; Mon, 31 Jul 2017 05:05:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=5cdFefbzoWwj93F/+yl48Vt2YEiF4nUdQQq9fbbxzYU=; b=vfD/mjh4XxVT7Ds0x0wirFI73P9zW2QrDT7lwrM0B8eeAju0KTbxk57umi5YoQzi2v g5td7efuY9F07Tds/hp5Aef2LoqZwGp+dnk0wrC0XsCCWCD0OPYsOTBNxq3STmec3Hhy wiYAgx65rZomCdZ0pPM4PNokpNXMmGJxbNYfTzu7rYPFa59/juKPEzSB7s4Gx5RFaOGK pAKMXh4T+SyxMq050OF/zxvamPGyF6UEZXOBWvtRX/uct5NpBYeWqGCdBuHdZ4HOUdw+ i+hVfGzJfMsIMMrVKcrS1P3U+o7kVsPjGjCb5tssmjDUOIGj4sAWL2qemj9Z13SwvOdx wdeQ== 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=5cdFefbzoWwj93F/+yl48Vt2YEiF4nUdQQq9fbbxzYU=; b=dFcLALjH4FUIbLZzHrDiT+ARJD6LK5fjy0AQBeOkw3VhCyPmrBCNmhSRdYI3gFhaH1 tI/RunFEHFvjSvMeJATRr+5joZrnd+biA78o+Vy9zxMD9nhqe8gXNRLhQWxHNyk5NO3h +FHOV4c5YQUYjqK3kDvWfCDJQawZkdq4dZzn9uEOaELkaff3g7iUvHtOGRrJbfw0h+kc wPF075+uVhRBobTchSO6vpT/C2iR1ib+4XqyI2pccCkRoxdAp30QMUMnuyyFzraaQuLK RxTsSu4f3aJeNmUXU1diyaeQ1m8G2m4aIQNqW09UnTYldyNsSMkilxd1LMeUtnvHlKlE IPfg== X-Gm-Message-State: AIVw113zxqU2tuPBh4JkZ5if9td55u3fgFy8p2kZ5gQNL8yVzMdQn6aV oihp5eGrLucQcYrN X-Received: by 10.223.147.97 with SMTP id 88mr12418497wro.226.1501502755846; Mon, 31 Jul 2017 05:05:55 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id q10sm33882422wrb.3.2017.07.31.05.05.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Jul 2017 05:05:55 -0700 (PDT) From: Jerome Brunet To: Kevin Hilman , Carlo Caione Subject: [PATCH] ARM64: dts: meson-gx: Use correct mmc clock source 0 Date: Mon, 31 Jul 2017 14:05:52 +0200 Message-Id: <20170731120552.31606-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170731_050617_552995_9DAE5CD3 X-CRM114-Status: UNSURE ( 8.95 ) X-CRM114-Notice: Please train this message. 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: devicetree@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet MIME-Version: 1.0 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 Now that the clock source 0 is properly described in the CCF, use it instead of assuming the default value (xtal) Signed-off-by: Jerome Brunet --- This patchset depends on clock patchset adding the related clocks: * https://lkml.kernel.org/r/20170731115603.29720-1-jbrunet@baylibre.com arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 6 +++--- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index 17d3efdf1469..9a1e478f80d5 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -652,21 +652,21 @@ &sd_emmc_a { clocks = <&clkc CLKID_SD_EMMC_A>, - <&xtal>, + <&clkc CLKID_SD_EMMC_A_CLK0>, <&clkc CLKID_FCLK_DIV2>; clock-names = "core", "clkin0", "clkin1"; }; &sd_emmc_b { clocks = <&clkc CLKID_SD_EMMC_B>, - <&xtal>, + <&clkc CLKID_SD_EMMC_B_CLK0>, <&clkc CLKID_FCLK_DIV2>; clock-names = "core", "clkin0", "clkin1"; }; &sd_emmc_c { clocks = <&clkc CLKID_SD_EMMC_C>, - <&xtal>, + <&clkc CLKID_SD_EMMC_C_CLK0>, <&clkc CLKID_FCLK_DIV2>; clock-names = "core", "clkin0", "clkin1"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index 8d4f3160a0ee..071eca074a91 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -593,21 +593,21 @@ &sd_emmc_a { clocks = <&clkc CLKID_SD_EMMC_A>, - <&xtal>, + <&clkc CLKID_SD_EMMC_A_CLK0>, <&clkc CLKID_FCLK_DIV2>; clock-names = "core", "clkin0", "clkin1"; }; &sd_emmc_b { clocks = <&clkc CLKID_SD_EMMC_B>, - <&xtal>, + <&clkc CLKID_SD_EMMC_B_CLK0>, <&clkc CLKID_FCLK_DIV2>; clock-names = "core", "clkin0", "clkin1"; }; &sd_emmc_c { clocks = <&clkc CLKID_SD_EMMC_C>, - <&xtal>, + <&clkc CLKID_SD_EMMC_C_CLK0>, <&clkc CLKID_FCLK_DIV2>; clock-names = "core", "clkin0", "clkin1"; };