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

Commit 00cec111 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:
 "We didn't have any fixes sent up for -rc2, so this is a slightly
  larger batch.  A bit all over the place platform-wise; OMAP, at91,
  marvell, renesas, sunxi, ux500, etc.

  I tried to summarize highlights but there isn't a whole lot to point
  out.  Lots of little things fixed all over.  A couple of defconfig
  updates due to new/changing options."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
  ARM: at91/sama5: fix incorrect PMC pcr div definition
  ARM: at91/dt: fix macb pinctrl_macb_rmii_mii_alt definition
  ARM: at91: at91sam9n12: move external irq declatation to DT
  ARM: shmobile: marzen: Use error values in usb_power_*
  ARM: tegra: defconfig fixes
  ARM: nomadik: fix IRQ assignment for SMC ethernet
  ARM: vt8500: Add missing NULL terminator in dt_compat
  clk: tegra: add ac97 controller clock
  clk: tegra: remove USB from clk init table
  ARM: dts: mvebu: Fix wrong the address reg value for the L2-cache node
  ARM: plat-orion: Fix num_resources and id for ge10 and ge11
  ARM: OMAP2+: hwmod: Remove sysc slave idle and auto idle apis
  SERIAL: OMAP: Remove the slave idle handling from the driver
  ARM: OMAP2+: serial: Remove the un-used slave idle hooks
  ARM: OMAP2+: hwmod-data: UART IP needs software control to manage sidle modes
  ARM: OMAP2+: hwmod: Add a new flag to handle SIDLE in SWSUP only in active
  ARM: OMAP2+: hwmod: Fix sidle programming in _enable_sysc()/_idle_sysc()
  arm: mvebu: fix the 'ranges' property to handle PCIe
  ARM: mvebu: select ARCH_REQUIRE_GPIOLIB for mvebu platform
  ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock
  ...
parents 17fdfd08 f4ae176c

Documentation/devicetree/bindings/net/macb.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Required properties: 
- compatible: Should be "cdns,[<chip>-]{macb|gem}"

  Use "cdns,at91sam9260-macb" Atmel at91sam9260 and at91sam9263 SoCs.

  Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".

  Use "cnds,pc302-gem" for Picochip picoXcell pc302 and later devices based on

  Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on

  the Cadence GEM, or the generic form: "cdns,gem".

- reg: Address and length of the register set for the device

- interrupts: Should contain macb interrupt

arch/arm/boot/dts/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -177,7 +177,9 @@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \ 
	spear320-evb.dtb \

	spear320-hmi.dtb

dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun4i-a10-cubieboard.dtb \

dtb-$(CONFIG_ARCH_SUNXI) += \

	sun4i-a10-cubieboard.dtb \

	sun4i-a10-mini-xplus.dtb \

	sun4i-a10-hackberry.dtb \

	sun5i-a13-olinuxino.dtb

dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \

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

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ 
		#size-cells = <1>;

		compatible = "simple-bus";

		interrupt-parent = <&mpic>;

		ranges = <0 0 0xd0000000 0x100000>;

		ranges = <0          0 0xd0000000 0x0100000 /* internal registers */

			  0xe0000000 0 0xe0000000 0x8100000 /* PCIe */>;



		internal-regs {

			compatible = "simple-bus";

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

+4 −3
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ 
	};



	soc {

		ranges = <0 0xd0000000 0x100000>;

		ranges = <0          0xd0000000 0x0100000 /* internal registers */

			  0xe0000000 0xe0000000 0x8100000 /* PCIe */>;

		internal-regs {

			system-controller@18200 {

				compatible = "marvell,armada-370-xp-system-controller";
@@ -38,12 +39,12 @@ 


			L2: l2-cache {

				compatible = "marvell,aurora-outer-cache";

				reg = <0xd0008000 0x1000>;

				reg = <0x08000 0x1000>;

				cache-id-part = <0x100>;

				wt-override;

			};



			mpic: interrupt-controller@20000 {

			interrupt-controller@20000 {

				reg = <0x20a00 0x1d0>, <0x21870 0x58>;

			};

arch/arm/boot/dts/armada-xp-gp.dts

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ 
	};



	soc {

		ranges = <0          0 0xd0000000 0x100000

			  0xf0000000 0 0xf0000000 0x1000000>;



		internal-regs {

			serial@12000 {

				clock-frequency = <250000000>;