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

384d11fa · Linus Torvalds <[email protected]> · 2019-03-06 09:41:12 -08:00

Pull ARM SoC driver updates from Arnd Bergmann:
 "As usual, the drivers/tee and drivers/reset subsystems get merged
  here, with the expected set of smaller updates and some new hardware
  support. The tee subsystem now supports device drivers to be attached
  to a tee, the first example here is a random number driver with its
  implementation in the secure world.

  Three new power domain drivers get added for specific chip families:
   - Broadcom BCM283x chips (used in Raspberry Pi)
   - Qualcomm Snapdragon phone chips
   - Xilinx ZynqMP FPGA SoCs

  One new driver is added to talk to the BPMP firmware on NVIDIA
  Tegra210

  Existing drivers are extended for new SoC variants from NXP, NVIDIA,
  Amlogic and Qualcomm"

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (113 commits)
  tee: optee: update optee_msg.h and optee_smc.h to dual license
  tee: add cancellation support to client interface
  dpaa2-eth: configure the cache stashing amount on a queue
  soc: fsl: dpio: configure cache stashing destination
  soc: fsl: dpio: enable frame data cache stashing per software portal
  soc: fsl: guts: make fsl_guts_get_svr() static
  hwrng: make symbol 'optee_rng_id_table' static
  tee: optee: Fix unsigned comparison with less than zero
  hwrng: Fix unsigned comparison with less than zero
  tee: fix possible error pointer ctx dereferencing
  hwrng: optee: Initialize some structs using memset instead of braces
  tee: optee: Initialize some structs using memset instead of braces
  soc: fsl: dpio: fix memory leak of a struct qbman on error exit path
  clk: tegra: dfll: Make symbol 'tegra210_cpu_cvb_tables' static
  soc: qcom: llcc-slice: Fix typos
  qcom: soc: llcc-slice: Consolidate some code
  qcom: soc: llcc-slice: Clear the global drv_data pointer on error
  drivers: soc: xilinx: Add ZynqMP power domain driver
  firmware: xilinx: Add APIs to control node status/power
  dt-bindings: power: Add ZynqMP power domain bindings
  ...

Commit: 384d11fa0e2ca15a3e7e52db34a4e43bedf0dc70
Parents: 6ad63dec · 8ceb820b

Merge commit. Changes below are compared with the first parent: 6ad63dec.

Changes

126 files changed · +7122 −744

