Unverified Commit ccd74bec authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'for-6.18-clk' of... 

Merge tag 'for-6.18-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into clk-tegra

Pull Tegra clk driver updates from Thierry Reding:

 - Add DFLL support on Tegra114

 This is quite similar to the existing Tegra124 support and most
 of the code can be reused, except for the CVB frequency tables.

* tag 'for-6.18-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  clk: tegra: dfll: Add CVB tables for Tegra114
  clk: tegra: Add DFLL DVCO reset control for Tegra114
  dt-bindings: arm: tegra: Add ASUS TF101G and SL101
  dt-bindings: reset: Add Tegra114 CAR header
  dt-bindings: arm: tegra: Add Xiaomi Mi Pad (A0101)
  dt-bindings: clock: tegra30: Add IDs for CSI pad clocks
  dt-bindings: display: tegra: Move avdd-dsi-csi-supply from VI to CSI
  dt-bindings: i2c: nvidia,tegra20-i2c: Document Tegra264 I2C
parents 8f5ae30d 5aba939e

Documentation/devicetree/bindings/arm/tegra.yaml

+10 −2
Original line number Diff line number Diff line
@@ -36,8 +36,12 @@ properties: 
              - toradex,colibri_t20-iris

          - const: toradex,colibri_t20

          - const: nvidia,tegra20

      - items:

          - const: asus,tf101

      - description: ASUS Transformers T20 Device family

        items:

          - enum:

              - asus,sl101

              - asus,tf101

              - asus,tf101g

          - const: nvidia,tegra20

      - items:

          - const: acer,picasso
@@ -174,6 +178,10 @@ properties: 
          - const: google,nyan-big

          - const: google,nyan

          - const: nvidia,tegra124

      - description: Xiaomi Mi Pad (A0101)

        items:

          - const: xiaomi,mocha

          - const: nvidia,tegra124

      - items:

          - enum:

              - nvidia,darcy

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

+0 −3
Original line number Diff line number Diff line
@@ -70,9 +70,6 @@ properties: 
  ranges:

    maxItems: 1



  avdd-dsi-csi-supply:

    description: DSI/CSI power supply. Must supply 1.2 V.



  vip:

    $ref: /schemas/display/tegra/nvidia,tegra20-vip.yaml

Documentation/devicetree/bindings/display/tegra/nvidia,tegra210-csi.yaml

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ properties: 
      - const: cile

      - const: csi_tpg



  avdd-dsi-csi-supply:

    description: DSI/CSI power supply. Must supply 1.2 V.



  power-domains:

    maxItems: 1

Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml

+7 −0
Original line number Diff line number Diff line
@@ -80,6 +80,12 @@ properties: 
          support for 64 KiB transactions whereas earlier chips supported no

          more than 4 KiB per transactions.

        const: nvidia,tegra194-i2c

      - description:

          Tegra264 has 17 generic I2C controllers, two of which are in the AON

          (always-on) partition of the SoC. In addition to the features from

          Tegra194, a SW mutex register is added to support use of the same I2C

          instance across multiple firmwares.

        const: nvidia,tegra264-i2c



  reg:

    maxItems: 1
@@ -186,6 +192,7 @@ allOf: 
            contains:

              enum:

                - nvidia,tegra194-i2c

                - nvidia,tegra264-i2c

    then:

      required:

        - resets

drivers/clk/tegra/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ config CLK_TEGRA_BPMP 
	depends on TEGRA_BPMP



config TEGRA_CLK_DFLL

	depends on ARCH_TEGRA_124_SOC || ARCH_TEGRA_210_SOC

	depends on ARCH_TEGRA_114_SOC || ARCH_TEGRA_124_SOC || ARCH_TEGRA_210_SOC

	select PM_OPP

	def_bool y