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

Commit 9ddabb67 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux 

* 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux:
  ARM: MINI2440: Fixup __initdata usage
  ARM: MINI2440: Fix crash on boot due to improper __initdata qualifier
  ARM: SMDK6410: Specify no GPIO for B_PWR_5V regulator
  ARM: S3C: NAND: Check the existence of nr_map before copying
parents bf0c346b 3ce2f76f

arch/arm/mach-s3c2440/mach-mini2440.c

+18 −18
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static struct s3c2410_platform_nand mini2440_nand_info __initdata = { 


/* DM9000AEP 10/100 ethernet controller */



static struct resource mini2440_dm9k_resource[] __initdata = {

static struct resource mini2440_dm9k_resource[] = {

	[0] = {

		.start = MACH_MINI2440_DM9K_BASE,

		.end   = MACH_MINI2440_DM9K_BASE + 3,
@@ -310,11 +310,11 @@ static struct resource mini2440_dm9k_resource[] __initdata = { 
 * The DM9000 has no eeprom, and it's MAC address is set by

 * the bootloader before starting the kernel.

 */

static struct dm9000_plat_data mini2440_dm9k_pdata __initdata = {

static struct dm9000_plat_data mini2440_dm9k_pdata = {

	.flags		= (DM9000_PLATF_16BITONLY | DM9000_PLATF_NO_EEPROM),

};



static struct platform_device mini2440_device_eth __initdata = {

static struct platform_device mini2440_device_eth = {

	.name		= "dm9000",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(mini2440_dm9k_resource),
@@ -341,7 +341,7 @@ static struct platform_device mini2440_device_eth __initdata = { 
 *	|  |  +----+  +----+

 *	  .....

 */

static struct gpio_keys_button mini2440_buttons[] __initdata = {

static struct gpio_keys_button mini2440_buttons[] = {

	{

		.gpio		= S3C2410_GPG(0),		/* K1 */

		.code		= KEY_F1,
@@ -384,12 +384,12 @@ static struct gpio_keys_button mini2440_buttons[] __initdata = { 
#endif

};



static struct gpio_keys_platform_data mini2440_button_data __initdata = {

static struct gpio_keys_platform_data mini2440_button_data = {

	.buttons	= mini2440_buttons,

	.nbuttons	= ARRAY_SIZE(mini2440_buttons),

};



static struct platform_device mini2440_button_device __initdata = {

static struct platform_device mini2440_button_device = {

	.name		= "gpio-keys",

	.id		= -1,

	.dev		= {
@@ -399,41 +399,41 @@ static struct platform_device mini2440_button_device __initdata = { 


/* LEDS */



static struct s3c24xx_led_platdata mini2440_led1_pdata __initdata = {

static struct s3c24xx_led_platdata mini2440_led1_pdata = {

	.name		= "led1",

	.gpio		= S3C2410_GPB(5),

	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,

	.def_trigger	= "heartbeat",

};



static struct s3c24xx_led_platdata mini2440_led2_pdata __initdata = {

static struct s3c24xx_led_platdata mini2440_led2_pdata = {

	.name		= "led2",

	.gpio		= S3C2410_GPB(6),

	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,

	.def_trigger	= "nand-disk",

};



static struct s3c24xx_led_platdata mini2440_led3_pdata __initdata = {

static struct s3c24xx_led_platdata mini2440_led3_pdata = {

	.name		= "led3",

	.gpio		= S3C2410_GPB(7),

	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,

	.def_trigger	= "mmc0",

};



static struct s3c24xx_led_platdata mini2440_led4_pdata __initdata = {

static struct s3c24xx_led_platdata mini2440_led4_pdata = {

	.name		= "led4",

	.gpio		= S3C2410_GPB(8),

	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,

	.def_trigger	= "",

};



static struct s3c24xx_led_platdata mini2440_led_backlight_pdata __initdata = {

static struct s3c24xx_led_platdata mini2440_led_backlight_pdata = {

	.name		= "backlight",

	.gpio		= S3C2410_GPG(4),

	.def_trigger	= "backlight",

};



static struct platform_device mini2440_led1 __initdata = {

static struct platform_device mini2440_led1 = {

	.name		= "s3c24xx_led",

	.id		= 1,

	.dev		= {
@@ -441,7 +441,7 @@ static struct platform_device mini2440_led1 __initdata = { 
	},

};



static struct platform_device mini2440_led2 __initdata = {

static struct platform_device mini2440_led2 = {

	.name		= "s3c24xx_led",

	.id		= 2,

	.dev		= {
@@ -449,7 +449,7 @@ static struct platform_device mini2440_led2 __initdata = { 
	},

};



static struct platform_device mini2440_led3 __initdata = {

static struct platform_device mini2440_led3 = {

	.name		= "s3c24xx_led",

	.id		= 3,

	.dev		= {
@@ -457,7 +457,7 @@ static struct platform_device mini2440_led3 __initdata = { 
	},

};



static struct platform_device mini2440_led4 __initdata = {

static struct platform_device mini2440_led4 = {

	.name		= "s3c24xx_led",

	.id		= 4,

	.dev		= {
@@ -465,7 +465,7 @@ static struct platform_device mini2440_led4 __initdata = { 
	},

};



static struct platform_device mini2440_led_backlight __initdata = {

static struct platform_device mini2440_led_backlight = {

	.name		= "s3c24xx_led",

	.id		= 5,

	.dev		= {
@@ -475,14 +475,14 @@ static struct platform_device mini2440_led_backlight __initdata = { 


/* AUDIO */



static struct s3c24xx_uda134x_platform_data mini2440_audio_pins __initdata = {

static struct s3c24xx_uda134x_platform_data mini2440_audio_pins = {

	.l3_clk = S3C2410_GPB(4),

	.l3_mode = S3C2410_GPB(2),

	.l3_data = S3C2410_GPB(3),

	.model = UDA134X_UDA1341

};



static struct platform_device mini2440_audio __initdata = {

static struct platform_device mini2440_audio = {

	.name		= "s3c24xx_uda134x",

	.id		= 0,

	.dev		= {

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

+1 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ static struct fixed_voltage_config smdk6410_b_pwr_5v_pdata = { 
	.supply_name = "B_PWR_5V",

	.microvolts = 5000000,

	.init_data = &smdk6410_b_pwr_5v_data,

	.gpio = -EINVAL,

};



static struct platform_device smdk6410_b_pwr_5v = {

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

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ static int __init s3c_nand_copy_set(struct s3c2410_nand_set *set) 
			return -ENOMEM;

	}

	

	if (set->nr_map && set->nr_chips) {

		size = sizeof(int) * set->nr_chips;

	if (size) {

		ptr = kmemdup(set->nr_map, size, GFP_KERNEL);

		set->nr_map = ptr;