Commit d12a73cf authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-dt-for-5.3-201906210807' of... 

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

Our usual bunch of patches:
  - Some work on the BPi M2-Berry to support various devices
  - Convert some bindings to a schema, and a lot of fixes reported by
    the schemas we introduced.
  - A few other fixes here and there

* tag 'sunxi-dt-for-5.3-201906210807' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux

: (21 commits)
  dt-bindings: pwm: Convert Allwinner PWM to a schema
  ARM: dts: sun8i: r40: Change the RTC compatible
  ARM: dts: sun8i: v3s: Add external crystals accuracy
  ARM: dts: sun8i: v3s: Fix the RTC node
  ARM: dts: sun6i: Add external crystals accuracy
  ARM: dts: sun6i: Fix RTC node
  ARM: dts: sun8i: a83t: Add device node for CSI (Camera Sensor Interface)
  ARM: dts: gr8-evb: Fix RTC vendor
  ARM: dts: sun7i: icnova-swac: Fix the model vendor
  ARM: dts: sun8i: a711: Change LRADC node names to avoid warnings
  ARM: dts: sun7i: olimex-lime2: Enable ac and power supplies
  ARM: dts: sun6i: Add default address and size cells for SPI
  ARM: dts: sun8i-h3: Fix wifi in Beelink X2 DT
  dt-bindings: bus: Convert Allwinner RSB to a schema
  ARM: dts: sun8i: r40: bananapi-m2-ultra: Remove regulator-always-on
  ARM: dts: sun8i: v40: bananapi-m2-berry: Add Bluetooth device node
  ARM: dts: sun8i: v40: bananapi-m2-berry: Enable AHCI
  ARM: dts: sun8i: v40: bananapi-m2-berry: Enable HDMI output
  ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC ethernet controller
  ARM: dts: sun8i: v40: bananapi-m2-berry: Add GPIO pin-bank regulator supplies
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 266050d8 2269f0c1

Documentation/devicetree/bindings/arm/sunxi.yaml

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ properties: 


      - description: ICNova A20 SWAC

        items:

          - const: swac,icnova-a20-swac

          - const: incircuit,icnova-a20-swac

          - const: incircuit,icnova-a20

          - const: allwinner,sun7i-a20

Documentation/devicetree/bindings/bus/allwinner,sun8i-a23-rsb.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/bus/allwinner,sun8i-a23-rsb.yaml#

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



title: Allwinner A23 RSB Device Tree Bindings



maintainers:

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

  - Maxime Ripard <maxime.ripard@bootlin.com>



properties:

  "#address-cells":

    const: 1



  "#size-cells":

    const: 0



  compatible:

    oneOf:

      - const: allwinner,sun8i-a23-rsb

      - items:

        - const: allwinner,sun8i-a83t-rsb

        - const: allwinner,sun8i-a23-rsb



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



  resets:

    maxItems: 1



  clock-frequency:

    minimum: 1

    maximum: 20000000



patternProperties:

  "^.*@[0-9a-fA-F]+$":

    properties:

      reg:

        maxItems: 1



    required:

      - reg



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - resets



examples:

  - |

    rsb@1f03400 {

        compatible = "allwinner,sun8i-a23-rsb";

        reg = <0x01f03400 0x400>;

        interrupts = <0 39 4>;

        clocks = <&apb0_gates 3>;

        clock-frequency = <3000000>;

        resets = <&apb0_rst 3>;

        #address-cells = <1>;

        #size-cells = <0>;



        pmic@3e3 {

            compatible = "...";

            reg = <0x3e3>;



            /* ... */

        };

    };



additionalProperties: false

Documentation/devicetree/bindings/bus/sunxi-rsb.txt

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
Allwinner Reduced Serial Bus (RSB) controller



The RSB controller found on later Allwinner SoCs is an SMBus like 2 wire

serial bus with 1 master and up to 15 slaves. It is represented by a node

for the controller itself, and child nodes representing the slave devices.



Required properties :



 - reg             : Offset and length of the register set for the controller.

 - compatible      : Shall be "allwinner,sun8i-a23-rsb".

 - interrupts      : The interrupt line associated to the RSB controller.

 - clocks          : The gate clk associated to the RSB controller.

 - resets          : The reset line associated to the RSB controller.

 - #address-cells  : shall be 1

 - #size-cells     : shall be 0



Optional properties :



 - clock-frequency : Desired RSB bus clock frequency in Hz. Maximum is 20MHz.

		     If not set this defaults to 3MHz.



Child nodes:



An RSB controller node can contain zero or more child nodes representing

slave devices on the bus.  Child 'reg' properties should contain the slave

device's hardware address. The hardware address is hardwired in the device,

which can normally be found in the datasheet.



Example:



	rsb@1f03400 {

		compatible = "allwinner,sun8i-a23-rsb";

		reg = <0x01f03400 0x400>;

		interrupts = <0 39 4>;

		clocks = <&apb0_gates 3>;

		clock-frequency = <3000000>;

		resets = <&apb0_rst 3>;

		#address-cells = <1>;

		#size-cells = <0>;



		pmic@3e3 {

			compatible = "...";

			reg = <0x3e3>;



			/* ... */

		};

	};

Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/pwm/allwinner,sun4i-a10-pwm.yaml#

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



title: Allwinner A10 PWM Device Tree Bindings



maintainers:

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

  - Maxime Ripard <maxime.ripard@bootlin.com>



properties:

  "#pwm-cells":

    const: 3



  compatible:

    oneOf:

      - const: allwinner,sun4i-a10-pwm

      - const: allwinner,sun5i-a10s-pwm

      - const: allwinner,sun5i-a13-pwm

      - const: allwinner,sun7i-a20-pwm

      - const: allwinner,sun8i-h3-pwm

      - items:

          - const: allwinner,sun8i-a83t-pwm

          - const: allwinner,sun8i-h3-pwm

      - items:

          - const: allwinner,sun50i-a64-pwm

          - const: allwinner,sun5i-a13-pwm

      - items:

          - const: allwinner,sun50i-h5-pwm

          - const: allwinner,sun5i-a13-pwm



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



required:

  - "#pwm-cells"

  - compatible

  - reg

  - clocks



additionalProperties: false



examples:

  - |

    pwm: pwm@1c20e00 {

        compatible = "allwinner,sun7i-a20-pwm";

        reg = <0x01c20e00 0xc>;

        clocks = <&osc24M>;

        #pwm-cells = <3>;

    };



...

Documentation/devicetree/bindings/pwm/pwm-sun4i.txt

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
Allwinner sun4i and sun7i SoC PWM controller



Required properties:

  - compatible: should be one of:

    - "allwinner,sun4i-a10-pwm"

    - "allwinner,sun5i-a10s-pwm"

    - "allwinner,sun5i-a13-pwm"

    - "allwinner,sun7i-a20-pwm"

    - "allwinner,sun8i-h3-pwm"

    - "allwinner,sun50i-a64-pwm", "allwinner,sun5i-a13-pwm"

    - "allwinner,sun50i-h5-pwm", "allwinner,sun5i-a13-pwm"

  - reg: physical base address and length of the controller's registers

  - #pwm-cells: should be 3. See pwm.txt in this directory for a description of

    the cells format.

  - clocks: From common clock binding, handle to the parent clock.



Example:



	pwm: pwm@1c20e00 {

		compatible = "allwinner,sun7i-a20-pwm";

		reg = <0x01c20e00 0xc>;

		clocks = <&osc24M>;

		#pwm-cells = <3>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE