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

Commit b315dac3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-legacy-4.9' of... 

Merge tag 'imx-legacy-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc

Pull "i.MX legacy board file changes for 4.9" from Shawn Guo:

It includes a patch series that moves registrations and initializations
of all peripherals which are GPIO line consumers for all legacy boards
from .init_machine to .init_late init level. This is needed to
proactively prevent boot time issues on the legacy boards due to the
deprioritized init level of the GPIO controller driver (set lower than
IOMUX controller driver init level), which is shared among all i.MX
SoCs.

* tag 'imx-legacy-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx legacy: pca100: move peripheral initialization to .init_late
  ARM: imx legacy: mx27ads: move peripheral initialization to .init_late
  ARM: imx legacy: mx21ads: move peripheral initialization to .init_late
  ARM: imx legacy: pcm043: move peripheral initialization to .init_late
  ARM: imx legacy: mx35-3ds: move peripheral initialization to .init_late
  ARM: imx legacy: mx27-3ds: move peripheral initialization to .init_late
  ARM: imx legacy: imx27-visstrim-m10: move peripheral initialization to .init_late
  ARM: imx legacy: vpr200: move peripheral initialization to .init_late
  ARM: imx legacy: mx31moboard: move peripheral initialization to .init_late
  ARM: imx legacy: armadillo5x0: move peripheral initialization to .init_late
  ARM: imx legacy: qong: move peripheral initialization to .init_late
  ARM: imx legacy: mx31-3ds: move peripheral initialization to .init_late
  ARM: imx legacy: pcm037: move peripheral initialization to .init_late
  ARM: imx legacy: mx31lilly: move peripheral initialization to .init_late
  ARM: imx legacy: mx31ads: move peripheral initialization to .init_late
  ARM: imx legacy: mx31lite: move peripheral initialization to .init_late
  ARM: imx legacy: kzm: move peripheral initialization to .init_late
parents d6fbd37b 23fe1fd0

arch/arm/mach-imx/mach-armadillo5x0.c

+23 −16
Original line number Diff line number Diff line
@@ -493,24 +493,12 @@ static void __init armadillo5x0_init(void) 


	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));



	armadillo5x0_smc911x_resources[1].start =

			gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_0));

	armadillo5x0_smc911x_resources[1].end =

			gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_0));

	platform_add_devices(devices, ARRAY_SIZE(devices));

	imx_add_gpio_keys(&armadillo5x0_button_data);

	imx31_add_imx_i2c1(NULL);



	/* Register UART */

	imx31_add_imx_uart0(&uart_pdata);

	imx31_add_imx_uart1(&uart_pdata);



	/* SMSC9118 IRQ pin */

	gpio_direction_input(MX31_PIN_GPIO1_0);



	/* Register SDHC */

	imx31_add_mxc_mmc(0, &sdhc_pdata);



	/* Register FB */

	imx31_add_ipu_core();

	imx31_add_mx3_sdc_fb(&mx3fb_pdata);
@@ -527,21 +515,39 @@ static void __init armadillo5x0_init(void) 
	/* set NAND page size to 2k if not configured via boot mode pins */

	imx_writel(imx_readl(mx3_ccm_base + MXC_CCM_RCSR) | (1 << 30),

		   mx3_ccm_base + MXC_CCM_RCSR);

}



static void __init armadillo5x0_late(void)

{

	armadillo5x0_smc911x_resources[1].start =

		gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_0));

	armadillo5x0_smc911x_resources[1].end =

		gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_0));

	platform_add_devices(devices, ARRAY_SIZE(devices));



	imx_add_gpio_keys(&armadillo5x0_button_data);



	/* SMSC9118 IRQ pin */

	gpio_direction_input(MX31_PIN_GPIO1_0);



	/* Register SDHC */

	imx31_add_mxc_mmc(0, &sdhc_pdata);



	/* RTC */

	/* Get RTC IRQ and register the chip */

	if (gpio_request(ARMADILLO5X0_RTC_GPIO, "rtc") == 0) {

		if (gpio_direction_input(ARMADILLO5X0_RTC_GPIO) == 0)

			armadillo5x0_i2c_rtc.irq = gpio_to_irq(ARMADILLO5X0_RTC_GPIO);

	if (!gpio_request(ARMADILLO5X0_RTC_GPIO, "rtc")) {

		if (!gpio_direction_input(ARMADILLO5X0_RTC_GPIO))

			armadillo5x0_i2c_rtc.irq =

				gpio_to_irq(ARMADILLO5X0_RTC_GPIO);

		else

			gpio_free(ARMADILLO5X0_RTC_GPIO);

	}



	if (armadillo5x0_i2c_rtc.irq == 0)

		pr_warn("armadillo5x0_init: failed to get RTC IRQ\n");

	i2c_register_board_info(1, &armadillo5x0_i2c_rtc, 1);



	/* USB */



	usbotg_pdata.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |

			ULPI_OTG_DRVVBUS_EXT);

	if (usbotg_pdata.otg)
