Commit d9652f58 authored by Thierry Reding's avatar Thierry Reding
Browse files

Merge tag 'tegra-for-5.17-dt-bindings-memory' into for-5.17/arm64/dt 

dt-bindings: memory: Add Tegra234 support

This stable tag contains the addition of the EMC clock ID and an initial
list of memory client IDs for Tegra234 and will be shared between the
memory and ARM SoC trees.
parents fa55b7dc c3859c14

Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml

+87 −11
Original line number Diff line number Diff line
@@ -31,12 +31,15 @@ properties: 
      - enum:

          - nvidia,tegra186-mc

          - nvidia,tegra194-mc

          - nvidia,tegra234-mc



  reg:

    maxItems: 1

    minItems: 1

    maxItems: 3



  interrupts:

    maxItems: 1

    items:

      - description: MC general interrupt



  "#address-cells":

    const: 2
@@ -48,6 +51,9 @@ properties: 


  dma-ranges: true



  "#interconnect-cells":

    const: 1



patternProperties:

  "^external-memory-controller@[0-9a-f]+$":

    description:
@@ -63,12 +69,15 @@ patternProperties: 
          - enum:

              - nvidia,tegra186-emc

              - nvidia,tegra194-emc

              - nvidia,tegra234-emc



      reg:

        maxItems: 1

        minItems: 1

        maxItems: 2



      interrupts:

        maxItems: 1

        items:

          - description: EMC general interrupt



      clocks:

        items:
@@ -78,20 +87,90 @@ patternProperties: 
        items:

          - const: emc



      "#interconnect-cells":

        const: 0



      nvidia,bpmp:

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

        description:

          phandle of the node representing the BPMP



    allOf:

      - if:

          properties:

            compatible:

              const: nvidia,tegra186-emc

        then:

          properties:

            reg:

              maxItems: 1



      - if:

          properties:

            compatible:

              const: nvidia,tegra194-emc

        then:

          properties:

            reg:

              minItems: 2



      - if:

          properties:

            compatible:

              const: nvidia,tegra234-emc

        then:

          properties:

            reg:

              minItems: 2



    additionalProperties: false



    required:

      - compatible

      - reg

      - interrupts

  - "#address-cells"

  - "#size-cells"

      - clocks

      - clock-names

      - "#interconnect-cells"

      - nvidia,bpmp



allOf:

  - if:

      properties:

        compatible:

          const: nvidia,tegra186-mc

    then:

      properties:

        reg:

          maxItems: 1



  - if:

      properties:

        compatible:

          const: nvidia,tegra194-mc

    then:

      properties:

        reg:

          minItems: 3



  - if:

      properties:

        compatible:

          const: nvidia,tegra234-mc

    then:

      properties:

        reg:

          minItems: 3



additionalProperties: false



required:

  - compatible

  - reg

  - interrupts

  - "#address-cells"

  - "#size-cells"



examples:

  - |

    #include <dt-bindings/clock/tegra186-clock.h>
@@ -124,12 +203,9 @@ examples: 
                clocks = <&bpmp TEGRA186_CLK_EMC>;

                clock-names = "emc";



                #interconnect-cells = <0>;



                nvidia,bpmp = <&bpmp>;

            };

        };

    };
 


    bpmp: bpmp {

        compatible = "nvidia,tegra186-bpmp";

        #clock-cells = <1>;

    };

include/dt-bindings/clock/tegra234-clock.h

+23 −3
Original line number Diff line number Diff line
@@ -4,11 +4,31 @@ 
#ifndef DT_BINDINGS_CLOCK_TEGRA234_CLOCK_H

#define DT_BINDINGS_CLOCK_TEGRA234_CLOCK_H



/**

 * @file

 * @defgroup bpmp_clock_ids Clock ID's

 * @{

 */

/**

 * @brief controls the EMC clock frequency.

 * @details Doing a clk_set_rate on this clock will select the

 * appropriate clock source, program the source rate and execute a

 * specific sequence to switch to the new clock source for both memory

 * controllers. This can be used to control the balance between memory

 * throughput and memory controller power.

 */

#define TEGRA234_CLK_EMC			31U

/** @brief output of gate CLK_ENB_FUSE */

#define TEGRA234_CLK_FUSE			40

#define TEGRA234_CLK_FUSE			40U

/** @brief output of mux controlled by CLK_RST_CONTROLLER_CLK_SOURCE_SDMMC4 */

#define TEGRA234_CLK_SDMMC4			123

#define TEGRA234_CLK_SDMMC4			123U

/** @brief output of mux controlled by CLK_RST_CONTROLLER_CLK_SOURCE_UARTA */

#define TEGRA234_CLK_UARTA			155

#define TEGRA234_CLK_UARTA			155U

/** @brief CLK_RST_CONTROLLER_CLK_SOURCE_SDMMC_LEGACY_TM switch divider output */

#define TEGRA234_CLK_SDMMC_LEGACY_TM		219U

/** @brief PLL controlled by CLK_RST_CONTROLLER_PLLC4_BASE */

#define TEGRA234_CLK_PLLC4			237U

/** @brief 32K input clock provided by PMIC */

#define TEGRA234_CLK_CLK_32K			289U



#endif

include/dt-bindings/memory/tegra234-mc.h

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



#ifndef DT_BINDINGS_MEMORY_TEGRA234_MC_H

#define DT_BINDINGS_MEMORY_TEGRA234_MC_H



/* special clients */

#define TEGRA234_SID_INVALID		0x00

#define TEGRA234_SID_PASSTHROUGH	0x7f





/* NISO1 stream IDs */

#define TEGRA234_SID_SDMMC4	0x02

#define TEGRA234_SID_BPMP	0x10



/*

 * memory client IDs

 */



/* sdmmcd memory read client */

#define TEGRA234_MEMORY_CLIENT_SDMMCRAB 0x63

/* sdmmcd memory write client */

#define TEGRA234_MEMORY_CLIENT_SDMMCWAB 0x67

/* BPMP read client */

#define TEGRA234_MEMORY_CLIENT_BPMPR 0x93

/* BPMP write client */

#define TEGRA234_MEMORY_CLIENT_BPMPW 0x94

/* BPMPDMA read client */

#define TEGRA234_MEMORY_CLIENT_BPMPDMAR 0x95

/* BPMPDMA write client */

#define TEGRA234_MEMORY_CLIENT_BPMPDMAW 0x96



#endif

include/dt-bindings/reset/tegra234-reset.h

+10 −2
Original line number Diff line number Diff line
@@ -4,7 +4,15 @@ 
#ifndef DT_BINDINGS_RESET_TEGRA234_RESET_H

#define DT_BINDINGS_RESET_TEGRA234_RESET_H



#define TEGRA234_RESET_SDMMC4			85

#define TEGRA234_RESET_UARTA			100

/**

 * @file

 * @defgroup bpmp_reset_ids Reset ID's

 * @brief Identifiers for Resets controllable by firmware

 * @{

 */

#define TEGRA234_RESET_SDMMC4			85U

#define TEGRA234_RESET_UARTA			100U



/** @} */



#endif