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

Commit 98ead6e0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'fixes-against-v3.12-rc3-take2' of... 

Merge tag 'fixes-against-v3.12-rc3-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren:

Few fixes for omap3 related hangs and errors that people have
noticed now that people are actually using the device tree
based booting for omap3.

Also one regression fix for timer compile for dra7xx when
omap5 is not selected, and a LED regression fix for n900.

* tag 'fixes-against-v3.12-rc3-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2: RX-51: Add missing max_current to rx51_lp5523_led_config
  ARM: mach-omap2: board-generic: fix undefined symbol
  ARM: dts: Fix pinctrl mask for omap3
  ARM: OMAP3: Fix hardware detection for omap3630 when booted with device tree
  ARM: OMAP2: gpmc-onenand: fix sync mode setup with DT

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d0e639c9 d1f1ca36

arch/arm/boot/dts/omap3-beagle-xm.dts

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


/ {

	model = "TI OMAP3 BeagleBoard xM";

	compatible = "ti,omap3-beagle-xm", "ti,omap3-beagle", "ti,omap3";

	compatible = "ti,omap3-beagle-xm", "ti,omap36xx", "ti,omap3";



	cpus {

		cpu@0 {

arch/arm/boot/dts/omap3.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			pinctrl-single,register-width = <16>;

			pinctrl-single,function-mask = <0x7f1f>;

			pinctrl-single,function-mask = <0xff1f>;

		};



		omap3_pmx_wkup: pinmux@0x48002a00 {
@@ -117,7 +117,7 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			pinctrl-single,register-width = <16>;

			pinctrl-single,function-mask = <0x7f1f>;

			pinctrl-single,function-mask = <0xff1f>;

		};



		gpio1: gpio@48310000 {

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

+18 −0
Original line number Diff line number Diff line
@@ -129,6 +129,24 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") 
	.restart	= omap3xxx_restart,

MACHINE_END



static const char *omap36xx_boards_compat[] __initdata = {

	"ti,omap36xx",

	NULL,

};



DT_MACHINE_START(OMAP36XX_DT, "Generic OMAP36xx (Flattened Device Tree)")

	.reserve	= omap_reserve,

	.map_io		= omap3_map_io,

	.init_early	= omap3630_init_early,

	.init_irq	= omap_intc_of_init,

	.handle_irq	= omap3_intc_handle_irq,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_time	= omap3_sync32k_timer_init,

	.dt_compat	= omap36xx_boards_compat,

	.restart	= omap3xxx_restart,

MACHINE_END



static const char *omap3_gp_boards_compat[] __initdata = {

	"ti,omap3-beagle",

	"timll,omap3-devkit8000",

arch/arm/mach-omap2/board-rx51-peripherals.c

+9 −0
Original line number Diff line number Diff line
@@ -167,38 +167,47 @@ static struct lp55xx_led_config rx51_lp5523_led_config[] = { 
		.name		= "lp5523:kb1",

		.chan_nr	= 0,

		.led_current	= 50,

		.max_current	= 100,

	}, {

		.name		= "lp5523:kb2",

		.chan_nr	= 1,

		.led_current	= 50,

		.max_current	= 100,

	}, {

		.name		= "lp5523:kb3",

		.chan_nr	= 2,

		.led_current	= 50,

		.max_current	= 100,

	}, {

		.name		= "lp5523:kb4",

		.chan_nr	= 3,

		.led_current	= 50,

		.max_current	= 100,

	}, {

		.name		= "lp5523:b",

		.chan_nr	= 4,

		.led_current	= 50,

		.max_current	= 100,

	}, {

		.name		= "lp5523:g",

		.chan_nr	= 5,

		.led_current	= 50,

		.max_current	= 100,

	}, {

		.name		= "lp5523:r",

		.chan_nr	= 6,

		.led_current	= 50,

		.max_current	= 100,

	}, {

		.name		= "lp5523:kb5",

		.chan_nr	= 7,

		.led_current	= 50,

		.max_current	= 100,

	}, {

		.name		= "lp5523:kb6",

		.chan_nr	= 8,

		.led_current	= 50,

		.max_current	= 100,

	}

};

arch/arm/mach-omap2/gpmc-onenand.c

+11 −1
Original line number Diff line number Diff line
@@ -272,9 +272,19 @@ static int omap2_onenand_setup_async(void __iomem *onenand_base) 
	struct gpmc_timings t;

	int ret;



	if (gpmc_onenand_data->of_node)

	if (gpmc_onenand_data->of_node) {

		gpmc_read_settings_dt(gpmc_onenand_data->of_node,

				      &onenand_async);

		if (onenand_async.sync_read || onenand_async.sync_write) {

			if (onenand_async.sync_write)

				gpmc_onenand_data->flags |=

					ONENAND_SYNC_READWRITE;

			else

				gpmc_onenand_data->flags |= ONENAND_SYNC_READ;

			onenand_async.sync_read = false;

			onenand_async.sync_write = false;

		}

	}



	omap2_onenand_set_async_mode(onenand_base);