diff options
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/omap_opp_data.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap_twl.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap2/pm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/smartreflex.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap2/sr_device.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/vc3xxx_data.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-omap2/vc44xx_data.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-omap2/voltage.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-omap2/voltagedomains3xxx_data.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap2/voltagedomains44xx_data.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap2/vp3xxx_data.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/vp44xx_data.c | 4 |
12 files changed, 23 insertions, 28 deletions
diff --git a/arch/arm/mach-omap2/omap_opp_data.h b/arch/arm/mach-omap2/omap_opp_data.h index c784c12f98a..4d9320995d5 100644 --- a/arch/arm/mach-omap2/omap_opp_data.h +++ b/arch/arm/mach-omap2/omap_opp_data.h @@ -20,8 +20,7 @@ #define __ARCH_ARM_MACH_OMAP2_OMAP_OPP_DATA_H #include <plat/omap_hwmod.h> - -#include "voltage.h" +#include <plat/voltage.h> /* * *BIG FAT WARNING*: diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c index 0a8e74e3e81..cad28502431 100644 --- a/arch/arm/mach-omap2/omap_twl.c +++ b/arch/arm/mach-omap2/omap_twl.c @@ -17,8 +17,7 @@ #include <linux/io.h> #include <linux/kernel.h> #include <linux/i2c/twl.h> - -#include "voltage.h" +#include <plat/voltage.h> #include "pm.h" diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 30af3351c2d..cdb95c4b476 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -18,8 +18,8 @@ #include <plat/omap-pm.h> #include <plat/omap_device.h> #include <plat/common.h> +#include <plat/voltage.h> -#include "voltage.h" #include "powerdomain.h" #include "clockdomain.h" #include "pm.h" diff --git a/arch/arm/mach-omap2/smartreflex.h b/arch/arm/mach-omap2/smartreflex.h index 5f35b9e2555..6568c885f37 100644 --- a/arch/arm/mach-omap2/smartreflex.h +++ b/arch/arm/mach-omap2/smartreflex.h @@ -21,8 +21,7 @@ #define __ASM_ARM_OMAP_SMARTREFLEX_H #include <linux/platform_device.h> - -#include "voltage.h" +#include <plat/voltage.h> /* * Different Smartreflex IPs version. The v1 is the 65nm version used in diff --git a/arch/arm/mach-omap2/sr_device.c b/arch/arm/mach-omap2/sr_device.c index 10d3c5ee801..a636604961b 100644 --- a/arch/arm/mach-omap2/sr_device.c +++ b/arch/arm/mach-omap2/sr_device.c @@ -23,9 +23,9 @@ #include <linux/io.h> #include <plat/omap_device.h> +#include <plat/voltage.h> #include "smartreflex.h" -#include "voltage.h" #include "control.h" #include "pm.h" diff --git a/arch/arm/mach-omap2/vc3xxx_data.c b/arch/arm/mach-omap2/vc3xxx_data.c index f37dc4bc379..6e9c15069a5 100644 --- a/arch/arm/mach-omap2/vc3xxx_data.c +++ b/arch/arm/mach-omap2/vc3xxx_data.c @@ -19,11 +19,12 @@ #include <linux/init.h> #include <plat/common.h> +#include <plat/voltage.h> +#include <plat/vc.h> #include "prm-regbits-34xx.h" -#include "voltage.h" -#include "vc.h" + /* * VC data common to 34xx/36xx chips diff --git a/arch/arm/mach-omap2/vc44xx_data.c b/arch/arm/mach-omap2/vc44xx_data.c index a98da8ddec5..c8a768a279d 100644 --- a/arch/arm/mach-omap2/vc44xx_data.c +++ b/arch/arm/mach-omap2/vc44xx_data.c @@ -19,12 +19,11 @@ #include <linux/init.h> #include <plat/common.h> +#include <plat/voltage.h> +#include <plat/vc.h> #include "prm44xx.h" #include "prm-regbits-44xx.h" -#include "voltage.h" - -#include "vc.h" /* * VC data common to 44xx chips diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c index c6facf7becf..029481f302a 100644 --- a/arch/arm/mach-omap2/voltage.c +++ b/arch/arm/mach-omap2/voltage.c @@ -27,6 +27,9 @@ #include <linux/slab.h> #include <plat/common.h> +#include <plat/voltage.h> +#include <plat/vc.h> +#include <plat/vp.h> #include "prm-regbits-34xx.h" #include "prm-regbits-44xx.h" @@ -35,11 +38,6 @@ #include "prminst44xx.h" #include "control.h" -#include "voltage.h" - -#include "vc.h" -#include "vp.h" - #define VOLTAGE_DIR_SIZE 16 diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c index def230fd2fd..49106dad21e 100644 --- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c +++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c @@ -20,12 +20,12 @@ #include <plat/common.h> #include <plat/cpu.h> +#include <plat/voltage.h> +#include <plat/vc.h> +#include <plat/vp.h> #include "prm-regbits-34xx.h" #include "omap_opp_data.h" -#include "voltage.h" -#include "vc.h" -#include "vp.h" /* * VDD data diff --git a/arch/arm/mach-omap2/voltagedomains44xx_data.c b/arch/arm/mach-omap2/voltagedomains44xx_data.c index cb64996de0e..d3e0f04e2e6 100644 --- a/arch/arm/mach-omap2/voltagedomains44xx_data.c +++ b/arch/arm/mach-omap2/voltagedomains44xx_data.c @@ -22,15 +22,15 @@ #include <linux/init.h> #include <plat/common.h> +#include <plat/voltage.h> +#include <plat/vc.h> +#include <plat/vp.h> #include "prm-regbits-44xx.h" #include "prm44xx.h" #include "prcm44xx.h" #include "prminst44xx.h" -#include "voltage.h" #include "omap_opp_data.h" -#include "vc.h" -#include "vp.h" static const struct omap_vfsm_instance_data omap4_vdd_mpu_vfsm_data = { .voltsetup_reg = OMAP4_PRM_VOLTSETUP_MPU_RET_SLEEP_OFFSET, diff --git a/arch/arm/mach-omap2/vp3xxx_data.c b/arch/arm/mach-omap2/vp3xxx_data.c index 645217094e5..fd9b43d7cc2 100644 --- a/arch/arm/mach-omap2/vp3xxx_data.c +++ b/arch/arm/mach-omap2/vp3xxx_data.c @@ -20,11 +20,11 @@ #include <linux/init.h> #include <plat/common.h> +#include <plat/voltage.h> +#include <plat/vp.h> #include "prm-regbits-34xx.h" -#include "voltage.h" -#include "vp.h" /* * VP data common to 34xx/36xx chips diff --git a/arch/arm/mach-omap2/vp44xx_data.c b/arch/arm/mach-omap2/vp44xx_data.c index 65d1ad63800..fbdedd481e7 100644 --- a/arch/arm/mach-omap2/vp44xx_data.c +++ b/arch/arm/mach-omap2/vp44xx_data.c @@ -20,12 +20,12 @@ #include <linux/init.h> #include <plat/common.h> +#include <plat/voltage.h> +#include <plat/vp.h> #include "prm44xx.h" #include "prm-regbits-44xx.h" -#include "voltage.h" -#include "vp.h" /* * VP data common to 44xx chips |