From patchwork Thu Feb 26 13:10:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 45169 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C82BE2043C for ; Thu, 26 Feb 2015 13:11:27 +0000 (UTC) Received: by wghk14 with SMTP id k14sf7975177wgh.0 for ; Thu, 26 Feb 2015 05:11:27 -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=66+0u2N8slrT6Eo0I4aBAUv92VZ7W9EXaVtdjF+iOOw=; b=CALXwbJfoZOOZLG/7vDsuIR6OwazJ8/Eq7myylzPkWtSynuch79wL37iYu+KZw47o9 hgPibFEXvUwP8sasfcBEi4CLnfaDHdk8upkjrmQYK2T9w8+rfCVdP9hiyah3Pfw5a8yx qjDvueCM1R+hYCufx834xCcN6nyQqC2b/XtfjUuVLoLY3Ox9T0N0R2SDHx89PnNT0ZJ9 tx/2jjhBbeXxihR0mqSqnlWSgrAAE9Qq+aMJC5Lwph/Teg4c2hl5wbf5q4vNDacQumY7 5V6nyMkjwBHqIb1h7MwQ3DwmPiLENBERlJ7g1INXtBW8XmPuy3wgJzssrdjWKDDJle35 H/zg== X-Gm-Message-State: ALoCoQkp4Rs8ux2eAzueXOPp/uTtQ383KFVmMMP0Dz0uMVF8xg/KVNG9RAHEVZlLitI6F1YB9ayt X-Received: by 10.194.86.1 with SMTP id l1mr1287799wjz.0.1424956287111; Thu, 26 Feb 2015 05:11:27 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.65 with SMTP id o1ls28074laj.67.gmail; Thu, 26 Feb 2015 05:11:26 -0800 (PST) X-Received: by 10.112.8.68 with SMTP id p4mr7262743lba.37.1424956286914; Thu, 26 Feb 2015 05:11:26 -0800 (PST) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id jr10si510201lab.155.2015.02.26.05.11.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Feb 2015 05:11:26 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by lbjb6 with SMTP id b6so10705527lbj.2 for ; Thu, 26 Feb 2015 05:11:26 -0800 (PST) X-Received: by 10.152.116.18 with SMTP id js18mr7473257lab.106.1424956286825; Thu, 26 Feb 2015 05:11: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.35.133 with SMTP id h5csp3289222lbj; Thu, 26 Feb 2015 05:11:25 -0800 (PST) X-Received: by 10.68.240.5 with SMTP id vw5mr14376809pbc.165.1424956278129; Thu, 26 Feb 2015 05:11:18 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n3si1070240pap.109.2015.02.26.05.11.16; Thu, 26 Feb 2015 05:11:18 -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 S1753908AbbBZNKy (ORCPT + 28 others); Thu, 26 Feb 2015 08:10:54 -0500 Received: from mail-we0-f177.google.com ([74.125.82.177]:46808 "EHLO mail-we0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932318AbbBZNKv (ORCPT ); Thu, 26 Feb 2015 08:10:51 -0500 Received: by wevm14 with SMTP id m14so10475241wev.13 for ; Thu, 26 Feb 2015 05:10:50 -0800 (PST) X-Received: by 10.180.207.6 with SMTP id ls6mr50880061wic.13.1424956250003; Thu, 26 Feb 2015 05:10:50 -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 dz6sm23075747wib.0.2015.02.26.05.10.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Feb 2015 05:10:49 -0800 (PST) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, maxime.coquelin@st.com, patrice.chotard@st.com, srinivas.kandagatla@gmail.com, chris@printf.net, ulf.hansson@linaro.org Cc: peter.griffin@linaro.org, lee.jones@linaro.org, devicetree@vger.kernel.org, linux-mmc@vger.kernel.org, peppe.cavallaro@st.com Subject: [PATCH v2 8/8] ARM: STi: DT: STiH407: Add dt nodes for sdhci and emmc. Date: Thu, 26 Feb 2015 13:10:27 +0000 Message-Id: <1424956227-18258-9-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424956227-18258-1-git-send-email-peter.griffin@linaro.org> References: <1424956227-18258-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.180 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";