File	Status	Add	Del	Content
Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt	modified	+6	−2	View file
Documentation/devicetree/bindings/bus/imx-weim.txt	modified	+29	−3	View file
Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.txt	added	+46	−0	View file
Documentation/devicetree/bindings/opp/opp.txt	modified	+3	−0	View file
Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt	modified	+3	−0	View file
Documentation/devicetree/bindings/power/qcom,rpmpd.txt	added	+145	−0	View file
Documentation/devicetree/bindings/power/reset/xlnx,zynqmp-power.txt	added	+25	−0	View file
Documentation/devicetree/bindings/power/xlnx,zynqmp-genpd.txt	added	+34	−0	View file
Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.txt	added	+27	−0	View file
Documentation/devicetree/bindings/reset/fsl,imx7-src.txt	modified	+5	−2	View file
Documentation/devicetree/bindings/reset/xlnx,zynqmp-reset.txt	added	+52	−0	View file
Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt	modified	+2	−0	View file
Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt	added	+46	−0	View file
Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.txt	modified	+1	−0	View file
MAINTAINERS	modified	+31	−7	View file
arch/arm/boot/dts/bcm2835-rpi.dtsi	modified	+0	−4	View file
arch/arm/boot/dts/bcm283x.dtsi	modified	+14	−3	View file
arch/arm/mach-bcm/Kconfig	modified	+1	−0	View file
arch/arm/mach-socfpga/socfpga.c	modified	+1	−2	View file
arch/arm/mach-sunxi/sunxi.c	modified	+1	−1	View file
drivers/bus/hisi_lpc.c	modified	+2	−3	View file
drivers/bus/imx-weim.c	modified	+57	−13	View file
drivers/char/hw_random/Kconfig	modified	+15	−0	View file
drivers/char/hw_random/Makefile	modified	+1	−0	View file
drivers/char/hw_random/optee-rng.c	added	+306	−0	View file
drivers/clk/tegra/Kconfig	modified	+5	−0	View file
drivers/clk/tegra/Makefile	modified	+1	−1	View file
drivers/clk/tegra/clk-dfll.c	modified	+387	−72	View file
drivers/clk/tegra/clk-dfll.h	modified	+5	−1	View file
drivers/clk/tegra/clk-tegra124-dfll-fcpu.c	modified	+504	−16	View file
drivers/clk/tegra/cvb.c	modified	+7	−5	View file
drivers/clk/tegra/cvb.h	modified	+4	−3	View file
drivers/cpufreq/Kconfig.arm	modified	+2	−2	View file
drivers/cpufreq/cpufreq-dt-platdev.c	modified	+1	−0	View file
drivers/cpufreq/tegra124-cpufreq.c	modified	+4	−40	View file
drivers/firmware/imx/misc.c	modified	+38	−0	View file
drivers/firmware/imx/scu-pd.c	modified	+1	−0	View file
drivers/firmware/raspberrypi.c	modified	+11	−0	View file
drivers/firmware/tegra/Makefile	modified	+3	−0	View file
drivers/firmware/tegra/bpmp-private.h	added	+34	−0	View file
drivers/firmware/tegra/bpmp-tegra186.c	added	+305	−0	View file
drivers/firmware/tegra/bpmp-tegra210.c	added	+243	−0	View file
drivers/firmware/tegra/bpmp.c	modified	+150	−226	View file
drivers/firmware/ti_sci.c	modified	+2	−19	View file
drivers/firmware/xilinx/Kconfig	modified	+1	−0	View file
drivers/firmware/xilinx/zynqmp.c	modified	+166	−0	View file
drivers/mfd/Makefile	modified	+1	−0	View file
drivers/mfd/bcm2835-pm.c	added	+92	−0	View file
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c	modified	+6	−1	View file
drivers/nvmem/Kconfig	modified	+10	−0	View file
drivers/nvmem/Makefile	modified	+2	−0	View file
drivers/nvmem/zynqmp_nvmem.c	added	+86	−0	View file
drivers/opp/core.c	modified	+18	−0	View file
drivers/opp/of.c	modified	+2	−0	View file
drivers/opp/opp.h	modified	+2	−0	View file
drivers/reset/Kconfig	modified	+10	−2	View file
drivers/reset/Makefile	modified	+2	−0	View file
drivers/reset/reset-brcmstb.c	added	+132	−0	View file
drivers/reset/reset-imx7.c	modified	+158	−14	View file
drivers/reset/reset-socfpga.c	modified	+1	−1	View file
drivers/reset/reset-sunxi.c	modified	+1	−0	View file
drivers/reset/reset-zynqmp.c	added	+114	−0	View file
drivers/soc/amlogic/meson-canvas.c	modified	+16	−2	View file
drivers/soc/amlogic/meson-clk-measure.c	modified	+196	−0	View file
drivers/soc/bcm/Kconfig	modified	+12	−0	View file
drivers/soc/bcm/Makefile	modified	+1	−0	View file
drivers/soc/bcm/bcm2835-power.c	added	+661	−0	View file
drivers/soc/fsl/Kconfig	modified	+1	−0	View file
drivers/soc/fsl/dpio/dpio-cmd.h	modified	+5	−0	View file
drivers/soc/fsl/dpio/dpio-driver.c	modified	+53	−1	View file
drivers/soc/fsl/dpio/dpio-service.c	modified	+3	−2	View file
drivers/soc/fsl/dpio/dpio.c	modified	+16	−0	View file
drivers/soc/fsl/dpio/dpio.h	modified	+5	−0	View file
drivers/soc/fsl/dpio/qbman-portal.c	modified	+3	−2	View file
drivers/soc/fsl/guts.c	modified	+5	−5	View file
drivers/soc/imx/Kconfig	modified	+1	−1	View file
drivers/soc/imx/gpcv2.c	modified	+74	−2	View file
drivers/soc/qcom/Kconfig	modified	+18	−0	View file
drivers/soc/qcom/Makefile	modified	+2	−0	View file
drivers/soc/qcom/llcc-sdm845.c	modified	+6	−0	View file
drivers/soc/qcom/llcc-slice.c	modified	+68	−33	View file
drivers/soc/qcom/qcom_gsbi.c	modified	+5	−2	View file
drivers/soc/qcom/rmtfs_mem.c	modified	+24	−8	View file
drivers/soc/qcom/rpmh.c	modified	+22	−15	View file
drivers/soc/qcom/rpmhpd.c	added	+406	−0	View file
drivers/soc/qcom/rpmpd.c	added	+315	−0	View file
drivers/soc/qcom/smd-rpm.c	modified	+1	−0	View file
drivers/soc/tegra/fuse/fuse-tegra.c	modified	+9	−3	View file
drivers/soc/tegra/fuse/speedo-tegra210.c	modified	+1	−1	View file
drivers/soc/tegra/pmc.c	modified	+288	−136	View file
drivers/soc/ti/knav_dma.c	modified	+1	−1	View file
drivers/soc/xilinx/Kconfig	modified	+20	−0	View file
drivers/soc/xilinx/Makefile	modified	+2	−0	View file
drivers/soc/xilinx/zynqmp_pm_domains.c	added	+321	−0	View file
drivers/soc/xilinx/zynqmp_power.c	added	+178	−0	View file
drivers/tee/optee/Makefile	modified	+1	−0	View file
drivers/tee/optee/core.c	modified	+4	−0	View file
drivers/tee/optee/device.c	added	+160	−0	View file
drivers/tee/optee/optee_msg.h	modified	+2	−24	View file
drivers/tee/optee/optee_private.h	modified	+3	−0	View file
drivers/tee/optee/optee_smc.h	modified	+2	−24	View file
drivers/tee/optee/supp.c	modified	+9	−1	View file
drivers/tee/tee_core.c	modified	+74	−4	View file
drivers/watchdog/bcm2835_wdt.c	modified	+9	−17	View file
include/dt-bindings/power/qcom-rpmpd.h	added	+39	−0	View file
include/dt-bindings/power/xlnx-zynqmp-power.h	added	+39	−0	View file
include/dt-bindings/reset/amlogic,meson-g12a-reset.h	added	+134	−0	View file
include/dt-bindings/reset/imx8mq-reset.h	added	+64	−0	View file
include/dt-bindings/reset/xlnx-zynqmp-resets.h	added	+130	−0	View file
include/dt-bindings/soc/bcm2835-pm.h	added	+28	−0	View file
include/linux/firmware/imx/svc/misc.h	modified	+3	−0	View file
include/linux/firmware/xlnx-zynqmp.h	modified	+184	−0	View file
include/linux/fsl/guts.h	modified	+0	−2	View file
include/linux/mfd/bcm2835-pm.h	added	+14	−0	View file
include/linux/mod_devicetable.h	modified	+9	−0	View file
include/linux/pm_opp.h	modified	+7	−0	View file
include/linux/reset/socfpga.h	added	+7	−0	View file
include/linux/reset/sunxi.h	added	+7	−0	View file
include/linux/soc/qcom/llcc-qcom.h	modified	+6	−0	View file
include/linux/tee_drv.h	modified	+49	−1	View file
include/soc/bcm2835/raspberrypi-firmware.h	modified	+4	−0	View file
include/soc/fsl/dpaa2-io.h	modified	+2	−2	View file
include/soc/tegra/bpmp.h	modified	+7	−6	View file
include/soc/tegra/pmc.h	modified	+0	−6	View file
scripts/mod/devicetable-offsets.c	modified	+3	−0	View file
scripts/mod/file2alias.c	modified	+19	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt b/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
index cef5ee8..72d481c 100644
--- a/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
+++ b/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
@@ -58,7 +58,11 @@ This binding for the SCU power domain providers uses the generic power
 domain binding[2].
 
 Required properties:
