Commit 7d6292ab authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-dt-for-5.6-2' of... 

Merge tag 'sunxi-dt-for-5.6-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt

This is our usual set of DT patches for the Allwinner SoCs.

It's fairly big this time, but the highlights are:
  - Enable cpufreq and CPU thermal throttling on the A64
    - CLK_CPUX macro usage removed (changed from first pull request)
  - CSI0 support on the R40
  - CSI1 support on the A10 and A20
  - SPI support on the R40
  - PMU support on the H3, H5, H6 and R40
  - MIPI-DSI support on the A64
  - PWM support on the H6
  - Thermal sensor on the A64, A83t, H3, H5, H6 and R40
  - More DT schemas fixes and conversions
  - New boards: LibreComputer ALL-H5-CC H5, LibreComputer ALL-H3-IT H5,
                Pine64 H64 Model B, Neutis N5H3

* tag 'sunxi-dt-for-5.6-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (52 commits)
  arm64: dts: allwinner: a64: enable DVFS
  arm64: dts: allwinner: a64: add dtsi with CPU operating points
  arm64: dts: allwinner: a64: add cooling maps and thermal tripping points
  arm64: dts: allwinner: a64: add CPU clock to CPU0-3 nodes
  arm64: dts: allwinner: sun50i-a64: Use macros for newly exported clocks
  ARM: dts: sunxi: Use macros for references to CCU clocks
  arm64: dts: allwinner: h5: Add Libre Computer ALL-H5-CC H5 board
  ARM: dts: sun8i: R40: Add SPI controllers nodes and pinmuxes
  arm64: dts: allwinner: a64: pinebook: Fix lid wakeup
  ARM: dts: sun8i: r40: Add device node for CSI0
  ARM: dts: sun7i: Add CSI1 controller and pinmux options
  ARM: dts: sun4i: Add CSI1 controller and pinmux options
  ARM: dts: sunxi: Add missing LVDS resets and clocks
  ARM: dts: sun8i: r40: Use tcon top clock index macros
  ARM: dts: sun8i: R40: Add PMU node
  ARM: dts: sun8i: R40: Upgrade GICC reg size to 8K
  arm64: dts: allwinner: h6: Add thermal sensor and thermal zones
  ARM: dts: sunxi: Add Libre Computer ALL-H3-IT H5 board
  arm64: dts: allwinner: a64: Add MIPI DSI pipeline
  arm64: dts: allwinner: a64: Add thermal sensors and thermal zones
  ...

Link: https://lore.kernel.org/r/20200113095555.GA29848@wens.csie.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 87f846c7 ac904843

Documentation/devicetree/bindings/arm/sunxi.yaml

+22 −1
Original line number Diff line number Diff line
@@ -342,6 +342,16 @@ properties: 
          - const: libretech,all-h3-cc-h5

          - const: allwinner,sun50i-h5



      - description: Libre Computer Board ALL-H3-IT H5

        items:

          - const: libretech,all-h3-it-h5

          - const: allwinner,sun50i-h5



      - description: Libre Computer Board ALL-H5-CC H5

        items:

          - const: libretech,all-h5-cc-h5

          - const: allwinner,sun50i-h5



      - description: Lichee Pi One

        items:

          - const: licheepi,licheepi-one
@@ -470,6 +480,12 @@ properties: 
          - const: emlid,neutis-n5

          - const: allwinner,sun50i-h5



      - description: Emlid Neutis N5H3 Developper Board

        items:

          - const: emlid,neutis-n5h3-devboard

          - const: emlid,neutis-n5h3

          - const: allwinner,sun8i-h3



      - description: NextThing Co. CHIP

        items:

          - const: nextthing,chip
@@ -599,11 +615,16 @@ properties: 
          - const: pine64,pine64-plus

          - const: allwinner,sun50i-a64



      - description: Pine64 PineH64

      - description: Pine64 PineH64 model A

        items:

          - const: pine64,pine-h64

          - const: allwinner,sun50i-h6



      - description: Pine64 PineH64 model B

        items:

          - const: pine64,pine-h64-model-b

          - const: allwinner,sun50i-h6



      - description: Pine64 LTS

        items:

          - const: pine64,pine64-lts

Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml

0 → 100644
+76 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0+

%YAML 1.2

---

$id: http://devicetree.org/schemas/clock/allwinner,sun8i-a83t-de2-clk.yaml#

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



title: Allwinner A83t Display Engine 2/3 Clock Controller Device Tree Bindings



maintainers:

  - Chen-Yu Tsai <wens@csie.org>

  - Maxime Ripard <mripard@kernel.org>



properties:

  "#clock-cells":

    const: 1



  "#reset-cells":

    const: 1



  compatible:

    oneOf:

      - const: allwinner,sun8i-a83t-de2-clk

      - const: allwinner,sun8i-h3-de2-clk

      - const: allwinner,sun8i-v3s-de2-clk

      - const: allwinner,sun50i-a64-de2-clk

      - const: allwinner,sun50i-h5-de2-clk

      - const: allwinner,sun50i-h6-de2-clk

      - items:

          - const: allwinner,sun8i-r40-de2-clk

          - const: allwinner,sun8i-h3-de2-clk



  reg:

    maxItems: 1



  clocks:

    items:

      - description: Bus Clock

      - description: Module Clock



  clock-names:

    items:

      - const: bus

      - const: mod



  resets:

    maxItems: 1



