![Tony Lindgren](/assets/img/avatar_default.png)
As the plat and mach includes need to disappear for single zImage work, we need to remove plat/hardware.h. Do this by splitting plat/hardware.h into omap1 and omap2+ specific files. The old plat/hardware.h already has omap1 only defines, so it gets moved to mach/hardware.h for omap1. For omap2+, we use the local soc.h that for now just includes the related SoC headers to keep this patch more readable. Note that the local soc.h still includes plat/cpu.h that can be dealt with in later patches. Let's also include plat/serial.h from common.h for all the board-*.c files. This allows making the include files local later on without patching these files again. Note that only minimal changes are done in this patch for the drivers/watchdog/omap_wdt.c driver to keep things compiling. Further patches are needed to eventually remove cpu_is_omap usage in the drivers. Also only minimal changes are done to sound/soc/omap/* to remove the unneeded includes and to define OMAP44XX_MCPDM_L3_BASE locally so there's no need to include omap44xx.h. While at it, also sort some of the includes in the standard way. Cc: linux-watchdog@vger.kernel.org Cc: alsa-devel@alsa-project.org Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com> Cc: Liam Girdwood <lrg@ti.com> Acked-by: Wim Van Sebroeck <wim@iguana.be> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
75 lines
1.5 KiB
C
75 lines
1.5 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 "soc.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. XXX This should be removed from the
|
|
* clock code and handled by the OPP layer code in the near future.
|
|
*/
|
|
static int __init omap2xxx_clk_arch_init(void)
|
|
{
|
|
int ret;
|
|
|
|
if (!cpu_is_omap24xx())
|
|
return 0;
|
|
|
|
ret = omap2_clk_switch_mpurate_at_boot("virt_prcm_set");
|
|
if (!ret)
|
|
omap2_clk_print_new_rates("sys_ck", "dpll_ck", "mpu_ck");
|
|
|
|
return ret;
|
|
}
|
|
|
|
arch_initcall(omap2xxx_clk_arch_init);
|
|
|
|
|