From patchwork Fri Apr 12 23:34:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 2439321 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 3B5143FD40 for ; Fri, 12 Apr 2013 23:35:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753838Ab3DLXfB (ORCPT ); Fri, 12 Apr 2013 19:35:01 -0400 Received: from mail-la0-f44.google.com ([209.85.215.44]:54041 "EHLO mail-la0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751504Ab3DLXfA (ORCPT ); Fri, 12 Apr 2013 19:35:00 -0400 Received: by mail-la0-f44.google.com with SMTP id fr10so2968247lab.3 for ; Fri, 12 Apr 2013 16:34:59 -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=q6EnlDqlOQZ6EirYE1+gtoL4c+HqWll6KiP9riXV+oc=; b=nl5OMPgiD52aXDt5vdfjq3a/tWhMjf6FFqWpXU+EyVGa9qrPiEyIi+cVIMPy2xhP+S eInn+i/AhVe36r5EcU4MFvvfNEkNUTX7iqF9fCXBB7KNgR+PFgiynJgQiO6r7e/Q0xqk 0OvJBTr7vv5YYwxWsL89a8xmCD+b/1AqoQwoLKO+Hf5OvBlVYayk/WrZWLBbaI9Np1IL MZXuFAWSuVdngL89o1aUH4paIxi5Jes27G44+L2ZpJ2b9TVEq6qM3DI3v69mzI8PiFj6 SE8IdM0V50BHkB4Asg0lyQt5G7b38pFxIlfOXCyu1CRnV4S+xKHLSAPRFaQ0cWiSkH6q GKgQ== X-Received: by 10.112.180.65 with SMTP id dm1mr6043030lbc.83.1365809698910; Fri, 12 Apr 2013 16:34:58 -0700 (PDT) Received: from wasted.dev.rtsoft.ru (ppp91-79-80-224.pppoe.mtu-net.ru. [91.79.80.224]) by mx.google.com with ESMTPS id fz10sm4025068lbb.12.2013.04.12.16.34.56 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 12 Apr 2013 16:34:57 -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 v4 6/9] rcar-phy: correct base address From: Sergei Shtylyov Organization: Cogent Embedded Date: Sat, 13 Apr 2013 03:34:02 +0400 MIME-Version: 1.0 Message-Id: <201304130334.02826.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQmBNFjOpGVB94BMCowKjh/YaVOK0KaGs9oFvG+ASXFqFF6A2fT0SIpP9gkDILMdnxBM07eu 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... The patch has been tested on the Marzen board. Signed-off-by: Sergei Shtylyov Acked-by: Kuninori Morimoto Acked-by: Simon Horman --- Changes since version 2: - refreshed atop of the prior patches; - added a note about testing to the changelog; - added ACKs from Simon Horman and Kuninori Morimoto. 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 @@ -402,7 +402,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) {