81b34fbecb
In preparation for multi-OMAP2 kernels, split mach-omap2/clock2xxx_data.c into mach-omap2/clock2420_data.c and mach-omap2/clock2430_data.c. 2430 uses a different device space physical memory layout than past or future OMAPs, and we use a different virtual memory layout as well, which causes trouble for architecture-level code/data that tries to support both. We tried using offsets from the virtual base last year, but those patches never made it upstream; so after some discussion with Tony about the best all-around approach, we'll just grit our teeth and duplicate the structures. The maintenance advantages of a single kernel config that can compile and boot on OMAP2, 3, and 4 platforms are simply too compelling. This approach does have some nice benefits beyond multi-OMAP 2 kernel support. The runtime size of OMAP2420-specific and OMAP2430-specific kernels is smaller, since unused clocks for the other OMAP2 chip will no longer be compiled in. (At some point we will mark the clock data __initdata and allocate it during registration, which will eliminate the runtime memory advantage.) It also makes the clock trees slightly easier to read, since 2420-specific and 2430-specific clocks are no longer mixed together. This patch also splits 2430-specific clock code into its own file, mach-omap2/clock2430.c, which is only compiled in for 2430 builds - mostly for organizational clarity. While here, fix a bug in the OMAP2430 clock tree: "emul_ck" was incorrectly marked as being 2420-only, when actually it is present on both OMAP2420 and OMAP2430. Thanks to Tony for some good discussions about how to approach this problem. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Tony Lindgren <tony@atomide.com> Cc: Richard Woodruff <r-woodruff2@ti.com>
90 lines
1.9 KiB
C
90 lines
1.9 KiB
C
/*
|
|
* clock2xxx.c - OMAP2xxx-specific clock integration code
|
|
*
|
|
* Copyright (C) 2005-2008 Texas Instruments, Inc.
|
|
* Copyright (C) 2004-2010 Nokia Corporation
|
|
*
|
|
* Contacts:
|
|
* Richard Woodruff <r-woodruff2@ti.com>
|
|
* Paul Walmsley
|
|
*
|
|
* Based on earlier work by Tuukka Tikkanen, Tony Lindgren,
|
|
* Gordon McNutt and RidgeRun, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#undef DEBUG
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/io.h>
|
|
|
|
#include <plat/clock.h>
|
|
|
|
#include "clock.h"
|
|
#include "clock2xxx.h"
|
|
#include "cm.h"
|
|
#include "cm-regbits-24xx.h"
|
|
|
|
struct clk *vclk, *sclk, *dclk;
|
|
|
|
/*
|
|
* Omap24xx specific clock functions
|
|
*/
|
|
|
|
/*
|
|
* Set clocks for bypass mode for reboot to work.
|
|
*/
|
|
void omap2xxx_clk_prepare_for_reboot(void)
|
|
{
|
|
u32 rate;
|
|
|
|
if (vclk == NULL || sclk == NULL)
|
|
return;
|
|
|
|
rate = clk_get_rate(sclk);
|
|
clk_set_rate(vclk, rate);
|
|
}
|
|
|
|
/*
|
|
* Switch the MPU rate if specified on cmdline.
|
|
* We cannot do this early until cmdline is parsed.
|
|
*/
|
|
static int __init omap2xxx_clk_arch_init(void)
|
|
{
|
|
struct clk *virt_prcm_set, *sys_ck, *dpll_ck, *mpu_ck;
|
|
unsigned long sys_ck_rate;
|
|
|
|
if (!cpu_is_omap24xx())
|
|
return 0;
|
|
|
|
if (!mpurate)
|
|
return -EINVAL;
|
|
|
|
virt_prcm_set = clk_get(NULL, "virt_prcm_set");
|
|
sys_ck = clk_get(NULL, "sys_ck");
|
|
dpll_ck = clk_get(NULL, "dpll_ck");
|
|
mpu_ck = clk_get(NULL, "mpu_ck");
|
|
|
|
if (clk_set_rate(virt_prcm_set, mpurate))
|
|
pr_err("Could not find matching MPU rate\n");
|
|
|
|
recalculate_root_clocks();
|
|
|
|
sys_ck_rate = clk_get_rate(sys_ck);
|
|
|
|
pr_info("Switched to new clocking rate (Crystal/DPLL/MPU): "
|
|
"%ld.%01ld/%ld/%ld MHz\n",
|
|
(sys_ck_rate / 1000000), (sys_ck_rate / 100000) % 10,
|
|
(clk_get_rate(dpll_ck) / 1000000),
|
|
(clk_get_rate(mpu_ck) / 1000000));
|
|
|
|
return 0;
|
|
}
|
|
arch_initcall(omap2xxx_clk_arch_init);
|
|
|
|
|