From patchwork Tue Apr 23 15:03:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 16356 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EBEA92391B for ; Tue, 23 Apr 2013 15:04:32 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id 15sf523519vea.4 for ; Tue, 23 Apr 2013 08:03:43 -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=MFmYeLr5V4SLYokw1vLYGxHXgn2XXLEldnP2/iZqm0A=; b=Z0bmRI6Z6qvCfGvlhQR6yjD/hQncwkxB0BKRAN3kCecSe8TZwDLklvNtuKpcNKBzId /5gg/UqiHZ/OUMA/8iPYhnymU7Kdc9lpqIkepkBmJ3UvVszNa7rfrmviN6HwNeWVHFEx Nk+aesazn6Zan1yPPCQO+wMxvXYzETp4vmytv8JvTm5xUZsq85PMO8PUBdvfzDuGbGOQ 4gvIgZcGyMMSLrCzx70Qi7BIX9AIJrlTFagJLXAV+bnq5a9uiY4PXn2Llnl8GNk1Bf8W A9wW042JvrSgaPcTwT2k3IZsVF5/icnDjKS02SR6nIALjT1o+FXXsJ4o8sphUZntxhHO OiDA== X-Received: by 10.236.139.230 with SMTP id c66mr15507799yhj.55.1366729422901; Tue, 23 Apr 2013 08:03:42 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.94.78 with SMTP id da14ls383035qeb.74.gmail; Tue, 23 Apr 2013 08:03:42 -0700 (PDT) X-Received: by 10.52.230.197 with SMTP id ta5mr14712861vdc.103.1366729422724; Tue, 23 Apr 2013 08:03:42 -0700 (PDT) Received: from mail-vb0-x22b.google.com (mail-vb0-x22b.google.com [2607:f8b0:400c:c02::22b]) by mx.google.com with ESMTPS id lb19si18701018vcb.25.2013.04.23.08.03.42 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Apr 2013 08:03:42 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::22b 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:c02::22b; Received: by mail-vb0-f43.google.com with SMTP id q12so686530vbe.30 for ; Tue, 23 Apr 2013 08:03:42 -0700 (PDT) X-Received: by 10.58.173.36 with SMTP id bh4mr8744715vec.9.1366729422561; Tue, 23 Apr 2013 08:03:42 -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 nf2csp129517veb; Tue, 23 Apr 2013 08:03:41 -0700 (PDT) X-Received: by 10.194.89.169 with SMTP id bp9mr62197228wjb.57.1366729419864; Tue, 23 Apr 2013 08:03:39 -0700 (PDT) Received: from mail-we0-x236.google.com (mail-we0-x236.google.com [2a00:1450:400c:c03::236]) by mx.google.com with ESMTPS id u10si6348662wiw.126.2013.04.23.08.03.39 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Apr 2013 08:03:39 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::236 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::236; Received: by mail-we0-f182.google.com with SMTP id s43so707444wey.13 for ; Tue, 23 Apr 2013 08:03:39 -0700 (PDT) X-Received: by 10.180.77.10 with SMTP id o10mr29660360wiw.10.1366729419223; Tue, 23 Apr 2013 08:03:39 -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 ESMTPS id q20sm16491081wiv.7.2013.04.23.08.03.36 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Apr 2013 08:03:37 -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, mian.yousaf.kaukab@stericsson.com, Lee Jones , Felipe Balbi , linux-usb@vger.kernel.org Subject: [PATCH 02/10] usb: musb: ux500: move the MUSB HDRC configuration into the driver Date: Tue, 23 Apr 2013 16:03:06 +0100 Message-Id: <1366729394-11406-3-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366729394-11406-1-git-send-email-lee.jones@linaro.org> References: <1366729394-11406-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQngw8tKyVMRboY42Z0dAkZ6+XS4XOYcwDYAoCrPWwfzwowQSbmdQKrW/IhBsAztYgAqbier X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::22b 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 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);