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

Commit 5cc57e3e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Change bindings for subsystem dt properties"

parents e36b0ea5 864a3256
Loading
Loading
Loading
Loading
+45 −45
Original line number Diff line number Diff line
@@ -6,18 +6,18 @@ to be reset.

Required Properties:
- compatible:	The bus devices need to be compatible with
		"qcom,mdm2-modem".
		"qti,mdm2-modem".

Required named gpio properties:
- qcom,mdm2ap-errfatal-gpio: gpio for the external modem to indicate to the apps processor
- qti,mdm2ap-errfatal-gpio: gpio for the external modem to indicate to the apps processor
		of an error fatal condition on the modem.
- qcom,ap2mdm-errfatal-gpio: gpio for the apps processor to indicate to the external modem
- qti,ap2mdm-errfatal-gpio: gpio for the apps processor to indicate to the external modem
		of an error fatal condition on the apps processor.
- qcom,mdm2ap-status-gpio: gpio to indicate to the apps processor when there is a watchdog
- qti,mdm2ap-status-gpio: gpio to indicate to the apps processor when there is a watchdog
		bite on the external modem.
- qcom,ap2mdm-status-gpio: gpio for the apps processor to indicate to the modem that an apps
- qti,ap2mdm-status-gpio: gpio for the apps processor to indicate to the modem that an apps
		processor watchdog bite has occurred.
- qcom,ap2mdm-soft-reset-gpio: gpio for the apps processor to use to soft-reset the external
- qti,ap2mdm-soft-reset-gpio: gpio for the apps processor to use to soft-reset the external
		modem. If the flags parameter has a value of 0x1 then the gpio is active LOW.

Required Interrupts:
@@ -32,28 +32,28 @@ Required Interrupts:
		into vddmin power state.

Optional named gpio properties:
- qcom,mdm2ap-pblrdy-gpio: gpio used by some external modems to indicate when the modem has
- qti,mdm2ap-pblrdy-gpio: gpio used by some external modems to indicate when the modem has
		booted into the PBL bootloader.
- qcom,ap2mdm-wakeup-gpio: gpio used by the apps processor to wake the external modem
- qti,ap2mdm-wakeup-gpio: gpio used by the apps processor to wake the external modem
		out of a low power state.
- qcom,ap2mdm-chnl-rdy-gpio: gpio used by the apps processor to inform the external modem
- qti,ap2mdm-chnl-rdy-gpio: gpio used by the apps processor to inform the external modem
		that data link is ready.
- qcom,mdm2ap-wakeup-gpio: gpio from the external modem to the apps processor to wake it
- qti,mdm2ap-wakeup-gpio: gpio from the external modem to the apps processor to wake it
		out of a low power state.
- qcom,ap2mdm-vddmin-gpio: gpio to indicate to the external modem when the apps processor
- qti,ap2mdm-vddmin-gpio: gpio to indicate to the external modem when the apps processor
		is about to enter vddmin power state.
- qcom,mdm2ap-vddmin-gpio: gpio used by the external modem to inform the apps processor
- qti,mdm2ap-vddmin-gpio: gpio used by the external modem to inform the apps processor
		when it is about to enter vddmin power state.
- qcom,ap2mdm-kpdpwr-gpio: gpio used to simulate a power button press on the external
- qti,ap2mdm-kpdpwr-gpio: gpio used to simulate a power button press on the external
		modem. Some modems use this as part of their initial power-up sequence.
		If the "flags" parameter has a value of 0x1 then it is active LOW.
- qcom,ap2mdm-pmic-pwr-en-gpio: Some modems need this gpio for the apps processor to enable
- qti,ap2mdm-pmic-pwr-en-gpio: Some modems need this gpio for the apps processor to enable
		the pmic on the external modem.
- qcom,use-usb-port-gpio: some modems use this gpio to switch a port connection from uart to usb.
- qti,use-usb-port-gpio: some modems use this gpio to switch a port connection from uart to usb.
		This is used during firmware upgrade of some modems.

Optional driver parameters:
- qcom,ramdump-delay-ms: time in milliseconds to wait before starting to collect ramdumps.
- qti,ramdump-delay-ms: time in milliseconds to wait before starting to collect ramdumps.
		This interval is the time to wait after an error on the external modem is
		signaled to the apps processor before starting to collect ramdumps. Its
		value depends on the type of external modem (e.g. MDM vs QSC), and how
@@ -61,18 +61,18 @@ Optional driver parameters:
		The default value is 2 seconds (2000 milliseconds) as specified by the
		mdm9x15 software developer. Consultation with the developer of the modem
		software is required to determine this value for that modem.
