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

Commit 72673429 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 Olof Johansson:
 "A collection of fixes for ARM platforms.  Most are fixes for DTS
  files, mostly from DT conversion on OMAP which is still finding a few
  issues here and there.

  There's a couple of small stale code removal patches that we usually
  queue for the next release instead, but they seemed harmless enough to
  bring in now.

  Also, a fix for backlight on some PXA platforms, and a cache
  configuration fix for Tegra, etc"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (25 commits)
  MAINTAINERS: add additional ARM BCM281xx/BCM11xxx maintainer
  ARM: tegra: only run PL310 init on systems with one
  ARM: tegra: Add head numbers to display controllers
  ARM: imx6: build pm-imx6q.c independently of CONFIG_PM
  ARM: tegra: fix RTC0 alias for Cardhu
  ARM: dove: dt: revert PMU interrupt controller node
  Documentation: dt: OMAP: Update Overo/Tobi
  ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi
  ARM: dts: omap3-tobi: Use the correct vendor prefix
  ARM: dts: omap3-tobi: Fix boot with OMAP36xx-based Overo
  ARM: OMAP2+: Remove legacy macros for zoom platforms
  ARM: OMAP2+: Remove MACH_NOKIA_N800
  ARM: dts: N900: add missing compatible property
  ARM: dts: N9/N950: fix boot hang with 3.14-rc1
  ARM: OMAP1: nokia770: enable tahvo-usb
  ARM: OMAP2+: gpmc: fix: DT ONENAND child nodes not probed when MTD_ONENAND is built as module
  ARM: OMAP2+: gpmc: fix: DT NAND child nodes not probed when MTD_NAND is built as module
  ARM: dts: omap3-gta04: Fix mmc1 properties.
  ARM: dts: omap3-gta04: Fix 'aux' gpio key flags.
  ARM: OMAP2+: add missing ARCH_HAS_OPP
  ...
parents 24c85258 a3db2bba

Documentation/devicetree/bindings/arm/omap/omap.txt

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ Boards: 
  compatible = "ti,omap3-beagle", "ti,omap3"



- OMAP3 Tobi with Overo : Commercial expansion board with daughter board

  compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3"

  compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3"



- OMAP4 SDP : Software Development Board

  compatible = "ti,omap4-sdp", "ti,omap4430"

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1860,6 +1860,7 @@ F: drivers/net/ethernet/broadcom/bnx2x/ 


BROADCOM BCM281XX/BCM11XXX ARM ARCHITECTURE

M:	Christian Daudt <bcm@fixthebug.org>

M:	Matt Porter <mporter@linaro.org>

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

T:	git git://git.github.com/broadcom/bcm11351

S:	Maintained

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -209,7 +209,8 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap3-n900.dtb \

	omap3-n9.dtb \

	omap3-n950.dtb \

	omap3-tobi.dtb \

	omap3-overo-tobi.dtb \

	omap3-overo-storm-tobi.dtb \

	omap3-gta04.dtb \

	omap3-igep0020.dtb \

	omap3-igep0030.dtb \

arch/arm/boot/dts/am335x-evmsk.dts

+10 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ 
		ti,model = "AM335x-EVMSK";

		ti,audio-codec = <&tlv320aic3106>;

		ti,mcasp-controller = <&mcasp1>;

		ti,codec-clock-rate = <24576000>;

		ti,codec-clock-rate = <24000000>;

		ti,audio-routing =

			"Headphone Jack",       "HPLOUT",

			"Headphone Jack",       "HPROUT";
@@ -256,6 +256,12 @@ 
		>;

	};



	mmc1_pins: pinmux_mmc1_pins {

		pinctrl-single,pins = <

			0x160 (PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */

		>;

	};



	mcasp1_pins: mcasp1_pins {

		pinctrl-single,pins = <

			0x10c (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_crs.mcasp1_aclkx */
@@ -456,6 +462,9 @@ 
	status = "okay";

	vmmc-supply = <&vmmc_reg>;

	bus-width = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;

};



&sham {

arch/arm/boot/dts/armada-xp-mv78260.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
		gpio0 = &gpio0;

		gpio1 = &gpio1;

		gpio2 = &gpio2;

		eth3 = &eth3;

	};



	cpus {
@@ -291,7 +292,7 @@ 
				interrupts = <91>;

			};



			ethernet@34000 {

			eth3: ethernet@34000 {

				compatible = "marvell,armada-370-neta";

				reg = <0x34000 0x4000>;

				interrupts = <14>;