Commit d7dbdada authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge tag 'tegra-for-7.1-dt-bindings' of... 

Merge tag 'tegra-for-7.1-dt-bindings' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/drivers

dt-bindings: Changes for v7.1-rc1

This contains a few conversions to DT schema along with various
additions and fixes to reduce the amount of validation warnings.

Included are also a new binding for the PCIe controller found on
Tegra264 as well as compatible strings for the Jetson AGX Thor
Developer Kit.

* tag 'tegra-for-7.1-dt-bindings' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux

:
  dt-bindings: arm: tegra: Document Jetson AGX Thor DevKit
  dt-bindings: display: tegra: Document Tegra20 HDMI port
  dt-bindings: arm: tegra: Add Tegra238 CBB compatible strings
  dt-bindings: memory: tegra210: Mark EMC as cooling device
  dt-bindings: memory: Add Tegra210 memory controller bindings
  dt-bindings: phy: tegra: Document Tegra210 USB PHY
  dt-bindings: arm: tegra: Add missing compatible strings
  dt-bindings: interrupt-controller: tegra: Fix reg entries
  dt-bindings: clock: tegra124-dfll: Convert to json-schema
  dt-bindings: phy: tegra-xusb: Document Type C support
  dt-bindings: pci: Document the NVIDIA Tegra264 PCIe controller

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parents a66cc657 bed2f5b4

Documentation/devicetree/bindings/arm/tegra.yaml

+53 −3
Original line number Diff line number Diff line
@@ -131,6 +131,33 @@ properties: 
          - const: toradex,apalis-tk1-v1.2

          - const: toradex,apalis-tk1

          - const: nvidia,tegra124

      - items:

          - const: google,nyan-big-rev7

          - const: google,nyan-big-rev6

          - const: google,nyan-big-rev5

          - const: google,nyan-big-rev4

          - const: google,nyan-big-rev3

          - const: google,nyan-big-rev2

          - const: google,nyan-big-rev1

          - const: google,nyan-big-rev0

          - const: google,nyan-big

          - const: google,nyan

          - const: nvidia,tegra124

      - items:

          - const: google,nyan-blaze-rev10

          - const: google,nyan-blaze-rev9

          - const: google,nyan-blaze-rev8

          - const: google,nyan-blaze-rev7

          - const: google,nyan-blaze-rev6

          - const: google,nyan-blaze-rev5

          - const: google,nyan-blaze-rev4

          - const: google,nyan-blaze-rev3

          - const: google,nyan-blaze-rev2

          - const: google,nyan-blaze-rev1

          - const: google,nyan-blaze-rev0

          - const: google,nyan-blaze

          - const: google,nyan

          - const: nvidia,tegra124

      - items:

          - enum:

              - nvidia,norrin
@@ -184,17 +211,35 @@ properties: 
          - const: nvidia,tegra124

      - items:

          - enum:

              - nvidia,darcy

              - nvidia,p2371-0000

              - nvidia,p2371-2180

              - nvidia,p2571

              - nvidia,p2894-0050-a08

              - nvidia,p3450-0000

          - const: nvidia,tegra210

      - items:

          - const: nvidia,p3541-0000

          - const: nvidia,p3450-0000

          - const: nvidia,tegra210

      - description: NVIDIA Jetson Nano

        items:

          - const: nvidia,p3450-0000

          - const: nvidia,tegra210

      - description: NVIDIA Shield TV

        items:

          - const: nvidia,p2894-0050-a08

          - const: nvidia,darcy

          - const: nvidia,tegra210

      - description: Google Pixel C

        items:

          - const: google,smaug-rev8

          - const: google,smaug-rev7

          - const: google,smaug-rev6

          - const: google,smaug-rev5

          - const: google,smaug-rev4

          - const: google,smaug-rev3

          - const: google,smaug-rev2

          - const: google,smaug-rev1

          - const: google,smaug

          - const: nvidia,tegra210

      - description: Jetson TX2 Developer Kit

        items:

          - const: nvidia,p2771-0000
@@ -268,5 +313,10 @@ properties: 
          - const: nvidia,p3971-0089+p3834-0008

          - const: nvidia,p3834-0008

          - const: nvidia,tegra264

      - description: Jetson AGX Thor Developer Kit

        items:

          - const: nvidia,p4071-0000+p3834-0008

          - const: nvidia,p3834-0008

          - const: nvidia,tegra264



additionalProperties: true

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra234-cbb.yaml

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ properties: 
      - nvidia,tegra234-dce-fabric

      - nvidia,tegra234-rce-fabric

      - nvidia,tegra234-sce-fabric

      - nvidia,tegra238-ape-fabric

      - nvidia,tegra238-aon-fabric

      - nvidia,tegra238-bpmp-fabric

      - nvidia,tegra238-cbb-fabric



  reg:

    maxItems: 1

Documentation/devicetree/bindings/clock/nvidia,tegra124-dfll.txt

deleted100644 → 0
+0 −155
Original line number Diff line number Diff line 
NVIDIA Tegra124 DFLL FCPU clocksource



This binding uses the common clock binding:

Documentation/devicetree/bindings/clock/clock-bindings.txt



The DFLL IP block on Tegra is a root clocksource designed for clocking

the fast CPU cluster. It consists of a free-running voltage controlled

oscillator connected to the CPU voltage rail (VDD_CPU), and a closed loop

control module that will automatically adjust the VDD_CPU voltage by

communicating with an off-chip PMIC either via an I2C bus or via PWM signals.



Required properties:

- compatible : should be one of:

  - "nvidia,tegra124-dfll": for Tegra124

  - "nvidia,tegra210-dfll": for Tegra210

- reg : Defines the following set of registers, in the order listed:

        - registers for the DFLL control logic.

        - registers for the I2C output logic.

        - registers for the integrated I2C master controller.

        - look-up table RAM for voltage register values.

- interrupts: Should contain the DFLL block interrupt.

- clocks: Must contain an entry for each entry in clock-names.

  See clock-bindings.txt for details.

- clock-names: Must include the following entries:

  - soc: Clock source for the DFLL control logic.

  - ref: The closed loop reference clock

  - i2c: Clock source for the integrated I2C master.

- resets: Must contain an entry for each entry in reset-names.

  See ../reset/reset.txt for details.

- reset-names: Must include the following entries:

  - dvco: Reset control for the DFLL DVCO.

- #clock-cells: Must be 0.

- clock-output-names: Name of the clock output.

- vdd-cpu-supply: Regulator for the CPU voltage rail that the DFLL

  hardware will start controlling. The regulator will be queried for

  the I2C register, control values and supported voltages.



Required properties for the control loop parameters:

- nvidia,sample-rate: Sample rate of the DFLL control loop.

- nvidia,droop-ctrl: See the register CL_DVFS_DROOP_CTRL in the TRM.

- nvidia,force-mode: See the field DFLL_PARAMS_FORCE_MODE in the TRM.

- nvidia,cf: Numeric value, see the field DFLL_PARAMS_CF_PARAM in the TRM.

- nvidia,ci: Numeric value, see the field DFLL_PARAMS_CI_PARAM in the TRM.

- nvidia,cg: Numeric value, see the field DFLL_PARAMS_CG_PARAM in the TRM.



Optional properties for the control loop parameters:

- nvidia,cg-scale: Boolean value, see the field DFLL_PARAMS_CG_SCALE in the TRM.



Optional properties for mode selection:

- nvidia,pwm-to-pmic: Use PWM to control regulator rather then I2C.



Required properties for I2C mode:

- nvidia,i2c-fs-rate: I2C transfer rate, if using full speed mode.



Required properties for PWM mode:

- nvidia,pwm-period-nanoseconds: period of PWM square wave in nanoseconds.

- nvidia,pwm-tristate-microvolts: Regulator voltage in micro volts when PWM

  control is disabled and the PWM output is tristated. Note that this voltage is

  configured in hardware, typically via a resistor divider.

- nvidia,pwm-min-microvolts: Regulator voltage in micro volts when PWM control

  is enabled and PWM output is low. Hence, this is the minimum output voltage

  that the regulator supports when PWM control is enabled.

- nvidia,pwm-voltage-step-microvolts: Voltage increase in micro volts

  corresponding to a 1/33th increase in duty cycle. Eg the voltage for 2/33th

  duty cycle would be: nvidia,pwm-min-microvolts +

  nvidia,pwm-voltage-step-microvolts * 2.

- pinctrl-0: I/O pad configuration when PWM control is enabled.

- pinctrl-1: I/O pad configuration when PWM control is disabled.

- pinctrl-names: must include the following entries:

  - dvfs_pwm_enable: I/O pad configuration when PWM control is enabled.

  - dvfs_pwm_disable: I/O pad configuration when PWM control is disabled.



Example for I2C:



clock@70110000 {

        compatible = "nvidia,tegra124-dfll";

        reg = <0 0x70110000 0 0x100>, /* DFLL control */

              <0 0x70110000 0 0x100>, /* I2C output control */

              <0 0x70110100 0 0x100>, /* Integrated I2C controller */

              <0 0x70110200 0 0x100>; /* Look-up table RAM */

        interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&tegra_car TEGRA124_CLK_DFLL_SOC>,

                 <&tegra_car TEGRA124_CLK_DFLL_REF>,

                 <&tegra_car TEGRA124_CLK_I2C5>;

        clock-names = "soc", "ref", "i2c";

        resets = <&tegra_car TEGRA124_RST_DFLL_DVCO>;

        reset-names = "dvco";

        #clock-cells = <0>;

        clock-output-names = "dfllCPU_out";

        vdd-cpu-supply = <&vdd_cpu>;



        nvidia,sample-rate = <12500>;

        nvidia,droop-ctrl = <0x00000f00>;

        nvidia,force-mode = <1>;

        nvidia,cf = <10>;

        nvidia,ci = <0>;

        nvidia,cg = <2>;



        nvidia,i2c-fs-rate = <400000>;

};



Example for PWM:



clock@70110000 {

	compatible = "nvidia,tegra124-dfll";

	reg = <0 0x70110000 0 0x100>, /* DFLL control */

	      <0 0x70110000 0 0x100>, /* I2C output control */

	      <0 0x70110100 0 0x100>, /* Integrated I2C controller */

	      <0 0x70110200 0 0x100>; /* Look-up table RAM */

	interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;

	clocks = <&tegra_car TEGRA210_CLK_DFLL_SOC>,

	         <&tegra_car TEGRA210_CLK_DFLL_REF>,

		 <&tegra_car TEGRA124_CLK_I2C5>;;

	clock-names = "soc", "ref", "i2c";

	resets = <&tegra_car TEGRA124_RST_DFLL_DVCO>;

	reset-names = "dvco";

	#clock-cells = <0>;

	clock-output-names = "dfllCPU_out";



	nvidia,sample-rate = <25000>;

	nvidia,droop-ctrl = <0x00000f00>;

	nvidia,force-mode = <1>;

	nvidia,cf = <6>;

	nvidia,ci = <0>;

	nvidia,cg = <2>;



	nvidia,pwm-min-microvolts = <708000>; /* 708mV */

	nvidia,pwm-period-nanoseconds = <2500>; /* 2.5us */

	nvidia,pwm-to-pmic;

	nvidia,pwm-tristate-microvolts = <1000000>;

	nvidia,pwm-voltage-step-microvolts = <19200>; /* 19.2mV */



	pinctrl-names = "dvfs_pwm_enable", "dvfs_pwm_disable";

	pinctrl-0 = <&dvfs_pwm_active_state>;

	pinctrl-1 = <&dvfs_pwm_inactive_state>;

};



/* pinmux nodes added for completeness. Binding doc can be found in:

 * Documentation/devicetree/bindings/pinctrl/nvidia,tegra210-pinmux.yaml

 */



pinmux: pinmux@700008d4 {

	dvfs_pwm_active_state: dvfs_pwm_active {

		dvfs_pwm_pbb1 {

			nvidia,pins = "dvfs_pwm_pbb1";

			nvidia,tristate = <TEGRA_PIN_DISABLE>;

		};

	};

	dvfs_pwm_inactive_state: dvfs_pwm_inactive {

		dvfs_pwm_pbb1 {

			nvidia,pins = "dvfs_pwm_pbb1";

			nvidia,tristate = <TEGRA_PIN_ENABLE>;

		};

	};

};

Documentation/devicetree/bindings/clock/nvidia,tegra124-dfll.yaml

0 → 100644
+290 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/clock/nvidia,tegra124-dfll.yaml#

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



title: NVIDIA Tegra124 (and later) DFLL FCPU clocksource



maintainers:

  - Thierry Reding <thierry.reding@gmail.com>

  - Jon Hunter <jonathanh@nvidia.com>



