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

Commit 0a9e0acd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC non-critical bug fixes from Arnd Bergmann:
 "These are bug fixes for harmless problems that were not important
  enough to get fixed in 3.19.  This contains updates to the MAINTAINERS
  file, in particular:

   - Ben Dooks stepped down as Samsung co-maintainer (thanks Ben for
     long years of maintaining this).  Kukjin Kim, who has been doing
     the work de-facto by himself recently is now the only maintainer.

   - Liviu, Sudeep and Lorenzo from ARM now officially maintain the
     Versatile Express platform, which was orphaned (thanks for

   - Gregory Fong and Florian Fainelli help out on the Broadcom BCM7XXX
     platform

   - Ray Jui and Scott Branden are the future maintainers for the newly
     merged Broadcom Cygnus platform.  Welcome!

  In terms of actual fixes, we have the usual set of OMAP bug fixes,
  which Tony Lindgren separates out well from the other OMAP changes,
  one really ep93xx regression fix against 3.11 that didn't make it for
  3.18, a few GIC changes from Marc Zyngier as a preparation for later
  rework (the current code is wrong in a harmless way), on Tegra
  regression and one samsung spelling fix"

* tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: imx6: fix bogus use of irq_get_irq_data
  ARM: imx: irq: fix buggy usage of irq_data irq field
  MAINTAINERS: ARM Versatile Express platform, add missing pattern
  MAINTAINERS: ARM Versatile Express platform
  arm: ep93xx: add dma_masks for the M2P and M2M DMA controllers
  MAINTAINERS: Add ahci_st.c to ARCH/STI architecture
  MAINTAINERS: add entry for the GISB arbiter driver
  MAINTAINERS: update brcmstb entries
  MAINTAINERS: update email address and cleanup for exynos entry
  ARM: tegra: Re-add removed SoC id macro to tegra_resume()
  MAINTAINERS: Entry for Cygnus/iproc arm architecture
  ARM: OMAP: serial: remove last vestige of DTR_gpio support.
  ARM: OMAP2+: gpmc: Get rid of "ti,elm-id not found" warning
  ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"
  ARM: OMAP2: Remove unnecessary KERN_* in omap_phy_internal.c
  ARM: OMAP4+: Remove unused omap_l3_noc platform init
  ARM: dts: Add twl keypad map for omap3 EVM
  ARM: dts: Add twl keypad map for LDP
  ARM: dts: Fix NAND last partition size on LDP
  ARM: OMAP3: Fix errors for omap_l3_smx when booted with device tree
parents b64bb1d7 65bb688a

MAINTAINERS

+35 −12
Original line number Diff line number Diff line
@@ -1308,30 +1308,22 @@ F: drivers/*/*rockchip* 
F:	drivers/*/*/*rockchip*

F:	sound/soc/rockchip/



ARM/SAMSUNG ARM ARCHITECTURES

M:	Ben Dooks <ben-linux@fluff.org>

M:	Kukjin Kim <kgene.kim@samsung.com>

ARM/SAMSUNG EXYNOS ARM ARCHITECTURES

M:	Kukjin Kim <kgene@kernel.org>

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

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

W:	http://www.fluff.org/ben/linux/

S:	Maintained

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

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

F:	arch/arm/plat-samsung/

F:	arch/arm/mach-s3c24*/

F:	arch/arm/mach-s3c64xx/

F:	arch/arm/mach-s5p*/

F:	arch/arm/mach-exynos*/

F:	drivers/*/*s3c2410*

F:	drivers/*/*/*s3c2410*

F:	drivers/spi/spi-s3c*

F:	sound/soc/samsung/*



ARM/S5P EXYNOS ARM ARCHITECTURES

M:	Kukjin Kim <kgene.kim@samsung.com>

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

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-s5p*/

F:	arch/arm/mach-exynos*/

N:	exynos



ARM/SAMSUNG MOBILE MACHINE SUPPORT
@@ -1430,6 +1422,7 @@ F: drivers/tty/serial/st-asc.c 
F:	drivers/usb/dwc3/dwc3-st.c

F:	drivers/usb/host/ehci-st.c

F:	drivers/usb/host/ohci-st.c

F:	drivers/ata/ahci_st.c



ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>
@@ -1503,6 +1496,19 @@ S: Maintained 
F:	drivers/clk/ux500/

F:	include/linux/platform_data/clk-ux500.h



ARM/VERSATILE EXPRESS PLATFORM

M:	Liviu Dudau <liviu.dudau@arm.com>

M:	Sudeep Holla <sudeep.holla@arm.com>

M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

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

S:	Maintained

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

F:	arch/arm/mach-vexpress/

F:	*/*/vexpress*

F:	*/*/*/vexpress*

F:	drivers/clk/versatile/clk-vexpress-osc.c

F:	drivers/clocksource/versatile.c



ARM/VFP SUPPORT

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

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -2097,10 +2103,13 @@ F: arch/arm/include/debug/bcm63xx.S 
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>

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

S:	Maintained

F:	arch/arm/mach-bcm/*brcmstb*

F:	arch/arm/boot/dts/bcm7*.dts*

F:	drivers/bus/brcmstb_gisb.c



BROADCOM TG3 GIGABIT ETHERNET DRIVER

M:	Prashant Sreedharan <prashant@broadcom.com>
@@ -2131,6 +2140,20 @@ L: linux-scsi@vger.kernel.org 
S:	Supported

F:	drivers/scsi/bnx2i/



BROADCOM CYGNUS/IPROC ARM ARCHITECTURE

M:	Ray Jui <rjui@broadcom.com>

M:	Scott Branden <sbranden@broadcom.com>

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

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

T:	git git://git.github.com/brcm/linux.git

S:	Maintained

N:	iproc

N:	cygnus

N:	bcm9113*

N:	bcm9583*

N:	bcm583*

N:	bcm113*



BROADCOM KONA GPIO DRIVER

M:	Ray Jui <rjui@broadcom.com>

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

arch/arm/boot/dts/omap3-evm-common.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
 * Common support for omap3 EVM boards

 */



#include <dt-bindings/input/input.h>

#include "omap-gpmc-smsc911x.dtsi"



/ {
@@ -111,6 +112,26 @@ 
	ti,use-leds;

};



&twl_keypad {

	linux,keymap = <

			MATRIX_KEY(2, 2, KEY_1)

			MATRIX_KEY(1, 1, KEY_2)

			MATRIX_KEY(0, 0, KEY_3)

			MATRIX_KEY(3, 2, KEY_4)

			MATRIX_KEY(2, 1, KEY_5)

			MATRIX_KEY(1, 0, KEY_6)

			MATRIX_KEY(1, 3, KEY_7)

			MATRIX_KEY(3, 1, KEY_8)

			MATRIX_KEY(2, 0, KEY_9)

			MATRIX_KEY(2, 3, KEY_KPASTERISK)

			MATRIX_KEY(0, 2, KEY_0)

			MATRIX_KEY(3, 0, KEY_KPDOT)

			/* s4 not wired */

			MATRIX_KEY(1, 2, KEY_BACKSPACE)

			MATRIX_KEY(0, 1, KEY_ENTER)

			>;

};



&usb_otg_hs {

	interface-type = <0>;

	usb-phy = <&usb2_phy>;

arch/arm/boot/dts/omap3-ldp.dts

+22 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */

/dts-v1/;



#include <dt-bindings/input/input.h>

#include "omap34xx.dtsi"

#include "omap-gpmc-smsc911x.dtsi"
@@ -141,7 +142,7 @@ 
		};

		partition@2000000 {

			label = "Filesystem";

			reg = <0x2000000 0xe000000>;

			reg = <0x2000000 0x6000000>;

		};

	};
