From patchwork Wed Nov 2 12:44:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 9409041 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AC3A46022E for ; Wed, 2 Nov 2016 12:50:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 999FE2A137 for ; Wed, 2 Nov 2016 12:50:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E66A2A139; Wed, 2 Nov 2016 12:50:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4C07C2A137 for ; Wed, 2 Nov 2016 12:50:48 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c1uyH-0001pq-2E; Wed, 02 Nov 2016 12:48:49 +0000 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c1uxu-0001kS-GN for linux-arm-kernel@lists.infradead.org; Wed, 02 Nov 2016 12:48:27 +0000 Received: by mail-wm0-x229.google.com with SMTP id u144so23373910wmu.1 for ; Wed, 02 Nov 2016 05:48:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ypSYHSr70sfeX7XoSfAR6yZzEU4GtQfcqrhafhbnT9c=; b=ourQZUM0S4fMw+dTdUXAKQM0hBltKwnYJFG+2/RuqLPUzo2WxyCzNTgUUMZgB+e56g K6faAlLliFGTV6/axDkyFQVrV0tE6DOmHgr8bNZUEImxKuZ3RI3oFv1+vdtuwGRk2tmD ta6JyRKyI5QYyc/xjvCENzvB3j1+TG4UQ5B7V5koYmEJkgljFQ530xx03xgNnS+YRua8 oWuPs4Z+/KpZoAi3YJ5wSXn8t+/pkd/LgWjKIeSLOpnTm1ImGXbfOIeZSgapo7xcT/8B 5m6eWQRxv41/vHxESzCo43V+3jhInL6RvuAbUHdlNVJhXC6rhfxBEPA8A56KgfQkvrqD RRdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ypSYHSr70sfeX7XoSfAR6yZzEU4GtQfcqrhafhbnT9c=; b=mrG3CWJ7vHfNtGB2teeMyiS1Cu/Y+nVCPUayR+IxcT6gOfEn55vtcYsX0HnV4Q7LVK qCH+Jeri4vAm12hf/d31pwbqXQLKoD4CrdyhatXwUtnoB9UB7UkGQraK9kZYljY3fJxZ bpbmqMf2taceSdrDhnixwwmhyoAP9xSLFs0cFxcQWax4lemHyyxK4XD61mgV4Im40k51 rWtuq649BhUVJsvxF6uRZpO/N5RXHDyWw8NsGDrjxAKTegWC6sphutp2mfD2pobDNI1D UOtiE71BrdfhOT3QeHEBCDvJzbwHkY14vmP2B9/ZZOoMouu3bonZP2aXWvVxgGriUdZu lSLw== X-Gm-Message-State: ABUngvd1png5HP8u4JvSbTSH376bB1y6Fm2EqjN3apxJUzJfw0K7AIGCNCdyMBUAFEjIT1te X-Received: by 10.28.175.77 with SMTP id y74mr2965890wme.114.1478090884400; Wed, 02 Nov 2016 05:48:04 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 18sm3033495wmp.24.2016.11.02.05.48.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Nov 2016 05:48:04 -0700 (PDT) From: Axel Haslam To: khilman@kernel.org, nsekhar@ti.com, david@lechnology.com, gregkh@linuxfoundation.org, kishon@ti.com Subject: [PATCH 1/3] ARM: davinci: da8xx: Fix ohci driver name Date: Wed, 2 Nov 2016 13:44:33 +0100 Message-Id: <20161102124435.31777-2-ahaslam@baylibre.com> X-Mailer: git-send-email 2.10.1.502.g6598894 In-Reply-To: <20161102124435.31777-1-ahaslam@baylibre.com> References: <20161102124435.31777-1-ahaslam@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161102_054826_772983_9278C8E1 X-CRM114-Status: GOOD ( 13.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Axel Haslam , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP There is a single instance of the ohci driver, while the clk lookup table is making reference to "ohci" other subsystems (such as phy) are looking for "ohci.0" Since there is a single ohci instance, change the dev id to -1, and add the "-da8xx" for consitancy with the musb driver name. Signed-off-by: Axel Haslam --- arch/arm/mach-davinci/da830.c | 2 +- arch/arm/mach-davinci/da850.c | 2 +- arch/arm/mach-davinci/da8xx-dt.c | 2 +- arch/arm/mach-davinci/usb-da8xx.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 41459bd..073c458 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -420,7 +420,7 @@ static struct clk_lookup da830_clks[] = { CLK("davinci_mdio.0", "fck", &emac_clk), CLK(NULL, "gpio", &gpio_clk), CLK("i2c_davinci.2", NULL, &i2c1_clk), - CLK("ohci", "usb11", &usb11_clk), + CLK("ohci-da8xx", "usb11", &usb11_clk), CLK(NULL, "emif3", &emif3_clk), CLK(NULL, "arm", &arm_clk), CLK(NULL, "rmii", &rmii_clk), diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 196e262..3961556 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -503,7 +503,7 @@ static struct clk_lookup da850_clks[] = { CLK("da830-mmc.1", NULL, &mmcsd1_clk), CLK("ti-aemif", NULL, &aemif_clk), CLK(NULL, "aemif", &aemif_clk), - CLK("ohci", "usb11", &usb11_clk), + CLK("ohci-da8xx", "usb11", &usb11_clk), CLK("musb-da8xx", "usb20", &usb20_clk), CLK("spi_davinci.0", NULL, &spi0_clk), CLK("spi_davinci.1", NULL, &spi1_clk), diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index 92ae093..2afb067 100644 --- a/arch/arm/mach-davinci/da8xx-dt.c +++ b/arch/arm/mach-davinci/da8xx-dt.c @@ -39,7 +39,7 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("ti,da830-mcasp-audio", 0x01d00000, "davinci-mcasp.0", NULL), OF_DEV_AUXDATA("ti,da850-aemif", 0x68000000, "ti-aemif", NULL), OF_DEV_AUXDATA("ti,da850-tilcdc", 0x01e13000, "da8xx_lcdc.0", NULL), - OF_DEV_AUXDATA("ti,da830-ohci", 0x01e25000, "ohci", NULL), + OF_DEV_AUXDATA("ti,da830-ohci", 0x01e25000, "ohci-da8xx", NULL), OF_DEV_AUXDATA("ti,da830-musb", 0x01e00000, "musb-da8xx", NULL), OF_DEV_AUXDATA("ti,da830-usb-phy", 0x01c1417c, "da8xx-usb-phy", NULL), {} diff --git a/arch/arm/mach-davinci/usb-da8xx.c b/arch/arm/mach-davinci/usb-da8xx.c index b010e5f..c6feecf 100644 --- a/arch/arm/mach-davinci/usb-da8xx.c +++ b/arch/arm/mach-davinci/usb-da8xx.c @@ -109,8 +109,8 @@ static struct resource da8xx_usb11_resources[] = { static u64 da8xx_usb11_dma_mask = DMA_BIT_MASK(32); static struct platform_device da8xx_usb11_device = { - .name = "ohci", - .id = 0, + .name = "ohci-da8xx", + .id = -1, .dev = { .dma_mask = &da8xx_usb11_dma_mask, .coherent_dma_mask = DMA_BIT_MASK(32),