From patchwork Fri May 3 14:32:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 16676 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f198.google.com (mail-ve0-f198.google.com [209.85.128.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2DD4F23905 for ; Fri, 3 May 2013 14:35:16 +0000 (UTC) Received: by mail-ve0-f198.google.com with SMTP id 15sf3031860vea.9 for ; Fri, 03 May 2013 07:35:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=kdztoR4prl2L3btUKgN+17cQ+66zM82mwrs6Bg2y7ac=; b=iYGh5ttjd0erN7Lk2XsOwcqFOU4pwmDF5D1/r+nwek1iP4nK6cgeU4Rontyrba9onl XEv1thYduS8vlm/WtCF22jCYxs4+82mQ+Dbj0JQRHFSDqjenBp6bHM9FLHvl4UtpMvU7 UTwRXzYA3BxucfGzvpyAZdzfJ+sNwoO7VjxANK3OJ5XQrfmh9nHTAk19HuXxgfkNyWaw ZwPiMeUwyOPEy+5SnZwhKaUWxeRGNmY5DOOBjB9PVAmdX4TGF0kHsPLW/1LcvEOR83mJ RLFtGh5OfqOQ4l2owFKlyMOrLQSxGh83VJw22YDtITU+GHEEKDATQNCe7XI9YTT9iExh YFqg== X-Received: by 10.236.189.241 with SMTP id c77mr8672395yhn.17.1367591706366; Fri, 03 May 2013 07:35:06 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.41.33 with SMTP id c1ls1888654qel.0.gmail; Fri, 03 May 2013 07:35:06 -0700 (PDT) X-Received: by 10.58.144.231 with SMTP id sp7mr3745386veb.34.1367591706099; Fri, 03 May 2013 07:35:06 -0700 (PDT) Received: from mail-ve0-x232.google.com (mail-ve0-x232.google.com [2607:f8b0:400c:c01::232]) by mx.google.com with ESMTPS id iz8si5157459vdb.110.2013.05.03.07.35.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 07:35:06 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::232 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::232; Received: by mail-ve0-f178.google.com with SMTP id jy13so1563218veb.9 for ; Fri, 03 May 2013 07:35:06 -0700 (PDT) X-Received: by 10.58.48.166 with SMTP id m6mr3650073ven.59.1367591706017; Fri, 03 May 2013 07:35:06 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp25255veb; Fri, 3 May 2013 07:35:05 -0700 (PDT) X-Received: by 10.194.133.198 with SMTP id pe6mr14357519wjb.9.1367591705002; Fri, 03 May 2013 07:35:05 -0700 (PDT) Received: from mail-wi0-x22a.google.com (mail-wi0-x22a.google.com [2a00:1450:400c:c05::22a]) by mx.google.com with ESMTPS id j10si9815858wiv.83.2013.05.03.07.35.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 07:35:04 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::22a is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c05::22a; Received: by mail-wi0-f170.google.com with SMTP id hq12so793466wib.5 for ; Fri, 03 May 2013 07:35:04 -0700 (PDT) X-Received: by 10.194.59.132 with SMTP id z4mr14275166wjq.57.1367591704568; Fri, 03 May 2013 07:35:04 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPSA id o3sm17516019wia.2.2013.05.03.07.35.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 07:35:03 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, srinidhi.kasagar@stericsson.com, Lee Jones , Felipe Balbi , linux-usb@vger.kernel.org Subject: [PATCH 45/63] usb: musb: ux500: move the MUSB HDRC configuration into the driver Date: Fri, 3 May 2013 15:32:31 +0100 Message-Id: <1367591569-32197-46-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1367591569-32197-1-git-send-email-lee.jones@linaro.org> References: <1367591569-32197-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkjf/hkJvbdNxu6psZiWdrS9EHgjX/hyKOOYDJFkLyjU4cFglTezmlwf+1RIo2xvh0oYpU0 X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::232 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The MUSB HDRC configuration never changes between each of the ux500 supported platforms, so there's little point passing it though platform data. If we set it in the driver instead, we can make good use of it when booting with either ATAGs or Device Tree. Cc: Felipe Balbi Cc: linux-usb@vger.kernel.org Acked-by: Linus Walleij Acked-by: Fabio Baltieri Signed-off-by: Lee Jones --- arch/arm/mach-ux500/usb.c | 8 -------- drivers/usb/musb/ux500.c | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c index 8aff9a4..4f68a9c 100644 --- a/arch/arm/mach-ux500/usb.c +++ b/arch/arm/mach-ux500/usb.c @@ -76,16 +76,8 @@ static struct ux500_musb_board_data musb_board_data = { static u64 ux500_musb_dmamask = DMA_BIT_MASK(32); -static struct musb_hdrc_config musb_hdrc_config = { - .multipoint = true, - .dyn_fifo = true, - .num_eps = 16, - .ram_bits = 16, -}; - static struct musb_hdrc_platform_data musb_platform_data = { .mode = MUSB_OTG, - .config = &musb_hdrc_config, .board_data = &musb_board_data, }; diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c index 13a3929..4a8f5c9 100644 --- a/drivers/usb/musb/ux500.c +++ b/drivers/usb/musb/ux500.c @@ -29,6 +29,13 @@ #include "musb_core.h" +static struct musb_hdrc_config ux500_musb_hdrc_config = { + .multipoint = true, + .dyn_fifo = true, + .num_eps = 16, + .ram_bits = 16, +}; + struct ux500_glue { struct device *dev; struct platform_device *musb; @@ -123,6 +130,7 @@ static int ux500_probe(struct platform_device *pdev) glue->clk = clk; pdata->platform_ops = &ux500_ops; + pdata->config = &ux500_musb_hdrc_config; platform_set_drvdata(pdev, glue);