@@ -565,5 +571,6 @@ MACHINE_START(ARMADILLO5X0, "Armadillo-500") 
	.init_irq = mx31_init_irq,

	.init_time	= armadillo5x0_timer_init,

	.init_machine = armadillo5x0_init,

	.init_late	= armadillo5x0_late,

	.restart	= mxc_restart,

MACHINE_END

arch/arm/mach-imx/mach-imx27_visstrim_m10.c

+17 −7
Original line number Diff line number Diff line
@@ -540,7 +540,6 @@ static void __init visstrim_m10_revision(void) 
static void __init visstrim_m10_board_init(void)

{

	int ret;

	int mo_version;



	imx27_soc_init();

	visstrim_m10_revision();
@@ -550,11 +549,6 @@ static void __init visstrim_m10_board_init(void) 
	if (ret)

		pr_err("Failed to setup pins (%d)\n", ret);



	ret = gpio_request_array(visstrim_m10_gpios,

				ARRAY_SIZE(visstrim_m10_gpios));

	if (ret)

		pr_err("Failed to request gpios (%d)\n", ret);



	imx27_add_imx_ssi(0, &visstrim_m10_ssi_pdata);

	imx27_add_imx_uart0(&uart_pdata);
@@ -566,12 +560,26 @@ static void __init visstrim_m10_board_init(void) 
	imx27_add_mxc_mmc(0, &visstrim_m10_sdhc_pdata);

	imx27_add_mxc_ehci_otg(&visstrim_m10_usbotg_pdata);

	imx27_add_fec(NULL);

	imx_add_gpio_keys(&visstrim_gpio_keys_platform_data);



	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));

}



static void __init visstrim_m10_late_init(void)

{

	int mo_version, ret;



	ret = gpio_request_array(visstrim_m10_gpios,

				 ARRAY_SIZE(visstrim_m10_gpios));

	if (ret)

		pr_err("Failed to request gpios (%d)\n", ret);



	imx_add_gpio_keys(&visstrim_gpio_keys_platform_data);



	imx_add_platform_device("mx27vis", 0, NULL, 0, &snd_mx27vis_pdata,

				sizeof(snd_mx27vis_pdata));

	platform_device_register_resndata(NULL, "soc-camera-pdrv", 0, NULL, 0,

				      &iclink_tvp5150, sizeof(iclink_tvp5150));



	gpio_led_register_device(0, &visstrim_m10_led_data);



	/* Use mother board version to decide what video devices we shall use */
@@ -591,6 +599,7 @@ static void __init visstrim_m10_board_init(void) 
		visstrim_deinterlace_init();

		visstrim_analog_camera_init();

	}



	visstrim_coda_init();

}
@@ -607,5 +616,6 @@ MACHINE_START(IMX27_VISSTRIM_M10, "Vista Silicon Visstrim_M10") 
	.init_irq = mx27_init_irq,

	.init_time	= visstrim_m10_timer_init,

	.init_machine = visstrim_m10_board_init,

	.init_late	= visstrim_m10_late_init,

	.restart	= mxc_restart,

MACHINE_END

arch/arm/mach-imx/mach-kzm_arm11_01.c

+7 −2
Original line number Diff line number Diff line
@@ -245,13 +245,17 @@ static void __init kzm_board_init(void) 


	mxc_iomux_setup_multiple_pins(kzm_pins,

				      ARRAY_SIZE(kzm_pins), "kzm");

	kzm_init_ext_uart();

	kzm_init_smsc9118();

	kzm_init_imx_uart();



	pr_info("Clock input source is 26MHz\n");

}



static void __init kzm_late_init(void)

{

	kzm_init_ext_uart();

	kzm_init_smsc9118();

}



/*

 * This structure defines static mappings for the kzm-arm11-01 board.

 */
@@ -291,5 +295,6 @@ MACHINE_START(KZM_ARM11_01, "Kyoto Microcomputer Co., Ltd. KZM-ARM11-01") 
	.init_irq = mx31_init_irq,

	.init_time	= kzm_timer_init,

	.init_machine = kzm_board_init,

	.init_late	= kzm_late_init,

	.restart	= mxc_restart,

MACHINE_END

