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

Commit 3552570a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Olof Johansson:
 "A small batch of fixes this week, mostly OMAP related.  Nothing stands
  out as particularly controversial.

  Also a fix for a 3.12-rc1 timer regression for Exynos platforms,
  including the Chromebooks"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: exynos: dts: Update 5250 arch timer node with clock frequency
  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
parents 2d4712b7 4d594dd3

arch/arm/boot/dts/exynos5250.dtsi

+5 −0
Original line number Original line Diff line number Diff line
@@ -96,6 +96,11 @@ 
			     <1 14 0xf08>,

			     <1 14 0xf08>,

			     <1 11 0xf08>,

			     <1 11 0xf08>,

			     <1 10 0xf08>;

			     <1 10 0xf08>;

		/* Unfortunately we need this since some versions of U-Boot

		 * on Exynos don't set the CNTFRQ register, so we need the

		 * value from DT.

		 */

		clock-frequency = <24000000>;

	};

	};





	mct@101C0000 {

	mct@101C0000 {

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

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




/ {

/ {

	model = "TI OMAP3 BeagleBoard xM";

	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 {

	cpus {

		cpu@0 {

		cpu@0 {

arch/arm/boot/dts/omap3.dtsi

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

			#address-cells = <1>;

			#size-cells = <0>;

			#size-cells = <0>;

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

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

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

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

		};

		};





		omap3_pmx_wkup: pinmux@0x48002a00 {

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

			#address-cells = <1>;

			#size-cells = <0>;

			#size-cells = <0>;

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

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

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

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

		};

		};





		gpio1: gpio@48310000 {

		gpio1: gpio@48310000 {

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

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

	.restart	= omap3xxx_restart,

MACHINE_END

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 = {

static const char *omap3_gp_boards_compat[] __initdata = {

	"ti,omap3-beagle",

	"ti,omap3-beagle",

	"timll,omap3-devkit8000",

	"timll,omap3-devkit8000",

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

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

		.name		= "lp5523:kb1",

		.chan_nr	= 0,

		.chan_nr	= 0,

		.led_current	= 50,

		.led_current	= 50,

		.max_current	= 100,

	}, {

	}, {

		.name		= "lp5523:kb2",

		.name		= "lp5523:kb2",

		.chan_nr	= 1,

		.chan_nr	= 1,

		.led_current	= 50,

		.led_current	= 50,

		.max_current	= 100,

	}, {

	}, {

		.name		= "lp5523:kb3",

		.name		= "lp5523:kb3",

		.chan_nr	= 2,

		.chan_nr	= 2,

		.led_current	= 50,

		.led_current	= 50,

		.max_current	= 100,

	}, {

	}, {

		.name		= "lp5523:kb4",

		.name		= "lp5523:kb4",

		.chan_nr	= 3,

		.chan_nr	= 3,

		.led_current	= 50,

		.led_current	= 50,

		.max_current	= 100,

	}, {

	}, {

		.name		= "lp5523:b",

		.name		= "lp5523:b",

		.chan_nr	= 4,

		.chan_nr	= 4,

		.led_current	= 50,

		.led_current	= 50,

		.max_current	= 100,

	}, {

	}, {

		.name		= "lp5523:g",

		.name		= "lp5523:g",

		.chan_nr	= 5,

		.chan_nr	= 5,

		.led_current	= 50,

		.led_current	= 50,

		.max_current	= 100,

	}, {

	}, {

		.name		= "lp5523:r",

		.name		= "lp5523:r",

		.chan_nr	= 6,

		.chan_nr	= 6,

		.led_current	= 50,

		.led_current	= 50,

		.max_current	= 100,

	}, {

	}, {

		.name		= "lp5523:kb5",

		.name		= "lp5523:kb5",

		.chan_nr	= 7,

		.chan_nr	= 7,

		.led_current	= 50,

		.led_current	= 50,

		.max_current	= 100,

	}, {

	}, {

		.name		= "lp5523:kb6",

		.name		= "lp5523:kb6",

		.chan_nr	= 8,

		.chan_nr	= 8,

		.led_current	= 50,

		.led_current	= 50,

		.max_current	= 100,

	}

	}

};

};