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

Commit 118c9a45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC bug fixes from Arnd Bergmann:
 "After a quiet set of fixes for 3.9-rc4, a lot of people woke up and
  sent urgent fixes for 3.9.  I pushed back on a number of them that got
  deferred to 3.10, but these are the ones that seemed important.

  Regression in 3.9:

   - Multiple regressions in OMAP2+ clock cleanup
   - SH-Mobile frame buffer bug fix that merged here because of
     maintainer MIA
   - ux500 prcmu changes broke DT booting
   - MMCI duplicated regulator setup on ux500
   - New ux500 clock driver broke ethernet on snowball
   - Local interrupt driver for mvebu broke ethernet
   - MVEBU GPIO driver did not get set up right on Orion DT
   - incorrect interrupt number on Orion crypto for DT

  Long-standing bugs, including candidates for stable:

   - Kirkwood MMC needs to disable invalid card detect pins
   - MV SDIO pinmux was wrong on Mirabox
   - GoFlex Net board file needs to set NAND chip delay
   - MSM timer restart race
   - ep93xx early debug code broke in 3.7
   - i.MX CPU hotplug race
   - Incorrect clock setup for OMAP1 USB
   - Workaround for bad clock setup by some old OMAP4 boot loaders
   - Static I/O mappings on cns3xxx since 3.2"

* tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: cns3xxx: fix mapping of private memory region
  arm: mvebu: Fix pinctrl for Armada 370 Mirabox SDIO port.
  arm: orion5x: correct IRQ used in dtsi for mv_cesa
  arm: orion5x: fix orion5x.dtsi gpio parameters
  ARM: Kirkwood: fix unused mvsdio gpio pins
  arm: mvebu: Use local interrupt only for the timer 0
  ARM: kirkwood: Fix chip-delay for GoFlex Net
  ARM: ux500: Enable the clock controlling Ethernet on Snowball
  ARM: ux500: Stop passing ios_handler() as an MMCI power controlling call-back
  ARM: ux500: Apply the TCPM and TCDM locations and sizes to dbx5x0 DT
  fbdev: sh_mobile_lcdc: fixup B side hsync adjust settings
  ARM: OMAP: clocks: Delay clk inits atleast until slab is initialized
  ARM: imx: fix sync issue between imx_cpu_die and imx_cpu_kill
  ARM: msm: Stop counting before reprogramming clockevent
  ARM: ep93xx: Fix wait for UART FIFO to be empty
  ARM: OMAP4: PM: fix PM regression introduced by recent clock cleanup
  ARM: OMAP3: hwmod data: keep MIDLEMODE in force-standby for musb
  ARM: OMAP4: clock data: lock USB DPLL on boot
  ARM: OMAP1: fix USB host on 1710
parents f8e9248d 06d1d8c8

arch/arm/boot/dts/armada-370-mirabox.dts

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
		};



		mvsdio@d00d4000 {

			pinctrl-0 = <&sdio_pins2>;

			pinctrl-0 = <&sdio_pins3>;

			pinctrl-names = "default";

			status = "okay";

			/*

arch/arm/boot/dts/armada-370.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -59,6 +59,12 @@ 
					     "mpp50", "mpp51", "mpp52";

			      marvell,function = "sd0";

			};



			sdio_pins3: sdio-pins3 {

			      marvell,pins = "mpp48", "mpp49", "mpp50",

					     "mpp51", "mpp52", "mpp53";

			      marvell,function = "sd0";

			};

	        };



		gpio0: gpio@d0018100 {

arch/arm/boot/dts/dbx5x0.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -191,8 +191,8 @@ 


		prcmu: prcmu@80157000 {

			compatible = "stericsson,db8500-prcmu";

			reg = <0x80157000 0x1000>;

			reg-names = "prcmu";

			reg = <0x80157000 0x1000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;

			reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";

			interrupts = <0 47 0x4>;

			#address-cells = <1>;

			#size-cells = <1>;

arch/arm/boot/dts/kirkwood-goflexnet.dts

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
		};



		nand@3000000 {

			chip-delay = <40>;

			status = "okay";



			partition@0 {

arch/arm/boot/dts/orion5x.dtsi

+7 −2
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 
	compatible = "marvell,orion5x";

	interrupt-parent = <&intc>;



	aliases {

		gpio0 = &gpio0;

	};

	intc: interrupt-controller {

		compatible = "marvell,orion-intc", "marvell,intc";

		interrupt-controller;
@@ -32,7 +35,9 @@ 
			#gpio-cells = <2>;

			gpio-controller;

			reg = <0x10100 0x40>;

			ngpio = <32>;

			ngpios = <32>;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupts = <6>, <7>, <8>, <9>;

		};
@@ -91,7 +96,7 @@ 
			reg = <0x90000 0x10000>,

			      <0xf2200000 0x800>;

			reg-names = "regs", "sram";

			interrupts = <22>;

			interrupts = <28>;

			status = "okay";

		};

	};