From patchwork Fri Apr 10 08:58:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 47000 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7D86121416 for ; Fri, 10 Apr 2015 08:59:25 +0000 (UTC) Received: by lbdc7 with SMTP id c7sf724846lbd.2 for ; Fri, 10 Apr 2015 01:59:24 -0700 (PDT) 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=66+0u2N8slrT6Eo0I4aBAUv92VZ7W9EXaVtdjF+iOOw=; b=HDAzzlta8y+nZIeVMCBXDCAXlPKckmoalV044s8k+qSE9pK30pg+MeHErdWmMC04l9 wOxPyxRD4XB+qDUfgfAtHAq91YkovSnGDkeoyAly+tG/S8SxNYrb58T4dJZCqkrAuaM/ SO31KjPpIaZbVgW4qWuFVApOzfSP8IUKS80arWwsDtP9eucGkWAyt7mhWjkzc0mU50C1 hbsOOrT0eL2wTgTlHIv46hQWBRvj3u/8yHcYP5lLpXVUUSzzAjGLZ7BgH7rSbvaoq0wt HKOavaVl8e/Ac55fgc/Fn6iElbuQy+IsfN/xhjjHoLw+WYUkF9m4+gMK+U/6uIjtWHVq XoAA== X-Gm-Message-State: ALoCoQkxcD0xh55T9FMsTZ4hoYpDXpjNmvFM7ABUfRtQPLm5xULivKydW8mmHfUBugmdwgrDGFO1 X-Received: by 10.180.101.39 with SMTP id fd7mr294106wib.0.1428656364129; Fri, 10 Apr 2015 01:59:24 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.199 with SMTP id x7ls442417lae.0.gmail; Fri, 10 Apr 2015 01:59:23 -0700 (PDT) X-Received: by 10.112.140.74 with SMTP id re10mr507060lbb.80.1428656363943; Fri, 10 Apr 2015 01:59:23 -0700 (PDT) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id ci12si972337lad.37.2015.04.10.01.59.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2015 01:59:23 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by lbcga7 with SMTP id ga7so8834889lbc.1 for ; Fri, 10 Apr 2015 01:59:23 -0700 (PDT) X-Received: by 10.152.23.70 with SMTP id k6mr488866laf.76.1428656363830; Fri, 10 Apr 2015 01:59:23 -0700 (PDT) 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.67.65 with SMTP id l1csp958945lbt; Fri, 10 Apr 2015 01:59:22 -0700 (PDT) X-Received: by 10.66.139.109 with SMTP id qx13mr937725pab.110.1428656361212; Fri, 10 Apr 2015 01:59:21 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zj2si2053786pbb.29.2015.04.10.01.59.19; Fri, 10 Apr 2015 01:59:21 -0700 (PDT) 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 S1755266AbbDJI7O (ORCPT + 27 others); Fri, 10 Apr 2015 04:59:14 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:35460 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755051AbbDJI7F (ORCPT ); Fri, 10 Apr 2015 04:59:05 -0400 Received: by wgyo15 with SMTP id o15so11127916wgy.2 for ; Fri, 10 Apr 2015 01:59:03 -0700 (PDT) X-Received: by 10.194.223.5 with SMTP id qq5mr1112577wjc.152.1428656343703; Fri, 10 Apr 2015 01:59:03 -0700 (PDT) Received: from localhost.localdomain ([31.105.225.148]) by mx.google.com with ESMTPSA id ew5sm23844403wic.14.2015.04.10.01.59.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Apr 2015 01:59:02 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, ulf.hansson@linaro.org, maxime.coquelin@st.com, patrice.chotard@st.com, srinivas.kandagatla@gmail.com Cc: peter.griffin@linaro.org, lee.jones@linaro.org, devicetree@vger.kernel.org, linux-mmc@vger.kernel.org, peppe.cavallaro@st.com Subject: [PATCH v4 8/9] ARM: STi: DT: STiH407: Add dt nodes for sdhci and emmc. Date: Fri, 10 Apr 2015 09:58:30 +0100 Message-Id: <1428656311-2605-9-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1428656311-2605-1-git-send-email-peter.griffin@linaro.org> References: <1428656311-2605-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.174 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 c06a546..77614a5 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -336,5 +336,35 @@ resets = <&softreset STIH407_MIPHY2_SOFTRESET>; }; }; + + 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 c1d8590..64fa0b5 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 */ hdmiddc: i2c@9541000 { status = "okay";