Unverified Commit eacef7cc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.3-rockchip-dts32-1' of... 

Merge tag 'v6.3-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Two new 32bit SoC were added, the rv1126 and rk3128.

New boards are thr rk3128-eval-board, and a number of rv1126-based compute
modules from Edgeble AI.

Also included are some dt-binding improvements with relevant Acks from
maintainers when the changes touch these areas.

* tag 'v6.3-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  dt-bindings: phy: rename phy-rockchip-inno-usb2.yaml
  dt-bindings: soc: rockchip: grf: add rockchip,rk3288-dp-phy.yaml
  dt-bindings: phy: rockchip: convert rockchip-dp-phy.txt to yaml
  ARM: dts: rockchip: Enable Ethernet on rv1126 Neu2-IO
  ARM: dts: rockchip: Add Ethernet GMAC node for RV1126
  ARM: dts: rockchip: Add ethernet rgmiim1 pin-control for rv1126
  dt-bindings: arm: rockchip: Add Edgeble Neural Compute Module 6
  ARM: dts: rockchip: add brcmf node to rk3066a-mk808
  ARM: dts: rockchip: add space between label and nodename nfc pinctrl on rk3128
  ARM: dts: rockchip: add rk3128-evb
  ARM: dts: rockchip: add rk3128 soc dtsi
  dt-bindings: arm: rockchip: Add Rockchip RK3128 Evaluation board
  ARM: dts: rockchip: Add Edgeble Neural Compute Module 2(Neu2) IO board
  ARM: dts: rockchip: Add Edgeble RV1126 Neural Compute Module 2(Neu2)
  dt-bindings: arm: rockchip: Add Edgeble Neural Compute Module 2
  dt-bindings: vendor-prefixes: Add Edgeble AI Technologies Pvt. Ltd.
  ARM: dts: rockchip: Add Rockchip RV1126 SoC
  ARM: dts: rockchip: Add Rockchip RV1126 pinctrl
  dt-bindings: arm: rockchip: Add pmu compatible for rv1126

Link: https://lore.kernel.org/r/5651506.31r3eYUQgx@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
parents 84afaf4e 0f48b0ed

Documentation/devicetree/bindings/arm/rockchip.yaml

+17 −0
Original line number Diff line number Diff line
@@ -90,6 +90,18 @@ properties: 
          - const: chipspark,rayeager-px2

          - const: rockchip,rk3066a



      - description: Edgeble Neural Compute Module 2(Neu2) SoM based boards

        items:

          - const: edgeble,neural-compute-module-2-io   # Edgeble Neural Compute Module 2 IO Board

          - const: edgeble,neural-compute-module-2      # Edgeble Neural Compute Module 2 SoM

          - const: rockchip,rv1126



      - description: Edgeble Neural Compute Module 6(Neu6) Model A SoM based boards

        items:

          - const: edgeble,neural-compute-module-6a-io  # Edgeble Neural Compute Module 6A IO Board

          - const: edgeble,neural-compute-module-6a     # Edgeble Neural Compute Module 6A SoM

          - const: rockchip,rk3588



      - description: Elgin RV1108 R1

        items:

          - const: elgin,rv1108-r1
@@ -723,6 +735,11 @@ properties: 
          - const: rockchip,rk3036-evb

          - const: rockchip,rk3036



      - description: Rockchip RK3128 Evaluation board

        items:

          - const: rockchip,rk3128-evb

          - const: rockchip,rk3128



      - description: Rockchip RK3228 Evaluation board

        items:

          - const: rockchip,rk3228-evb

Documentation/devicetree/bindings/arm/rockchip/pmu.yaml

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ select: 
          - rockchip,rk3399-pmu

          - rockchip,rk3568-pmu

          - rockchip,rk3588-pmu

          - rockchip,rv1126-pmu



  required:

    - compatible
@@ -43,6 +44,7 @@ properties: 
          - rockchip,rk3399-pmu

          - rockchip,rk3568-pmu

          - rockchip,rk3588-pmu

          - rockchip,rv1126-pmu

      - const: syscon

      - const: simple-mfd

Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml→Documentation/devicetree/bindings/phy/rockchip,inno-usb2phy.yaml

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/phy/phy-rockchip-inno-usb2.yaml#

$id: http://devicetree.org/schemas/phy/rockchip,inno-usb2phy.yaml#

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



title: Rockchip USB2.0 phy with inno IP block

Documentation/devicetree/bindings/phy/rockchip,rk3288-dp-phy.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/phy/rockchip,rk3288-dp-phy.yaml#

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



title: Rockchip specific extensions to the Analogix Display Port PHY



maintainers:

  - Heiko Stuebner <heiko@sntech.de>



properties:

  compatible:

    const: rockchip,rk3288-dp-phy



  clocks:

    maxItems: 1



  clock-names:

    const: 24m



  "#phy-cells":

    const: 0



required:

  - compatible

  - clocks

  - clock-names

  - "#phy-cells"



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/rk3288-cru.h>

    edp-phy {

      compatible = "rockchip,rk3288-dp-phy";

      clocks = <&cru SCLK_EDP_24M>;

      clock-names = "24m";

      #phy-cells = <0>;

    };

Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
Rockchip specific extensions to the Analogix Display Port PHY

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



Required properties:

- compatible : should be one of the following supported values:

	 - "rockchip.rk3288-dp-phy"

- clocks: from common clock binding: handle to dp clock.

	of memory mapped region.

- clock-names: from common clock binding:

	Required elements: "24m"

- #phy-cells : from the generic PHY bindings, must be 0;



Example:



grf: syscon@ff770000 {

	compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd";



...



	edp_phy: edp-phy {

		compatible = "rockchip,rk3288-dp-phy";

		clocks = <&cru SCLK_EDP_24M>;

		clock-names = "24m";

		#phy-cells = <0>;

	};

};