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

Commit ad363e09 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-torvalds' of... 

Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

* 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  mach-ux500: voltage domain regulators for DB8500
  cpufreq: make DB8500 cpufreq driver compile
  cpufreq: update DB8500 cpufreq driver
  mach-ux500: move CPUfreq driver to cpufreq subsystem
  mfd: add DB5500 PRCMU driver
  mfd: update DB8500 PRCMU driver
  mach-ux500: move the DB8500 PRCMU driver to MFD
  mach-ux500: make PRCMU base address dynamic
  mach-ux500: rename PRCMU driver per SoC
  mach-ux500: update ASIC version detection
  mach-ux500: update SoC and board IRQ handling
  mach-ux500: update the DB5500 register file
  mach-ux500: update the DB8500 register file
parents ed0795aa 1032fbfd

arch/arm/mach-ux500/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -12,9 +12,12 @@ menu "Ux500 SoC" 


config UX500_SOC_DB5500

	bool "DB5500"

	select MFD_DB5500_PRCMU



config UX500_SOC_DB8500

	bool "DB8500"

	select MFD_DB8500_PRCMU

	select REGULATOR_DB8500_PRCMU



endmenu

arch/arm/mach-ux500/Makefile

+2 −2
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.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 \
@@ -17,4 +17,4 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o 
obj-$(CONFIG_LOCAL_TIMERS)	+= localtimer.o

obj-$(CONFIG_U5500_MODEM_IRQ)	+= modem-irq-db5500.o

obj-$(CONFIG_U5500_MBOX)	+= mbox-db5500.o

obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o

arch/arm/mach-ux500/cpu-db5500.c

+2 −0
Original line number Diff line number Diff line
@@ -188,6 +188,8 @@ void __init u5500_map_io(void) 
	ux500_map_io();



	iotable_init(u5500_io_desc, ARRAY_SIZE(u5500_io_desc));



	_PRCMU_BASE = __io_address(U5500_PRCMU_BASE);

}



static int usb_db5500_rx_dma_cfg[] = {

arch/arm/mach-ux500/cpu-db8500.c

+7 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ void __init u8500_map_io(void) 
		iotable_init(u8500_v1_io_desc, ARRAY_SIZE(u8500_v1_io_desc));

	else if (cpu_is_u8500v2())

		iotable_init(u8500_v2_io_desc, ARRAY_SIZE(u8500_v2_io_desc));



	_PRCMU_BASE = __io_address(U8500_PRCMU_BASE);

}



static struct resource db8500_pmu_resources[] = {
@@ -129,9 +131,14 @@ static struct platform_device db8500_pmu_device = { 
	.dev.platform_data	= &db8500_pmu_platdata,

};



static struct platform_device db8500_prcmu_device = {

	.name			= "db8500-prcmu",

};



static struct platform_device *platform_devs[] __initdata = {

	&u8500_dma40_device,

	&db8500_pmu_device,

	&db8500_prcmu_device,

};



static resource_size_t __initdata db8500_gpio_base[] = {

arch/arm/mach-ux500/cpu.c

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

#include <linux/io.h>

#include <linux/clk.h>

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

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



#include <asm/cacheflush.h>

#include <asm/hardware/cache-l2x0.h>
@@ -19,10 +21,11 @@ 
#include <mach/hardware.h>

#include <mach/setup.h>

#include <mach/devices.h>

#include <mach/prcmu.h>



#include "clock.h"



void __iomem *_PRCMU_BASE;



#ifdef CONFIG_CACHE_L2X0

static void __iomem *l2x0_base;

#endif
@@ -47,6 +50,8 @@ void __init ux500_init_irq(void) 
	 * Init clocks here so that they are available for system timer

	 * initialization.

	 */

	if (cpu_is_u5500())

		db5500_prcmu_early_init();

	if (cpu_is_u8500())

		prcmu_early_init();

	clk_init();