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

Commit 650c2a21 authored by Linus Walleij's avatar Linus Walleij
Browse files

mach-ux500: move the DB8500 PRCMU driver to MFD 



We have decided that this function arbiter fits better in the MFD
subsystem. Since we need to concatenate the split header files we move
it basically like this:

mv mach-ux500/prcmu-db8500.c drivers/mfd/db8500-prcmu.c
mv mach-ux500/include/mach/prcmu-defs.h include/linux/mfd/db8500-prcmu.h
mv mach-ux500/include/mach/prcmu-regs.h drivers/mfd/db8500-prcmu-regs.h
mach-ux500/include/mach/prcmu.h >> include/linux/mfd/db8500-prcmu.h
rm arch/arm/mach-ux500/include/mach/prcmu.h

Then we update different #include statements and Makefile orders etc
to make the PRCMU driver compile, link and boot in the new place
without really changing any code.

Acked-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 11871890

arch/arm/mach-ux500/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ config UX500_SOC_DB5500 


config UX500_SOC_DB8500

	bool "DB8500"

	select MFD_DB8500_PRCMU



endmenu

arch/arm/mach-ux500/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
obj-y				:= clock.o cpu.o devices.o devices-common.o \

				   id.o usb.o

obj-$(CONFIG_UX500_SOC_DB5500)	+= cpu-db5500.o dma-db5500.o

obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o devices-db8500.o prcmu-db8500.o

obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o devices-db8500.o

obj-$(CONFIG_MACH_U8500)	+= board-mop500.o board-mop500-sdi.o \

				board-mop500-regulators.o \

				board-mop500-uib.o board-mop500-stuib.o \

arch/arm/mach-ux500/cpu.c

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

#include <linux/io.h>

#include <linux/clk.h>

#include <linux/mfd/db8500-prcmu.h>



#include <asm/cacheflush.h>

#include <asm/hardware/cache-l2x0.h>
@@ -19,7 +20,6 @@ 
#include <mach/hardware.h>

#include <mach/setup.h>

#include <mach/devices.h>

#include <mach/prcmu.h>



#include "clock.h"

arch/arm/mach-ux500/cpufreq.c

+1 −2
Original line number Diff line number Diff line
@@ -17,10 +17,9 @@ 
#include <linux/kernel.h>

#include <linux/cpufreq.h>

#include <linux/delay.h>

#include <linux/mfd/db8500-prcmu.h>



#include <mach/hardware.h>

#include <mach/prcmu.h>

#include <mach/prcmu-defs.h>



#define DRIVER_NAME "cpufreq-u8500"

#define CPUFREQ_NAME "u8500"

arch/arm/mach-ux500/include/mach/prcmu-defs.h

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
/*

 * Copyright (C) STMicroelectronics 2009

 * Copyright (C) ST-Ericsson SA 2010

 *

 * Author: Sundar Iyer <sundar.iyer@stericsson.com>

 * Author: Martin Persson <martin.persson@stericsson.com>

 *

 * License Terms: GNU General Public License v2

 *

 * PRCM Unit definitions

 */



#ifndef __MACH_PRCMU_DEFS_H

#define __MACH_PRCMU_DEFS_H



enum prcmu_cpu_opp {

	CPU_OPP_INIT	  = 0x00,

	CPU_OPP_NO_CHANGE = 0x01,

	CPU_OPP_100	  = 0x02,

	CPU_OPP_50	  = 0x03,

	CPU_OPP_MAX	  = 0x04,

	CPU_OPP_EXT_CLK	  = 0x07

};

enum prcmu_ape_opp {

	APE_OPP_NO_CHANGE = 0x00,

	APE_OPP_100	  = 0x02,

	APE_OPP_50	  = 0x03,

};



#endif /* __MACH_PRCMU_DEFS_H */