-- compatible:		Should be "fsl,imx8qxp-scu-pd".
+- compatible:		Should be one of:
+			  "fsl,imx8qm-scu-pd",
+			  "fsl,imx8qxp-scu-pd"
+			followed by "fsl,scu-pd"
+
 - #power-domain-cells:	Must be 1. Contains the Resource ID used by
 			SCU commands.
 			See detailed Resource ID list from:
@@ -157,7 +161,7 @@ firmware {
 		};
 
 		pd: imx8qx-pd {
-			compatible = "fsl,imx8qxp-scu-pd";
+			compatible = "fsl,imx8qxp-scu-pd", "fsl,scu-pd";
 			#power-domain-cells = <1>;
 		};
 

Documentation/devicetree/bindings/bus/imx-weim.txt

View file

diff --git a/Documentation/devicetree/bindings/bus/imx-weim.txt b/Documentation/devicetree/bindings/bus/imx-weim.txt
index 683eaf3..dda7d6d 100644
--- a/Documentation/devicetree/bindings/bus/imx-weim.txt
+++ b/Documentation/devicetree/bindings/bus/imx-weim.txt
@@ -47,9 +47,9 @@ Optional properties:
 Timing property for child nodes. It is mandatory, not optional.
 
  - fsl,weim-cs-timing:	The timing array, contains timing values for the
