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

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

Merge branch 'cleanup-pm' of... 

Merge branch 'cleanup-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

* 'cleanup-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: PM: share some suspend-related functions across OMAP2, 3, 4
  ARM: OMAP2+: omap_device: call all suspend, resume callbacks when OMAP_DEVICE_NO_IDLE_ON_SUSPEND is set
  ARM: OMAP: omap_device: remove omap_device_parent
  ARM: OMAP2+: PM debug: fix the use of debugfs_create_* API
  ARM: OMAP2+: PM: share clkdms_setup() across OMAP2, 3, 4
  ARM: OMAP2+: PM: clean up omap_set_pwrdm_state()
  ARM: OMAP3: PM: remove superfluous calls to pwrdm_clear_all_prev_pwrst()
  ARM: OMAP: convert omap_device_build() and callers to __init
  ARM: OMAP2+: Mark omap_hsmmc_init and omap_mux related functions as __init
  ARM: OMAP2+: Split omap2_hsmmc_init() to properly support I2C GPIO pins
  ARM: OMAP: omap_device: Expose omap_device_{alloc, delete, register}
  ARM: OMAP: Fix build error when mmc_omap is built as module
  ARM: OMAP: Fix kernel panic with HSMMC when twl4030_gpio is a module
parents d60d506e 00fd72cc

arch/arm/mach-omap2/board-2430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static void __init omap_2430sdp_init(void) 
	platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));

	omap_serial_init();

	omap_sdrc_init(NULL, NULL);

	omap2_hsmmc_init(mmc);

	omap_hsmmc_init(mmc);

	omap2_usbfs_init(&sdp2430_usb_config);



	omap_mux_init_signal("usb0hs_stp", OMAP_PULL_ENA | OMAP_PULL_UP);

arch/arm/mach-omap2/board-3430sdp.c

+4 −1
Original line number Diff line number Diff line
@@ -232,11 +232,13 @@ static struct omap2_hsmmc_info mmc[] = { 
		 */

		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,

		.gpio_wp	= 4,

		.deferred	= true,

	},

	{

		.mmc		= 2,

		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,

		.gpio_wp	= 7,

		.deferred	= true,

	},

	{}	/* Terminator */

};
@@ -249,7 +251,7 @@ static int sdp3430_twl_gpio_setup(struct device *dev, 
	 */

	mmc[0].gpio_cd = gpio + 0;

	mmc[1].gpio_cd = gpio + 1;

	omap2_hsmmc_init(mmc);

	omap_hsmmc_late_init(mmc);



	/* gpio + 7 is "sub_lcd_en_bkl" (output/PWM1) */

	gpio_request_one(gpio + 7, GPIOF_OUT_INIT_LOW, "sub_lcd_en_bkl");
@@ -606,6 +608,7 @@ static void __init omap_3430sdp_init(void) 
	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap_board_config = sdp3430_config;

	omap_board_config_size = ARRAY_SIZE(sdp3430_config);

	omap_hsmmc_init(mmc);

	omap3430_i2c_init();

	omap_display_init(&sdp3430_dss_data);

	if (omap_rev() > OMAP3430_REV_ES1_0)

arch/arm/mach-omap2/board-4430sdp.c

+2 −2
Original line number Diff line number Diff line
@@ -491,9 +491,9 @@ static int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers) 
{

	struct omap2_hsmmc_info *c;



	omap2_hsmmc_init(controllers);

	omap_hsmmc_init(controllers);

	for (c = controllers; c->mmc; c++)

		omap4_twl6030_hsmmc_set_late_init(c->dev);

		omap4_twl6030_hsmmc_set_late_init(&c->pdev->dev);



	return 0;

}

arch/arm/mach-omap2/board-am3517evm.c

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ static void __init am3517_evm_init(void) 
	am3517_evm_musb_init();



	/* MMC init function */

	omap2_hsmmc_init(mmc);

	omap_hsmmc_init(mmc);

}



MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM")

arch/arm/mach-omap2/board-cm-t35.c

+3 −2
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ static struct omap2_hsmmc_info mmc[] = { 
		.caps		= MMC_CAP_4_BIT_DATA,

		.gpio_cd	= -EINVAL,

		.gpio_wp	= -EINVAL,



		.deferred	= true,

	},

	{

		.mmc		= 2,
@@ -470,7 +470,7 @@ static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio, 


	/* gpio + 0 is "mmc0_cd" (input/IRQ) */

	mmc[0].gpio_cd = gpio + 0;

	omap2_hsmmc_init(mmc);

	omap_hsmmc_late_init(mmc);



	return 0;

}
@@ -638,6 +638,7 @@ static void __init cm_t3x_common_init(void) 
	omap_serial_init();

	omap_sdrc_init(mt46h32m32lf6_sdrc_params,

			     mt46h32m32lf6_sdrc_params);

	omap_hsmmc_init(mmc);

	cm_t35_init_i2c();

	omap_ads7846_init(1, CM_T35_GPIO_PENDOWN, 0, NULL);

	cm_t35_init_ethernet();