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

Commit 1496ec13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "Here's a long-pending fixes pull request for arm-soc (I didn't send
  one in the -rc4 cycle).

  The larger deltas are from:

   - A fixup of error paths in the mvsdio driver

   - Header file move for a driver that hadn't been properly converted
     to multiplatform on i.MX, which was causing build failures when
     included

   - Device tree updates for at91 dealing mostly with their new pinctrl
     setup merged in 3.8 and mistakes in those initial configs

  The rest are the normal mix of small fixes all over the place; sunxi,
  omap, imx, mvebu, etc, etc."

* tag 'fixes-for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (40 commits)
  mfd: vexpress-sysreg: Don't skip initialization on probe
  ARM: vexpress: Enable A7 cores in V2P-CA15_A7's Device Tree
  ARM: vexpress: extend the MPIDR range used for pen release check
  ARM: at91/dts: correct comment in at91sam9x5.dtsi for mii
  ARM: at91/at91_dt_defconfig: add at91sam9n12 SoC to DT defconfig
  ARM: at91/at91_dt_defconfig: remove memory specification to cmdline
  ARM: at91/dts: add macb mii pinctrl config for kizbox
  ARM: at91: rm9200: remake the BGA as default version
  ARM: at91: fix gpios on i2c-gpio for RM9200 DT
  ARM: at91/at91sam9x5 DTS: add SCK USART pins
  ARM: at91/at91sam9x5 DTS: correct wrong PIO BANK values on u(s)arts
  ARM: at91/at91-pinctrl documentation: fix typo and add some details
  ARM: kirkwood: fix missing #interrupt-cells property
  mmc: mvsdio: use devm_ API to simplify/correct error paths.
  clk: mvebu/clk-cpu.c: fix memory leakage
  ARM: OMAP2+: omap4-panda: add UART2 muxing for WiLink shared transport
  ARM: OMAP2+: DT node Timer iteration fix
  ARM: OMAP2+: Fix section warning for omap_init_ocp2scp()
  ARM: OMAP2+: fix build break for omapdrm
  ARM: OMAP2: Fix missing omap2xxx_clkt_vps_late_init function calls
  ...
parents ba2ab41f 3836414f

Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt

+3 −2
Original line number Diff line number Diff line
@@ -81,7 +81,8 @@ PA31 TXD4 
Required properties for pin configuration node:

- atmel,pins: 4 integers array, represents a group of pins mux and config

  setting. The format is atmel,pins = <PIN_BANK PIN_BANK_NUM PERIPH CONFIG>.

  The PERIPH 0 means gpio.

  The PERIPH 0 means gpio, PERIPH 1 is periph A, PERIPH 2 is periph B...

  PIN_BANK 0 is pioA, PIN_BANK 1 is pioB...



Bits used for CONFIG:

PULL_UP		(1 << 0): indicate this pin need a pull up.
@@ -126,7 +127,7 @@ pinctrl@fffff400 { 
		pinctrl_dbgu: dbgu-0 {

			atmel,pins =

				<1 14 0x1 0x0	/* PB14 periph A */

				 1 15 0x1 0x1>;	/* PB15 periph with pullup */

				 1 15 0x1 0x1>;	/* PB15 periph A with pullup */

		};

	};

};

arch/arm/boot/dts/armada-370-db.dts

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


	memory {

		device_type = "memory";

		reg = <0x00000000 0x20000000>; /* 512 MB */

		reg = <0x00000000 0x40000000>; /* 1 GB */

	};



	soc {

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

+6 −8
Original line number Diff line number Diff line
@@ -50,27 +50,25 @@ 
		};



		gpio0: gpio@d0018100 {

			compatible = "marvell,armadaxp-gpio";

			reg = <0xd0018100 0x40>,

			    <0xd0018800 0x30>;

			compatible = "marvell,orion-gpio";

			reg = <0xd0018100 0x40>;

			ngpios = <32>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupts-cells = <2>;

			interrupts = <16>, <17>, <18>, <19>;

			interrupts = <82>, <83>, <84>, <85>;

		};



		gpio1: gpio@d0018140 {

			compatible = "marvell,armadaxp-gpio";

			reg = <0xd0018140 0x40>,

			    <0xd0018840 0x30>;

			compatible = "marvell,orion-gpio";

			reg = <0xd0018140 0x40>;

			ngpios = <17>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupts-cells = <2>;

			interrupts = <20>, <21>, <22>;

			interrupts = <87>, <88>, <89>;

		};

	};

};

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

+9 −12
Original line number Diff line number Diff line
@@ -51,39 +51,36 @@ 
		};



		gpio0: gpio@d0018100 {

			compatible = "marvell,armadaxp-gpio";

			reg = <0xd0018100 0x40>,

			    <0xd0018800 0x30>;

			compatible = "marvell,orion-gpio";

			reg = <0xd0018100 0x40>;

			ngpios = <32>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupts-cells = <2>;

			interrupts = <16>, <17>, <18>, <19>;

			interrupts = <82>, <83>, <84>, <85>;

		};



		gpio1: gpio@d0018140 {

			compatible = "marvell,armadaxp-gpio";

			reg = <0xd0018140 0x40>,

			    <0xd0018840 0x30>;

			compatible = "marvell,orion-gpio";

			reg = <0xd0018140 0x40>;

			ngpios = <32>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupts-cells = <2>;

			interrupts = <20>, <21>, <22>, <23>;

			interrupts = <87>, <88>, <89>, <90>;

		};



		gpio2: gpio@d0018180 {

			compatible = "marvell,armadaxp-gpio";

			reg = <0xd0018180 0x40>,

			    <0xd0018870 0x30>;

			compatible = "marvell,orion-gpio";

			reg = <0xd0018180 0x40>;

			ngpios = <3>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupts-cells = <2>;

			interrupts = <24>;

			interrupts = <91>;

		};



		ethernet@d0034000 {

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

+9 −12
Original line number Diff line number Diff line
@@ -66,39 +66,36 @@ 
		};



		gpio0: gpio@d0018100 {

			compatible = "marvell,armadaxp-gpio";

			reg = <0xd0018100 0x40>,

			    <0xd0018800 0x30>;

			compatible = "marvell,orion-gpio";

			reg = <0xd0018100 0x40>;

			ngpios = <32>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupts-cells = <2>;

			interrupts = <16>, <17>, <18>, <19>;

			interrupts = <82>, <83>, <84>, <85>;

		};



		gpio1: gpio@d0018140 {

			compatible = "marvell,armadaxp-gpio";

			reg = <0xd0018140 0x40>,

			    <0xd0018840 0x30>;

			compatible = "marvell,orion-gpio";

			reg = <0xd0018140 0x40>;

			ngpios = <32>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupts-cells = <2>;

			interrupts = <20>, <21>, <22>, <23>;

			interrupts = <87>, <88>, <89>, <90>;

		};



		gpio2: gpio@d0018180 {

			compatible = "marvell,armadaxp-gpio";

			reg = <0xd0018180 0x40>,

			    <0xd0018870 0x30>;

			compatible = "marvell,orion-gpio";

			reg = <0xd0018180 0x40>;

			ngpios = <3>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupts-cells = <2>;

			interrupts = <24>;

			interrupts = <91>;

		};



		ethernet@d0034000 {