-			child node. We can get the CS index from the child
-			node's "reg" property. The number of registers depends
-			on the selected chip.
+			child node. We get the CS indexes from the address
+			ranges in the child node's "reg" property.
+			The number of registers depends on the selected chip:
 			For i.MX1, i.MX21 ("fsl,imx1-weim") there are two
 			registers: CSxU, CSxL.
 			For i.MX25, i.MX27, i.MX31 and i.MX35 ("fsl,imx27-weim")
@@ -80,3 +80,29 @@ Example for an imx6q-sabreauto board, the NOR flash connected to the WEIM:
 					0x0000c000 0x1404a38e 0x00000000>;
 		};
 	};
+
+Example for an imx6q-based board, a multi-chipselect device connected to WEIM:
+
+In this case, both chip select 0 and 1 will be configured with the same timing
+array values.
+
+	weim: weim@21b8000 {
+		compatible = "fsl,imx6q-weim";
+		reg = <0x021b8000 0x4000>;
+		clocks = <&clks 196>;
+		#address-cells = <2>;
+		#size-cells = <1>;
+		ranges = <0 0 0x08000000 0x02000000
+			  1 0 0x0a000000 0x02000000
+			  2 0 0x0c000000 0x02000000
+			  3 0 0x0e000000 0x02000000>;
+		fsl,weim-cs-gpr = <&gpr>;
+
+		acme@0 {
+			compatible = "acme,whatever";
+			reg = <0 0 0x100>, <0 0x400000 0x800>,
+				<1 0x400000 0x800>;
+			fsl,weim-cs-timing = <0x024400b1 0x00001010 0x20081100
+				0x00000000 0xa0000240 0x00000000>;
+		};
+	};

Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.txt

View file

diff --git a/Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.txt b/Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.txt
new file mode 100644
index 0000000..4881561
--- /dev/null
+++ b/Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.txt
@@ -0,0 +1,46 @@
+--------------------------------------------------------------------------
+=  Zynq UltraScale+ MPSoC nvmem firmware driver binding =
+--------------------------------------------------------------------------
+The nvmem_firmware node provides access to the hardware related data
+like soc revision, IDCODE... etc, By using the firmware interface.
+
+Required properties:
+- compatible: should be "xlnx,zynqmp-nvmem-fw"
+
+= Data cells =
+Are child nodes of silicon id, bindings of which as described in
+bindings/nvmem/nvmem.txt
+
+-------
+ Example
+-------
+firmware {
+	zynqmp_firmware: zynqmp-firmware {
+		compatible = "xlnx,zynqmp-firmware";
+		method = "smc";
+
+		nvmem_firmware {
+			compatible = "xlnx,zynqmp-nvmem-fw";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			/* Data cells */
+			soc_revision: soc_revision {
+				reg = <0x0 0x4>;
+			};
+		};
+	};
+};
+
+= Data consumers =
+Are device nodes which consume nvmem data cells.
+
+For example:
+	pcap {
+		...
+
+		nvmem-cells = <&soc_revision>;
+		nvmem-cell-names = "soc_revision";
+
+		...
+	};

Documentation/devicetree/bindings/opp/opp.txt

View file

diff --git a/Documentation/devicetree/bindings/opp/opp.txt b/Documentation/devicetree/bindings/opp/opp.txt
index c396c4c..76b6c79 100644
--- a/Documentation/devicetree/bindings/opp/opp.txt
+++ b/Documentation/devicetree/bindings/opp/opp.txt
@@ -129,6 +129,9 @@ Optional properties:
 - opp-microamp-<name>: Named opp-microamp property. Similar to
   opp-microvolt-<name> property, but for microamp instead.
 
+- opp-level: A value representing the performance level of the device,
+  expressed as a 32-bit integer.
+
 - clock-latency-ns: Specifies the maximum possible transition latency (in
   nanoseconds) for switching to this OPP from any other OPP.
 

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

