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

Commit 88de3d0d 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 bug fixes from Arnd Bergmann:
 "These are a bunch of bug fixes that came in after the merge window and
  one update for the MAINTAINERS file.

  The largest part of the fixes are patches that address bugs found by
  building all the ARM defconfig files.  There are a lot more warnings
  that we have patches for, but the others are either still under
  discussion or are harmless and do not cause actual problems besides
  making the build slightly noisy."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (30 commits)
  ARM: davinci: remove broken ntosd2_init_i2c
  ARM: s3c24xx: enable CONFIG_BUG for tct_hammer
  omap-rng: fix use of SIMPLE_DEV_PM_OPS
  spi/s3c64xx: improve error handling
  mtd/omap2: fix dmaengine_slave_config error handling
  gpio: em: do not discard em_gio_irq_domain_cleanup
  ARM: exynos: exynos_pm_add_dev_to_genpd may be unused
  ARM: imx: gpmi-nand depends on mxs-dma
  ARM: integrator: include <linux/export.h>
  ARM: s3c24xx: use new PWM driver
  ARM: sa1100: include linux/io.h in hackkit leds code
  Input: eeti_ts: pass gpio value instead of IRQ
  ARM: pxa: remove irq_to_gpio from ezx-pcap driver
  ARM: tegra: more regulator fixes for Harmony
  usb/ohci-omap: remove unused variable
  mfd/asic3: fix asic3_mfd_probe return value
  ARM: kirkwood: fix typo in Makefile.boot
  i.MX27: Fix emma-prp and csi clocks.
  ARM: integrator: use clk_prepare_enable() for timer
  MAINTAINERS: update entry for Linus Walleij
  ...
parents f720e7ea de923430

MAINTAINERS

+11 −6
Original line number Diff line number Diff line
@@ -925,14 +925,14 @@ S: Maintained 


ARM/NOMADIK ARCHITECTURE

M:	Alessandro Rubini <rubini@unipv.it>

M:	Linus Walleij <linus.walleij@stericsson.com>

M:	Linus Walleij <linus.walleij@linaro.org>

M:	STEricsson <STEricsson_nomadik_linux@list.st.com>

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

S:	Maintained

F:	arch/arm/mach-nomadik/

F:	arch/arm/plat-nomadik/

F:	drivers/i2c/busses/i2c-nomadik.c

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git



ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT

M:	Nelson Castillo <arhuaco@freaks-unidos.net>
@@ -1146,7 +1146,7 @@ F: drivers/usb/host/ehci-w90x900.c 
F:	drivers/video/nuc900fb.c



ARM/U300 MACHINE SUPPORT

M:	Linus Walleij <linus.walleij@stericsson.com>

M:	Linus Walleij <linus.walleij@linaro.org>

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

S:	Supported

F:	arch/arm/mach-u300/
@@ -1161,15 +1161,20 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git 


ARM/Ux500 ARM ARCHITECTURE

M:	Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>

M:	Linus Walleij <linus.walleij@stericsson.com>

M:	Linus Walleij <linus.walleij@linaro.org>

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

S:	Maintained

F:	arch/arm/mach-ux500/

F:	drivers/clocksource/clksrc-dbx500-prcmu.c

F:	drivers/dma/ste_dma40*

F:	drivers/hwspinlock/u8500_hsem.c

F:	drivers/mfd/abx500*

F:	drivers/mfd/ab8500*

F:	drivers/mfd/stmpe*

F:	drivers/mfd/dbx500*

F:	drivers/mfd/db8500*

F:	drivers/pinctrl/pinctrl-nomadik*

F:	drivers/rtc/rtc-ab8500.c

F:	drivers/rtc/rtc-pl031.c

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git



ARM/VFP SUPPORT
@@ -3094,7 +3099,7 @@ F: include/linux/gigaset_dev.h 


GPIO SUBSYSTEM

M:	Grant Likely <grant.likely@secretlab.ca>

M:	Linus Walleij <linus.walleij@stericsson.com>

M:	Linus Walleij <linus.walleij@linaro.org>

S:	Maintained

T:	git git://git.secretlab.ca/git/linux-2.6.git

F:	Documentation/gpio.txt

arch/arm/boot/dts/imx23.dtsi

+26 −26
Original line number Diff line number Diff line
@@ -51,11 +51,11 @@ 


			dma-apbh@80004000 {

				compatible = "fsl,imx23-dma-apbh";

				reg = <0x80004000 2000>;

				reg = <0x80004000 0x2000>;

			};



			ecc@80008000 {

				reg = <0x80008000 2000>;

				reg = <0x80008000 0x2000>;

				status = "disabled";

			};