description:

  The DFLL IP block on Tegra is a root clocksource designed for clocking

  the fast CPU cluster. It consists of a free-running voltage controlled

  oscillator connected to the CPU voltage rail (VDD_CPU), and a closed

  loop control module that will automatically adjust the VDD_CPU voltage

  by communicating with an off-chip PMIC either via an I2C bus or via

  PWM signals.



properties:

  compatible:

    enum:

      - nvidia,tegra124-dfll

      - nvidia,tegra210-dfll



  reg:

    items:

      - description: DFLL control logic

      - description: I2C output logic

      - description: Integrated I2C controller

      - description: Look-up table RAM for voltage register values



  interrupts:

    maxItems: 1



  "#clock-cells":

    const: 0



  clocks:

    items:

      - description: Clock source for the DFLL control logic

      - description: Closed loop reference clock

      - description: Clock source for the integrated I2C controller



  clock-names:

    items:

      - const: soc

      - const: ref

      - const: i2c



  clock-output-names:

    description: Name of the clock output

    items:

      - const: dfllCPU_out



  resets:

    minItems: 1

    maxItems: 2



  reset-names:

    minItems: 1

    items:

      - const: dvco

      - const: dfll



  vdd-cpu-supply:

    description: Regulator for the CPU voltage rail that the DFLL

      hardware will start controlling. The regulator will be queried for

      the I2C register, control values and supported voltages.



  nvidia,sample-rate:

    description: Sample rate of the DFLL control loop

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 12500

    maximum: 25000



  nvidia,droop-ctrl:

    description: Droop control parameter (CL_DVFS_DROOP_CTRL) in the TRM

    $ref: /schemas/types.yaml#/definitions/uint32



  nvidia,force-mode:

    description: See the field DFLL_PARAMS_FORCE_MODE in the TRM

    $ref: /schemas/types.yaml#/definitions/uint32

    oneOf:

      - description: disabled

        const: 0

      - description: fixed delay mode

        const: 1

      - description: auto mode

        const: 2



  nvidia,cf:

    description: Numeric value, see the field DFLL_PARAMS_CF_PARAM in the TRM

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 63



  nvidia,ci:

    description: Numeric value, see the field DFLL_PARAMS_CI_PARAM in the TRM

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 7



  nvidia,cg:

    description: Numeric value, see the field DFLL_PARAMS_CG_PARAM in the TRM

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 255



  # optional properties

  nvidia,cg-scale:

    description: Boolean value, see the field DFLL_PARAMS_CG_SCALE in the TRM

    $ref: /schemas/types.yaml#/definitions/flag



  nvidia,pwm-to-pmic:

    description: Use PWM to control regulator rather than I2C

    $ref: /schemas/types.yaml#/definitions/flag



  nvidia,i2c-fs-rate:

    description: I2C transfer rate, if using full speed mode

    $ref: /schemas/types.yaml#/definitions/uint32

    enum: [100000, 400000]



  # required properties for PWM mode

  nvidia,pwm-period-nanoseconds:

    description: Period of PWM square wave in nanoseconds

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 1000

    maximum: 1000000000



  nvidia,pwm-tristate-microvolts:

    description: Regulator voltage in microvolts when PWM control is disabled

      and the PWM output is tristated. Note that this voltage is configured in

      hardware, typically via a resistor divider.

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 3300000



  nvidia,pwm-min-microvolts:

    description: Regulator voltage in microvolts when PWM control is enabled

      and PWM output is low. Hence, this is the minimum output voltage that

      the regulator supports when PWM control is enabled.

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 3300000



  nvidia,pwm-voltage-step-microvolts:

    description: |

      Voltage increase in micro volts corresponding to a 1/33th increase

      in duty cycle. For example, the voltage for 2/33th duty cycle would be:



        nvidia,pwm-min-microvolts + nvidia,pwm-voltage-step-microvolts * 2

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 100000



  pinctrl-0:

    description: I/O pad configuration when PWM control is enabled



  pinctrl-1:

    description: I/O pad configuration when PWM control is disabled



  pinctrl-names:

    items:

      - const: dvfs_pwm_enable

      - const: dvfs_pwm_disable



required:

  - compatible

  - reg

  - interrupts

  - "#clock-cells"

  - clocks

  - clock-names

  - clock-output-names

  - resets

  - reset-names

  - nvidia,sample-rate

  - nvidia,droop-ctrl

  - nvidia,force-mode

  - nvidia,cf

  - nvidia,ci

  - nvidia,cg