View file

diff --git a/Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt b/Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt
index 7c947a9..7c7e972 100644
--- a/Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt
+++ b/Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt
@@ -32,6 +32,9 @@ Required properties:
 Optional properties:
 
 - power-supply: Power supply used to power the domain
+- clocks: a number of phandles to clocks that need to be enabled during
+  domain power-up sequencing to ensure reset propagation into devices
+  located inside this power domain
 
 Example:
 

Documentation/devicetree/bindings/power/qcom,rpmpd.txt

View file

diff --git a/Documentation/devicetree/bindings/power/qcom,rpmpd.txt b/Documentation/devicetree/bindings/power/qcom,rpmpd.txt
new file mode 100644
index 0000000..980e541
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/qcom,rpmpd.txt
@@ -0,0 +1,145 @@
+Qualcomm RPM/RPMh Power domains
+
+For RPM/RPMh Power domains, we communicate a performance state to RPM/RPMh
+which then translates it into a corresponding voltage on a rail
+
+Required Properties:
+ - compatible: Should be one of the following
+	* qcom,msm8996-rpmpd: RPM Power domain for the msm8996 family of SoC
+	* qcom,sdm845-rpmhpd: RPMh Power domain for the sdm845 family of SoC
+ - #power-domain-cells: number of cells in Power domain specifier
+	must be 1.
+ - operating-points-v2: Phandle to the OPP table for the Power domain.
+	Refer to Documentation/devicetree/bindings/power/power_domain.txt
+	and Documentation/devicetree/bindings/opp/opp.txt for more details
+
+Refer to <dt-bindings/power/qcom-rpmpd.h> for the level values for
+various OPPs for different platforms as well as Power domain indexes
+
+Example: rpmh power domain controller and OPP table
+
+#include <dt-bindings/power/qcom-rpmhpd.h>
+
+opp-level values specified in the OPP tables for RPMh power domains
+should use the RPMH_REGULATOR_LEVEL_* constants from
+<dt-bindings/power/qcom-rpmhpd.h>
+
+	rpmhpd: power-controller {
+		compatible = "qcom,sdm845-rpmhpd";
+		#power-domain-cells = <1>;
+		operating-points-v2 = <&rpmhpd_opp_table>;
+
+		rpmhpd_opp_table: opp-table {
+			compatible = "operating-points-v2";
+
+			rpmhpd_opp_ret: opp1 {
+				opp-level = <RPMH_REGULATOR_LEVEL_RETENTION>;
+			};
+
+			rpmhpd_opp_min_svs: opp2 {
+				opp-level = <RPMH_REGULATOR_LEVEL_MIN_SVS>;
+			};
+
+			rpmhpd_opp_low_svs: opp3 {
+				opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS>;
+			};
+
+			rpmhpd_opp_svs: opp4 {
+				opp-level = <RPMH_REGULATOR_LEVEL_SVS>;
+			};
+
+			rpmhpd_opp_svs_l1: opp5 {
+				opp-level = <RPMH_REGULATOR_LEVEL_SVS_L1>;
+			};
+
+			rpmhpd_opp_nom: opp6 {
+				opp-level = <RPMH_REGULATOR_LEVEL_NOM>;
+			};
+
+			rpmhpd_opp_nom_l1: opp7 {
+				opp-level = <RPMH_REGULATOR_LEVEL_NOM_L1>;
+			};
+
+			rpmhpd_opp_nom_l2: opp8 {
+				opp-level = <RPMH_REGULATOR_LEVEL_NOM_L2>;
+			};
+
+			rpmhpd_opp_turbo: opp9 {
+				opp-level = <RPMH_REGULATOR_LEVEL_TURBO>;
+			};
+
+			rpmhpd_opp_turbo_l1: opp10 {
+				opp-level = <RPMH_REGULATOR_LEVEL_TURBO_L1>;
+			};
+		};
+	};
+
+Example: rpm power domain controller and OPP table
+
+	rpmpd: power-controller {
+		compatible = "qcom,msm8996-rpmpd";
+		#power-domain-cells = <1>;
+		operating-points-v2 = <&rpmpd_opp_table>;
+
+		rpmpd_opp_table: opp-table {
+			compatible = "operating-points-v2";
+
+			rpmpd_opp_low: opp1 {
+				opp-level = <1>;
+			};
+
+			rpmpd_opp_ret: opp2 {
+				opp-level = <2>;
+			};
+
+			rpmpd_opp_svs: opp3 {
+				opp-level = <3>;
+			};
+
+			rpmpd_opp_normal: opp4 {
+				opp-level = <4>;
+			};
+
+			rpmpd_opp_high: opp5 {
+				opp-level = <5>;
+			};
+
+			rpmpd_opp_turbo: opp6 {
+				opp-level = <6>;
+			};
+		};
+	};
+
+Example: Client/Consumer device using OPP table
+
+	leaky-device0@12350000 {
+		compatible = "foo,i-leak-current";
+		reg = <0x12350000 0x1000>;
+		power-domains = <&rpmhpd SDM845_MX>;
+		operating-points-v2 = <&leaky_opp_table>;
+	};
+
+
+	leaky_opp_table: opp-table {
+		compatible = "operating-points-v2";
+
+		opp1 {
+			opp-hz = /bits/ 64 <144000>;
+			required-opps = <&rpmhpd_opp_low>;
+		};
+
+		opp2 {
+			opp-hz = /bits/ 64 <400000>;
+			required-opps = <&rpmhpd_opp_ret>;
+		};
+
+		opp3 {
+			opp-hz = /bits/ 64 <20000000>;
+			required-opps = <&rpmpd_opp_svs>;
+		};
+
+		opp4 {
+			opp-hz = /bits/ 64 <25000000>;
+			required-opps = <&rpmpd_opp_normal>;
+		};
+	};

