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

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

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

Pull ARM SoC driver updates from Olof Johansson:
 "Misc driver updates for platforms, many of them power related.

   - Rockchip adds power domain support for rk3066 and rk3188

   - Amlogic adds a power measurement driver

   - Allwinner adds SRAM support for three platforms (F1C100, H5, A64
     C1)

   - Wakeup and ti-sysc (platform bus) fixes for OMAP/DRA7

   - Broadcom fixes suspend/resume with Thumb2 kernels, and improves
     stability of a handful of firmware/platform interfaces

   - PXA completes their conversion to dmaengine framework

   - Renesas does a bunch of PM cleanups across many platforms

   - Tegra adds support for suspend/resume on T186/T194, which includes
     some driver cleanups and addition of wake events

   - Tegra also adds a driver for memory controller (EMC) on Tegra2

   - i.MX tweaks power domain bindings, and adds support for i.MX8MQ in
     GPC

   - Atmel adds identifiers and LPDDR2 support for a new SoC, SAM9X60

  and misc cleanups across several platforms"

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)
  ARM: at91: add support in soc driver for new SAM9X60
  ARM: at91: add support in soc driver for LPDDR2 SiP
  memory: omap-gpmc: Use of_node_name_eq for node name comparisons
  bus: ti-sysc: Check for no-reset and no-idle flags at the child level
  ARM: OMAP2+: Check also the first dts child for hwmod flags
  soc: amlogic: meson-clk-measure: Add missing REGMAP_MMIO dependency
  soc: imx: gpc: Increase GPC_CLK_MAX to 7
  soc: renesas: rcar-sysc: Fix power domain control after system resume
  soc: renesas: rcar-sysc: Merge PM Domain registration and linking
  soc: renesas: rcar-sysc: Remove rcar_sysc_power_{down,up}() helpers
  soc: renesas: r8a77990-sysc: Fix initialization order of 3DG-{A,B}
  dt-bindings: sram: sunxi: Add compatible for the A64 SRAM C1
  dt-bindings: sram: sunxi: Add bindings for the H5 with SRAM C1
  dt-bindings: sram: Add Allwinner suniv F1C100s
  soc: sunxi: sram: Add support for the H5 SoC system control
  soc: sunxi: sram: Enable EMAC clock access for H3 variant
  soc: imx: gpcv2: add support for i.MX8MQ SoC
  soc: imx: gpcv2: move register access table to domain data
  soc: imx: gpcv2: prefix i.MX7 specific defines
  dmaengine: pxa: make the filter function internal
  ...
parents 0922275e a6f119a0

Documentation/devicetree/bindings/bus/ti-sysc.txt

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ Required standard properties: 
		"ti,sysc-omap3-sham"

		"ti,sysc-omap-aes"

		"ti,sysc-mcasp"

		"ti,sysc-dra7-mcasp"

		"ti,sysc-usb-host-fs"

		"ti,sysc-dra7-mcan"

Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt

+5 −2
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ Control (PGC) for various power domains. 


Required properties:



- compatible: Should be "fsl,imx7d-gpc"

- compatible: Should be one of:

	- "fsl,imx7d-gpc"

	- "fsl,imx8mq-gpc"



- reg: should be register base and length as documented in the

  datasheet
@@ -22,7 +24,8 @@ which, in turn, is expected to contain the following: 
Required properties:



- reg: Power domain index. Valid values are defined in

  include/dt-bindings/power/imx7-power.h

  include/dt-bindings/power/imx7-power.h for fsl,imx7d-gpc and

  include/dt-bindings/power/imx8m-power.h for fsl,imx8mq-gpc



- #power-domain-cells: Should be 0

Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Amlogic Internal Clock Measurer

===============================



The Amlogic SoCs contains an IP to measure the internal clocks.

The precision is multiple of MHz, useful to debug the clock states.



Required properties:

- compatible: Shall contain one of the following :

			"amlogic,meson-gx-clk-measure" for GX SoCs

			"amlogic,meson8-clk-measure" for Meson8 SoCs

			"amlogic,meson8b-clk-measure" for Meson8b SoCs

- reg: base address and size of the Clock Measurer register space.



Example:

	clock-measure@8758 {

		compatible = "amlogic,meson-gx-clk-measure";

		reg = <0x0 0x8758 0x0 0x10>;

	};

Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.txt

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ resources. 
		    "qcom,rpm-msm8916"

		    "qcom,rpm-msm8974"

		    "qcom,rpm-msm8998"

		    "qcom,rpm-qcs404"



- qcom,smd-channels:

	Usage: required

Documentation/devicetree/bindings/soc/rockchip/power_domain.txt

+4 −0
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ Required properties for power domain controller: 
- compatible: Should be one of the following.

	"rockchip,px30-power-controller" - for PX30 SoCs.

	"rockchip,rk3036-power-controller" - for RK3036 SoCs.

	"rockchip,rk3066-power-controller" - for RK3066 SoCs.

	"rockchip,rk3128-power-controller" - for RK3128 SoCs.

	"rockchip,rk3188-power-controller" - for RK3188 SoCs.

	"rockchip,rk3228-power-controller" - for RK3228 SoCs.

	"rockchip,rk3288-power-controller" - for RK3288 SoCs.

	"rockchip,rk3328-power-controller" - for RK3328 SoCs.
@@ -23,7 +25,9 @@ Required properties for power domain sub nodes: 
- reg: index of the power domain, should use macros in:

	"include/dt-bindings/power/px30-power.h" - for PX30 type power domain.

	"include/dt-bindings/power/rk3036-power.h" - for RK3036 type power domain.

	"include/dt-bindings/power/rk3066-power.h" - for RK3066 type power domain.

	"include/dt-bindings/power/rk3128-power.h" - for RK3128 type power domain.

	"include/dt-bindings/power/rk3188-power.h" - for RK3188 type power domain.

	"include/dt-bindings/power/rk3228-power.h" - for RK3228 type power domain.

	"include/dt-bindings/power/rk3288-power.h" - for RK3288 type power domain.

	"include/dt-bindings/power/rk3328-power.h" - for RK3328 type power domain.