additionalProperties: false



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: nvidia,tegra124-dfll

    then:

      properties:

        resets:

          maxItems: 1



        reset-names:

          maxItems: 1

    else:

      properties:

        resets:

          minItems: 2



        reset-names:

          minItems: 2



  - if:

      required:

        - nvidia,pwm-to-pmic

    then:

      required:

        - nvidia,pwm-min-microvolts

        - nvidia,pwm-period-nanoseconds

        - nvidia,pwm-tristate-microvolts

        - nvidia,pwm-voltage-step-microvolts

    else:

      required:

        - vdd-cpu-supply



examples:

  - |

    #include <dt-bindings/clock/tegra124-car.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/reset/tegra124-car.h>



    clock@70110000 {

        compatible = "nvidia,tegra124-dfll";

        reg = <0x70110000 0x100>, /* DFLL control */

              <0x70110000 0x100>, /* I2C output control */

              <0x70110100 0x100>, /* Integrated I2C controller */

              <0x70110200 0x100>; /* Look-up table RAM */

        interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&tegra_car TEGRA124_CLK_DFLL_SOC>,

                 <&tegra_car TEGRA124_CLK_DFLL_REF>,

                 <&tegra_car TEGRA124_CLK_I2C5>;

        clock-names = "soc", "ref", "i2c";

        resets = <&tegra_car TEGRA124_RST_DFLL_DVCO>;

        reset-names = "dvco";

        #clock-cells = <0>;

        clock-output-names = "dfllCPU_out";

        vdd-cpu-supply = <&vdd_cpu>;



        nvidia,sample-rate = <12500>;

        nvidia,droop-ctrl = <0x00000f00>;

        nvidia,force-mode = <1>;

        nvidia,cf = <10>;

        nvidia,ci = <0>;

        nvidia,cg = <2>;



        nvidia,i2c-fs-rate = <400000>;

    };



  - |

    #include <dt-bindings/clock/tegra210-car.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/reset/tegra210-car.h>



    clock@70110000 {

        compatible = "nvidia,tegra210-dfll";

        reg = <0x70110000 0x100>, /* DFLL control */

              <0x70110000 0x100>, /* I2C output control */

              <0x70110100 0x100>, /* Integrated I2C controller */

              <0x70110200 0x100>; /* Look-up table RAM */

        interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&tegra_car TEGRA210_CLK_DFLL_SOC>,

                 <&tegra_car TEGRA210_CLK_DFLL_REF>,

                 <&tegra_car TEGRA210_CLK_I2C5>;

        clock-names = "soc", "ref", "i2c";

        resets = <&tegra_car TEGRA210_RST_DFLL_DVCO>,

                 <&tegra_car 155>;

        reset-names = "dvco", "dfll";

        #clock-cells = <0>;

        clock-output-names = "dfllCPU_out";

        vdd-cpu-supply = <&vdd_cpu>;



        nvidia,sample-rate = <25000>;

        nvidia,droop-ctrl = <0x00000f00>;

        nvidia,force-mode = <1>;

        nvidia,cf = <6>;

        nvidia,ci = <0>;

        nvidia,cg = <2>;



        nvidia,pwm-min-microvolts = <708000>; /* 708mV */

        nvidia,pwm-period-nanoseconds = <2500>; /* 2.5us */

        nvidia,pwm-to-pmic;

        nvidia,pwm-tristate-microvolts = <1000000>;

        nvidia,pwm-voltage-step-microvolts = <19200>; /* 19.2mV */

    };

Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-hdmi.yaml

+11 −2
Original line number Diff line number Diff line
@@ -82,6 +82,10 @@ properties: 
    description: phandle of a display panel

    $ref: /schemas/types.yaml#/definitions/phandle



  port:

    description: HDMI output port for connection to HDMI connector or bridge

    $ref: /schemas/graph.yaml#/properties/port



  "#sound-dai-cells":

    const: 0
@@ -97,8 +101,13 @@ required: 
  - reset-names

  - pll-supply

  - vdd-supply



anyOf:

  - required:

      - nvidia,ddc-i2c-bus

      - nvidia,hpd-gpio

  - required:

      - port



examples:

  - |