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

Commit 815acebf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'ux500/delete-u5500' into next/soc 



Conflicts:
	arch/arm/mach-ux500/cache-l2x0.c
	arch/arm/mach-ux500/clock.c
	arch/arm/mach-ux500/cpu.c
	arch/arm/mach-ux500/mbox-db5500.c
	arch/arm/mach-ux500/platsmp.c
	arch/arm/mach-ux500/timer.c

Resolve lots of identical conflicts between the removal of
u5500 and the addition of u8540.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 417f381c 72fb9220

arch/arm/mach-ux500/Kconfig

+0 −25
Original line number Diff line number Diff line
@@ -10,10 +10,6 @@ config UX500_SOC_COMMON 
	select ARM_ERRATA_764369

	select CACHE_L2X0



config UX500_SOC_DB5500

	bool

	select MFD_DB5500_PRCMU



config UX500_SOC_DB8500

	bool

	select MFD_DB8500_PRCMU
@@ -45,15 +41,8 @@ config MACH_SNOWBALL 
	help

	  Include support for the snowball development platform.



config MACH_U5500

	bool "U5500 Development platform"

	select UX500_SOC_DB5500

	help

	  Include support for the U5500 development platform.



config UX500_AUTO_PLATFORM

	def_bool y

	depends on !MACH_U5500

	select MACH_MOP500

	help

	  At least one platform needs to be selected in order to build
@@ -74,18 +63,4 @@ config UX500_DEBUG_UART 
	  Choose the UART on which kernel low-level debug messages should be

	  output.



config U5500_MODEM_IRQ

	bool "Modem IRQ support"

	depends on UX500_SOC_DB5500

	default y

	help

	  Add support for handling IRQ:s from modem side



config U5500_MBOX

	bool "Mailbox support"

	depends on U5500_MODEM_IRQ

	default y

	help

	  Add support for U5500 mailbox communication with modem side



endif

arch/arm/mach-ux500/Makefile

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

				   id.o usb.o timer.o

obj-$(CONFIG_CACHE_L2X0)	+= cache-l2x0.o

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

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

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

				board-mop500-regulators.o \

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

				board-mop500-u8500uib.o \

				board-mop500-pins.o

obj-$(CONFIG_MACH_U5500)	+= board-u5500.o board-u5500-sdi.o

obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o

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

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

arch/arm/mach-ux500/board-u5500-sdi.c

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

 * Copyright (C) ST-Ericsson SA 2010

 *

 * Author: Hanumath Prasad <ulf.hansson@stericsson.com>

 * License terms: GNU General Public License (GPL) version 2

 */



#include <linux/amba/mmci.h>

#include <linux/mmc/host.h>



#include <plat/pincfg.h>

#include <plat/gpio-nomadik.h>

#include <mach/db5500-regs.h>

#include <plat/ste_dma40.h>



#include "pins-db5500.h"

#include "devices-db5500.h"

#include "ste-dma40-db5500.h"



static pin_cfg_t u5500_sdi_pins[] = {

	/* SDI0 (POP eMMC) */

	GPIO5_MC0_DAT0		| PIN_DIR_INPUT | PIN_PULL_UP,

	GPIO6_MC0_DAT1		| PIN_DIR_INPUT | PIN_PULL_UP,

	GPIO7_MC0_DAT2		| PIN_DIR_INPUT | PIN_PULL_UP,

	GPIO8_MC0_DAT3		| PIN_DIR_INPUT | PIN_PULL_UP,

	GPIO9_MC0_DAT4		| PIN_DIR_INPUT | PIN_PULL_UP,

	GPIO10_MC0_DAT5		| PIN_DIR_INPUT | PIN_PULL_UP,

	GPIO11_MC0_DAT6		| PIN_DIR_INPUT | PIN_PULL_UP,

	GPIO12_MC0_DAT7		| PIN_DIR_INPUT | PIN_PULL_UP,

	GPIO13_MC0_CMD		| PIN_DIR_INPUT | PIN_PULL_UP,

	GPIO14_MC0_CLK		| PIN_DIR_OUTPUT | PIN_VAL_LOW,

};



#ifdef CONFIG_STE_DMA40

struct stedma40_chan_cfg u5500_sdi0_dma_cfg_rx = {

	.mode = STEDMA40_MODE_LOGICAL,

	.dir = STEDMA40_PERIPH_TO_MEM,

	.src_dev_type = DB5500_DMA_DEV24_SDMMC0_RX,

	.dst_dev_type = STEDMA40_DEV_DST_MEMORY,

	.src_info.data_width = STEDMA40_WORD_WIDTH,

	.dst_info.data_width = STEDMA40_WORD_WIDTH,

};



static struct stedma40_chan_cfg u5500_sdi0_dma_cfg_tx = {

	.mode = STEDMA40_MODE_LOGICAL,

	.dir = STEDMA40_MEM_TO_PERIPH,

	.src_dev_type = STEDMA40_DEV_SRC_MEMORY,

	.dst_dev_type = DB5500_DMA_DEV24_SDMMC0_TX,

	.src_info.data_width = STEDMA40_WORD_WIDTH,

	.dst_info.data_width = STEDMA40_WORD_WIDTH,

};

#endif



static struct mmci_platform_data u5500_sdi0_data = {

	.ocr_mask	= MMC_VDD_165_195,

	.f_max		= 50000000,

	.capabilities	= MMC_CAP_4_BIT_DATA |

				MMC_CAP_8_BIT_DATA |

				MMC_CAP_MMC_HIGHSPEED,

	.gpio_cd	= -1,

	.gpio_wp	= -1,

#ifdef CONFIG_STE_DMA40

	.dma_filter	= stedma40_filter,

	.dma_rx_param	= &u5500_sdi0_dma_cfg_rx,

	.dma_tx_param	= &u5500_sdi0_dma_cfg_tx,

#endif

};



void __init u5500_sdi_init(struct device *parent)

{

	nmk_config_pins(u5500_sdi_pins, ARRAY_SIZE(u5500_sdi_pins));



	db5500_add_sdi0(parent, &u5500_sdi0_data);

}

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

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

 * Copyright (C) ST-Ericsson SA 2010

 *

 * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson

 * License terms: GNU General Public License (GPL) version 2

 */



#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/amba/bus.h>

#include <linux/irq.h>

#include <linux/i2c.h>

#include <linux/mfd/abx500/ab5500.h>



#include <asm/hardware/gic.h>

#include <asm/mach/arch.h>

#include <asm/mach-types.h>



#include <plat/pincfg.h>

#include <plat/i2c.h>

#include <plat/gpio-nomadik.h>



#include <mach/hardware.h>

#include <mach/devices.h>

#include <mach/setup.h>



#include "pins-db5500.h"

#include "devices-db5500.h"

#include <linux/led-lm3530.h>



/*

 * GPIO

 */



static pin_cfg_t u5500_pins[] = {

	/* I2C */

	GPIO218_I2C2_SCL        | PIN_INPUT_PULLUP,

	GPIO219_I2C2_SDA        | PIN_INPUT_PULLUP,



	/* DISPLAY_ENABLE */

	GPIO226_GPIO        | PIN_OUTPUT_LOW,



	/* Backlight Enbale */

	GPIO224_GPIO        | PIN_OUTPUT_HIGH,

};

/*

 * I2C

 */



#define U5500_I2C_CONTROLLER(id, _slsu, _tft, _rft, clk, _sm) \

static struct nmk_i2c_controller u5500_i2c##id##_data = { \

	/*				\

	 * slave data setup time, which is	\

	 * 250 ns,100ns,10ns which is 14,6,2	\

	 * respectively for a 48 Mhz	\

	 * i2c clock			\

	 */				\

	.slsu		= _slsu,	\

	/* Tx FIFO threshold */		\

	.tft		= _tft,		\

	/* Rx FIFO threshold */		\

	.rft		= _rft,		\

	/* std. mode operation */	\

	.clk_freq	= clk,		\

	.sm		= _sm,		\

}

/*

 * The board uses TODO <3> i2c controllers, initialize all of

 * them with slave data setup time of 250 ns,

 * Tx & Rx FIFO threshold values as 1 and standard

 * mode of operation

 */



U5500_I2C_CONTROLLER(2,	0xe, 1, 1, 400000, I2C_FREQ_MODE_FAST);



static struct lm3530_platform_data u5500_als_platform_data = {

	.mode = LM3530_BL_MODE_MANUAL,

	.als_input_mode = LM3530_INPUT_ALS1,

	.max_current = LM3530_FS_CURR_26mA,

	.pwm_pol_hi = true,

	.als_avrg_time = LM3530_ALS_AVRG_TIME_512ms,

	.brt_ramp_law = 1,      /* Linear */

	.brt_ramp_fall = LM3530_RAMP_TIME_8s,

	.brt_ramp_rise = LM3530_RAMP_TIME_8s,

	.als1_resistor_sel = LM3530_ALS_IMPD_13_53kOhm,

	.als2_resistor_sel = LM3530_ALS_IMPD_Z,

	.als_vmin = 730,	/* mV */

	.als_vmax = 1020,	/* mV */

	.brt_val = 0x7F,	/* Max brightness */

};



static struct i2c_board_info __initdata u5500_i2c2_devices[] = {

	{

		/* Backlight */

		I2C_BOARD_INFO("lm3530-led", 0x36),

		.platform_data = &u5500_als_platform_data,

	},

};



static void __init u5500_i2c_init(struct device *parent)

{

	db5500_add_i2c2(parent, &u5500_i2c2_data);

	i2c_register_board_info(2, ARRAY_AND_SIZE(u5500_i2c2_devices));

}



static struct ab5500_platform_data ab5500_plf_data = {

	.irq = {

		.base = 0,

		.count = 0,

	},

	.init_settings = NULL,

	.init_settings_sz = 0,

	.pm_power_off = false,

};



static struct platform_device ab5500_device = {

	.name = "ab5500-core",

	.id = 0,

	.dev = {

		.platform_data = &ab5500_plf_data,

	},

	.num_resources = 0,

};



static struct platform_device *u5500_platform_devices[] __initdata = {

	&ab5500_device,

};



static void __init u5500_uart_init(struct device *parent)

{

	db5500_add_uart0(parent, NULL);

	db5500_add_uart1(parent, NULL);

	db5500_add_uart2(parent, NULL);

}



static void __init u5500_init_machine(void)

{

	struct device *parent = NULL;

	int i;



	parent = u5500_init_devices();

	nmk_config_pins(u5500_pins, ARRAY_SIZE(u5500_pins));



	u5500_i2c_init(parent);

	u5500_sdi_init(parent);

	u5500_uart_init(parent);



	for (i = 0; i < ARRAY_SIZE(u5500_platform_devices); i++)

		u5500_platform_devices[i]->dev.parent = parent;



	platform_add_devices(u5500_platform_devices,

		ARRAY_SIZE(u5500_platform_devices));

}



MACHINE_START(U5500, "ST-Ericsson U5500 Platform")

	.atag_offset	= 0x100,

	.map_io		= u5500_map_io,

	.init_irq	= ux500_init_irq,

	.timer		= &ux500_timer,

	.handle_irq	= gic_handle_irq,

	.init_machine	= u5500_init_machine,

MACHINE_END

arch/arm/mach-ux500/cache-l2x0.c

+1 −3
Original line number Diff line number Diff line
@@ -38,9 +38,7 @@ static int __init ux500_l2x0_init(void) 
{

	u32 aux_val = 0x3e000000;



	if (cpu_is_u5500())

		l2x0_base = __io_address(U5500_L2CC_BASE);

	else if (cpu_is_u8500_family())

	if (cpu_is_u8500_family())

		l2x0_base = __io_address(U8500_L2CC_BASE);

	else

		ux500_unknown_soc();