@@ -63,7 +63,7 @@ 
				compatible = "fsl,imx23-gpmi-nand";

				#address-cells = <1>;

				#size-cells = <1>;

				reg = <0x8000c000 2000>, <0x8000a000 2000>;

				reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;

				reg-names = "gpmi-nand", "bch";

				interrupts = <13>, <56>;

				interrupt-names = "gpmi-dma", "bch";
@@ -72,14 +72,14 @@ 
			};



			ssp0: ssp@80010000 {

				reg = <0x80010000 2000>;

				reg = <0x80010000 0x2000>;

				interrupts = <15 14>;

				fsl,ssp-dma-channel = <1>;

				status = "disabled";

			};



			etm@80014000 {

				reg = <0x80014000 2000>;

				reg = <0x80014000 0x2000>;

				status = "disabled";

			};
@@ -87,7 +87,7 @@ 
				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,imx23-pinctrl", "simple-bus";

				reg = <0x80018000 2000>;

				reg = <0x80018000 0x2000>;



				gpio0: gpio@0 {

					compatible = "fsl,imx23-gpio", "fsl,mxs-gpio";
@@ -273,32 +273,32 @@ 
			};



			emi@80020000 {

				reg = <0x80020000 2000>;

				reg = <0x80020000 0x2000>;

				status = "disabled";

			};



			dma-apbx@80024000 {

				compatible = "fsl,imx23-dma-apbx";

				reg = <0x80024000 2000>;

				reg = <0x80024000 0x2000>;

			};



			dcp@80028000 {

				reg = <0x80028000 2000>;

				reg = <0x80028000 0x2000>;

				status = "disabled";

			};



			pxp@8002a000 {

				reg = <0x8002a000 2000>;

				reg = <0x8002a000 0x2000>;

				status = "disabled";

			};



			ocotp@8002c000 {

				reg = <0x8002c000 2000>;

				reg = <0x8002c000 0x2000>;

				status = "disabled";

			};



			axi-ahb@8002e000 {

				reg = <0x8002e000 2000>;

				reg = <0x8002e000 0x2000>;

				status = "disabled";

			};
@@ -310,14 +310,14 @@ 
			};



			ssp1: ssp@80034000 {

				reg = <0x80034000 2000>;

				reg = <0x80034000 0x2000>;

				interrupts = <2 20>;

				fsl,ssp-dma-channel = <2>;

				status = "disabled";

			};



			tvenc@80038000 {

				reg = <0x80038000 2000>;

				reg = <0x80038000 0x2000>;

				status = "disabled";

			};

                };
@@ -330,37 +330,37 @@ 
			ranges;



			clkctl@80040000 {

				reg = <0x80040000 2000>;

				reg = <0x80040000 0x2000>;

				status = "disabled";

			};



			saif0: saif@80042000 {

				reg = <0x80042000 2000>;

				reg = <0x80042000 0x2000>;

				status = "disabled";

			};



			power@80044000 {

				reg = <0x80044000 2000>;

				reg = <0x80044000 0x2000>;

				status = "disabled";

			};



			saif1: saif@80046000 {

				reg = <0x80046000 2000>;

				reg = <0x80046000 0x2000>;

				status = "disabled";

			};



			audio-out@80048000 {

				reg = <0x80048000 2000>;

				reg = <0x80048000 0x2000>;

				status = "disabled";

			};



			audio-in@8004c000 {

				reg = <0x8004c000 2000>;

				reg = <0x8004c000 0x2000>;

				status = "disabled";

			};



			lradc@80050000 {

				reg = <0x80050000 2000>;

				reg = <0x80050000 0x2000>;

				status = "disabled";

			};
@@ -370,26 +370,26 @@ 
			};



			i2c@80058000 {

				reg = <0x80058000 2000>;

				reg = <0x80058000 0x2000>;

				status = "disabled";

			};



			rtc@8005c000 {

				compatible = "fsl,imx23-rtc", "fsl,stmp3xxx-rtc";

				reg = <0x8005c000 2000>;

				reg = <0x8005c000 0x2000>;

				interrupts = <22>;

			};



			pwm: pwm@80064000 {

				compatible = "fsl,imx23-pwm";

				reg = <0x80064000 2000>;

				reg = <0x80064000 0x2000>;

				#pwm-cells = <2>;

				fsl,pwm-number = <5>;

				status = "disabled";

			};



			timrot@80068000 {

				reg = <0x80068000 2000>;

				reg = <0x80068000 0x2000>;

				status = "disabled";

			};
