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

Commit aac59e3e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC platform changes from Olof Johansson:
 "New and updated SoC support.  Among the things new for this release
  are:

   - More support for the AM33xx platforms from TI
   - Tegra 124 support, and some updates to older tegra families as well
   - imx cleanups and updates across the board
   - A rename of Broadcom's Mobile platforms which were introduced as
     ARCH_BCM, and turned out to be too broad a name.  New name is
     ARCH_BCM_MOBILE.
   - A whole bunch of updates and fixes for integrator, making the
     platform code more modern and switches over to DT-only booting.
   - Support for two new Renesas shmobile chipsets.  Next up for them is
     more work on consolidation instead of introduction of new
     non-multiplatform SoCs, we're all looking forward to that!
   - Misc cleanups for older Samsung platforms, some Allwinner updates,
     etc"

* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (159 commits)
  ARM: bcm281xx: Add ARCH_BCM_MOBILE to bcm config
  ARM: bcm_defconfig: Run "make savedefconfig"
  ARM: bcm281xx: Add ARCH Timers to config
  rename ARCH_BCM to ARCH_BCM_MOBILE (mach-bcm)
  ARM: vexpress: Enable platform-specific options in defconfig
  ARM: vexpress: Make defconfig work again
  ARM: sunxi: remove .init_time hooks
  ARM: imx: enable suspend for imx6sl
  ARM: imx: ensure dsm_request signal is not asserted when setting LPM
  ARM: imx6q: call WB and RBC configuration from imx6q_pm_enter()
  ARM: imx6q: move low-power code out of clock driver
  ARM: imx: drop extern with function prototypes in common.h
  ARM: imx: reset core along with enable/disable operation
  ARM: imx: do not return from imx_cpu_die() call
  ARM: imx_v6_v7_defconfig: Select CONFIG_PROVE_LOCKING
  ARM: imx_v6_v7_defconfig: Enable LEDS_GPIO related options
  ARM: mxs_defconfig: Turn off CONFIG_DEBUG_GPIO
  ARM: imx: replace imx6q_restart() with mxc_restart()
  ARM: mach-imx: mm-imx5: Retrieve iomuxc base address from dt
  ARM: mach-imx: mm-imx5: Retrieve tzic base address from dt
  ...
parents 21604cdc 005ff5fb

Documentation/arm/Marvell/README

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ EBU Armada family 
        MV78230

        MV78260

        MV78460

    NOTE: not to be confused with the non-SMP 78xx0 SoCs



  Product Brief: http://www.marvell.com/embedded-processors/armada-xp/assets/Marvell-ArmadaXP-SoC-product%20brief.pdf

  No public datasheet available.

Documentation/arm/sunxi/README

+25 −1
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ SunXi family 
  Linux kernel mach directory: arch/arm/mach-sunxi



  Flavors:

    * ARM926 based SoCs

      - Allwinner F20 (sun3i)

        + Not Supported



    * ARM Cortex-A8 based SoCs

      - Allwinner A10 (sun4i)

        + Datasheet
@@ -25,4 +29,24 @@ SunXi family 
        + Datasheet

	  http://dl.linux-sunxi.org/A13/A13%20Datasheet%20-%20v1.12%20%282012-03-29%29.pdf

        + User Manual

	  http://dl.linux-sunxi.org/A13/A13%20User%20Manual%20-%20v1.2%20%282013-08-08%29.pdf
 
          http://dl.linux-sunxi.org/A13/A13%20User%20Manual%20-%20v1.2%20%282013-01-08%29.pdf



    * Dual ARM Cortex-A7 based SoCs

      - Allwinner A20 (sun7i)

        + User Manual

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



      - Allwinner A23

        + Not Supported



    * Quad ARM Cortex-A7 based SoCs

      - Allwinner A31 (sun6i)

        + Datasheet

          http://dl.linux-sunxi.org/A31/A31%20Datasheet%20-%20v1.00%20(2012-12-24).pdf



      - Allwinner A31s (sun6i)

        + Not Supported



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

      - Allwinner A80

        + Not Supported
 
 No newline at end of file

Documentation/devicetree/bindings/arm/arm-boards

+47 −3
Original line number Diff line number Diff line
@@ -9,9 +9,53 @@ Required properties (in root node): 


FPGA type interrupt controllers, see the versatile-fpga-irq binding doc.



In the root node the Integrator/CP must have a /cpcon node pointing

to the CP control registers, and the Integrator/AP must have a

/syscon node pointing to the Integrator/AP system controller.

Required nodes:



- core-module: the root node to the Integrator platforms must have

  a core-module with regs and the compatible string

  "arm,core-module-integrator"



  Required properties for the core module:

  - regs: the location and size of the core module registers, one

    range of 0x200 bytes.



- syscon: the root node of the Integrator platforms must have a

  system controller node pointong to the control registers,

  with the compatible string

  "arm,integrator-ap-syscon"

  "arm,integrator-cp-syscon"

  respectively.



  Required properties for the system controller:

  - regs: the location and size of the system controller registers,

    one range of 0x100 bytes.



  Required properties for the AP system controller:

  - interrupts: the AP syscon node must include the logical module

    interrupts, stated in order of module instance <module 0>,

    <module 1>, <module 2> ... for the CP system controller this

    is not required not of any use.



/dts-v1/;

/include/ "integrator.dtsi"



/ {

	model = "ARM Integrator/AP";

	compatible = "arm,integrator-ap";



	core-module@10000000 {

		compatible = "arm,core-module-integrator";

		reg = <0x10000000 0x200>;

	};



	syscon {

		compatible = "arm,integrator-ap-syscon";

		reg = <0x11000000 0x100>;

		interrupt-parent = <&pic>;

		/* These are the logic module IRQs */

		interrupts = <9>, <10>, <11>, <12>;

	};

};





ARM Versatile Application and Platform Baseboards

Documentation/devicetree/bindings/clock/imx6q-clock.txt

+5 −0
Original line number Diff line number Diff line
@@ -215,6 +215,11 @@ clocks and IDs. 
	cko2      		200

	cko      		201

	vdoa      		202

	pll4_audio_div		203

	lvds1_sel		204

	lvds2_sel		205

	lvds1_gate		206

	lvds2_gate		207



Examples:

Documentation/devicetree/bindings/clock/sunxi.txt

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ Additionally, "allwinner,*-gates-clk" clocks require: 


Clock consumers should specify the desired clocks they use with a

"clocks" phandle cell. Consumers that are using a gated clock should

provide an additional ID in their clock property. The values of this

ID are documented in sunxi/<soc>-gates.txt.

provide an additional ID in their clock property. This ID is the

offset of the bit controlling this particular gate in the register.



For example: