From patchwork Tue Oct 30 09:22:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 195339 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 01EBB2C007F for ; Tue, 30 Oct 2012 20:24:01 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 972CE4A130; Tue, 30 Oct 2012 10:23:36 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8NGH8EYLLvNM; Tue, 30 Oct 2012 10:23:36 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 16C3E4A131; Tue, 30 Oct 2012 10:23:13 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2FC364A054 for ; Tue, 30 Oct 2012 10:23:08 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gMwDEJNhKyBB for ; Tue, 30 Oct 2012 10:23:07 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from km20343-01.keymachine.de (ns.km20343-01.keymachine.de [84.19.182.79]) by theia.denx.de (Postfix) with ESMTP id 24E794A11F for ; Tue, 30 Oct 2012 10:22:59 +0100 (CET) Received: from localhost.localdomain (g231091029.adsl.alicedsl.de [92.231.91.29]) by km20343-01.keymachine.de (Postfix) with ESMTPA id D8C5E7D4419; Tue, 30 Oct 2012 10:22:57 +0100 (CET) From: Lucas Stach To: Marek Vasut Date: Tue, 30 Oct 2012 10:22:48 +0100 Message-Id: <1351588973-20699-3-git-send-email-dev@lynxeye.de> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1351588973-20699-1-git-send-email-dev@lynxeye.de> References: <1351588973-20699-1-git-send-email-dev@lynxeye.de> MIME-Version: 1.0 Cc: u-boot@lists.denx.de, Tom Warren Subject: [U-Boot] =?utf-8?q?=5BPATCH_3/8=5D_tegra=3A_usb=3A_fold_initial_p?= =?utf-8?q?ll_setup_into_board=5Fusb=5Finit?= X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de The setup is trivial, no need to split this out into a separate function. Signed-off-by: Lucas Stach --- arch/arm/cpu/armv7/tegra20/usb.c | 15 +++++---------- 1 Datei geändert, 5 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) diff --git a/arch/arm/cpu/armv7/tegra20/usb.c b/arch/arm/cpu/armv7/tegra20/usb.c index 1725cd1..e61bd69 100644 --- a/arch/arm/cpu/armv7/tegra20/usb.c +++ b/arch/arm/cpu/armv7/tegra20/usb.c @@ -417,13 +417,6 @@ static int init_ulpi_usb_controller(struct fdt_usb *config) } #endif -static void config_clock(const u32 timing[]) -{ - clock_start_pll(CLOCK_ID_USB, - timing[PARAM_DIVM], timing[PARAM_DIVN], timing[PARAM_DIVP], - timing[PARAM_CPCON], timing[PARAM_LFCON]); -} - /** * Add a new USB port to the list of available ports. * @@ -534,13 +527,15 @@ int board_usb_init(const void *blob) { struct fdt_usb config; unsigned osc_freq = clock_get_rate(CLOCK_ID_OSC); - enum clock_osc_freq freq; int node_list[USB_PORTS_MAX]; int node, count, i; + u32 *timing; /* Set up the USB clocks correctly based on our oscillator frequency */ - freq = clock_get_osc_freq(); - config_clock(usb_pll[freq]); + timing = usb_pll[clock_get_osc_freq()]; + clock_start_pll(CLOCK_ID_USB, + timing[PARAM_DIVM], timing[PARAM_DIVN], timing[PARAM_DIVP], + timing[PARAM_CPCON], timing[PARAM_LFCON]); /* count may return <0 on error */ count = fdtdec_find_aliases_for_id(blob, "usb",