From patchwork Tue Jan 20 15:32:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 43380 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 34AB0218DB for ; Tue, 20 Jan 2015 15:33:27 +0000 (UTC) Received: by mail-wi0-f197.google.com with SMTP id n3sf7527484wiv.0 for ; Tue, 20 Jan 2015 07:33:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=vMStFIhn0+2uxqE/E8i23Tx6YPfrcemeJzI7QK9mpyw=; b=mWeITDLxaZ1Injg8KQP7S+xNKCYITLbujXfkVu1hZgSKPz0k1bSFZC0sodknP8XTF6 9k4Hx7w4NzoOaldp491qcUT7fVTyysSy8qRLZELjqO/pgc2WFvpYf76APmDrNZuFyGa+ VXt9IyPQ3CGhCiS9al/FXqfKmry9jwPRuF4Oe+7hINvOadvMY9DOUz1smGCCfJ2uWrPJ Mrv+6TE8pT55CJAsBF7VYTj0FMUxFOzZXO58Yvr+UkjxykCWn+LN+CKtEtsSrDnr6Pjn UbCYidHDh4UvIMjBsTlIrdjH5Uv0ZBwe+B/Oym1cH8/HeMsoanhNCTC74TaIDbgD1yfq /ynw== X-Gm-Message-State: ALoCoQkPkSbIbmRE2iFypKzQ0OdmoVF7qnr7YZDGH3OYRLrpc+z70Fhkd5ENn+zCFWhpllk4g2vx X-Received: by 10.152.43.50 with SMTP id t18mr487062lal.3.1421768006388; Tue, 20 Jan 2015 07:33:26 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.3.170 with SMTP id d10ls638713lad.37.gmail; Tue, 20 Jan 2015 07:33:26 -0800 (PST) X-Received: by 10.152.9.170 with SMTP id a10mr3220518lab.1.1421768006154; Tue, 20 Jan 2015 07:33:26 -0800 (PST) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id i8si15465766lbc.106.2015.01.20.07.33.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 Jan 2015 07:33:26 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id z12so13504598lbi.7 for ; Tue, 20 Jan 2015 07:33:26 -0800 (PST) X-Received: by 10.152.5.226 with SMTP id v2mr39128173lav.34.1421768006051; Tue, 20 Jan 2015 07:33:26 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp1456514lbb; Tue, 20 Jan 2015 07:33:25 -0800 (PST) X-Received: by 10.70.33.177 with SMTP id s17mr6410696pdi.9.1421768004218; Tue, 20 Jan 2015 07:33:24 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qc4si4898933pbb.103.2015.01.20.07.33.22; Tue, 20 Jan 2015 07:33:24 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753364AbbATPdL (ORCPT + 28 others); Tue, 20 Jan 2015 10:33:11 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:56366 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753252AbbATPdF (ORCPT ); Tue, 20 Jan 2015 10:33:05 -0500 Received: by mail-wi0-f174.google.com with SMTP id n3so4414737wiv.1 for ; Tue, 20 Jan 2015 07:33:04 -0800 (PST) X-Received: by 10.194.24.195 with SMTP id w3mr70180802wjf.135.1421767984205; Tue, 20 Jan 2015 07:33:04 -0800 (PST) Received: from localhost.localdomain (cpc14-aztw22-2-0-cust189.18-1.cable.virginm.net. [82.45.1.190]) by mx.google.com with ESMTPSA id dv9sm3464185wib.14.2015.01.20.07.33.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Jan 2015 07:33:03 -0800 (PST) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, srinivas.kandagatla@gmail.com, maxime.coquelin@st.com, patrice.chotard@st.com, mturquette@linaro.org, sboyd@codeaurora.org, chris@printf.net, ulf.hansson@linaro.org Cc: peter.griffin@linaro.org, lee.jones@linaro.org, peppe.cavallaro@st.com, olivier.bideau@st.com, gabriel.fernandez@st.com, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 4/4] ARM: STi: DT: STiH407: Add dt nodes for sdhci and emmc. Date: Tue, 20 Jan 2015 15:32:44 +0000 Message-Id: <1421767964-8798-5-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1421767964-8798-1-git-send-email-peter.griffin@linaro.org> References: <1421767964-8798-1-git-send-email-peter.griffin@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.griffin@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The nodes have been split to allow as much commonality as possible. The stih407 has a silicon bug with eMMC UHS modes (with top regs) and as such doesn't have any of the uhs dt properties. Signed-off-by: Peter Griffin --- arch/arm/boot/dts/stih407-family.dtsi | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/stih410-b2120.dts | 10 ++++++++++ arch/arm/boot/dts/stihxxx-b2120.dtsi | 8 ++++++++ 3 files changed, 48 insertions(+) diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index d4a8f84..df0284b 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -283,5 +283,35 @@ <&picophyreset STIH407_PICOPHY0_RESET>; reset-names = "global", "port"; }; + + mmc0: sdhci@09060000 { + compatible = "st,sdhci-stih407", "st,sdhci"; + status = "disabled"; + reg = <0x09060000 0x7ff>, <0x9061008 0x20>; + reg-names = "mmc", "top-mmc-delay"; + interrupts = ; + interrupt-names = "mmcirq"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_mmc0>; + clock-names = "mmc"; + clocks = <&clk_s_c0_flexgen CLK_MMC_0>; + bus-width = <8>; + non-removable; + }; + + mmc1: sdhci@09080000 { + compatible = "st,sdhci-stih407", "st,sdhci"; + status = "disabled"; + reg = <0x09080000 0x7ff>; + reg-names = "mmc"; + interrupts = ; + interrupt-names = "mmcirq"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sd1>; + clock-names = "mmc"; + clocks = <&clk_s_c0_flexgen CLK_MMC_1>; + resets = <&softreset STIH407_MMC1_SOFTRESET>; + bus-width = <4>; + }; }; }; diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts index 2f61a99..16f02c5 100644 --- a/arch/arm/boot/dts/stih410-b2120.dts +++ b/arch/arm/boot/dts/stih410-b2120.dts @@ -26,4 +26,14 @@ aliases { ttyAS0 = &sbc_serial0; }; + + soc { + + mmc0: sdhci@09060000 { + max-frequency = <200000000>; + sd-uhs-sdr50; + sd-uhs-sdr104; + sd-uhs-ddr50; + }; + }; }; diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi index 0074bd4..19082ed 100644 --- a/arch/arm/boot/dts/stihxxx-b2120.dtsi +++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi @@ -47,6 +47,14 @@ status = "okay"; }; + mmc0: sdhci@09060000 { + status = "okay"; + }; + + mmc1: sdhci@09080000 { + status = "okay"; + }; + /* SSC11 to HDMI */ i2c@9541000 { status = "okay";