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

Commit 8f59ae06 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 Arnd Bergmann:
 "A few patches have come up since the merge window.  The largest one is
  a rewrite of the PXA lubbock/mainstone IRQ handling.  This was already
  broken in 2011 by a change to the GPIO code and only noticed now.

  The other changes contained here are:

  MAINTAINERS file updates:

   - Ray Jui and Scott Branden are now co-maintainers for some of the
     mach-bcm chips, while Christian Daudt and Marc Carino have stepped
     down.

   - Andrew Victor is no longer maintaining at91.  Instead, Alexandre
     Belloni now becomes an official maintainer, after having done a
     bulk of the work for a while.

   - Baruch Siach, who added the mach-digicolor platform in 4.1 is now
     listed as maintainer

   - The git URL for mach-socfpga has changed

  Bug fixes:

   - Three bug fixes for new rockchip rk3288 code

   - A regression fix to make SD card support work on certain ux500
     boards

   - multiple smaller dts fixes for imx, omap, mvebu, and shmobile

   - a regression fiix for omap3 power consumption

   - a fix for regression in the ARM CCI bus driver

  Configuration changes:

   - more imx platforms are now enabled in multi_v7_defconfig"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
  MAINTAINERS: add Conexant Digicolor machines entry
  MAINTAINERS: socfpga: update the git repo for SoCFPGA
  ARM: multi_v7_defconfig: Select more FSL SoCs
  MAINTAINERS: replace an AT91 maintainer
  drivers: CCI: fix used_mask init in validate_group()
  bus: omap_l3_noc: Fix master id address decoding for OMAP5
  bus: omap_l3_noc: Fix offset for DRA7 CLK1_HOST_CLK1_2 instance
  ARM: dts: dra7: Fix efuse register size for ABB
  ARM: dts: am57xx-beagle-x15: Switch GPIO fan number
  ARM: dts: am57xx-beagle-x15: Switch UART mux pins
  ARM: dts: am437x-sk: reduce col-scan-delay-us
  ARM: dts: am437x-sk: fix for new newhaven display module revision
  ARM: dts: am57xx-beagle-x15: Fix RTC aliases
  ARM: dts: am57xx-beagle-x15: Fix IRQ type for mcp7941x
  ARM: dts: omap3: Add #iommu-cells to isp and iva iommu
  ARM: omap2plus_defconfig: Enable EXTCON_USB_GPIO
  ARM: dts: OMAP3-N900: Add microphone bias voltages
  ARM: OMAP2+: Fix omap off idle power consumption creeping up
  MAINTAINERS: Update brcmstb entry
  MAINTAINERS: Remove Christian Daudt for mach-bcm
  ...
parents 51dfcb07 c9d862c4

CREDITS

+7 −0
Original line number Diff line number Diff line
@@ -3709,6 +3709,13 @@ N: Dirk Verworner 
D: Co-author of German book ``Linux-Kernel-Programmierung''

D: Co-founder of Berlin Linux User Group



N: Andrew Victor

E: linux@maxim.org.za

W: http://maxim.org.za/at91_26.html

D: First maintainer of Atmel ARM-based SoC, aka AT91

D: Introduced support for at91rm9200, the first chip of AT91 family

S: South Africa



N: Riku Voipio

E: riku.voipio@iki.fi

D: Author of PCA9532 LED and Fintek f75375s hwmon driver

Documentation/devicetree/bindings/arm/omap/l3-noc.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ provided by Arteris. 
Required properties:

- compatible : Should be "ti,omap3-l3-smx" for OMAP3 family

               Should be "ti,omap4-l3-noc" for OMAP4 family

               Should be "ti,omap5-l3-noc" for OMAP5 family

	       Should be "ti,dra7-l3-noc" for DRA7 family

               Should be "ti,am4372-l3-noc" for AM43 family

- reg:	Contains L3 register address range for each noc domain.

Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ dma_apbx: dma-apbx@80024000 { 
		      80 81 68 69

		      70 71 72 73

		      74 75 76 77>;

	interrupt-names = "auart4-rx", "aurat4-tx", "spdif-tx", "empty",

	interrupt-names = "auart4-rx", "auart4-tx", "spdif-tx", "empty",

			  "saif0", "saif1", "i2c0", "i2c1",

			  "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",

			  "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";

MAINTAINERS

+12 −6
Original line number Diff line number Diff line
@@ -892,11 +892,10 @@ S: Maintained 
F:	arch/arm/mach-alpine/



ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES

M:	Andrew Victor <linux@maxim.org.za>

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Alexandre Belloni <alexandre.belloni@free-electrons.com>

M:	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>

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

W:	http://maxim.org.za/at91_26.html

W:	http://www.linux4sam.org

S:	Supported

F:	arch/arm/mach-at91/
@@ -990,6 +989,12 @@ F: drivers/clocksource/timer-prima2.c 
F:	drivers/clocksource/timer-atlas7.c

N:	[^a-z]sirf



ARM/CONEXANT DIGICOLOR MACHINE SUPPORT

M:	Baruch Siach <baruch@tkos.co.il>

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

S:	Maintained

N:	digicolor



ARM/EBSA110 MACHINE SUPPORT

M:	Russell King <linux@arm.linux.org.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1439,9 +1444,10 @@ ARM/SOCFPGA ARCHITECTURE 
M:	Dinh Nguyen <dinguyen@opensource.altera.com>

S:	Maintained

F:	arch/arm/mach-socfpga/

F:	arch/arm/boot/dts/socfpga*

F:	arch/arm/configs/socfpga_defconfig

W:	http://www.rocketboards.org

T:	git://git.rocketboards.org/linux-socfpga.git

T:	git://git.rocketboards.org/linux-socfpga-next.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git



ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT

M:	Dinh Nguyen <dinguyen@opensource.altera.com>
@@ -2116,8 +2122,9 @@ S: Supported 
F:	drivers/net/ethernet/broadcom/bnx2x/



BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE

M:	Christian Daudt <bcm@fixthebug.org>

M:	Florian Fainelli <f.fainelli@gmail.com>

M:	Ray Jui <rjui@broadcom.com>

M:	Scott Branden <sbranden@broadcom.com>

L:	bcm-kernel-feedback-list@broadcom.com

T:	git git://github.com/broadcom/mach-bcm

S:	Maintained
@@ -2168,7 +2175,6 @@ S: Maintained 
F:	drivers/usb/gadget/udc/bcm63xx_udc.*



BROADCOM BCM7XXX ARM ARCHITECTURE

M:	Marc Carino <marc.ceeeee@gmail.com>

M:	Brian Norris <computersforpeace@gmail.com>

M:	Gregory Fong <gregory.0xf0@gmail.com>

M:	Florian Fainelli <f.fainelli@gmail.com>

arch/arm/boot/dts/am437x-sk-evm.dts

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
		pinctrl-0 = <&matrix_keypad_pins>;



		debounce-delay-ms = <5>;

		col-scan-delay-us = <1500>;

		col-scan-delay-us = <5>;



		row-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH		/* Bank5, pin5 */

				&gpio5 6 GPIO_ACTIVE_HIGH>;	/* Bank5, pin6 */
@@ -473,7 +473,7 @@ 
		interrupt-parent = <&gpio0>;

		interrupts = <31 0>;



		wake-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;



		touchscreen-size-x = <480>;

		touchscreen-size-y = <272>;