Commit 19ed3eb9 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:
 "Here's the weekly batch of fixes from arm-soc.

  The delta is a largeish negative delta, due to revert of SMP support
  for Broadcom's STB SoC -- it was accidentally merged before some
  issues had been addressed, so they will make a new attempt for 3.18.
  I didn't see a need for a full revert of the whole platform due to
  this, we're keeping the rest enabled.

  The rest is mostly:

   - a handful of DT fixes for i.MX (Hummingboard/Cubox-i in particular)
   - some MTD/NAND fixes for OMAP
   - minor DT fixes for shmobile
   - warning fix for UP builds on vexpress/spc

  There's also a couple of patches that wires up hwmod on TI's DRA7 SoC
  so it can boot.  Drivers and the rest had landed for 3.17, and it's
  small and isolated so it made sense to pick up now even if it's not a
  bugfix"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
  vexpress/spc: fix a build warning on array bounds
  ARM: DRA7: hwmod: Add dra74x and dra72x specific ocp interface lists
  ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants
  MAINTAINERS: catch special Rockchip code locations
  ARM: dts: microsom-ar8035: MDIO pad must be set open drain
  ARM: dts: omap54xx-clocks: Fix the l3 and l4 clock rates
  ARM: brcmstb: revert SMP support
  ARM: OMAP2+: hwmod: Rearm wake-up interrupts for DT when MUSB is idled
  ARM: dts: Enable UART wake-up events for beagleboard
  ARM: dts: Remove twl6030 clk32g "regulator"
  ARM: OMAP2+: omap_device: remove warning that clk alias already exists
  ARM: OMAP: fix %d confusingly prefixed with 0x in format string
  ARM: dts: DRA7: fix interrupt-cells for GPIO
  mtd: nand: omap: Fix 1-bit Hamming code scheme, omap_calculate_ecc()
  ARM: dts: omap3430-sdp: Revert to using software ECC for NAND
  ARM: OMAP2+: GPMC: Support Software ECC scheme via DT
  mtd: nand: omap: Revert to using software ECC by default
  ARM: dts: hummingboard/cubox-i: change SPDIF output to be more descriptive
  ARM: dts: hummingboard/cubox-i: add USB OC pinctrl configuration
  ARM: shmobile: r8a7791: add missing 0x0100 for SDCKCR
  ...
parents 81bbadc6 e160cc17

Documentation/devicetree/bindings/mtd/gpmc-nand.txt

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ Optional properties: 
				width of 8 is assumed.



 - ti,nand-ecc-opt:		A string setting the ECC layout to use. One of:

		"sw"		<deprecated> use "ham1" instead

		"sw"		1-bit Hamming ecc code via software

		"hw"		<deprecated> use "ham1" instead

		"hw-romcode"	<deprecated> use "ham1" instead

		"ham1"		1-bit Hamming ecc code

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -1279,8 +1279,13 @@ M: Heiko Stuebner <heiko@sntech.de> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-rockchip@lists.infradead.org

S:	Maintained

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

F:	arch/arm/mach-rockchip/

F:	drivers/clk/rockchip/

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

F:	drivers/*/*rockchip*

F:	drivers/*/*/*rockchip*

F:	sound/soc/rockchip/



ARM/SAMSUNG ARM ARCHITECTURES

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

arch/arm/boot/dts/dra7.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio2: gpio@48055000 {
@@ -256,7 +256,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio3: gpio@48057000 {
@@ -267,7 +267,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio4: gpio@48059000 {
@@ -278,7 +278,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio5: gpio@4805b000 {
@@ -289,7 +289,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio6: gpio@4805d000 {
@@ -300,7 +300,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio7: gpio@48051000 {
@@ -311,7 +311,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio8: gpio@48053000 {
@@ -322,7 +322,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		uart1: serial@4806a000 {

arch/arm/boot/dts/imx53-qsrb.dts

+8 −0
Original line number Diff line number Diff line
@@ -28,6 +28,12 @@ 
				MX53_PAD_CSI0_DAT9__I2C1_SCL      0x400001ec

			>;

		};



		pinctrl_pmic: pmicgrp {

			fsl,pins = <

				MX53_PAD_CSI0_DAT5__GPIO5_23	0x1e4 /* IRQ */

			>;

		};

	};

};
@@ -38,6 +44,8 @@ 


	pmic: mc34708@8 {

		compatible = "fsl,mc34708";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_pmic>;

		reg = <0x08>;

		interrupt-parent = <&gpio5>;

		interrupts = <23 0x8>;

arch/arm/boot/dts/imx6dl-hummingboard.dts

+3 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 


	sound-spdif {

		compatible = "fsl,imx-audio-spdif";

		model = "imx-spdif";

		model = "On-board SPDIF";

		/* IMX6 doesn't implement this yet */

		spdif-controller = <&spdif>;

		spdif-out;
@@ -181,11 +181,13 @@ 
};



&usbh1 {

	disable-over-current;

	vbus-supply = <&reg_usbh1_vbus>;

	status = "okay";

};



&usbotg {

	disable-over-current;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_hummingboard_usbotg_id>;

	vbus-supply = <&reg_usbotg_vbus>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE