Commit 84e3e9d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Kevin Hilman:
 "A fairly random colletion of fixes based on -rc1 for OMAP, sunxi and
  prima2 as well as a few arm64-specific DT fixes.

  This series also includes a late to support a new Allwinner (sunxi)
  SoC, but since it's rather simple and isolated to the
  platform-specific code, it's included it for this -rc"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arm64: dts: add device tree for ARM SMM-A53x2 on LogicTile Express 20MG
  arm: dts: vexpress: add missing CCI PMU device node to TC2
  arm: dts: vexpress: describe all PMUs in TC2 dts
  GICv3: Add ITS entry to THUNDER dts
  arm64: dts: Add poweroff button device node for APM X-Gene platform
  ARM: dts: am4372.dtsi: disable rfbi
  ARM: dts: am57xx-beagle-x15: Provide supply for usb2_phy2
  ARM: dts: am4372: Add emif node
  Revert "ARM: dts: am335x-boneblack: disable RTC-only sleep"
  ARM: sunxi: Enable simplefb in the defconfig
  ARM: Remove deprecated symbol from defconfig files
  ARM: sunxi: Add Machine support for A33
  ARM: sunxi: Introduce Allwinner H3 support
  Documentation: sunxi: Update Allwinner SoC documentation
  ARM: prima2: move to use REGMAP APIs for rtciobrg
  ARM: dts: atlas7: add pinctrl and gpio descriptions
  ARM: OMAP2+: Remove unnessary return statement from the void function, omap2_show_dma_caps
  memory: omap-gpmc: Fix parsing of devices
parents b9243b5a 8dfbc0ab

Documentation/arm/sunxi/README

+17 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ SunXi family 
        + User Manual

        + User Manual

          http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf

          http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf





      - Allwinner A23

      - Allwinner A23 (sun8i)

        + Datasheet

        + Datasheet

          http://dl.linux-sunxi.org/A23/A23%20Datasheet%20V1.0%2020130830.pdf

          http://dl.linux-sunxi.org/A23/A23%20Datasheet%20V1.0%2020130830.pdf

        + User Manual

        + User Manual
@@ -55,7 +55,23 @@ SunXi family 
        + User Manual

        + User Manual

          http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20User%20Manual%20%20V1.0%2020130322.pdf

          http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20User%20Manual%20%20V1.0%2020130322.pdf





      - Allwinner A33 (sun8i)

        + Datasheet

          http://dl.linux-sunxi.org/A33/A33%20Datasheet%20release%201.1.pdf

        + User Manual

          http://dl.linux-sunxi.org/A33/A33%20user%20manual%20release%201.1.pdf



      - Allwinner H3 (sun8i)

        + Datasheet

          http://dl.linux-sunxi.org/H3/Allwinner_H3_Datasheet_V1.0.pdf



    * Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs

    * Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs

      - Allwinner A80

      - Allwinner A80

        + Datasheet

        + Datasheet

	  http://dl.linux-sunxi.org/A80/A80_Datasheet_Revision_1.0_0404.pdf

	  http://dl.linux-sunxi.org/A80/A80_Datasheet_Revision_1.0_0404.pdf



    * Octa ARM Cortex-A7 based SoCs

      - Allwinner A83T

        + Not Supported

        + Datasheet

          http://dl.linux-sunxi.org/A83T/A83T_datasheet_Revision_1.1.pdf

Documentation/devicetree/bindings/arm/sunxi.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -9,4 +9,6 @@ using one of the following compatible strings: 
  allwinner,sun6i-a31

  allwinner,sun6i-a31

  allwinner,sun7i-a20

  allwinner,sun7i-a20

  allwinner,sun8i-a23

  allwinner,sun8i-a23

  allwinner,sun8i-a33

  allwinner,sun8i-h3

  allwinner,sun9i-a80
 
  allwinner,sun9i-a80

Documentation/devicetree/bindings/memory-controllers/ti/emif.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ of the EMIF IP and memory parts attached to it. 
Required properties:

Required properties:

- compatible	: Should be of the form "ti,emif-<ip-rev>" where <ip-rev>

- compatible	: Should be of the form "ti,emif-<ip-rev>" where <ip-rev>

  is the IP revision of the specific EMIF instance.

  is the IP revision of the specific EMIF instance.

		  For am437x should be ti,emif-am4372.





- phy-type	: <u32> indicating the DDR phy type. Following are the

- phy-type	: <u32> indicating the DDR phy type. Following are the

  allowed values

  allowed values

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -1614,6 +1614,7 @@ M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

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

S:	Maintained

S:	Maintained

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

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

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

F:	arch/arm/mach-vexpress/

F:	arch/arm/mach-vexpress/

F:	*/*/vexpress*

F:	*/*/vexpress*

F:	*/*/*/vexpress*

F:	*/*/*/vexpress*

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -80,3 +80,7 @@ 
		status = "okay";

		status = "okay";

	};

	};

};

};



&rtc {

	system-power-controller;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE