Commit 8c609698 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC platform updates from Arnd Bergmann:
 "Most of the commits are for defconfig changes, to enable newly added
  drivers or features that people have started using. For the changed
  lines lines, we have mostly cleanups, the affected platforms are OMAP,
  Versatile, EP93xx, Samsung, Broadcom, i.MX, and Actions.

  The largest single change is the introduction of the TI "sysc" bus
  driver, with the intention of cleaning up more legacy code.

  Two new SoC platforms get added this time:

   - Allwinner R40 is a modernized version of the A20 chip, now with a
     Quad-Core ARM Cortex-A7. According to the manufacturer, it is
     intended for "Smart Hardware"

   - Broadcom Hurricane 2 (Aka Strataconnect BCM5334X) is a family of
     chips meant for managed gigabit ethernet switches, based around a
     Cortex-A9 CPU.

  Finally, we gain SMP support for two platforms: Renesas R-Car E2 and
  Amlogic Meson8/8b, which were previously added but only supported
  uniprocessor operation"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (118 commits)
  ARM: multi_v7_defconfig: Select RPMSG_VIRTIO as module
  ARM: multi_v7_defconfig: enable CONFIG_GPIO_UNIPHIER
  arm64: defconfig: enable CONFIG_GPIO_UNIPHIER
  ARM: meson: enable MESON_IRQ_GPIO in Kconfig for meson8b
  ARM: meson: Add SMP bringup code for Meson8 and Meson8b
  ARM: smp_scu: allow the platform code to read the SCU CPU status
  ARM: smp_scu: add a helper for powering on a specific CPU
  dt-bindings: Amlogic: Add Meson8 and Meson8b SMP related documentation
  ARM: OMAP3: Delete an unnecessary variable initialisation in omap3xxx_hwmod_init()
  ARM: OMAP3: Use common error handling code in omap3xxx_hwmod_init()
  ARM: defconfig: select the right SX150X driver
  arm64: defconfig: Enable QCOM_IOMMU
  arm64: Add ThunderX drivers to defconfig
  arm64: defconfig: Enable Tegra PCI controller
  cpufreq: imx6q: Move speed grading check to cpufreq driver
  arm64: defconfig: re-enable Qualcomm DB410c USB
  ARM: configs: stm32: Add MDMA support in STM32 defconfig
  ARM: imx: Enable cpuidle for i.MX6DL starting at 1.1
  bus: ti-sysc: Fix unbalanced pm_runtime_enable by adding remove
  bus: ti-sysc: mark PM functions as __maybe_unused
  ...
parents 18c83d2c fa32475a

Documentation/arm/sunxi/README

+9 −2
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ SunXi family 


      - Next Thing Co GR8 (sun5i)



    * Single ARM Cortex-A7 based SoCs

      - Allwinner V3s (sun8i)

        + Datasheet

          http://linux-sunxi.org/File:Allwinner_V3s_Datasheet_V1.0.pdf



    * Dual ARM Cortex-A7 based SoCs

      - Allwinner A20 (sun7i)

        + User Manual
@@ -71,9 +76,11 @@ SunXi family 
        + Datasheet

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



      - Allwinner V3s (sun8i)

      - Allwinner R40 (sun8i)

        + Datasheet

          http://linux-sunxi.org/File:Allwinner_V3s_Datasheet_V1.0.pdf

          https://github.com/tinalinux/docs/raw/r40-v1.y/R40_Datasheet_V1.0.pdf

        + User Manual

          https://github.com/tinalinux/docs/raw/r40-v1.y/Allwinner_R40_User_Manual_V1.0.pdf



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

      - Allwinner A80

Documentation/devicetree/bindings/arm/amlogic/pmu.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Amlogic Meson8 and Meson8b power-management-unit:

-------------------------------------------------



The pmu is used to turn off and on different power domains of the SoCs

This includes the power to the CPU cores.



Required node properties:

- compatible value : depending on the SoC this should be one of:

			"amlogic,meson8-pmu"

			"amlogic,meson8b-pmu"

- reg : physical base address and the size of the registers window



Example:



	pmu@c81000e4 {

		compatible = "amlogic,meson8b-pmu", "syscon";

		reg = <0xc81000e0 0x18>;

	};

Documentation/devicetree/bindings/arm/amlogic/smp-sram.txt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
Amlogic Meson8 and Meson8b SRAM for smp bringup:

------------------------------------------------



Amlogic's SMP-capable SoCs use part of the sram for the bringup of the cores.

Once the core gets powered up it executes the code that is residing at a

specific location.



Therefore a reserved section sub-node has to be added to the mmio-sram

declaration.



Required sub-node properties:

- compatible : depending on the SoC this should be one of:

		"amlogic,meson8-smp-sram"

		"amlogic,meson8b-smp-sram"



The rest of the properties should follow the generic mmio-sram discription

found in ../../misc/sram.txt



Example:



	sram: sram@d9000000 {

		compatible = "mmio-sram";

		reg = <0xd9000000 0x20000>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0xd9000000 0x20000>;



		smp-sram@1ff80 {

			compatible = "amlogic,meson8b-smp-sram";

			reg = <0x1ff80 0x8>;

		};

	};

Documentation/devicetree/bindings/arm/cpus.txt

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ described below. 
			    "actions,s500-smp"

			    "allwinner,sun6i-a31"

			    "allwinner,sun8i-a23"

			    "amlogic,meson8-smp"

			    "amlogic,meson8b-smp"

			    "arm,realview-smp"

			    "brcm,bcm11351-cpu-method"

			    "brcm,bcm23550"

Documentation/devicetree/bindings/arm/omap/ctrl.txt

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ Required properties: 
		"ti,omap3-scm"

		"ti,omap4-scm-core"

		"ti,omap4-scm-padconf-core"

		"ti,omap4-scm-wkup"

		"ti,omap4-scm-padconf-wkup"

		"ti,omap5-scm-core"

		"ti,omap5-scm-padconf-core"

		"ti,dra7-scm-core"

CRA Git | Maintained and supported by SUSTech CRA and CCSE