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

Commit 009f742b authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge next-s3c64xx-updates 

Merge branch 'next-s3c64xx-updates' into for-rmk

Conflicts:

	arch/arm/plat-s3c/dev-hsmmc2.c
	arch/arm/plat-s3c/include/plat/sdhci.h
parents f18ea827 92b118f6

arch/arm/mach-s3c6400/include/mach/map.h

+4 −0
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ 


#define S3C64XX_PA_USBHOST	(0x74300000)



#define S3C64XX_PA_USB_HSPHY	(0x7C100000)

#define S3C64XX_VA_USB_HSPHY	S3C_ADDR_CPU(0x00200000)



/* place VICs close together */

#define S3C_VA_VIC0		(S3C_VA_IRQ + 0x00)

#define S3C_VA_VIC1		(S3C_VA_IRQ + 0x10000)
@@ -79,5 +82,6 @@ 
#define S3C_PA_FB		S3C64XX_PA_FB

#define S3C_PA_USBHOST		S3C64XX_PA_USBHOST

#define S3C_PA_USB_HSOTG	S3C64XX_PA_USB_HSOTG

#define S3C_VA_USB_HSPHY	S3C64XX_VA_USB_HSPHY



#endif /* __ASM_ARCH_6400_MAP_H */

arch/arm/mach-s3c6400/s3c6400.c

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ void __init s3c6400_map_io(void) 


	s3c6400_default_sdhci0();

	s3c6400_default_sdhci1();

	s3c6400_default_sdhci2();



	/* the i2c devices are directly compatible with s3c2440 */

	s3c_i2c0_setname("s3c2440-i2c");

arch/arm/mach-s3c6410/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ void __init s3c6410_map_io(void) 
	/* initialise device information early */

	s3c6410_default_sdhci0();

	s3c6410_default_sdhci1();

	s3c6410_default_sdhci2();



	/* the i2c devices are directly compatible with s3c2440 */

	s3c_i2c0_setname("s3c2440-i2c");

arch/arm/mach-s3c6410/mach-smdk6410.c

+52 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/gpio.h>

#include <linux/delay.h>

#include <linux/smsc911x.h>

#include <linux/regulator/fixed.h>



#ifdef CONFIG_SMDK6410_WM1190_EV1

#include <linux/mfd/wm8350/core.h>
@@ -184,6 +185,43 @@ static struct platform_device smdk6410_smsc911x = { 
	},

};



#ifdef CONFIG_REGULATOR

static struct regulator_consumer_supply smdk6410_b_pwr_5v_consumers[] = {

	{

		/* WM8580 */

		.supply = "PVDD",

		.dev_name = "0-001b",

	},

	{

		/* WM8580 */

		.supply = "AVDD",

		.dev_name = "0-001b",

	},

};



static struct regulator_init_data smdk6410_b_pwr_5v_data = {

	.constraints = {

		.always_on = 1,

	},

	.num_consumer_supplies = ARRAY_SIZE(smdk6410_b_pwr_5v_consumers),

	.consumer_supplies = smdk6410_b_pwr_5v_consumers,

};



static struct fixed_voltage_config smdk6410_b_pwr_5v_pdata = {

	.supply_name = "B_PWR_5V",

	.microvolts = 5000000,

	.init_data = &smdk6410_b_pwr_5v_data,

};



static struct platform_device smdk6410_b_pwr_5v = {

	.name          = "reg-fixed-voltage",

	.id            = -1,

	.dev = {

		.platform_data = &smdk6410_b_pwr_5v_pdata,

	},

};

#endif



static struct map_desc smdk6410_iodesc[] = {};



static struct platform_device *smdk6410_devices[] __initdata = {
@@ -198,6 +236,10 @@ static struct platform_device *smdk6410_devices[] __initdata = { 
	&s3c_device_fb,

	&s3c_device_usb,

	&s3c_device_usb_hsotg,



#ifdef CONFIG_REGULATOR

	&smdk6410_b_pwr_5v,

#endif

	&smdk6410_lcd_powerdev,



	&smdk6410_smsc911x,
@@ -232,6 +274,14 @@ static struct regulator_init_data wm8350_dcdc3_data = { 
};



/* USB, EXT, PCM, ADC/DAC, USB, MMC */

static struct regulator_consumer_supply wm8350_dcdc4_consumers[] = {

	{

		/* WM8580 */

		.supply = "DVDD",

		.dev_name = "0-001b",

	},

};



static struct regulator_init_data wm8350_dcdc4_data = {

	.constraints = {

		.name = "PVDD_HI/PVDD_EXT/PVDD_SYS/PVCCM2MTV",
@@ -239,6 +289,8 @@ static struct regulator_init_data wm8350_dcdc4_data = { 
		.max_uV = 3000000,

		.always_on = 1,

	},

	.num_consumer_supplies = ARRAY_SIZE(wm8350_dcdc4_consumers),

	.consumer_supplies = wm8350_dcdc4_consumers,

};



/* ARM core */

arch/arm/plat-s3c/dev-hsmmc2.c

+4 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s3c/dev-hsmmc2.c

 *

 * Copyright (c) 2009 Samsung Electronics

 * Copyright (c) 2009 Maurus Cuelenaere

 *

 * Based on arch/arm/plat-s3c/dev-hsmmc1.c

 * original file Copyright (c) 2008 Simtec Electronics

 *

 * S3C series device definition for hsmmc device 2

 *