From patchwork Mon Jun 17 19:39:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 2737391 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 AA4DD9F3A0 for ; Mon, 17 Jun 2013 19:39:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AAF6B2050D for ; Mon, 17 Jun 2013 19:39:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 826352050C for ; Mon, 17 Jun 2013 19:39:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751697Ab3FQTju (ORCPT ); Mon, 17 Jun 2013 15:39:50 -0400 Received: from mail-la0-f41.google.com ([209.85.215.41]:57162 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751494Ab3FQTjt (ORCPT ); Mon, 17 Jun 2013 15:39:49 -0400 Received: by mail-la0-f41.google.com with SMTP id fn20so2825415lab.0 for ; Mon, 17 Jun 2013 12:39:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=to:subject:cc:from:organization:date:mime-version:content-type :content-transfer-encoding:message-id:x-gm-message-state; bh=2mVUqo4p0BpLf+Z0J2GLOJ8QNtryEQFTh0vYsZuKd8U=; b=Pqda8xx3V/imqzGdWJLuKtvNWC6Hk8I4MoSbq2lkkrRRv9I3FJykq3CpjRQrSoa78v VE8Ts0Dx5silthCPZm73yuteRxhmdCt+8lTzacVGfzo0tGl0eSFT53K2eoZpbBpH/Mee HRExB6Hd0yWebkfM4q7Dgr/p/bXOq7HKT3uSYFaXc/Jdlo0ACJLqjZDsW29ez5H3Bjkl Ixg5i4BbGrSGSBZDX/gzvaaB1c+kwKB8ryx9qJLNptCevKrd82w3Qt46Gdrryd8XLSNF 8KXFZn3N9lHNhAfk8ROIr8pG7dBnHrJsEnE/xqtqE7FpUayrWoSmLFxXPIIbK5yJFO9l CUYw== X-Received: by 10.152.28.199 with SMTP id d7mr7420659lah.67.1371497986691; Mon, 17 Jun 2013 12:39:46 -0700 (PDT) Received: from wasted.dev.rtsoft.ru (ppp91-76-82-42.pppoe.mtu-net.ru. [91.76.82.42]) by mx.google.com with ESMTPSA id p20sm5945103lbb.17.2013.06.17.12.39.45 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 17 Jun 2013 12:39:45 -0700 (PDT) To: horms@verge.net.au, linux-sh@vger.kernel.org Subject: [PATCH] ARM: shmobile: BOCK-W: change Ether device name Cc: magnus.damm@gmail.com, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org From: Sergei Shtylyov Organization: Cogent Embedded Date: Mon, 17 Jun 2013 23:39:44 +0400 MIME-Version: 1.0 Message-Id: <201306172339.45357.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQkeY2JOR++kC53xADGcr7aSPgQGNQSyDg7p2KL6Pk6KsVnx0yRfrLBUoH/xLt0wO+3o6sOL Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 When changing the name of Ether platform device in the commit c02f846938fe (ARM: shmobile: r8a7778: fix Ether device name), I completely forgot that there's also platform device name used in bockw_pinctrl_map[], so the commit "ARM: shmobile: BOCK-W: add Ether support" went in with the old "sh-eth" device name. Now change it to "r8a777x-ether" in accordance with the commits that are now in the 'net- next.git' repository, otherwise BOCK-W Ether support won't work in 3.11. Signed-off-by: Sergei Shtylyov --- This patch is atop of Simon's 'renesas.git' repo, 'renesas-next-20130617v3' tag. arch/arm/mach-shmobile/board-bockw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: renesas/arch/arm/mach-shmobile/board-bockw.c =================================================================== --- renesas.orig/arch/arm/mach-shmobile/board-bockw.c +++ renesas/arch/arm/mach-shmobile/board-bockw.c @@ -144,7 +144,7 @@ static struct rcar_phy_platform_data usb static const struct pinctrl_map bockw_pinctrl_map[] = { /* Ether */ - PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7778", + PIN_MAP_MUX_GROUP_DEFAULT("r8a777x-ether", "pfc-r8a7778", "ether_rmii", "ether"), /* HSPI0 */ PIN_MAP_MUX_GROUP_DEFAULT("sh-hspi.0", "pfc-r8a7778",