From owner-svn-src-all@FreeBSD.ORG Sun May 25 10:49:08 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 14A6E9BC; Sun, 25 May 2014 10:49:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E99612489; Sun, 25 May 2014 10:49:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4PAn7mO079925; Sun, 25 May 2014 10:49:07 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4PAn7jd079920; Sun, 25 May 2014 10:49:07 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201405251049.s4PAn7jd079920@svn.freebsd.org> From: Andrew Turner Date: Sun, 25 May 2014 10:49:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r266648 - in head/sys/arm/ti: . am335x omap4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 May 2014 10:49:08 -0000 Author: andrew Date: Sun May 25 10:49:07 2014 New Revision: 266648 URL: http://svnweb.freebsd.org/changeset/base/266648 Log: Allow the OMAP4 and AM335x prcm drivers to be compiled in the same kernel by renaming the structures used. Modified: head/sys/arm/ti/am335x/am335x_prcm.c head/sys/arm/ti/omap4/omap4_prcm_clks.c head/sys/arm/ti/ti_prcm.c Modified: head/sys/arm/ti/am335x/am335x_prcm.c ============================================================================== --- head/sys/arm/ti/am335x/am335x_prcm.c Sun May 25 10:17:26 2014 (r266647) +++ head/sys/arm/ti/am335x/am335x_prcm.c Sun May 25 10:49:07 2014 (r266648) @@ -190,7 +190,7 @@ static int am335x_clk_pruss_activate(str .clk_get_source_freq = am335x_clk_hsmmc_get_source_freq \ } -struct ti_clock_dev ti_clk_devmap[] = { +struct ti_clock_dev ti_am335x_clk_devmap[] = { /* System clocks */ { .id = SYS_CLK, .clk_activate = NULL, Modified: head/sys/arm/ti/omap4/omap4_prcm_clks.c ============================================================================== --- head/sys/arm/ti/omap4/omap4_prcm_clks.c Sun May 25 10:17:26 2014 (r266647) +++ head/sys/arm/ti/omap4/omap4_prcm_clks.c Sun May 25 10:49:07 2014 (r266648) @@ -256,7 +256,7 @@ static int omap4_clk_get_arm_fclk_freq(s } -struct ti_clock_dev ti_clk_devmap[] = { +struct ti_clock_dev ti_omap4_clk_devmap[] = { /* System clocks */ { .id = SYS_CLK, Modified: head/sys/arm/ti/ti_prcm.c ============================================================================== --- head/sys/arm/ti/ti_prcm.c Sun May 25 10:17:26 2014 (r266647) +++ head/sys/arm/ti/ti_prcm.c Sun May 25 10:49:07 2014 (r266648) @@ -57,16 +57,18 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include /** - * ti_clk_devmap - Array of clock devices, should be defined one per SoC + * ti_*_clk_devmap - Array of clock devices, should be defined one per SoC * * This array is typically defined in one of the targeted *_prcm_clk.c * files and is specific to the given SoC platform. Each entry in the array * corresponds to an individual clock device. */ -extern struct ti_clock_dev ti_clk_devmap[]; +extern struct ti_clock_dev ti_omap4_clk_devmap[]; +extern struct ti_clock_dev ti_am335x_clk_devmap[]; /** * ti_prcm_clk_dev - returns a pointer to the clock device with given id @@ -90,7 +92,21 @@ ti_prcm_clk_dev(clk_ident_t clk) * loop for this, but this function should only called when a driver is * being activated so IMHO not a big issue. */ - clk_dev = &(ti_clk_devmap[0]); + clk_dev = NULL; + switch(ti_chip()) { +#ifdef SOC_OMAP4 + case CHIP_OMAP_4: + clk_dev = &(ti_omap4_clk_devmap[0]); + break; +#endif +#ifdef SOC_TI_AM335X + case CHIP_AM335X: + clk_dev = &(ti_am335x_clk_devmap[0]); + break; +#endif + } + if (clk_dev == NULL) + panic("No clock devmap found"); while (clk_dev->id != INVALID_CLK_IDENT) { if (clk_dev->id == clk) { return (clk_dev);