diff options
author | Tony Lindgren <tony@atomide.com> | 2012-10-24 22:25:44 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-24 22:25:44 +0200 |
commit | 3e9a6321f9895eac9a3d241d3126e44021e7102b (patch) | |
tree | d674cf54e26837bee89095c211ffa362c8546f03 /arch/arm/plat-omap/common.h | |
parent | tty/serial/8250: Make omap hardware workarounds local to 8250.h (diff) | |
parent | ARM: OMAP: Split plat/cpu.h into local soc.h for mach-omap1 and mach-omap2 (diff) | |
download | linux-3e9a6321f9895eac9a3d241d3126e44021e7102b.tar.xz linux-3e9a6321f9895eac9a3d241d3126e44021e7102b.zip |
Merge tag 'omap-for-v3.8/cleanup-headers-signed' into omap-for-v3.8/cleanup-headers-serial-take2
This is the first set of omap cleanup patches for v3.8 merge
window to remove most of the remaining plat includes to get us
closer to ARM common zImage support.
To avoid a huge amount of trivial merge conflicts with includes,
this branch is based on several small topic branches coordinated
with the driver subsystem maintainers. These branches are based on
v3.7-rc1 and can also be merged into the related driver subsystem
branches as needed:
omap-for-v3.8/cleanup-headers-prepare few trivial driver changes
omap-for-v3.8/cleanup-headers-dma move of the DMA header
omap-for-v3.8/cleanup-headers-gpmc GPMC and MTD changes
omap-for-v3.8/cleanup-headers-mmc MMC related changes
omap-for-v3.8/cleanup-headers-dss DSS related changes
omap-for-v3.8/cleanup-headers-asoc ASoC related changes
Note that for the dma-omap.h, it was decided that it should be
is completed. For the related discussion, please see:
https://patchwork.kernel.org/patch/1519591/#
After these patches we still have a few plat headers remaining
that will be handled in later pull requests.
Diffstat (limited to 'arch/arm/plat-omap/common.h')
-rw-r--r-- | arch/arm/plat-omap/common.h | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/common.h b/arch/arm/plat-omap/common.h new file mode 100644 index 000000000000..8ae0542a37d9 --- /dev/null +++ b/arch/arm/plat-omap/common.h @@ -0,0 +1,36 @@ +/* + * Header for shared OMAP code in plat-omap. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef __ARCH_ARM_MACH_OMAP_COMMON_H +#define __ARCH_ARM_MACH_OMAP_COMMON_H + +extern int __init omap_init_clocksource_32k(void __iomem *vbase); + +extern void __init omap_check_revision(void); + +extern void omap_reserve(void); +struct omap_hwmod; +extern int omap_dss_reset(struct omap_hwmod *); + +#endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */ |