From patchwork Fri May 17 14:55:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2583171 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 56F95DF215 for ; Fri, 17 May 2013 14:55:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754856Ab3EQOz0 (ORCPT ); Fri, 17 May 2013 10:55:26 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:54433 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754985Ab3EQOzZ (ORCPT ); Fri, 17 May 2013 10:55:25 -0400 Received: from axis700.grange (dslb-088-076-018-110.pools.arcor-ip.net [88.76.18.110]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0MOU8z-1UY8zv1Qub-005a2t; Fri, 17 May 2013 16:55:22 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 23F2240BB8; Fri, 17 May 2013 16:55:21 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1UdM40-0004H6-MA; Fri, 17 May 2013 16:55:20 +0200 From: Guennadi Liakhovetski To: linux-sh@vger.kernel.org Cc: Magnus Damm , Simon Horman , Laurent Pinchart , Linus Walleij , Guennadi Liakhovetski Subject: [PATCH 7/9] ARM: shmobile: APE6EVM: add MMCIF and SDHI DT nodes Date: Fri, 17 May 2013 16:55:18 +0200 Message-Id: <1368802520-16378-8-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1368802520-16378-1-git-send-email-g.liakhovetski@gmx.de> References: <1368802520-16378-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:/RpWpp7adriXN8VGn7t7JiTFdnQjIgzchmu3RRdtvmA oAO2l1mYXDzDyVakd/0c/qBer5FMVpHA5WkEuq0AH3+ZdMlIRJ h+fuZ2NceqX7dHfSxTfSERfCvaexRwa1RUUEh/x3H2cAT9nCi7 7924NLlU9U+b4Y578hKFs69aGsakscxYfllMZUFh55icTaI/+W Y14O5/nQGOFol5eL7GZAMGU/sdprET8nIbBnGOZlE7rQf52JLU 52MH+0kQfhOKvSuY0eW1LGXPzGlpDxWeiHUut4PU114yecME8p /vFrY75npaXSbCgCS5DQ2XzQDRZ9l2xpHM/TddgLJ3xjwmdMK1 lLnjUKDOI/S/5arABbFnsWWIyzykOfSXNPpT4m/QApqajiMOq4 V4wNMGJbs9mAQ== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org This patch adds all MMCIF and SDHI devices to r8a73a4.dtsi in the "disabled" state, those of them, available on APE6EVM, are then added to the board DT. This version assignes fixed regulators to all the interfaces, in future versions support for regulators should be added. Signed-off-by: Guennadi Liakhovetski --- arch/arm/boot/dts/r8a73a4-ape6evm.dts | 46 +++++++++++++++++++++++++++++++++ arch/arm/boot/dts/r8a73a4.dtsi | 45 ++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm.dts b/arch/arm/boot/dts/r8a73a4-ape6evm.dts index b5b24eb..63eaf5a 100644 --- a/arch/arm/boot/dts/r8a73a4-ape6evm.dts +++ b/arch/arm/boot/dts/r8a73a4-ape6evm.dts @@ -53,6 +53,37 @@ }; }; +&mmcif0 { + pinctrl-0 = <&mmcif0_pins>; + pinctrl-names = "default"; + + vmmc-supply = <&ape6evm_fixed_3v3>; + bus-width = <8>; + non-removable; + status = "okay"; +}; + +&sdhi0 { + pinctrl-0 = <&sdhi0_pins>; + pinctrl-names = "default"; + + vmmc-supply = <&ape6evm_fixed_3v3>; + bus-width = <4>; + toshiba,mmc-wrprotect-disable; + status = "okay"; +}; + +&sdhi1 { + pinctrl-0 = <&sdhi1_pins>; + pinctrl-names = "default"; + + vmmc-supply = <&ape6evm_fixed_3v3>; + bus-width = <4>; + broken-cd; + toshiba,mmc-wrprotect-disable; + status = "okay"; +}; + &pfc { pinctrl-0 = <&scifa0_pins>; pinctrl-names = "default"; @@ -61,4 +92,19 @@ renesas,groups = "scifa0_data"; renesas,function = "scifa0"; }; + + mmcif0_pins: mmcif0 { + renesas,groups = "mmc0_data8", "mmc0_ctrl"; + renesas,function = "mmc0"; + }; + + sdhi0_pins: sdhi0 { + renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd", "sdhi0_wp"; + renesas,function = "sdhi0"; + }; + + sdhi1_pins: sdhi1 { + renesas,groups = "sdhi1_data4", "sdhi1_ctrl"; + renesas,function = "sdhi1"; + }; }; diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi index 6e73367..33c9bac 100644 --- a/arch/arm/boot/dts/r8a73a4.dtsi +++ b/arch/arm/boot/dts/r8a73a4.dtsi @@ -98,4 +98,49 @@ gpio-controller; #gpio-cells = <2>; }; + + mmcif0: mmcif@ee200000 { + compatible = "renesas,sh-mmcif"; + reg = <0 0xee200000 0 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 169 0x4>; + reg-io-width = <4>; + status = "disabled"; + }; + + mmcif1: mmcif@ee220000 { + compatible = "renesas,sh-mmcif"; + reg = <0 0xee220000 0 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 170 0x4>; + reg-io-width = <4>; + status = "disabled"; + }; + + sdhi0: sdhi@ee100000 { + compatible = "renesas,r8a7740-sdhi"; + reg = <0 0xee100000 0 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 165 4>; + cap-sd-highspeed; + status = "disabled"; + }; + + sdhi1: sdhi@ee120000 { + compatible = "renesas,r8a7740-sdhi"; + reg = <0 0xee120000 0 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 166 4>; + cap-sd-highspeed; + status = "disabled"; + }; + + sdhi2: sdhi@ee140000 { + compatible = "renesas,r8a7740-sdhi"; + reg = <0 0xee140000 0 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 167 4>; + cap-sd-highspeed; + status = "disabled"; + }; };