From patchwork Sat Oct 7 16:29:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9991387 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 6288A60380 for ; Sat, 7 Oct 2017 16:31:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 53D5F28846 for ; Sat, 7 Oct 2017 16:31:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 470F6289D7; Sat, 7 Oct 2017 16:31:22 +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=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=ham 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 BF70028846 for ; Sat, 7 Oct 2017 16:31:21 +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:References: In-Reply-To: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:List-Owner; bh=bwlHaEgWK44NaI45Lm21uuV3mWTAGA8BDu7EPciYUbM=; b=XykftNk7J8qsZjD9LtyDh9XrKZ 4BjGi5iXW9j0CWUbkMamfdTDBPeklYXuzsobxwFUTCwX6MYqP5wakz0WFL1V0UMhrWUj1If7t9vj+ 8eH80jPEz5NKZKTg8p+syJBR9ufYp7BiowSMK/7QpL6YfyPa+Aa5qL3uEo5aezfXNM/ydOzh6j9mL iw8zxLhqbMAUpQF8uN+Gh7GsPqqJov2HV7YTlqtfI30BJM1L6iva2mnfDcKxI1Vr+UUBlVKAslooI s75K49D6NRMzkYi5KbP+nwPBW84oR0Tvin8nivYFj+hEx5R0jzvHsaHEyUnF7KNjVIrq1skBcWo/F sOB8WEew==; 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 1e0s0O-0005YT-Ck; Sat, 07 Oct 2017 16:31:12 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e0rzT-0003cm-GP; Sat, 07 Oct 2017 16:30:19 +0000 Received: by mail-wm0-x243.google.com with SMTP id u138so13236690wmu.5; Sat, 07 Oct 2017 09:29:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ErNofrRIOW9YEBrz4ekR2MDGL0Zgm/2njeHDBsWIpV0=; b=BKTf4qj24iTR4oWi01ghWp3lIeWgCPcoy1AjcX4Cf8fUNYqIm7ZKPXBViVS5kv1Tq8 RC2kk61G91gHrWZ1rb8eWoffLv6SLH1f3pT9lyinH+ip5VAqdGYtCVuR06CkAFtwz3qj lqKm2/AcG9f18DwxnbX97zNBRx1Mo5K3/gPg++P7peC4lly5p7S2AsRJQXhxBy+AFxU/ NHJUbTxCERbC7MM4UyM+HwGA+EyVkQyRGw6XsH+zSn4wFv6TJ99aaM149NsCFojV1S5c 8aEzDkviJoZjo8clpChCDVKxoGJV1PpgejOuSzkZkP3PhvoQ8yKfuFQoRDZZnuQd68NP ACkw== 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:in-reply-to :references; bh=ErNofrRIOW9YEBrz4ekR2MDGL0Zgm/2njeHDBsWIpV0=; b=YIypqbqKYBg4+nVPA9+5vjnj8YE80+Cy3eoV6EsXOhcm+Dc/7oqgBnVWoSL4nl6gNg AYHF2sMTlgta432hb5mmV1qzO+X5UjkrjK1LMfUZnaQoDQJIxBkX0j7bXhEINTcWn9JD MqiWide1SG3ae4GVb8KiTBYNVFKrli8SsDy5+JM3jb0ryZv2ipNpbT0OM3JsPC8av84Z GuYopu7hvnCO/T8bb9uFQKHuKEE/geO0ZYrd7Wgz/ANtGXsbXoMDwEeOUx2LWCpHollD ZrXhzuIv2HC0Y/leF3Hd6GKV1pmC3T0ADErvE9GrBjLLJCV85neuiwG6TO5DYtk3F3o1 JykQ== X-Gm-Message-State: AMCzsaWFaz6KmtjNkrOI7u+n9XJhWAzr9g3CLZo1ZP7+q5oklqLPBom7 3Xv45n0sKmiQLpVH/7rhyUUrNKTj X-Google-Smtp-Source: AOwi7QAiLaaGxg81S2qfY5MZMq9hNRlQ/TJgcqltlr0ifvwpUlwn9TM3NmX1/l8JvyF14GeU9t6d1g== X-Received: by 10.28.32.136 with SMTP id g130mr4647390wmg.102.1507393792925; Sat, 07 Oct 2017 09:29:52 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD3DC7704E9ACEFF3C88D374A.dip0.t-ipconnect.de. [2003:dc:d3dc:7704:e9ac:eff3:c88d:374a]) by smtp.googlemail.com with ESMTPSA id e8sm4367025wmc.46.2017.10.07.09.29.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Oct 2017 09:29:52 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, khilman@baylibre.com, carlo@caione.org Subject: [PATCH 1/2] ARM: dts: meson: add the SDIO MMC controller Date: Sat, 7 Oct 2017 18:29:39 +0200 Message-Id: <20171007162940.14595-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171007162940.14595-1-martin.blumenstingl@googlemail.com> References: <20171007162940.14595-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171007_093015_750889_27DCE1B6 X-CRM114-Status: UNSURE ( 8.94 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Blumenstingl , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Meson6, Meson8 and Meson8b are using the same MMC controller IP. This adds the MMC controller node to meson.dtsi so it can be used by all SoCs. The controller itself is a bit special, because it has multiple slots. Each slot is accessed through a sub-node of the controller. However, currently the driver for this hardware only supports one slot. Signed-off-by: Martin Blumenstingl --- arch/arm/boot/dts/meson.dtsi | 9 +++++++++ arch/arm/boot/dts/meson8.dtsi | 6 ++++++ arch/arm/boot/dts/meson8b.dtsi | 6 ++++++ 3 files changed, 21 insertions(+) diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index 7ae30e780506..290a183e87c5 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -165,6 +165,15 @@ status = "disabled"; }; + sdio: mmc@8c20 { + compatible = "amlogic,meson-mx-sdio"; + reg = <0x8c20 0x20>; + interrupts = ; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + spifc: spi@8c80 { compatible = "amlogic,meson6-spifc"; reg = <0x8c80 0x80>; diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi index ada26f8116a8..e6abcc7a1084 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -299,6 +299,12 @@ clock-names = "clkin", "core", "sana"; }; +&sdio { + compatible = "amlogic,meson8-sdio", "amlogic,meson-mx-sdio"; + clocks = <&clkc CLKID_SDIO>, <&clkc CLKID_CLK81>; + clock-names = "core", "clkin"; +}; + &spifc { clocks = <&clkc CLKID_CLK81>; }; diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index bc4d4a237ea5..283c68c6b1f4 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -207,6 +207,12 @@ clock-names = "clkin", "core", "sana"; }; +&sdio { + compatible = "amlogic,meson8b-sdio", "amlogic,meson-mx-sdio"; + clocks = <&clkc CLKID_SDIO>, <&clkc CLKID_CLK81>; + clock-names = "core", "clkin"; +}; + &uart_AO { clocks = <&clkc CLKID_CLK81>; };