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

Commit ce6fbaf1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC bug fixes from Arnd Bergmann:
 "A little later during the week than the last few pull requests, since
  there was very little that came in before 3.9-rc6.  At least things
  have calmed down again here.

  Some important bug fixes that came in over the last 10 days, mostly
  mvebu and imx:

   - Multiple regressions on i.mx following the conversion of the clock
     code, hopefully the last we are seeing of those.
   - a regression in the mvebu irq handling code
   - An incorrect register offset in the rewritten s3c24xx irq code.
   - Two bugs in setting up the iomega_ix2_200 machine
   - Turning on an extra bus clock on imx
   - A MAINTAINERS file entry for Roland Stigge"

* tag 'arm-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arm: mvebu: Fix the irq map function in SMP mode
  Fix GE0/GE1 init on ix2-200 as GE0 has no PHY
  ARM: S3C24XX: Fix interrupt pending register offset of the EINT controller
  ARM: S3C24XX: Correct NR_IRQS definition for s3c2440
  ARM i.MX6: Fix ldb_di clock selection
  ARM: imx: provide twd clock lookup from device tree
  ARM: imx35 Bugfix admux clock
  ARM: clk-imx35: Bugfix iomux clock
  ARM: mxs: Slow down the I2C clock speed
  MAINTAINERS: Add maintainer for LPC32xx
  ARM: Kirkwood: Fix typo in the definition of ix2-200 rebuild LED
parents 7ee32a6d 71bd98af

MAINTAINERS

+6 −0
Original line number Original line Diff line number Diff line
@@ -4941,6 +4941,12 @@ W: logfs.org 
S:	Maintained

S:	Maintained

F:	fs/logfs/

F:	fs/logfs/





LPC32XX MACHINE SUPPORT

M:	Roland Stigge <stigge@antcom.de>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-lpc32xx/



LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)

LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)

M:	Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>

M:	Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>

M:	Sreekanth Reddy <Sreekanth.Reddy@lsi.com>

M:	Sreekanth Reddy <Sreekanth.Reddy@lsi.com>

arch/arm/boot/dts/imx28-m28evk.dts

+0 −1
Original line number Original line Diff line number Diff line
@@ -152,7 +152,6 @@ 
			i2c0: i2c@80058000 {

			i2c0: i2c@80058000 {

				pinctrl-names = "default";

				pinctrl-names = "default";

				pinctrl-0 = <&i2c0_pins_a>;

				pinctrl-0 = <&i2c0_pins_a>;

				clock-frequency = <400000>;

				status = "okay";

				status = "okay";





				sgtl5000: codec@0a {

				sgtl5000: codec@0a {

arch/arm/boot/dts/imx28-sps1.dts

+0 −1
Original line number Original line Diff line number Diff line
@@ -70,7 +70,6 @@ 
			i2c0: i2c@80058000 {

			i2c0: i2c@80058000 {

				pinctrl-names = "default";

				pinctrl-names = "default";

				pinctrl-0 = <&i2c0_pins_a>;

				pinctrl-0 = <&i2c0_pins_a>;

				clock-frequency = <400000>;

				status = "okay";

				status = "okay";





				rtc: rtc@51 {

				rtc: rtc@51 {

arch/arm/boot/dts/imx6qdl.dtsi

+1 −0
Original line number Original line Diff line number Diff line
@@ -91,6 +91,7 @@ 
			compatible = "arm,cortex-a9-twd-timer";

			compatible = "arm,cortex-a9-twd-timer";

			reg = <0x00a00600 0x20>;

			reg = <0x00a00600 0x20>;

			interrupts = <1 13 0xf01>;

			interrupts = <1 13 0xf01>;

			clocks = <&clks 15>;

		};

		};





		L2: l2-cache@00a02000 {

		L2: l2-cache@00a02000 {

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

+7 −7
Original line number Original line Diff line number Diff line
@@ -96,11 +96,11 @@ 
				marvell,function = "gpio";

				marvell,function = "gpio";

			};

			};

			pmx_led_rebuild_brt_ctrl_1: pmx-led-rebuild-brt-ctrl-1 {

			pmx_led_rebuild_brt_ctrl_1: pmx-led-rebuild-brt-ctrl-1 {

				marvell,pins = "mpp44";

				marvell,pins = "mpp46";

				marvell,function = "gpio";

				marvell,function = "gpio";

			};

			};

			pmx_led_rebuild_brt_ctrl_2: pmx-led-rebuild-brt-ctrl-2 {

			pmx_led_rebuild_brt_ctrl_2: pmx-led-rebuild-brt-ctrl-2 {

				marvell,pins = "mpp45";

				marvell,pins = "mpp47";

				marvell,function = "gpio";

				marvell,function = "gpio";

			};

			};
@@ -157,14 +157,14 @@ 
			gpios = <&gpio0 16 0>;

			gpios = <&gpio0 16 0>;

			linux,default-trigger = "default-on";

			linux,default-trigger = "default-on";

		};

		};

		health_led1 {

		rebuild_led {

			label = "status:white:rebuild_led";

			gpios = <&gpio1 4 0>;

		};

		health_led {

			label = "status:red:health_led";

			label = "status:red:health_led";

			gpios = <&gpio1 5 0>;

			gpios = <&gpio1 5 0>;

		};

		};

		health_led2 {

			label = "status:white:health_led";

			gpios = <&gpio1 4 0>;

		};

		backup_led {

		backup_led {

			label = "status:blue:backup_led";

			label = "status:blue:backup_led";

			gpios = <&gpio0 15 0>;

			gpios = <&gpio0 15 0>;