From patchwork Mon Apr 8 21:31:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 2411931 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id C82463FD1A for ; Mon, 8 Apr 2013 21:32:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936188Ab3DHVcS (ORCPT ); Mon, 8 Apr 2013 17:32:18 -0400 Received: from mail-lb0-f176.google.com ([209.85.217.176]:41134 "EHLO mail-lb0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760644Ab3DHVcR (ORCPT ); Mon, 8 Apr 2013 17:32:17 -0400 Received: by mail-lb0-f176.google.com with SMTP id y8so6109778lbh.7 for ; Mon, 08 Apr 2013 14:32:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:to:subject:from:organization:date:mime-version :content-type:content-transfer-encoding:message-id :x-gm-message-state; bh=Sfy9gHPTOAmltt1JIUnlduIdFoM7s7yHdnOvX9GVthM=; b=GIk6d55CjcEoRdxFbSAwHtAzW39TE7lYQ+sLdpcjPZOJGje2qYBfMA/aPxStTvWE0q 6Nb+5GI8GdlQLnwZQWeUIsvgUSieOUpTeG7Pe/2TIxC1bnV3mISC9qJIlQ8HcErCoOJH +vjy/1qP8dDbIdWMo63pv5bxq+TV8fMEXHK2J/ApXvVaFkZU9E6AHImQI4bowiIcnCYg qWu4OqQCkUPbmINaxHc9ebiU74MZnF+k+8+6TtLossZNPoeX+MBuHEyEou8BgiZqCgxi pPRvFfy6v1JgmWaY+TK7qIoJ+WLKuGHDl9pgJK4X6fp38wkL/lllZ+lp73zJ6Lje3stP 7oqw== X-Received: by 10.152.122.100 with SMTP id lr4mr12692169lab.28.1365456734692; Mon, 08 Apr 2013 14:32:14 -0700 (PDT) Received: from wasted.dev.rtsoft.ru (ppp91-79-99-249.pppoe.mtu-net.ru. [91.79.99.249]) by mx.google.com with ESMTPS id fm8sm11365334lbb.17.2013.04.08.14.32.12 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 08 Apr 2013 14:32:13 -0700 (PDT) To: horms@verge.net.au, magnus.damm@gmail.com, linux@arm.linux.org.uk, linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org, gregkh@linuxfoundation.org, balbi@ti.com Subject: [PATCH v2 6/9] rcar-phy: correct base address From: Sergei Shtylyov Organization: Cogent Embedded Date: Tue, 9 Apr 2013 01:31:10 +0400 MIME-Version: 1.0 Message-Id: <201304090131.11208.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQmh7awmeiQ6uR1AC0YA0rN37C1f3uck+5IsQpqOQUIijlIqO9ApIts8nSrNLSksbH7BQrm5 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org The memory region that is used by the driver overlaps EHCI and OHCI register regions for absolutely no reason now -- fix it by adding offset of 0x800 to the base address, changing the register #define's accordingly. This has extra positive effect that we now can use devm_ioremap_resource()... Note that the driver and the SoC code have to be in one patch to keep the code bisectable... Signed-off-by: Sergei Shtylyov --- Changes since the original posting: - added a note about bisectability to the changelog. arch/arm/mach-shmobile/setup-r8a7779.c | 2 +- drivers/usb/phy/rcar-phy.c | 28 ++++++++++------------------ 2 files changed, 11 insertions(+), 19 deletions(-) -- 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/setup-r8a7779.c =================================================================== --- renesas.orig/arch/arm/mach-shmobile/setup-r8a7779.c +++ renesas/arch/arm/mach-shmobile/setup-r8a7779.c @@ -401,7 +401,7 @@ static struct platform_device sata_devic /* USB PHY */ static struct resource usb_phy_resources[] = { [0] = { - .start = 0xffe70000, + .start = 0xffe70800, .end = 0xffe70900 - 1, .flags = IORESOURCE_MEM, }, Index: renesas/drivers/usb/phy/rcar-phy.c =================================================================== --- renesas.orig/drivers/usb/phy/rcar-phy.c +++ renesas/drivers/usb/phy/rcar-phy.c @@ -16,13 +16,13 @@ #include #include -/* USBH common register */ -#define USBPCTRL0 0x0800 -#define USBPCTRL1 0x0804 -#define USBST 0x0808 -#define USBEH0 0x080C -#define USBOH0 0x081C -#define USBCTL0 0x0858 +/* REGS block */ +#define USBPCTRL0 0x00 +#define USBPCTRL1 0x04 +#define USBST 0x08 +#define USBEH0 0x0C +#define USBOH0 0x1C +#define USBCTL0 0x58 /* USBPCTRL1 */ #define PHY_RST (1 << 2) @@ -139,17 +139,9 @@ static int rcar_usb_phy_probe(struct pla return -EINVAL; } - /* - * CAUTION - * - * Because this phy address is also mapped under OHCI/EHCI address area, - * this driver can't use devm_request_and_ioremap(dev, res) here - */ - reg0 = devm_ioremap_nocache(dev, res0->start, resource_size(res0)); - if (!reg0) { - dev_err(dev, "ioremap error\n"); - return -ENOMEM; - } + reg0 = devm_ioremap_resource(dev, res0); + if (IS_ERR(reg0)) + return PTR_ERR(reg0); priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) {