@@ -263,6 +264,26 @@ 
	};

};



&twl_keypad {

	linux,keymap = <MATRIX_KEY(0, 0, KEY_1)

			MATRIX_KEY(0, 1, KEY_2)

			MATRIX_KEY(0, 2, KEY_3)

			MATRIX_KEY(1, 0, KEY_4)

			MATRIX_KEY(1, 1, KEY_5)

			MATRIX_KEY(1, 2, KEY_6)

			MATRIX_KEY(1, 3, KEY_F5)

			MATRIX_KEY(2, 0, KEY_7)

			MATRIX_KEY(2, 1, KEY_8)

			MATRIX_KEY(2, 2, KEY_9)

			MATRIX_KEY(2, 3, KEY_F6)

			MATRIX_KEY(3, 0, KEY_F7)

			MATRIX_KEY(3, 1, KEY_0)

			MATRIX_KEY(3, 2, KEY_F8)

			MATRIX_KEY(5, 4, KEY_RESERVED)

			MATRIX_KEY(4, 4, KEY_VOLUMEUP)

			MATRIX_KEY(5, 5, KEY_VOLUMEDOWN)>;

};



&uart3 {

	interrupts-extended = <&intc 74 &omap3_pmx_core OMAP3_UART3_RX>;

};

arch/arm/boot/dts/omap3.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
	 * hierarchy.

	 */

	ocp {

		compatible = "simple-bus";

		compatible = "ti,omap3-l3-smx", "simple-bus";

		reg = <0x68000000 0x10000>;

		interrupts = <9 10>;

		#address-cells = <1>;

arch/arm/mach-ep93xx/dma.c

+10 −2
Original line number Diff line number Diff line
@@ -66,11 +66,15 @@ static struct ep93xx_dma_platform_data ep93xx_dma_m2p_data = { 
	.num_channels		= ARRAY_SIZE(ep93xx_dma_m2p_channels),

};



static u64 ep93xx_dma_m2p_mask = DMA_BIT_MASK(32);



static struct platform_device ep93xx_dma_m2p_device = {

	.name			= "ep93xx-dma-m2p",

	.id			= -1,

	.dev			= {

		.platform_data		= &ep93xx_dma_m2p_data,

		.dma_mask		= &ep93xx_dma_m2p_mask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};
@@ -93,11 +97,15 @@ static struct ep93xx_dma_platform_data ep93xx_dma_m2m_data = { 
	.num_channels		= ARRAY_SIZE(ep93xx_dma_m2m_channels),

};



static u64 ep93xx_dma_m2m_mask = DMA_BIT_MASK(32);



static struct platform_device ep93xx_dma_m2m_device = {

	.name			= "ep93xx-dma-m2m",

	.id			= -1,

	.dev			= {

		.platform_data		= &ep93xx_dma_m2m_data,

		.dma_mask		= &ep93xx_dma_m2m_mask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};