Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1d6f472 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP: voltage: move plat/voltage.h to mach-omap2/voltage.h 



At this point in time, there's no reason for this header file to be in
plat-omap/include/plat/voltage.h.  It should not be included by device
drivers, and the code that uses it is currently all under mach-omap2/.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 7328ff4d

arch/arm/mach-omap2/omap_twl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/i2c/twl.h>

#include <linux/i2c/twl.h>





#include <plat/voltage.h>

#include "voltage.h"





#include "pm.h"

#include "pm.h"

arch/arm/mach-omap2/pm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,8 +18,8 @@ 
#include <plat/omap-pm.h>

#include <plat/omap-pm.h>

#include <plat/omap_device.h>

#include <plat/omap_device.h>

#include <plat/common.h>

#include <plat/common.h>

#include <plat/voltage.h>





#include "voltage.h"

#include "powerdomain.h"

#include "powerdomain.h"

#include "clockdomain.h"

#include "clockdomain.h"

#include "pm.h"

#include "pm.h"

arch/arm/mach-omap2/smartreflex.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,8 @@ 
#define __ASM_ARM_OMAP_SMARTREFLEX_H

#define __ASM_ARM_OMAP_SMARTREFLEX_H





#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <plat/voltage.h>



#include "voltage.h"





/*

/*

 * Different Smartreflex IPs version. The v1 is the 65nm version used in

 * Different Smartreflex IPs version. The v1 is the 65nm version used in

arch/arm/mach-omap2/sr_device.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,9 +23,9 @@ 
#include <linux/io.h>

#include <linux/io.h>





#include <plat/omap_device.h>

#include <plat/omap_device.h>

#include <plat/voltage.h>





#include "smartreflex.h"

#include "smartreflex.h"

#include "voltage.h"

#include "control.h"

#include "control.h"

#include "pm.h"

#include "pm.h"

arch/arm/mach-omap2/voltage.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/slab.h>

#include <linux/slab.h>





#include <plat/common.h>

#include <plat/common.h>

#include <plat/voltage.h>





#include "prm-regbits-34xx.h"

#include "prm-regbits-34xx.h"

#include "prm-regbits-44xx.h"

#include "prm-regbits-44xx.h"
@@ -35,6 +34,8 @@ 
#include "prminst44xx.h"

#include "prminst44xx.h"

#include "control.h"

#include "control.h"





#include "voltage.h"



#define VP_IDLE_TIMEOUT		200

#define VP_IDLE_TIMEOUT		200

#define VP_TRANXDONE_TIMEOUT	300

#define VP_TRANXDONE_TIMEOUT	300

#define VOLTAGE_DIR_SIZE	16

#define VOLTAGE_DIR_SIZE	16