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

Commit b22d18c3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'for-arm-soc-cleanup' of... 

Merge tag 'for-arm-soc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup

From Linus Walleij:
Two fixes for broken <mach/id.h> cleanup.

* tag 'for-arm-soc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

:
  mfd: db8500-prcmu: update resource passing
  drivers/db8500-cpufreq: delete dangling include

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a900e5d9 05ec260e

arch/arm/mach-ux500/board-mop500.c

+4 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static struct platform_device snowball_sbnet_dev = { 
	},

};



static struct ab8500_platform_data ab8500_platdata = {

struct ab8500_platform_data ab8500_platdata = {

	.irq_base	= MOP500_AB8500_IRQ_BASE,

	.regulator_reg_init = ab8500_regulator_reg_init,

	.num_regulator_reg_init	= ARRAY_SIZE(ab8500_regulator_reg_init),
@@ -650,6 +650,7 @@ static void __init mop500_init_machine(void) 
	int i2c0_devs;

	int i;



	platform_device_register(&db8500_prcmu_device);

	mop500_gpio_keys[0].gpio = GPIO_PROX_SENSOR;



	mop500_pinmaps_init();
@@ -684,6 +685,7 @@ static void __init snowball_init_machine(void) 
	struct device *parent = NULL;

	int i;



	platform_device_register(&db8500_prcmu_device);

	snowball_pinmaps_init();

	parent = u8500_init_devices(&ab8500_platdata);
@@ -709,6 +711,7 @@ static void __init hrefv60_init_machine(void) 
	int i2c0_devs;

	int i;



	platform_device_register(&db8500_prcmu_device);

	/*

	 * The HREFv60 board removed a GPIO expander and routed

	 * all these GPIO pins to the internal GPIO controller

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

+2 −5
Original line number Diff line number Diff line
@@ -138,14 +138,9 @@ 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[] = {
@@ -285,6 +280,8 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("st,nomadik-i2c", 0x80128000, "nmk-i2c.2", NULL),

	OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL),

	OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL),

	OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu",

			&db8500_prcmu_pdata),

	/* Requires device name bindings. */

	OF_DEV_AUXDATA("stericsson,nmk_pinctrl", U8500_PRCMU_BASE,

		"pinctrl-db8500", NULL),

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

+44 −0
Original line number Diff line number Diff line
@@ -13,11 +13,13 @@ 
#include <linux/amba/bus.h>

#include <linux/amba/pl022.h>

#include <linux/platform_data/dma-ste-dma40.h>

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



#include <mach/hardware.h>

#include <mach/setup.h>

#include <mach/irqs.h>



#include "devices-db8500.h"

#include "ste-dma40-db8500.h"



static struct resource dma40_resources[] = {
@@ -194,3 +196,45 @@ struct platform_device u8500_ske_keypad_device = { 
	.num_resources = ARRAY_SIZE(keypad_resources),

	.resource = keypad_resources,

};



struct prcmu_pdata db8500_prcmu_pdata = {

	.ab_platdata	= &ab8500_platdata,

	.version_offset	= DB8500_PRCMU_FW_VERSION_OFFSET,

	.legacy_offset	= DB8500_PRCMU_LEGACY_OFFSET,

};



static struct resource db8500_prcmu_res[] = {

	{

		.name  = "prcmu",

		.start = U8500_PRCMU_BASE,

		.end   = U8500_PRCMU_BASE + SZ_8K - 1,

		.flags = IORESOURCE_MEM,

	},

	{

		.name  = "prcmu-tcdm",

		.start = U8500_PRCMU_TCDM_BASE,

		.end   = U8500_PRCMU_TCDM_BASE + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

	{

		.name  = "irq",

		.start = IRQ_DB8500_PRCMU1,

		.end   = IRQ_DB8500_PRCMU1,

		.flags = IORESOURCE_IRQ,

	},

	{

		.name  = "prcmu-tcpm",

		.start = U8500_PRCMU_TCPM_BASE,

		.end   = U8500_PRCMU_TCPM_BASE + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

};



struct platform_device db8500_prcmu_device = {

	.name			= "db8500-prcmu",

	.resource		= db8500_prcmu_res,

	.num_resources		= ARRAY_SIZE(db8500_prcmu_res),

	.dev = {

		.platform_data = &db8500_prcmu_pdata,

	},

};

arch/arm/mach-ux500/devices-db8500.h

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@ 


struct ske_keypad_platform_data;

struct pl022_ssp_controller;

struct platform_device;



extern struct ab8500_platform_data ab8500_platdata;

extern struct prcmu_pdata db8500_prcmu_pdata;

extern struct platform_device db8500_prcmu_device;



static inline struct platform_device *

db8500_add_ske_keypad(struct device *parent,

drivers/cpufreq/db8500-cpufreq.c

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

#include <linux/platform_device.h>

#include <linux/clk.h>

#include <mach/id.h>



static struct cpufreq_frequency_table *freq_table;

static struct clk *armss_clk;