required:

  - "#clock-cells"

  - "#reset-cells"

  - compatible

  - reg

  - clocks

  - clock-names

  - resets



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/sun8i-h3-ccu.h>

    #include <dt-bindings/reset/sun8i-h3-ccu.h>



    de2_clocks: clock@1000000 {

        compatible = "allwinner,sun8i-h3-de2-clk";

        reg = <0x01000000 0x100000>;

        clocks = <&ccu CLK_BUS_DE>,

                 <&ccu CLK_DE>;

        clock-names = "bus",

                      "mod";

        resets = <&ccu RST_BUS_DE>;

        #clock-cells = <1>;

        #reset-cells = <1>;

    };



...

Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-de-clks.yaml

0 → 100644
+67 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0+

%YAML 1.2

---

$id: http://devicetree.org/schemas/clock/allwinner,sun9i-a80-de-clks.yaml#

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



title: Allwinner A80 Display Engine Clock Controller Device Tree Bindings



maintainers:

  - Chen-Yu Tsai <wens@csie.org>

  - Maxime Ripard <mripard@kernel.org>



properties:

  "#clock-cells":

    const: 1



  "#reset-cells":

    const: 1



  compatible:

    const: allwinner,sun9i-a80-de-clks



  reg:

    maxItems: 1



  clocks:

    items:

      - description: Bus Clock

      - description: RAM Bus Clock

      - description: Module Clock



  clock-names:

    items:

      - const: mod

      - const: dram

      - const: bus



  resets:

    maxItems: 1



required:

  - "#clock-cells"

  - "#reset-cells"

  - compatible

  - reg

  - clocks

  - clock-names

  - resets



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/sun9i-a80-ccu.h>

    #include <dt-bindings/reset/sun9i-a80-ccu.h>



    de_clocks: clock@3000000 {

        compatible = "allwinner,sun9i-a80-de-clks";

        reg = <0x03000000 0x30>;

        clocks = <&ccu CLK_DE>, <&ccu CLK_SDRAM>, <&ccu CLK_BUS_DE>;

        clock-names = "mod", "dram", "bus";

        resets = <&ccu RST_BUS_DE>;

        #clock-cells = <1>;

        #reset-cells = <1>;

    };



...

Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml

0 → 100644
+59 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0+

%YAML 1.2

---

$id: http://devicetree.org/schemas/clock/allwinner,sun9i-a80-usb-clocks.yaml#

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



title: Allwinner A80 USB Clock Controller Device Tree Bindings



maintainers:

  - Chen-Yu Tsai <wens@csie.org>

  - Maxime Ripard <mripard@kernel.org>



properties:

  "#clock-cells":

    const: 1



  "#reset-cells":

    const: 1



  compatible:

    const: allwinner,sun9i-a80-usb-clocks



  reg:

    maxItems: 1



  clocks:

    items:

      - description: Bus Clock

      - description: High Frequency Oscillator



  clock-names:

    items:

      - const: bus

      - const: hosc



required:

  - "#clock-cells"

  - "#reset-cells"

  - compatible

  - reg

  - clocks

  - clock-names



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/sun9i-a80-ccu.h>



    usb_clocks: clock@a08000 {

        compatible = "allwinner,sun9i-a80-usb-clks";

        reg = <0x00a08000 0x8>;

        clocks = <&ccu CLK_BUS_USB>, <&osc24M>;

        clock-names = "bus", "hosc";

        #clock-cells = <1>;

        #reset-cells = <1>;

    };



...

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

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
Allwinner Display Engine 2.0/3.0 Clock Control Binding

------------------------------------------------------



Required properties :

- compatible: must contain one of the following compatibles:

		- "allwinner,sun8i-a83t-de2-clk"

		- "allwinner,sun8i-h3-de2-clk"

		- "allwinner,sun8i-v3s-de2-clk"

		- "allwinner,sun50i-a64-de2-clk"

		- "allwinner,sun50i-h5-de2-clk"

		- "allwinner,sun50i-h6-de3-clk"



- reg: Must contain the registers base address and length

- clocks: phandle to the clocks feeding the display engine subsystem.

	  Three are needed:

  - "mod": the display engine module clock (on A83T it's the DE PLL)

  - "bus": the bus clock for the whole display engine subsystem

- clock-names: Must contain the clock names described just above

- resets: phandle to the reset control for the display engine subsystem.

- #clock-cells : must contain 1

- #reset-cells : must contain 1



Example:

de2_clocks: clock@1000000 {

	compatible = "allwinner,sun8i-h3-de2-clk";

	reg = <0x01000000 0x100000>;

	clocks = <&ccu CLK_BUS_DE>,

		 <&ccu CLK_DE>;

	clock-names = "bus",

		      "mod";

	resets = <&ccu RST_BUS_DE>;

	#clock-cells = <1>;

	#reset-cells = <1>;

};