Documentation/devicetree/bindings/power/reset/xlnx,zynqmp-power.txt

View file

diff --git a/Documentation/devicetree/bindings/power/reset/xlnx,zynqmp-power.txt b/Documentation/devicetree/bindings/power/reset/xlnx,zynqmp-power.txt
new file mode 100644
index 0000000..d366f1e
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/reset/xlnx,zynqmp-power.txt
@@ -0,0 +1,25 @@
+--------------------------------------------------------------------
+Device Tree Bindings for the Xilinx Zynq MPSoC Power Management
+--------------------------------------------------------------------
+The zynqmp-power node describes the power management configurations.
+It will control remote suspend/shutdown interfaces.
+
+Required properties:
+ - compatible:		Must contain:	"xlnx,zynqmp-power"
+ - interrupts:		Interrupt specifier
+
+-------
+Example
+-------
+
+firmware {
+	zynqmp_firmware: zynqmp-firmware {
+		compatible = "xlnx,zynqmp-firmware";
+		method = "smc";
+
+		zynqmp_power: zynqmp-power {
+			compatible = "xlnx,zynqmp-power";
+			interrupts = <0 35 4>;
+		};
+	};
+};

Documentation/devicetree/bindings/power/xlnx,zynqmp-genpd.txt

View file

diff --git a/Documentation/devicetree/bindings/power/xlnx,zynqmp-genpd.txt b/Documentation/devicetree/bindings/power/xlnx,zynqmp-genpd.txt
new file mode 100644
index 0000000..8d1b820
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/xlnx,zynqmp-genpd.txt
@@ -0,0 +1,34 @@
+-----------------------------------------------------------
+Device Tree Bindings for the Xilinx Zynq MPSoC PM domains
+-----------------------------------------------------------
+The binding for zynqmp-power-controller follow the common
+generic PM domain binding[1].
+
+[1] Documentation/devicetree/bindings/power/power_domain.txt
+
+== Zynq MPSoC Generic PM Domain Node ==
+
+Required property:
+ - Below property should be in zynqmp-firmware node.
+ - #power-domain-cells:	Number of cells in a PM domain specifier. Must be 1.
+
+Power domain ID indexes are mentioned in
+include/dt-bindings/power/xlnx-zynqmp-power.h.
+
+-------
+Example
+-------
+
+firmware {
+	zynqmp_firmware: zynqmp-firmware {
+		...
+		#power-domain-cells = <1>;
+		...
+	};
+};
+
+sata {
+	...
+	power-domains = <&zynqmp_firmware 28>;
+	...
+};

Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.txt

View file

