From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754424AbaEHNzV (ORCPT ); Thu, 8 May 2014 09:55:21 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:49672 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752573AbaEHNwk (ORCPT ); Thu, 8 May 2014 09:52:40 -0400 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Felipe Balbi , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Alan Stern Subject: [PATCH 8/8] usb: ohci-da8xx can only be built-in Date: Thu, 8 May 2014 15:52:21 +0200 Message-Id: <1399557141-1346645-9-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1399557141-1346645-1-git-send-email-arnd@arndb.de> References: <1399557141-1346645-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:YcdBa+9YqmAqTamf8nW97ztv2FxGZzxz4H+AmOIvVu7 nwLitSjqhgT1z8/VbCkYQDxaoCVdDQn+m3ljLYTZTMvYcPgQwT 5OR5XR/j05krNG9VN8xEznUUgfgEoceHmLIc00eJVCUPW9bWdq M5kxwOcHPLNs4rOgBOxv6FcAwCH+G/l+xSGinWnfhi7UbTNoim E/7ig9gx6hRPcvXZg3EIxTSjbitcw/V0nc7VyvvG+kZWZO/j79 9fXXxfPxB52TBv/xUIdkIV+LgsrOPiVk0m1o3bwNEncaimGlbK QM2fAdFpSw27DYHMobxI5NW/4cOLkcZWsURHipZ324++aiwupJ CtOn4Yh137KLQyYZ8pAN0dCUw5ONcOv6BFrtm7GzT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The PHY setup code of the TI DaVinci DA8xx OHCI controller uses ad-hoc register access using a pointer that is meant to be used only by the DaVinci platform implementation and that is intentionally not exported to loadable modules. This results in a link error on configurations that use a modular OHCI code on this platform. While the proper solution for this problem would be to implement a real PHY driver shared by ohci-da8xx and musb-da8xx, this patch for now just works around the build error by only allowing the ohci-da8xx code to be built-in. Signed-off-by: Arnd Bergmann Cc: Alan Stern --- drivers/usb/host/Kconfig | 10 ++++++++++ drivers/usb/host/ohci-hcd.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index e229a47..3af10b7 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -417,6 +417,16 @@ config USB_OHCI_HCD_OMAP3 Enables support for the on-chip OHCI controller on OMAP3 and later chips. +config USB_OHCI_HCD_DAVINCI + bool "OHCI support for TI DaVinci DA8xx" + depends on ARCH_DAVINCI_DA8XX + depends on USB_OHCI_HCD=y + default y + help + Enables support for the DaVinci DA8xx integrated OHCI + controller. This driver cannot currently be a loadable + module because it lacks a proper PHY abstraction. + config USB_OHCI_ATH79 bool "USB OHCI support for the Atheros AR71XX/AR7240 SoCs (DEPRECATED)" depends on (SOC_AR71XX || SOC_AR724X) diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 3586460..f98d03f 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -1178,7 +1178,7 @@ MODULE_LICENSE ("GPL"); #define SA1111_DRIVER ohci_hcd_sa1111_driver #endif -#ifdef CONFIG_ARCH_DAVINCI_DA8XX +#ifdef CONFIG_USB_OHCI_HCD_DAVINCI #include "ohci-da8xx.c" #define DAVINCI_PLATFORM_DRIVER ohci_hcd_da8xx_driver #endif -- 1.8.3.2