@@ -429,7 +429,7 @@ 
		ranges;



		usbctrl@80080000 {

			reg = <0x80080000 0x10000>;

			reg = <0x80080000 0x40000>;

			status = "disabled";

		};

	};

arch/arm/boot/dts/imx27-3ds.dts

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
				status = "okay";

			};



			uart@1000a000 {

			uart1: serial@1000a000 {

				fsl,uart-has-rtscts;

				status = "okay";

			};

arch/arm/boot/dts/imx28.dtsi

+37 −37
Original line number Diff line number Diff line
@@ -57,18 +57,18 @@ 
			};



			hsadc@80002000 {

				reg = <0x80002000 2000>;

				reg = <0x80002000 0x2000>;

				interrupts = <13 87>;

				status = "disabled";

			};



			dma-apbh@80004000 {

				compatible = "fsl,imx28-dma-apbh";

				reg = <0x80004000 2000>;

				reg = <0x80004000 0x2000>;

			};



			perfmon@80006000 {

				reg = <0x80006000 800>;

				reg = <0x80006000 0x800>;

				interrupts = <27>;

				status = "disabled";

			};
@@ -77,7 +77,7 @@ 
				compatible = "fsl,imx28-gpmi-nand";

				#address-cells = <1>;

				#size-cells = <1>;

				reg = <0x8000c000 2000>, <0x8000a000 2000>;

				reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;

				reg-names = "gpmi-nand", "bch";

				interrupts = <88>, <41>;

				interrupt-names = "gpmi-dma", "bch";
@@ -86,28 +86,28 @@ 
			};



			ssp0: ssp@80010000 {

				reg = <0x80010000 2000>;

				reg = <0x80010000 0x2000>;

				interrupts = <96 82>;

				fsl,ssp-dma-channel = <0>;

				status = "disabled";

			};



			ssp1: ssp@80012000 {

				reg = <0x80012000 2000>;

				reg = <0x80012000 0x2000>;

				interrupts = <97 83>;

				fsl,ssp-dma-channel = <1>;

				status = "disabled";

			};



			ssp2: ssp@80014000 {

				reg = <0x80014000 2000>;

				reg = <0x80014000 0x2000>;

				interrupts = <98 84>;

				fsl,ssp-dma-channel = <2>;

				status = "disabled";

			};



			ssp3: ssp@80016000 {

				reg = <0x80016000 2000>;

				reg = <0x80016000 0x2000>;

				interrupts = <99 85>;

				fsl,ssp-dma-channel = <3>;

				status = "disabled";
@@ -117,7 +117,7 @@ 
				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,imx28-pinctrl", "simple-bus";

				reg = <0x80018000 2000>;

				reg = <0x80018000 0x2000>;



				gpio0: gpio@0 {

					compatible = "fsl,imx28-gpio", "fsl,mxs-gpio";
@@ -510,96 +510,96 @@ 
			};



			digctl@8001c000 {

				reg = <0x8001c000 2000>;

				reg = <0x8001c000 0x2000>;

				interrupts = <89>;

				status = "disabled";

			};



			etm@80022000 {

				reg = <0x80022000 2000>;

				reg = <0x80022000 0x2000>;

				status = "disabled";

			};



			dma-apbx@80024000 {

				compatible = "fsl,imx28-dma-apbx";

				reg = <0x80024000 2000>;

				reg = <0x80024000 0x2000>;

			};



			dcp@80028000 {

				reg = <0x80028000 2000>;

				reg = <0x80028000 0x2000>;

				interrupts = <52 53 54>;

				status = "disabled";

			};



			pxp@8002a000 {

				reg = <0x8002a000 2000>;

				reg = <0x8002a000 0x2000>;

				interrupts = <39>;

				status = "disabled";

			};



			ocotp@8002c000 {

				reg = <0x8002c000 2000>;

				reg = <0x8002c000 0x2000>;

				status = "disabled";

			};



			axi-ahb@8002e000 {

				reg = <0x8002e000 2000>;

				reg = <0x8002e000 0x2000>;

				status = "disabled";

			};



			lcdif@80030000 {

				compatible = "fsl,imx28-lcdif";

				reg = <0x80030000 2000>;

				reg = <0x80030000 0x2000>;

				interrupts = <38 86>;

				status = "disabled";

			};



			can0: can@80032000 {

				compatible = "fsl,imx28-flexcan", "fsl,p1010-flexcan";

				reg = <0x80032000 2000>;

				reg = <0x80032000 0x2000>;

				interrupts = <8>;

				status = "disabled";

			};



			can1: can@80034000 {

				compatible = "fsl,imx28-flexcan", "fsl,p1010-flexcan";

				reg = <0x80034000 2000>;

				reg = <0x80034000 0x2000>;

				interrupts = <9>;

				status = "disabled";

			};



			simdbg@8003c000 {

				reg = <0x8003c000 200>;

				reg = <0x8003c000 0x200>;

				status = "disabled";

			};



			simgpmisel@8003c200 {

				reg = <0x8003c200 100>;

				reg = <0x8003c200 0x100>;

				status = "disabled";

			};



			simsspsel@8003c300 {

				reg = <0x8003c300 100>;

				reg = <0x8003c300 0x100>;

				status = "disabled";

			};



			simmemsel@8003c400 {

				reg = <0x8003c400 100>;

				reg = <0x8003c400 0x100>;

				status = "disabled";

			};



			gpiomon@8003c500 {

				reg = <0x8003c500 100>;

				reg = <0x8003c500 0x100>;

				status = "disabled";

			};



			simenet@8003c700 {

				reg = <0x8003c700 100>;

				reg = <0x8003c700 0x100>;

				status = "disabled";

			};



			armjtag@8003c800 {

				reg = <0x8003c800 100>;

				reg = <0x8003c800 0x100>;

				status = "disabled";

			};

                };
