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

Commit e6694d98 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:
 "These are a little later than I planned on since I got caught up with
  handling merges for 3.11 most of the week.

  Another week, another batch of fixes for arm-soc platforms.

  Again, nothing controversial.  A few more than would be ideal, but all
  are valid fixes.  In particular the prima2 panic patch is critical
  since it fixes a problem where multiplatform kernels panic on all but
  prima2 hardware."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: SAMSUNG: pm: Adjust for pinctrl- and DT-enabled platforms
  ARM: prima2: fix incorrect panic usage
  arm: mvebu: armada-xp-{gp,openblocks-ax3-4}: specify PCIe range
  ARM: Kirkwood: handle mv88f6282 cpu in __kirkwood_variant().
  ARM: omap3: clock: fix wrong container_of in clock36xx.c
  ARM: dts: OMAP5: Fix missing PWM capability to timer nodes
  ARM: dts: omap4-panda|sdp: Fix mux for twl6030 IRQ pin and msecure line
  ARM: dts: AM33xx: Fix properties on gpmc node
  arm: omap2: fix AM33xx hwmod infos for UART2
  ARM: OMAP3: Fix iva2_pwrdm settings for 3703
parents 596fa9e6 323226bb

arch/arm/boot/dts/am33xx.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -409,8 +409,8 @@ 
			ti,hwmods = "gpmc";

			reg = <0x50000000 0x2000>;

			interrupts = <100>;

			num-cs = <7>;

			num-waitpins = <2>;

			gpmc,num-cs = <7>;

			gpmc,num-waitpins = <2>;

			#address-cells = <2>;

			#size-cells = <1>;

			status = "disabled";

arch/arm/boot/dts/armada-xp-gp.dts

+3 −2
Original line number Diff line number Diff line
@@ -39,8 +39,9 @@ 
	};



	soc {

		ranges = <0          0 0xd0000000 0x100000

			  0xf0000000 0 0xf0000000 0x1000000>;

		ranges = <0          0 0xd0000000 0x100000  /* Internal registers 1MiB */

			  0xe0000000 0 0xe0000000 0x8100000 /* PCIe */

			  0xf0000000 0 0xf0000000 0x1000000 /* Device Bus, NOR 16MiB  */>;



		internal-regs {

			serial@12000 {

arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

+3 −2
Original line number Diff line number Diff line
@@ -27,8 +27,9 @@ 
	};



	soc {

		ranges = <0          0 0xd0000000 0x100000

			  0xf0000000 0 0xf0000000 0x8000000>;

		ranges = <0          0 0xd0000000 0x100000	/* Internal registers 1MiB */

			  0xe0000000 0 0xe0000000 0x8100000     /* PCIe */

			  0xf0000000 0 0xf0000000 0x8000000     /* Device Bus, NOR 128MiB   */>;



		internal-regs {

			serial@12000 {

arch/arm/boot/dts/omap4-panda-common.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -56,9 +56,23 @@ 
	};

};



&omap4_pmx_wkup {

	pinctrl-names = "default";

	pinctrl-0 = <

			&twl6030_wkup_pins

	>;



	twl6030_wkup_pins: pinmux_twl6030_wkup_pins {

		pinctrl-single,pins = <

			0x14 0x2        /* fref_clk0_out.sys_drm_msecure OUTPUT | MODE2 */

		>;

	};

};



&omap4_pmx_core {

	pinctrl-names = "default";

	pinctrl-0 = <

			&twl6030_pins

			&twl6040_pins

			&mcpdm_pins

			&mcbsp1_pins
@@ -66,6 +80,12 @@ 
			&tpd12s015_pins

	>;



	twl6030_pins: pinmux_twl6030_pins {

		pinctrl-single,pins = <

			0x15e 0x4118	/* sys_nirq1.sys_nirq1 OMAP_WAKEUP_EN | INPUT_PULLUP | MODE0 */

		>;

	};



	twl6040_pins: pinmux_twl6040_pins {

		pinctrl-single,pins = <

			0xe0 0x3	/* hdq_sio.gpio_127 OUTPUT | MODE3 */

arch/arm/boot/dts/omap4-sdp.dts

+20 −0
Original line number Diff line number Diff line
@@ -142,9 +142,23 @@ 
	};

};



&omap4_pmx_wkup {

	pinctrl-names = "default";

	pinctrl-0 = <

			&twl6030_wkup_pins

	>;



	twl6030_wkup_pins: pinmux_twl6030_wkup_pins {

		pinctrl-single,pins = <

			0x14 0x2        /* fref_clk0_out.sys_drm_msecure OUTPUT | MODE2 */

		>;

	};

};



&omap4_pmx_core {

	pinctrl-names = "default";

	pinctrl-0 = <

			&twl6030_pins

			&twl6040_pins

			&mcpdm_pins

			&dmic_pins
@@ -179,6 +193,12 @@ 
		>;

	};



	twl6030_pins: pinmux_twl6030_pins {

		pinctrl-single,pins = <

			0x15e 0x4118	/* sys_nirq1.sys_nirq1 OMAP_WAKEUP_EN | INPUT_PULLUP | MODE0 */

		>;

	};



	twl6040_pins: pinmux_twl6040_pins {

		pinctrl-single,pins = <

			0xe0 0x3	/* hdq_sio.gpio_127 OUTPUT | MODE3 */