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

Commit 427e3df6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'rmobile-fixes-for-linus' of... 

Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x

* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x:
  ARM: mach-shmobile: make a struct in board-ap4evb.c static
  ARM: mach-shmobile: ag5evm: consistently name sdhi info structures
  ARM: mach-shmobile: mackerel: change usbhs devices order
parents ca56a95e 4d4d6fbb

arch/arm/mach-shmobile/board-ag5evm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -381,7 +381,7 @@ void ag5evm_sdhi1_set_pwr(struct platform_device *pdev, int state) 
	gpio_set_value(GPIO_PORT114, state);

	gpio_set_value(GPIO_PORT114, state);

}

}





static struct sh_mobile_sdhi_info sh_sdhi1_platdata = {

static struct sh_mobile_sdhi_info sh_sdhi1_info = {

	.tmio_flags	= TMIO_MMC_WRPROTECT_DISABLE,

	.tmio_flags	= TMIO_MMC_WRPROTECT_DISABLE,

	.tmio_caps	= MMC_CAP_NONREMOVABLE | MMC_CAP_SDIO_IRQ,

	.tmio_caps	= MMC_CAP_NONREMOVABLE | MMC_CAP_SDIO_IRQ,

	.tmio_ocr_mask	= MMC_VDD_32_33 | MMC_VDD_33_34,

	.tmio_ocr_mask	= MMC_VDD_32_33 | MMC_VDD_33_34,
@@ -413,7 +413,7 @@ static struct platform_device sdhi1_device = { 
	.name		= "sh_mobile_sdhi",

	.name		= "sh_mobile_sdhi",

	.id		= 1,

	.id		= 1,

	.dev		= {

	.dev		= {

		.platform_data	= &sh_sdhi1_platdata,

		.platform_data	= &sh_sdhi1_info,

	},

	},

	.num_resources	= ARRAY_SIZE(sdhi1_resources),

	.num_resources	= ARRAY_SIZE(sdhi1_resources),

	.resource	= sdhi1_resources,

	.resource	= sdhi1_resources,

arch/arm/mach-shmobile/board-ap4evb.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -913,7 +913,7 @@ static struct i2c_board_info imx074_info = { 
	I2C_BOARD_INFO("imx074", 0x1a),

	I2C_BOARD_INFO("imx074", 0x1a),

};

};





struct soc_camera_link imx074_link = {

static struct soc_camera_link imx074_link = {

	.bus_id		= 0,

	.bus_id		= 0,

	.board_info	= &imx074_info,

	.board_info	= &imx074_info,

	.i2c_adapter_id	= 0,

	.i2c_adapter_id	= 0,

arch/arm/mach-shmobile/board-mackerel.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1287,9 +1287,9 @@ static struct platform_device *mackerel_devices[] __initdata = { 
	&nor_flash_device,

	&nor_flash_device,

	&smc911x_device,

	&smc911x_device,

	&lcdc_device,

	&lcdc_device,

	&usbhs0_device,

	&usb1_host_device,

	&usb1_host_device,

	&usbhs1_device,

	&usbhs1_device,

	&usbhs0_device,

	&leds_device,

	&leds_device,

	&fsi_device,

	&fsi_device,

	&fsi_ak4643_device,

	&fsi_ak4643_device,