From patchwork Tue Oct 15 07:44:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3043751 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A2DA99F2B6 for ; Tue, 15 Oct 2013 07:44:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8DCCE20265 for ; Tue, 15 Oct 2013 07:44:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 754BA20213 for ; Tue, 15 Oct 2013 07:44:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751219Ab3JOHoy (ORCPT ); Tue, 15 Oct 2013 03:44:54 -0400 Received: from mail-pb0-f44.google.com ([209.85.160.44]:37407 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751151Ab3JOHox (ORCPT ); Tue, 15 Oct 2013 03:44:53 -0400 Received: by mail-pb0-f44.google.com with SMTP id xa7so8405253pbc.3 for ; Tue, 15 Oct 2013 00:44:52 -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=Sui9Zlnb2iDU0CJ0ohJYz1hxp3ibNRbji+LEBe9AHFY=; b=bTcQ6wHTHx45VSQ1bBOV43NTerAT1F3/q16LCrwoT6eofrxaYhaIjWp+cVIptuEk+B d60rrKo6QzrkZDMvsWoEaTgSB+5WD/Rc8IQmylsNUtRuwg9yabjm380bYoBTu07XlBMp VGj3IOh1DQ8vaT3mxsWl7jkPVadqISUfBwvPx3D8iVlX0HjQl6cALBlXSGPVGn4LpD2l OL78NkObIvjtyvP32+iZrekmpLz7H5+FqryH5tf2ETLmUNOnlUJMbMLS9h8Ia7548AgW 2b/5zB7SWfSZndXgDDJvl4XAy2BXhlE80rYbGUzMy8+JXmloNe1EXjajXBkT/g4ZHJ8A /fyg== X-Received: by 10.68.189.193 with SMTP id gk1mr7079671pbc.134.1381823092588; Tue, 15 Oct 2013 00:44:52 -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 qz9sm82715438pbc.3.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 15 Oct 2013 00:44:51 -0700 (PDT) Date: Tue, 15 Oct 2013 00:44:51 -0700 (PDT) Message-ID: <87bo2rdllb.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 05/17] ARM: shmobile: r8a7740: fixup DT node naming for MMCIF 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 MMCIF DT node from "mmcif" to "mmc". Signed-off-by: Kuninori Morimoto --- .../boot/dts/r8a7740-armadillo800eva-reference.dts | 2 +- arch/arm/boot/dts/r8a7740.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts index 5b6578d..c10cf85 100644 --- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts @@ -135,7 +135,7 @@ status = "okay"; }; -&mmcif0 { +&mmc0 { pinctrl-0 = <&mmc0_pins>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi index d384fd8..44508df 100644 --- a/arch/arm/boot/dts/r8a7740.dtsi +++ b/arch/arm/boot/dts/r8a7740.dtsi @@ -162,7 +162,7 @@ #pwm-cells = <3>; }; - mmcif0: mmcif@e6bd0000 { + mmc0: mmc@e6bd0000 { compatible = "renesas,sh-mmcif"; reg = <0xe6bd0000 0x100>; interrupt-parent = <&gic>;