diff --git a/Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.txt b/Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.txt
new file mode 100644
index 0000000..6e5341b
--- /dev/null
+++ b/Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.txt
@@ -0,0 +1,27 @@
+Broadcom STB SW_INIT-style reset controller
+===========================================
+
+Broadcom STB SoCs have a SW_INIT-style reset controller with separate
+SET/CLEAR/STATUS registers and possibly multiple banks, each of 32 bit
+reset lines.
+
+Please also refer to reset.txt in this directory for common reset
+controller binding usage.
+
+Required properties:
+- compatible: should be brcm,brcmstb-reset
+- reg: register base and length
+- #reset-cells: must be set to 1
+
+Example:
+
+	reset: reset-controller@8404318 {
+		compatible = "brcm,brcmstb-reset";
+		reg = <0x8404318 0x30>;
+		#reset-cells = <1>;
+	};
+
+	&ethernet_switch {
+		resets = <&reset>;
+		reset-names = "switch";
+	};

Documentation/devicetree/bindings/reset/fsl,imx7-src.txt

View file

diff --git a/Documentation/devicetree/bindings/reset/fsl,imx7-src.txt b/Documentation/devicetree/bindings/reset/fsl,imx7-src.txt
index 1ab1d10..2ecf338 100644
--- a/Documentation/devicetree/bindings/reset/fsl,imx7-src.txt
+++ b/Documentation/devicetree/bindings/reset/fsl,imx7-src.txt
@@ -5,7 +5,9 @@ Please also refer to reset.txt in this directory for common reset
 controller binding usage.
 
 Required properties:
-- compatible: Should be "fsl,imx7d-src", "syscon"
+- compatible:
+	- For i.MX7 SoCs should be "fsl,imx7d-src", "syscon"
+	- For i.MX8MQ SoCs should be "fsl,imx8mq-src", "syscon"
 - reg: should be register base and length as documented in the
   datasheet
 - interrupts: Should contain SRC interrupt
@@ -44,4 +46,5 @@ Example:
 
 
 For list of all valid reset indicies see
-<dt-bindings/reset/imx7-reset.h>
+<dt-bindings/reset/imx7-reset.h> for i.MX7 and
+<dt-bindings/reset/imx8mq-reset.h> for i.MX8MQ

Documentation/devicetree/bindings/reset/xlnx,zynqmp-reset.txt

View file

diff --git a/Documentation/devicetree/bindings/reset/xlnx,zynqmp-reset.txt b/Documentation/devicetree/bindings/reset/xlnx,zynqmp-reset.txt
new file mode 100644
index 0000000..27a45fe
--- /dev/null
+++ b/Documentation/devicetree/bindings/reset/xlnx,zynqmp-reset.txt
@@ -0,0 +1,52 @@
+--------------------------------------------------------------------------
+ =  Zynq UltraScale+ MPSoC reset driver binding =
+--------------------------------------------------------------------------
+The Zynq UltraScale+ MPSoC has several different resets.
+
+See Chapter 36 of the Zynq UltraScale+ MPSoC TRM (UG) for more information
+about zynqmp resets.
+
+Please also refer to reset.txt in this directory for common reset
+controller binding usage.
+
+Required Properties:
+- compatible:	"xlnx,zynqmp-reset"
+- #reset-cells:	Specifies the number of cells needed to encode reset
+		line, should be 1
+
+-------
+Example
+-------
+
+firmware {
+	zynqmp_firmware: zynqmp-firmware {
+		compatible = "xlnx,zynqmp-firmware";
+		method = "smc";
+
+		zynqmp_reset: reset-controller {
+			compatible = "xlnx,zynqmp-reset";
+			#reset-cells = <1>;
+		};
+	};
+};
+
+Specifying reset lines connected to IP modules
+==============================================
+
+Device nodes that need access to reset lines should
+specify them as a reset phandle in their corresponding node as
+specified in reset.txt.
+
+For list of all valid reset indicies see
+<dt-bindings/reset/xlnx-zynqmp-resets.h>
+
+Example:
+
+serdes: zynqmp_phy@fd400000 {
+	...
+
+	resets = <&zynqmp_reset ZYNQMP_RESET_SATA>;
+	reset-names = "sata_rst";
+
+	...
+};

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

View file

diff --git a/Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt b/Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt
index 205a54b..6bf6b43 100644
--- a/Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt
+++ b/Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt
@@ -9,6 +9,8 @@ Required properties:
 			"amlogic,meson-gx-clk-measure" for GX SoCs
 			"amlogic,meson8-clk-measure" for Meson8 SoCs
 			"amlogic,meson8b-clk-measure" for Meson8b SoCs
