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

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

Pull ARM driver updates from Arnd Bergmann:
 "These are the usual updates for SoC specific device drivers and
  related subsystems that don't have their own top-level maintainers:

   - ARM SCMI/SCPI updates to allow pluggable transport layers

   - TEE subsystem cleanups

   - A new driver for the Amlogic secure power domain controller

   - Various driver updates for the NXP Layerscape DPAA2, NXP i.MX SCU
     and TI OMAP2+ sysc drivers.

   - Qualcomm SoC driver updates, including a new library module for
     "protection domain" notifications

   - Lots of smaller bugfixes and cleanups in other drivers"

* tag 'arm-drivers-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (70 commits)
  soc: fsl: qe: fix sparse warnings for ucc_slow.c
  soc: fsl: qe: ucc_slow: remove 0 assignment for kzalloc'ed structure
  soc: fsl: qe: fix sparse warnings for ucc_fast.c
  soc: fsl: qe: fix sparse warnings for qe_ic.c
  soc: fsl: qe: fix sparse warnings for ucc.c
  soc: fsl: qe: fix sparse warning for qe_common.c
  soc: fsl: qe: fix sparse warnings for qe.c
  soc: qcom: Fix QCOM_APR dependencies
  soc: qcom: pdr: Avoid uninitialized use of found in pdr_indication_cb
  soc: imx: drop COMPILE_TEST for IMX_SCU_SOC
  firmware: imx: add COMPILE_TEST for IMX_SCU driver
  soc: imx: gpc: fix power up sequencing
  soc: imx: increase build coverage for imx8m soc driver
  soc: qcom: apr: Add avs/audio tracking functionality
  dt-bindings: soc: qcom: apr: Add protection domain bindings
  soc: qcom: Introduce Protection Domain Restart helpers
  devicetree: bindings: firmware: add ipq806x to qcom_scm
  memory: tegra: Correct debugfs clk rate-range on Tegra124
  memory: tegra: Correct debugfs clk rate-range on Tegra30
  memory: tegra: Correct debugfs clk rate-range on Tegra20
  ...
parents 0e8fb69f cedb414a

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

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ Required standard properties: 
		"ti,sysc-dra7-mcasp"

		"ti,sysc-usb-host-fs"

		"ti,sysc-dra7-mcan"

		"ti,sysc-pruss"



- reg		shall have register areas implemented for the interconnect

		target module in question such as revision, sysc and syss

Documentation/devicetree/bindings/firmware/qcom,scm.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
 * "qcom,scm-apq8064"

 * "qcom,scm-apq8084"

 * "qcom,scm-ipq4019"

 * "qcom,scm-ipq806x"

 * "qcom,scm-msm8660"

 * "qcom,scm-msm8916"

 * "qcom,scm-msm8960"

Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0+ OR MIT)

# Copyright (c) 2019 Amlogic, Inc

# Author: Jianxin Pan <jianxin.pan@amlogic.com>

%YAML 1.2

---

$id: "http://devicetree.org/schemas/power/amlogic,meson-sec-pwrc.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"



title: Amlogic Meson Secure Power Domains



maintainers:

  - Jianxin Pan <jianxin.pan@amlogic.com>



description: |+

  Secure Power Domains used in Meson A1/C1 SoCs, and should be the child node

  of secure-monitor.



properties:

  compatible:

    enum:

      - amlogic,meson-a1-pwrc



  "#power-domain-cells":

    const: 1



required:

  - compatible

  - "#power-domain-cells"



examples:

  - |

    secure-monitor {

        compatible = "amlogic,meson-gxbb-sm";



        pwrc: power-controller {

            compatible = "amlogic,meson-a1-pwrc";

            #power-domain-cells = <1>;

        };

    };

Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt

+50 −0
Original line number Diff line number Diff line
@@ -45,6 +45,18 @@ by the individual bindings for the specific service 
			12 - Ultrasound stream manager.

			13 - Listen stream manager.



- qcom,protection-domain

	Usage: optional

	Value type: <stringlist>

	Definition: Must list the protection domain service name and path

		    that the particular apr service has a dependency on.

	Possible values are :

			"avs/audio", "msm/adsp/audio_pd".

			"kernel/elf_loader", "msm/modem/wlan_pd".

			"tms/servreg", "msm/adsp/audio_pd".

			"tms/servreg", "msm/modem/wlan_pd".

			"tms/servreg", "msm/slpi/sensor_pd".



= EXAMPLE

The following example represents a QDSP based sound card on a MSM8996 device

which uses apr as communication between Apps and QDSP.
@@ -82,3 +94,41 @@ which uses apr as communication between Apps and QDSP. 
			...

		};

	};



= EXAMPLE 2

The following example represents a QDSP based sound card with protection domain

dependencies specified. Here some of the apr services are dependent on services

running on protection domain hosted on ADSP/SLPI remote processors while others

have no such dependency.



	apr {

		compatible = "qcom,apr-v2";

		qcom,glink-channels = "apr_audio_svc";

		qcom,apr-domain = <APR_DOMAIN_ADSP>;



		q6core {

			compatible = "qcom,q6core";

			reg = <APR_SVC_ADSP_CORE>;

		};



		q6afe: q6afe {

			compatible = "qcom,q6afe";

			reg = <APR_SVC_AFE>;

			qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";

			...

		};



		q6asm: q6asm {

			compatible = "qcom,q6asm";

			reg = <APR_SVC_ASM>;

			qcom,protection-domain = "tms/servreg", "msm/slpi/sensor_pd";

			...

		};



		q6adm: q6adm {

			compatible = "qcom,q6adm";

			reg = <APR_SVC_ADM>;

			qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";

			...

		};

	};

arch/arm/mach-omap2/pdata-quirks.c

+6 −0
Original line number Diff line number Diff line
@@ -397,10 +397,16 @@ static int ti_sysc_shutdown_module(struct device *dev, 
	return omap_hwmod_shutdown(cookie->data);

}



static bool ti_sysc_soc_type_gp(void)

{

	return omap_type() == OMAP2_DEVICE_TYPE_GP;

}



static struct of_dev_auxdata omap_auxdata_lookup[];



static struct ti_sysc_platform_data ti_sysc_pdata = {

	.auxdata = omap_auxdata_lookup,

	.soc_type_gp = ti_sysc_soc_type_gp,

	.init_clockdomain = ti_sysc_clkdm_init,

	.clkdm_deny_idle = ti_sysc_clkdm_deny_idle,

	.clkdm_allow_idle = ti_sysc_clkdm_allow_idle,

CRA Git | Maintained and supported by SUSTech CRA and CCSE