From patchwork Tue Oct 15 07:45:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3043771 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B15D4BF925 for ; Tue, 15 Oct 2013 07:45:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7A53020266 for ; Tue, 15 Oct 2013 07:45:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 538AA20237 for ; Tue, 15 Oct 2013 07:45:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751753Ab3JOHpN (ORCPT ); Tue, 15 Oct 2013 03:45:13 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:50687 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752841Ab3JOHpK (ORCPT ); Tue, 15 Oct 2013 03:45:10 -0400 Received: by mail-pd0-f170.google.com with SMTP id x10so8529479pdj.15 for ; Tue, 15 Oct 2013 00:45:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:sender:message-id:to:cc:in-reply-to:references:from:subject :mime-version:content-type; bh=IAM6kvUsrF4tqCGdRAccbCCYD7YX/aIPA+NXzhdAXeo=; b=Rhh4/8Oe0EbEgcXvQsfb1adHY9KTJ6UX1tCs44jD8j7AipghkucRwe81JbJ0NRAOFQ +7LQgz/If82cU9mhHgK4GBIrQDq37RK3zA203CxR8/uvw9rSCRA/+cFXLFo7GCWPUdWe NLZAGz+B87RbEqvUxAZBnDje2QLH6SaqgdhLBXBeGNTr2QpWV2FRtpinw6Kz8AayP4vl +4G4fpxxurtsy6X/JvpuJBI9tOHY6cpW4TnteaEa2vSnzRUeIoOpolo3XJibH6ObWa2N 9mliwT/qhYGAkYHCDCRkyOU9c/ZencMZKcorAj+u3PP85zBfGlPTRqTqS7q7rSruD7RK +edw== X-Received: by 10.68.209.197 with SMTP id mo5mr30478pbc.191.1381823110199; Tue, 15 Oct 2013 00:45:10 -0700 (PDT) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id dk3sm82668242pbc.32.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 15 Oct 2013 00:45:09 -0700 (PDT) Date: Tue, 15 Oct 2013 00:45:09 -0700 (PDT) Message-ID: <878uxvdlku.wl%kuninori.morimoto.gx@renesas.com> To: Simon Cc: Magnus , linux-sh@vger.kernel.org, Kuninori Morimoto In-Reply-To: <87iowzdlnh.wl%kuninori.morimoto.gx@renesas.com> References: <87iowzdlnh.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 07/17] ARM: shmobile: sh73a0: fixup DT node naming for SDHI MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP According to ePAPR spec, this patch exchanges SDHI DT node from "sdhi" to "sd". Signed-off-by: Kuninori Morimoto --- arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 20 ++++++++++---------- arch/arm/boot/dts/sh73a0.dtsi | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts index 8ee06dd..eaeebd2 100644 --- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts +++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts @@ -59,7 +59,7 @@ regulator-boot-on; }; - vmmc_sdhi0: regulator@2 { + vmmc_sd0: regulator@2 { compatible = "regulator-fixed"; regulator-name = "SDHI0 Vcc"; regulator-min-microvolt = <3300000>; @@ -68,7 +68,7 @@ enable-active-high; }; - vmmc_sdhi2: regulator@3 { + vmmc_sd2: regulator@3 { compatible = "regulator-fixed"; regulator-name = "SDHI2 Vcc"; regulator-min-microvolt = <3300000>; @@ -222,31 +222,31 @@ renesas,function = "scifa4"; }; - sdhi0_pins: sdhi0 { + sd0_pins: sd0 { renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd", "sdhi0_wp"; renesas,function = "sdhi0"; }; - sdhi2_pins: sdhi2 { + sd2_pins: sd2 { renesas,groups = "sdhi2_data4", "sdhi2_ctrl"; renesas,function = "sdhi2"; }; }; -&sdhi0 { - pinctrl-0 = <&sdhi0_pins>; +&sd0 { + pinctrl-0 = <&sd0_pins>; pinctrl-names = "default"; - vmmc-supply = <&vmmc_sdhi0>; + vmmc-supply = <&vmmc_sd0>; bus-width = <4>; status = "okay"; }; -&sdhi2 { - pinctrl-0 = <&sdhi2_pins>; +&sd2 { + pinctrl-0 = <&sd2_pins>; pinctrl-names = "default"; - vmmc-supply = <&vmmc_sdhi2>; + vmmc-supply = <&vmmc_sd2>; bus-width = <4>; broken-cd; status = "okay"; diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi index fcf2688..ead8e58 100644 --- a/arch/arm/boot/dts/sh73a0.dtsi +++ b/arch/arm/boot/dts/sh73a0.dtsi @@ -200,7 +200,7 @@ status = "disabled"; }; - sdhi0: sdhi@ee100000 { + sd0: sd@ee100000 { compatible = "renesas,sdhi-r8a7740"; reg = <0xee100000 0x100>; interrupt-parent = <&gic>; @@ -212,7 +212,7 @@ }; /* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */ - sdhi1: sdhi@ee120000 { + sd1: sd@ee120000 { compatible = "renesas,sdhi-r8a7740"; reg = <0xee120000 0x100>; interrupt-parent = <&gic>; @@ -223,7 +223,7 @@ status = "disabled"; }; - sdhi2: sdhi@ee140000 { + sd2: sd@ee140000 { compatible = "renesas,sdhi-r8a7740"; reg = <0xee140000 0x100>; interrupt-parent = <&gic>;