+			"amlogic,meson-axg-clk-measure" for AXG SoCs
+			"amlogic,meson-g12a-clk-measure" for G12a SoCs
 - reg: base address and size of the Clock Measurer register space.
 
 Example:

Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt

View file

diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt
new file mode 100644
index 0000000..3b7d329
--- /dev/null
+++ b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt
@@ -0,0 +1,46 @@
+BCM2835 PM (Power domains, watchdog)
+
+The PM block controls power domains and some reset lines, and includes
+a watchdog timer.  This binding supersedes the brcm,bcm2835-pm-wdt
+binding which covered some of PM's register range and functionality.
+
+Required properties:
+
+- compatible:		Should be "brcm,bcm2835-pm"
+- reg:			Specifies base physical address and size of the two
+			  register ranges ("PM" and "ASYNC_BRIDGE" in that
+			  order)
+- clocks:		a) v3d: The V3D clock from CPRMAN
+			b) peri_image: The PERI_IMAGE clock from CPRMAN
+			c) h264: The H264 clock from CPRMAN
+			d) isp: The ISP clock from CPRMAN
+- #reset-cells: 	Should be 1.  This property follows the reset controller
+			  bindings[1].
+- #power-domain-cells:	Should be 1.  This property follows the power domain
+			  bindings[2].
+
+Optional properties:
+
+- timeout-sec:		Contains the watchdog timeout in seconds
+- system-power-controller: Whether the watchdog is controlling the
+    system power.  This node follows the power controller bindings[3].
+
+[1] Documentation/devicetree/bindings/reset/reset.txt
+[2] Documentation/devicetree/bindings/power/power_domain.txt
+[3] Documentation/devicetree/bindings/power/power-controller.txt
+
+Example:
+
+pm {
+	compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt";
+	#power-domain-cells = <1>;
+	#reset-cells = <1>;
+	reg = <0x7e100000 0x114>,
+	      <0x7e00a000 0x24>;
+	clocks = <&clocks BCM2835_CLOCK_V3D>,
+		 <&clocks BCM2835_CLOCK_PERI_IMAGE>,
+		 <&clocks BCM2835_CLOCK_H264>,
+		 <&clocks BCM2835_CLOCK_ISP>;
+	clock-names = "v3d", "peri_image", "h264", "isp";
+	system-power-controller;
+};

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

View file

diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.txt b/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.txt
index ec95705..f3fa313 100644
--- a/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.txt
+++ b/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.txt
@@ -23,6 +23,7 @@ resources.
 		    "qcom,rpm-msm8916"
 		    "qcom,rpm-msm8974"
 		    "qcom,rpm-msm8998"
+		    "qcom,rpm-sdm660"
 		    "qcom,rpm-qcs404"
 
 - qcom,smd-channels:

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 49f7d49..d5a4b63 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1940,19 +1940,37 @@ M:	David Brown <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/devicetree/bindings/soc/qcom/
+F:	Documentation/devicetree/bindings/*/qcom*
 F:	arch/arm/boot/dts/qcom-*.dts
 F:	arch/arm/boot/dts/qcom-*.dtsi
 F:	arch/arm/mach-qcom/
-F:	arch/arm64/boot/dts/qcom/*
+F:	arch/arm64/boot/dts/qcom/
+F:	drivers/*/qcom/
+F:	drivers/*/qcom*
+F:	drivers/*/*/qcom/
+F:	drivers/*/*/qcom*
+F:	drivers/*/pm8???-*
+F:	drivers/bluetooth/btqcomsmd.c
+F:	drivers/clocksource/timer-qcom.c
+F:	drivers/extcon/extcon-qcom*
+F:	drivers/iommu/msm*
 F:	drivers/i2c/busses/i2c-qup.c
-F:	drivers/clk/qcom/
-F:	drivers/dma/qcom/
-F:	drivers/soc/qcom/
+F:	drivers/i2c/busses/i2c-qcom-geni.c
+F:	drivers/mfd/ssbi.c
+F:	drivers/mmc/host/mmci_qcom*
+F:	drivers/mmc/host/sdhci_msm.c
+F:	drivers/pci/controller/dwc/pcie-qcom.c
+F:	drivers/phy/qualcomm/
+F:	drivers/power/*/msm*
+F:	drivers/reset/reset-qcom-*