@@ -612,45 +612,45 @@ 
			ranges;



			clkctl@80040000 {

				reg = <0x80040000 2000>;

				reg = <0x80040000 0x2000>;

				status = "disabled";

			};



			saif0: saif@80042000 {

				compatible = "fsl,imx28-saif";

				reg = <0x80042000 2000>;

				reg = <0x80042000 0x2000>;

				interrupts = <59 80>;

				fsl,saif-dma-channel = <4>;

				status = "disabled";

			};



			power@80044000 {

				reg = <0x80044000 2000>;

				reg = <0x80044000 0x2000>;

				status = "disabled";

			};



			saif1: saif@80046000 {

				compatible = "fsl,imx28-saif";

				reg = <0x80046000 2000>;

				reg = <0x80046000 0x2000>;

				interrupts = <58 81>;

				fsl,saif-dma-channel = <5>;

				status = "disabled";

			};



			lradc@80050000 {

				reg = <0x80050000 2000>;

				reg = <0x80050000 0x2000>;

				status = "disabled";

			};



			spdif@80054000 {

				reg = <0x80054000 2000>;

				reg = <0x80054000 0x2000>;

				interrupts = <45 66>;

				status = "disabled";

			};



			rtc@80056000 {

				compatible = "fsl,imx28-rtc", "fsl,stmp3xxx-rtc";

				reg = <0x80056000 2000>;

				reg = <0x80056000 0x2000>;

				interrupts = <29>;

			};
@@ -658,7 +658,7 @@ 
				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,imx28-i2c";

				reg = <0x80058000 2000>;

				reg = <0x80058000 0x2000>;

				interrupts = <111 68>;

				clock-frequency = <100000>;

				status = "disabled";
@@ -668,7 +668,7 @@ 
				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,imx28-i2c";

				reg = <0x8005a000 2000>;

				reg = <0x8005a000 0x2000>;

				interrupts = <110 69>;

				clock-frequency = <100000>;

				status = "disabled";
@@ -676,14 +676,14 @@ 


			pwm: pwm@80064000 {

				compatible = "fsl,imx28-pwm", "fsl,imx23-pwm";

				reg = <0x80064000 2000>;

				reg = <0x80064000 0x2000>;

				#pwm-cells = <2>;

				fsl,pwm-number = <8>;

				status = "disabled";

			};



			timrot@80068000 {

				reg = <0x80068000 2000>;

				reg = <0x80068000 0x2000>;

				status = "disabled";

			};

arch/arm/boot/dts/imx51-babbage.dts

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
						spi-max-frequency = <6000000>;

						reg = <0>;

						interrupt-parent = <&gpio1>;

						interrupts = <8>;

						interrupts = <8 0x4>;



						regulators {

							sw1_reg: sw1 {