From patchwork Mon Aug 17 22:02:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Cvek X-Patchwork-Id: 7027571 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 686A59F372 for ; Mon, 17 Aug 2015 22:02:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 957FE206D6 for ; Mon, 17 Aug 2015 22:02:08 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id B9A01205E5 for ; Mon, 17 Aug 2015 22:02:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZRSS3-0002Av-Pb; Mon, 17 Aug 2015 22:00:19 +0000 Received: from bubo.tul.cz ([2001:718:1c01:16::aa]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZRSS0-0000fG-4g for linux-arm-kernel@lists.infradead.org; Mon, 17 Aug 2015 22:00:17 +0000 Received: from [78.80.185.17] (78-80-185-17.tmcz.cz [78.80.185.17]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by bubo.tul.cz (Postfix) with ESMTPSA id A849B1F0006; Mon, 17 Aug 2015 23:59:31 +0200 (CEST) From: Petr Cvek Subject: [PATCH v2 12/21] ARM: pxa: magician: Add PXA27x UDC support To: robert.jarzmik@free.fr, philipp.zabel@gmail.com, daniel@zonque.org, haojian.zhuang@gmail.com, sameo@linux.intel.com, lee.jones@linaro.org, cooloney@gmail.com, rpurdie@rpsys.net, j.anaszewski@samsung.com, linux@arm.linux.org.uk, sre@kernel.org, dbaryshkov@gmail.com, dwmw2@infradead.org References: Message-ID: <55D25A06.9030507@tul.cz> Date: Tue, 18 Aug 2015 00:02:46 +0200 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150817_150016_380315_14ABB72C X-CRM114-Status: GOOD ( 13.33 ) X-Spam-Score: -2.5 (--) 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: linux-arm-kernel@lists.infradead.org, linux-leds@vger.kernel.org, linux-pm@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for PXA27x UDC to HTC Magician. Signed-off-by: Petr Cvek --- arch/arm/mach-pxa/magician.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index 8ca0b67..23b59a0 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c @@ -98,6 +98,10 @@ #include +#include +#include +#include + #include "devices.h" #include "generic.h" @@ -698,6 +702,34 @@ static struct platform_device magician_camera = { * USB "Transceiver" */ +#if IS_ENABLED(CONFIG_USB_PXA27X) +static void magician_udc_command(int cmd) +{ + if (cmd == PXA2XX_UDC_CMD_CONNECT) + UP2OCR |= UP2OCR_DPPUE | UP2OCR_DPPUBE; + else if (cmd == PXA2XX_UDC_CMD_DISCONNECT) + UP2OCR &= ~(UP2OCR_DPPUE | UP2OCR_DPPUBE); +} + +/* HACK, shared USB connected state with pda-power */ +int my_usb_online = 1; + +static int magician_udc_is_connected(void) +{ + /* Shared with pda_power or gpio-vbus */ + return my_usb_online; +} + +static struct pxa2xx_udc_mach_info magician_udc_info __initdata = { + .udc_command = magician_udc_command, + .udc_is_connected = magician_udc_is_connected, + .gpio_pullup = GPIO27_MAGICIAN_USBC_PUEN, +}; + +#else + +/* GPIO USB client vbus sensing, when no PXA UDC installed */ + static struct resource gpio_vbus_resource = { .flags = IORESOURCE_IRQ, .start = IRQ_MAGICIAN_VBUS, @@ -718,6 +750,7 @@ static struct platform_device gpio_vbus = { .platform_data = &gpio_vbus_info, }, }; +#endif /* IS_ENABLED(CONFIG_USB_PXA27X) */ /* * Charging functions @@ -1167,7 +1200,6 @@ static struct platform_device *devices[] __initdata = { &pasic3, &vads7846_device, &bq24022, - &gpio_vbus, &power_supply, &leds_gpio, &magician_camera, @@ -1175,6 +1207,11 @@ static struct platform_device *devices[] __initdata = { /* NOTICE mutually exclusive with PXA I2C */ &i2c_gpio_bus_alt, + + /* NOTICE mutually exclusive with UDC*/ +#if !(IS_ENABLED(CONFIG_USB_PXA27X)) + &gpio_vbus, +#endif }; /* @@ -1226,6 +1263,7 @@ static void __init magician_init(void) pxa_set_mci_info(&magician_mci_info); pxa_set_ohci_info(&magician_ohci_info); + pxa_set_udc_info(&magician_udc_info); /* Check LCD type we have */ cpld = ioremap_nocache(PXA_CS3_PHYS, 0x1000);