arch/arm/mach-imx/mach-mx21ads.c

+9 −4
Original line number Diff line number Diff line
@@ -302,12 +302,16 @@ static void __init mx21ads_board_init(void) 
	imx21_add_imx_uart0(&uart_pdata_rts);

	imx21_add_imx_uart2(&uart_pdata_norts);

	imx21_add_imx_uart3(&uart_pdata_rts);

	imx21_add_mxc_mmc(0, &mx21ads_sdhc_pdata);

	imx21_add_mxc_nand(&mx21ads_nand_board_info);



	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));



	imx21_add_imx_fb(&mx21ads_fb_data);

}



static void __init mx21ads_late_init(void)

{

	imx21_add_mxc_mmc(0, &mx21ads_sdhc_pdata);



	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));



	mx21ads_cs8900_resources[1].start =

			gpio_to_irq(MX21ADS_CS8900A_IRQ_GPIO);
@@ -329,5 +333,6 @@ MACHINE_START(MX21ADS, "Freescale i.MX21ADS") 
	.init_irq = mx21_init_irq,

	.init_time	= mx21ads_timer_init,

	.init_machine	= mx21ads_board_init,

	.init_late	= mx21ads_late_init,

	.restart	= mxc_restart,

MACHINE_END

arch/arm/mach-imx/mach-mx27_3ds.c

+20 −10
Original line number Diff line number Diff line
@@ -485,17 +485,32 @@ static const struct imxi2c_platform_data mx27_3ds_i2c0_data __initconst = { 


static void __init mx27pdk_init(void)

{

	int ret;

	imx27_soc_init();



	mxc_gpio_setup_multiple_pins(mx27pdk_pins, ARRAY_SIZE(mx27pdk_pins),

		"mx27pdk");

	mx27_3ds_sdhc1_enable_level_translator();

	imx27_add_imx_uart0(&uart_pdata);

	imx27_add_fec(NULL);

	imx27_add_imx_keypad(&mx27_3ds_keymap_data);

	imx27_add_mxc_mmc(0, &sdhc1_pdata);

	imx27_add_imx2_wdt();



	imx27_add_spi_imx1(&spi2_pdata);

	imx27_add_spi_imx0(&spi1_pdata);



	imx27_add_imx_i2c(0, &mx27_3ds_i2c0_data);

	platform_add_devices(devices, ARRAY_SIZE(devices));

	imx27_add_imx_fb(&mx27_3ds_fb_data);



	imx27_add_imx_ssi(0, &mx27_3ds_ssi_pdata);

}



static void __init mx27pdk_late_init(void)

{

	int ret;



	mx27_3ds_sdhc1_enable_level_translator();

	imx27_add_mxc_mmc(0, &sdhc1_pdata);



	otg_phy_init();



	if (otg_mode_host) {
@@ -509,17 +524,12 @@ static void __init mx27pdk_init(void) 
	if (!otg_mode_host)

		imx27_add_fsl_usb2_udc(&otg_device_pdata);



	imx27_add_spi_imx1(&spi2_pdata);

	imx27_add_spi_imx0(&spi1_pdata);

	mx27_3ds_spi_devs[0].irq = gpio_to_irq(PMIC_INT);

	spi_register_board_info(mx27_3ds_spi_devs,

				ARRAY_SIZE(mx27_3ds_spi_devs));



	if (mxc_expio_init(MX27_CS5_BASE_ADDR, IMX_GPIO_NR(3, 28)))

		pr_warn("Init of the debugboard failed, all devices on the debugboard are unusable.\n");

	imx27_add_imx_i2c(0, &mx27_3ds_i2c0_data);

	platform_add_devices(devices, ARRAY_SIZE(devices));

	imx27_add_imx_fb(&mx27_3ds_fb_data);



	ret = gpio_request_array(mx27_3ds_camera_gpios,

				 ARRAY_SIZE(mx27_3ds_camera_gpios));
@@ -529,7 +539,6 @@ static void __init mx27pdk_init(void) 
	}



	imx27_add_mx2_camera(&mx27_3ds_cam_pdata);

	imx27_add_imx_ssi(0, &mx27_3ds_ssi_pdata);



	imx_add_platform_device("imx_mc13783", 0, NULL, 0, NULL, 0);

}
@@ -547,5 +556,6 @@ MACHINE_START(MX27_3DS, "Freescale MX27PDK") 
	.init_irq = mx27_init_irq,

	.init_time	= mx27pdk_timer_init,

	.init_machine = mx27pdk_init,

	.init_late	= mx27pdk_late_init,

	.restart	= mxc_restart,

MACHINE_END