From patchwork Thu Oct 11 16:34:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Constantine Shulyupin X-Patchwork-Id: 1582711 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id E159EDFABE for ; Thu, 11 Oct 2012 16:36:57 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TMLii-00008O-II; Thu, 11 Oct 2012 16:34:48 +0000 Received: from oproxy6.bluehost.com ([2605:dc00:100:2::a6] helo=oproxy6-pub.bluehost.com) by merlin.infradead.org with smtp (Exim 4.76 #1 (Red Hat Linux)) id 1TMLid-000089-N4 for linux-arm-kernel@lists.infradead.org; Thu, 11 Oct 2012 16:34:46 +0000 Received: (qmail 16138 invoked by uid 0); 11 Oct 2012 16:34:38 -0000 Received: from unknown (HELO box668.bluehost.com) (66.147.244.168) by cpoproxy3.bluehost.com with SMTP; 11 Oct 2012 16:34:38 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=makelinux.com; s=default; h=Message-Id:Date:Subject:Cc:To:From; bh=r5YLt00ECV6QgYXgOXtI+zD7yipb7krqz5+J/VXXt/s=; b=YJ7tA/yQcPEdwvFPobNljbxVxzSHwjbOb9tJswiX91aPeCmM/JiGXqsw4YZR6IiZDjr73ibWEBky9+xe9eKMn2Raep5Q9cviOpg8yfa74UtciQvPlFzTayX4zF/j/COX; Received: from [84.229.113.105] (port=40596 helo=makelinux.home) by box668.bluehost.com with esmtpa (Exim 4.76) (envelope-from ) id 1TMLiX-0003N9-TA; Thu, 11 Oct 2012 10:34:38 -0600 From: Constantine Shulyupin To: nsekhar@ti.com, gregkh@linuxfoundation.org, sshtylyov@mvista.com Subject: [PATCH v7] Enable USB peripheral mode on dm365 EVM Date: Thu, 11 Oct 2012 18:34:34 +0200 Message-Id: <1349973274-24936-1-git-send-email-const@MakeLinux.com> X-Mailer: git-send-email 1.7.9.5 X-Identified-User: {1470:box668.bluehost.com:makelinu:makelinux.net} {sentby:smtp auth 84.229.113.105 authed with poster@makelinux.net} X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: davinci-linux-open-source@linux.davincidsp.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, balbi@ti.com, Constantine Shulyupin , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Constantine Shulyupin Sets USB PHY clock source to 24 MHz clock. Tested with OTG configuration, usb gadget g_zero on DM365 EVM connected to PC. To active the patch need to call davinci_setup_usb from dm365_evm_init References: Definition of USB_PHY_CTRL and PHYCLKFREQ: - http://www.makelinux.com/lib/ti/DM36x_ARM/doc-141 Original patch by miguel.aguilar@ridgerun.com three years ago: - http://www.mail-archive.com/davinci-linux-open-source@linux.davincidsp.com/msg14741.html Signed-off-by: Constantine Shulyupin --- Note: Changelog Changes since v6 - moved call to davinci_setup_usb from dm365_evm_init to another patch accordinly request of Sergei Changes since v5 http://www.spinics.net/lists/kernel/msg1413120.html accordingy feedback of nsekhar@ti.com http://www.spinics.net/lists/kernel/msg1414914.html - phy configuration moved to drivers/usb/musb/davinci.c - USB_OTG configuration is submitted in separated patch: http://www.spinics.net/lists/kernel/msg1414964.html - Setting current limit to 1000 mA. Any way the current is limited to 510 mA in davinci_setup_usb. Changes since v4 http://www.spinics.net/lists/kernel/msg1412995.html - removed fix of dev_info in musb_init_controller Changes since v3 http://www.spinics.net/lists/kernel/msg1412544.html: - removed optional altering of pr_info Changes since v1 http://marc.info/?l=linux-kernel&m=130894150803661&w=2: - removed optional code and reordered - removed alternation of GPIO33, which is multiplexed with DRVVBUS, because is not need for peripheral USB This patch is based on code from projects Arago, Angstom and RidgeRun. --- drivers/usb/musb/davinci.c | 3 +++ drivers/usb/musb/davinci.h | 1 + diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index 472c8b4..af09ebf 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c @@ -428,6 +428,9 @@ static int davinci_musb_init(struct musb *musb) __raw_writel(deepsleep, DM355_DEEPSLEEP); } + if (machine_is_davinci_dm365_evm()) + writel(readl(USB_PHY_CTRL) | USBPHY_CLKFREQ_24MHZ, USB_PHY_CTRL); + /* reset the controller */ musb_writel(tibase, DAVINCI_USB_CTRL_REG, 0x1); diff --git a/drivers/usb/musb/davinci.h b/drivers/usb/musb/davinci.h index 371baa0..e737d97 100644 --- a/drivers/usb/musb/davinci.h +++ b/drivers/usb/musb/davinci.h @@ -16,6 +16,7 @@ /* Integrated highspeed/otg PHY */ #define USBPHY_CTL_PADDR 0x01c40034 +#define USBPHY_CLKFREQ_24MHZ BIT(13) #define USBPHY_DATAPOL BIT(11) /* (dm355) switch D+/D- */ #define USBPHY_PHYCLKGD BIT(8) #define USBPHY_SESNDEN BIT(7) /* v(sess_end) comparator */