- qcom,ps-hold-delay-ms: minimum delay in milliseconds between consecutive PS_HOLD toggles.
- qti,ps-hold-delay-ms: minimum delay in milliseconds between consecutive PS_HOLD toggles.
		SGLTE targets that use a QSC1215 modem require a minimum delay between consecutive
		toggling of the PS_HOLD pmic input. For one target it is 500 milliseconds but it
		may vary depending on the target and how the external modem is connected. The value
		is specified by the hardware designers.
- qcom,early-power-on: boolean flag to indicate if to power on the modem when the device is probed.
- qcom,sfr-query: boolean flag to indicate if to query the modem for a reset reason.
- qcom,no-powerdown-after-ramdumps: boolean flag to indicate if to power down the modem after ramdumps.
- qcom,no-a2m-errfatal-on-ssr: boolean to tell driver not to raise ap2mdm errfatal during SSR.
- qcom,no-reset-on-first-powerup: boolean to tell driver not to reset the modem when first
- qti,early-power-on: boolean flag to indicate if to power on the modem when the device is probed.
- qti,sfr-query: boolean flag to indicate if to query the modem for a reset reason.
- qti,no-powerdown-after-ramdumps: boolean flag to indicate if to power down the modem after ramdumps.
- qti,no-a2m-errfatal-on-ssr: boolean to tell driver not to raise ap2mdm errfatal during SSR.
- qti,no-reset-on-first-powerup: boolean to tell driver not to reset the modem when first
		powering up the modem.
- qcom,ramdump-timeout-ms: ramdump timeout interval in milliseconds.
- qti,ramdump-timeout-ms: ramdump timeout interval in milliseconds.
		This interval is the time to wait for collection of the external modem's ramdump
		to complete. It's value depends on the speed of the data connection between the
		external modem and the apps processor on the platform. If the connection is a
@@ -82,11 +82,11 @@ Optional driver parameters:
		measured time it takes over a UART connection. It is reduced when the data
		connection is an HSIC port. The value is usually tuned empirically for a
		particular target.
- qcom,image-upgrade-supported: boolean flag to indicate if software upgrade is supported.
- qcom,support-shutdown: boolean flag to indicate if graceful shutdown is supported.
- qcom,sysmon-subsys-id: system monitor id for the external modem. This id is used to
- qti,image-upgrade-supported: boolean flag to indicate if software upgrade is supported.
- qti,support-shutdown: boolean flag to indicate if graceful shutdown is supported.
- qti,sysmon-subsys-id: system monitor id for the external modem. This id is used to
		send system monitor messages to the external modem.
- qcom,vddmin-drive-strength: drive strength in milliamps of the ap2mdm-vddmin gpio.
- qti,vddmin-drive-strength: drive strength in milliamps of the ap2mdm-vddmin gpio.
		The ap2mdm_vddmin gpio is controlled by the RPM processor. It is pulled low
		to indicate to the external modem that the apps processor has entered vddmin
		state, and high to indicate the reverse. Its parameters are passed to the RPM
@@ -94,16 +94,16 @@ Optional driver parameters:
		of configuration when an external modem is attached.
		The value of the drive strength is specified by the hardware designers. A value
		of 8 milliamps is typical.
		This property is ignored if the property "qcom,ap2mdm-vddmin-gpio" is
		This property is ignored if the property "qti,ap2mdm-vddmin-gpio" is
		not set.
- qcom,vddmin-modes: a string indicating the "modes" requested for the ap2mdm-vddmin gpio.
- qti,vddmin-modes: a string indicating the "modes" requested for the ap2mdm-vddmin gpio.
		This value is passed to RPM and is used by the RPM module to determine the
		gpio mux function. The only currently supported modes string is "normal" and
		corresponds to the value 0x03 that is passed to RPM.

Example:
	mdm0: qcom,mdm0 {
                compatible = "qcom,mdm2-modem";
	mdm0: qti,mdm0 {
                compatible = "qti,mdm2-modem";
		cell-index = <0>;
		#address-cells = <0>;
                interrupt-parent = <&mdm0>;
@@ -121,19 +121,19 @@ Example:
			"plbrdy_irq",
			"mdm2ap_vddmin_irq";

                qcom,mdm2ap-errfatal-gpio = <&msmgpio 82 0x00>;
		qcom,ap2mdm-errfatal-gpio = <&msmgpio 106 0x00>;
		qcom,mdm2ap-status-gpio   = <&msmgpio 46 0x00>;
		qcom,ap2mdm-status-gpio   = <&msmgpio 105 0x00>;
		qcom,ap2mdm-soft-reset-gpio = <&msmgpio 24 0x00>;
		qcom,mdm2ap-pblrdy-gpio = <&msmgpio 80 0x00>;
		qcom,ap2mdm-wakeup-gpio = <&msmgpio 104 0x00>;
		qcom,ap2mdm-vddmin-gpio = <&msmgpio 108 0x00>;
		qcom,mdm2ap-vddmin-gpio = <&msmgpio 27 0x00>;
                qti,mdm2ap-errfatal-gpio = <&msmgpio 82 0x00>;
		qti,ap2mdm-errfatal-gpio = <&msmgpio 106 0x00>;
		qti,mdm2ap-status-gpio   = <&msmgpio 46 0x00>;
		qti,ap2mdm-status-gpio   = <&msmgpio 105 0x00>;
		qti,ap2mdm-soft-reset-gpio = <&msmgpio 24 0x00>;
		qti,mdm2ap-pblrdy-gpio = <&msmgpio 80 0x00>;
		qti,ap2mdm-wakeup-gpio = <&msmgpio 104 0x00>;
		qti,ap2mdm-vddmin-gpio = <&msmgpio 108 0x00>;
		qti,mdm2ap-vddmin-gpio = <&msmgpio 27 0x00>;

                qcom,ramdump-delay-ms = <2000>;
                qcom,ramdump-timeout-ms = <120000>;
                qcom,vddmin-modes  = "normal";
                qcom,vddmin-drive-strength = <8>;
		qcom,sysmon-subsys-id = <19>;
                qti,ramdump-delay-ms = <2000>;
                qti,ramdump-timeout-ms = <120000>;
                qti,vddmin-modes  = "normal";
                qti,vddmin-drive-strength = <8>;
		qti,sysmon-subsys-id = <19>;
        };
+4 −4
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ and authenticating broadcast demodulator firmware images.

Required properties:
- compatible: "pil-bcss"
- qcom,firmware-name: Base name of the firmware image. Ex. "bcss"
- qti,firmware-name: Base name of the firmware image. Ex. "bcss"

Example:

	qcom,pil-bcss {
		compatible = "qcom,pil-bcss";
	qti,pil-bcss {
		compatible = "qti,pil-bcss";

		qcom,firmware-name = "bcss";
		qti,firmware-name = "bcss";
	};
+38 −38
Original line number Diff line number Diff line
@@ -6,87 +6,87 @@ loading firmware images on multiple modems resident on the FSM99XX platform.
The top-level device tree entry has the following properties:

Required properties:
- compatible:           Must be "qcom,pil-femto-modem".
- compatible:           Must be "qti,pil-femto-modem".
- reg:                  Pair of physical base address and region size of the
                        QDSP6[0] control registers.
- reg-names:            "qdsp6_base" is required.
- qcom,firmware-name:   Base name of the MBA firmware image ("mba").
- qti,firmware-name:   Base name of the MBA firmware image ("mba").
                        Maximum size is 4 characters.
- qcom,max-num-modems:  Number of modem child nodes specified.
- qti,max-num-modems:  Number of modem child nodes specified.

One child node per modem that must be loaded is required.

Required properties:
- compatible:           Must be "qcom,pil-femto-modem-desc".
- compatible:           Must be "qti,pil-femto-modem-desc".
- reg:                  Pair of physical base address and region size of the
                        Relay Message Buffer (RMB) registers for this modem.
- reg-names:            "rmb_base" is required.
- qcom,firmware-name:   Base filename of the firmware image (e.g. "mdm0").
- qti,firmware-name:   Base filename of the firmware image (e.g. "mdm0").
                        Maximum size is 4 characters.
- qcom,modem-id:        Unique ID of this modem.  This is not a logical
- qti,modem-id:        Unique ID of this modem.  This is not a logical
                        index.
- qcom,max-num-images:  The maximum number of images that will be loaded to
- qti,max-num-images:  The maximum number of images that will be loaded to
                        this modem.
Optional properties:
- qcom,pil-skip-entry-check:
- qti,pil-skip-entry-check:
                        Some entry pointers are virtual addresses,
                        which will cause the PIL entry address check
                        to fail.  This parameter will disable the
                        check.
Example:
        qcom,modem-femto@fbc00000 {
                compatible = "qcom,pil-femto-modem";
        qti,modem-femto@fbc00000 {
                compatible = "qti,pil-femto-modem";
                #address-cells=<1>;
                #size-cells=<1>;
                ranges;
                reg = <0xfbc00000 0x100>;
                reg-names = "qdsp6_base";
                qcom,firmware-name = "mba";
                qcom,max-num-modems = <5>;
                qti,firmware-name = "mba";
                qti,max-num-modems = <5>;

                qcom,modem@fd4a7000 {
                        compatible = "qcom,pil-femto-modem-desc";
                qti,modem@fd4a7000 {
                        compatible = "qti,pil-femto-modem-desc";
                        reg = <0xfd4a7000 0x20>;
                        reg-names = "rmb_base";
                        qcom,firmware-name = "mdm0";
                        qcom,modem-id = <0>;
                        qcom,max-num-images = <1>;
                        qti,firmware-name = "mdm0";
                        qti,modem-id = <0>;
                        qti,max-num-images = <1>;
                };

                qcom,modem@fd4a7030 {
                        compatible = "qcom,pil-femto-modem-desc";
                qti,modem@fd4a7030 {
                        compatible = "qti,pil-femto-modem-desc";
                        reg = <0xfd4a7030 0x20>;
                        reg-names = "rmb_base";
                        qcom,firmware-name = "mdm1";
                        qcom,modem-id = <1>;
                        qcom,max-num-images = <1>;
                        qti,firmware-name = "mdm1";
                        qti,modem-id = <1>;
                        qti,max-num-images = <1>;
                };

                qcom,modem@fd4a7060 {
                        compatible = "qcom,pil-femto-modem-desc";
                qti,modem@fd4a7060 {
                        compatible = "qti,pil-femto-modem-desc";
                        reg = <0xfd4a7060 0x20>;
                        reg-names = "rmb_base";
                        qcom,firmware-name = "mdm2";
                        qcom,modem-id = <2>;
                        qcom,max-num-images = <1>;
                        qti,firmware-name = "mdm2";
                        qti,modem-id = <2>;
                        qti,max-num-images = <1>;
                };

                qcom,modem@fd4a7090 {
                        compatible = "qcom,pil-femto-modem-desc";
                qti,modem@fd4a7090 {
                        compatible = "qti,pil-femto-modem-desc";
                        reg = <0xfd4a7090 0x20>;
                        reg-names = "rmb_base";
                        qcom,firmware-name = "mdm3";
                        qcom,modem-id = <3>;
                        qcom,max-num-images = <1>;
                        qti,firmware-name = "mdm3";
                        qti,modem-id = <3>;
                        qti,max-num-images = <1>;
                };

                qcom,modem@fd4a70c0 {
                        compatible = "qcom,pil-femto-modem-desc";
                qti,modem@fd4a70c0 {
                        compatible = "qti,pil-femto-modem-desc";
                        reg = <0xfd4a70c0 0x20>;
                        reg-names = "rmb_base";
                        qcom,firmware-name = "mdm4";
                        qcom,modem-id = <4>;
                        qcom,max-num-images = <8>;
                        qcom,pil-skip-entry-check;
                        qti,firmware-name = "mdm4";
                        qti,modem-id = <4>;
                        qti,max-num-images = <8>;
                        qti,pil-skip-entry-check;
                };
        };
+12 −12
Original line number Diff line number Diff line
@@ -12,18 +12,18 @@ Required properties:
             and "halt_base" are expected.
- interrupts: WCNSS to Apps watchdog bite interrupt
- vdd_pronto_pll-supply: regulator to supply pronto pll.
- qcom,firmware-name: Base name of the firmware image. Ex. "wcnss"
- qti,firmware-name: Base name of the firmware image. Ex. "wcnss"

Optional properties:
- qcom,gpio-err-fatal: GPIO used by the wcnss to indicate error fatal to the Apps.
- qcom,gpio-err-ready: GPIO used by the wcnss to indicate error ready to the Apps.
- qcom,gpio-proxy-unvote: GPIO used by the wcnss to trigger proxy unvoting in
- qti,gpio-err-fatal: GPIO used by the wcnss to indicate error fatal to the Apps.
- qti,gpio-err-ready: GPIO used by the wcnss to indicate error ready to the Apps.
- qti,gpio-proxy-unvote: GPIO used by the wcnss to trigger proxy unvoting in
  the Apps
- qcom,gpio-force-stop: GPIO used by the Apps to force the wcnss to shutdown.
- qti,gpio-force-stop: GPIO used by the Apps to force the wcnss to shutdown.

Example:
	qcom,pronto@fb21b000 {
		compatible = "qcom,pil-pronto";
	qti,pronto@fb21b000 {
		compatible = "qti,pil-pronto";
		reg = <0xfb21b000 0x3000>,
		      <0xfc401700 0x4>,
		      <0xfd485300 0xc>;
@@ -31,13 +31,13 @@ Example:
		vdd_pronto_pll-supply = <&pm8941_l12>;
		interrupts = <0 231 1>;

		qcom,firmware-name = "wcnss";
		qti,firmware-name = "wcnss";

		/* GPIO input from wcnss */
		qcom,gpio-err-fatal = <&smp2pgpio_ssr_smp2p_4_in 0 0>;
		qcom,gpio-err-ready = <&smp2pgpio_ssr_smp2p_4_in 1 0>;
		qcom,proxy-unvote = <&smp2pgpio_ssr_smp2p_4_in 2 0>;
		qti,gpio-err-fatal = <&smp2pgpio_ssr_smp2p_4_in 0 0>;
		qti,gpio-err-ready = <&smp2pgpio_ssr_smp2p_4_in 1 0>;
		qti,proxy-unvote = <&smp2pgpio_ssr_smp2p_4_in 2 0>;

		/* GPIO output to wcnss */
		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_4_out 0 0>;
		qti,gpio-force-stop = <&smp2pgpio_ssr_smp2p_4_out 0 0>;
	};
+13 −13
Original line number Diff line number Diff line
@@ -6,38 +6,38 @@ into memory and preparing the subsystem's processor to execute code. It's
also responsible for shutting down the processor when it's not needed.

Required properties:
- compatible:	      Must be "qcom,pil-q6v5-lpass" or "qcom,pil-q6v55-lpass"
- compatible:	      Must be "qti,pil-q6v5-lpass" or "qti,pil-q6v55-lpass"
- reg:		      Pairs of physical base addresses and region sizes of
		      memory mapped registers.
- reg-names:	      Names of the bases for the above registers. "qdsp6_base"
		      "halt_base", and "restart_reg" are expected.
- interrupts:         The lpass watchdog interrupt
- vdd_cx-supply:      Reference to the regulator that supplies the vdd_cx domain.
- qcom,firmware-name: Base name of the firmware image. Ex. "lpass"
- qti,firmware-name: Base name of the firmware image. Ex. "lpass"

Optional properties:
- vdd_pll-supply:     Reference to the regulator that supplies the PLL's rail.
- qcom,vdd_pll:       Voltage to be set for the PLL's rail.
- qcom,gpio-err-fatal: GPIO used by the lpass to indicate error fatal to the apps.
- qcom,gpio-err-ready: GPIO used by the lpass to indicate apps error service is ready.
- qcom,gpio-proxy-unvote: GPIO used by the lpass to indicate apps clock is ready.
- qcom,gpio-force-stop: GPIO used by the apps to force the lpass to shutdown.
- qti,vdd_pll:       Voltage to be set for the PLL's rail.
- qti,gpio-err-fatal: GPIO used by the lpass to indicate error fatal to the apps.
- qti,gpio-err-ready: GPIO used by the lpass to indicate apps error service is ready.
- qti,gpio-proxy-unvote: GPIO used by the lpass to indicate apps clock is ready.
- qti,gpio-force-stop: GPIO used by the apps to force the lpass to shutdown.

Example:
	qcom,lpass@fe200000 {
	        compatible = "qcom,pil-q6v5-lpass";
	qti,lpass@fe200000 {
	        compatible = "qti,pil-q6v5-lpass";
	        reg = <0xfe200000 0x00100>,
	              <0xfd485100 0x00010>,
	              <0xfc4016c0 0x00004>;
		reg-names = "qdsp6_base", "halt_base", "restart_reg";
		interrupts = <0 194 1>;
		vdd_cx-supply = <&pm8841_s2>;
	        qcom,firmware-name = "lpass";
	        qti,firmware-name = "lpass";

		/* GPIO inputs from lpass */
		qcom,gpio-err-fatal = <&smp2pgpio_ssr_smp2p_2_in 0 0>;
		qcom,gpio-proxy-unvote = <&smp2pgpio_ssr_smp2p_2_in 2 0>;
		qti,gpio-err-fatal = <&smp2pgpio_ssr_smp2p_2_in 0 0>;
		qti,gpio-proxy-unvote = <&smp2pgpio_ssr_smp2p_2_in 2 0>;

		/* GPIO output to lpass */
		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_2_out 0 0>;
		qti,gpio-force-stop = <&smp2pgpio_ssr_smp2p_2_out 0 0>;
	};
Loading