This file needs to be accessible from the PRCM core and mach-omap2 board support code.
Signed-off-by: Tero Kristo <t-kri...@ti.com> --- arch/arm/mach-omap2/prm44xx.c | 2 +- arch/arm/mach-omap2/prm44xx.h | 2 +- arch/arm/mach-omap2/prm44xx_54xx.h | 61 ------------------------------- arch/arm/mach-omap2/prm54xx.h | 2 +- arch/arm/mach-omap2/prm7xx.h | 2 +- include/linux/power/omap/prm44xx_54xx.h | 61 +++++++++++++++++++++++++++++++ 6 files changed, 65 insertions(+), 65 deletions(-) delete mode 100644 arch/arm/mach-omap2/prm44xx_54xx.h create mode 100644 include/linux/power/omap/prm44xx_54xx.h diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c index f1f3e78..7cbb35f 100644 --- a/arch/arm/mach-omap2/prm44xx.c +++ b/arch/arm/mach-omap2/prm44xx.c @@ -28,7 +28,7 @@ #include "powerdomain.h" #include "prm.h" #include "prcm-common.h" -#include "prm44xx_54xx.h" +#include <linux/power/omap/prm44xx_54xx.h> #define OMAP4430_GLOBAL_COLD_RST_SHIFT 0 #define OMAP4430_GLOBAL_WARM_SW_RST_SHIFT 1 diff --git a/arch/arm/mach-omap2/prm44xx.h b/arch/arm/mach-omap2/prm44xx.h index 1f7a3a6..52585e1 100644 --- a/arch/arm/mach-omap2/prm44xx.h +++ b/arch/arm/mach-omap2/prm44xx.h @@ -25,7 +25,7 @@ #ifndef __ARCH_ARM_MACH_OMAP2_PRM44XX_H #define __ARCH_ARM_MACH_OMAP2_PRM44XX_H -#include "prm44xx_54xx.h" +#include <linux/power/omap/prm44xx_54xx.h> #include "prcm-common.h" #include "prm.h" #include <linux/power/omap/prm44xx.h> diff --git a/arch/arm/mach-omap2/prm44xx_54xx.h b/arch/arm/mach-omap2/prm44xx_54xx.h deleted file mode 100644 index 4b36d3d..0000000 --- a/arch/arm/mach-omap2/prm44xx_54xx.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * OMAP44xx and 54xx PRM common functions - * - * Copyright (C) 2009-2013 Texas Instruments, Inc. - * Copyright (C) 2009-2010 Nokia Corporation - * - * Paul Walmsley (p...@pwsan.com) - * Rajendra Nayak (rna...@ti.com) - * Benoit Cousson (b-cous...@ti.com) - * - * This file is automatically generated from the OMAP hardware databases. - * We respectfully ask that any modifications to this file be coordinated - * with the public linux-omap@vger.kernel.org mailing list and the - * authors above to ensure that the autogeneration scripts are kept - * up-to-date with the file contents. - * - * 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. - * - */ - -#ifndef __ARCH_ARM_MACH_OMAP2_PRM44XX_54XX_H -#define __ARCH_ARM_MACH_OMAP2_PRM44XX_54XX_H - -/* Function prototypes */ -#ifndef __ASSEMBLER__ - -/* OMAP4/OMAP5-specific VP functions */ -u32 omap4_prm_vp_check_txdone(u8 vp_id); -void omap4_prm_vp_clear_txdone(u8 vp_id); - -/* - * OMAP4/OMAP5 access functions for voltage controller (VC) and - * voltage proccessor (VP) in the PRM. - */ -extern u32 omap4_prm_vcvp_read(u8 offset); -extern void omap4_prm_vcvp_write(u32 val, u8 offset); -extern u32 omap4_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset); - -#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \ - defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX) -void omap44xx_prm_reconfigure_io_chain(void); -#else -static inline void omap44xx_prm_reconfigure_io_chain(void) -{ -} -#endif - -/* PRM interrupt-related functions */ -extern void omap44xx_prm_read_pending_irqs(unsigned long *events); -extern void omap44xx_prm_ocp_barrier(void); -extern void omap44xx_prm_save_and_clear_irqen(u32 *saved_mask); -extern void omap44xx_prm_restore_irqen(u32 *saved_mask); - -int __init omap44xx_prm_init(u16 cpu_type); -extern u32 omap44xx_prm_get_reset_sources(void); - -#endif - -#endif diff --git a/arch/arm/mach-omap2/prm54xx.h b/arch/arm/mach-omap2/prm54xx.h index 64d0859..34a0835 100644 --- a/arch/arm/mach-omap2/prm54xx.h +++ b/arch/arm/mach-omap2/prm54xx.h @@ -21,7 +21,7 @@ #ifndef __ARCH_ARM_MACH_OMAP2_PRM54XX_H #define __ARCH_ARM_MACH_OMAP2_PRM54XX_H -#include "prm44xx_54xx.h" +#include <linux/power/omap/prm44xx_54xx.h> #include "prcm-common.h" #include "prm.h" #include <linux/power/omap/prm54xx.h> diff --git a/arch/arm/mach-omap2/prm7xx.h b/arch/arm/mach-omap2/prm7xx.h index c6dc341..2637d62 100644 --- a/arch/arm/mach-omap2/prm7xx.h +++ b/arch/arm/mach-omap2/prm7xx.h @@ -22,7 +22,7 @@ #ifndef __ARCH_ARM_MACH_OMAP2_PRM7XX_H #define __ARCH_ARM_MACH_OMAP2_PRM7XX_H -#include "prm44xx_54xx.h" +#include <linux/power/omap/prm44xx_54xx.h> #include "prcm-common.h" #include "prm.h" #include <linux/power/omap/prm7xx.h> diff --git a/include/linux/power/omap/prm44xx_54xx.h b/include/linux/power/omap/prm44xx_54xx.h new file mode 100644 index 0000000..b6d6d65 --- /dev/null +++ b/include/linux/power/omap/prm44xx_54xx.h @@ -0,0 +1,61 @@ +/* + * OMAP44xx and 54xx PRM common functions + * + * Copyright (C) 2009-2013 Texas Instruments, Inc. + * Copyright (C) 2009-2010 Nokia Corporation + * + * Paul Walmsley (p...@pwsan.com) + * Rajendra Nayak (rna...@ti.com) + * Benoit Cousson (b-cous...@ti.com) + * + * This file is automatically generated from the OMAP hardware databases. + * We respectfully ask that any modifications to this file be coordinated + * with the public linux-omap@vger.kernel.org mailing list and the + * authors above to ensure that the autogeneration scripts are kept + * up-to-date with the file contents. + * + * 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. + * + */ + +#ifndef __LINUX_POWER_OMAP_PRM44XX_54XX_H +#define __LINUX_POWER_OMAP_PRM44XX_54XX_H + +/* Function prototypes */ +#ifndef __ASSEMBLER__ + +/* OMAP4/OMAP5-specific VP functions */ +u32 omap4_prm_vp_check_txdone(u8 vp_id); +void omap4_prm_vp_clear_txdone(u8 vp_id); + +/* + * OMAP4/OMAP5 access functions for voltage controller (VC) and + * voltage proccessor (VP) in the PRM. + */ +u32 omap4_prm_vcvp_read(u8 offset); +void omap4_prm_vcvp_write(u32 val, u8 offset); +u32 omap4_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset); + +#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \ + defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX) +void omap44xx_prm_reconfigure_io_chain(void); +#else +static inline void omap44xx_prm_reconfigure_io_chain(void) +{ +} +#endif + +/* PRM interrupt-related functions */ +void omap44xx_prm_read_pending_irqs(unsigned long *events); +void omap44xx_prm_ocp_barrier(void); +void omap44xx_prm_save_and_clear_irqen(u32 *saved_mask); +void omap44xx_prm_restore_irqen(u32 *saved_mask); + +int __init omap44xx_prm_init(u16 cpu_type); +u32 omap44xx_prm_get_reset_sources(void); + +#endif + +#endif -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html