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

Merge branch 'mstar-dt-next' of https://github.com/linux-chenxing/linux into arm/dt 

* 'mstar-dt-next' of https://github.com/linux-chenxing/linux:
  ARM: mstar: Extend opp_table for infinity2m
  ARM: mstar: Add OPP table for infinity3
  ARM: mstar: Add OPP table for infinity
  ARM: mstar: Link cpupll to second core
  ARM: mstar: Link cpupll to cpu
  ARM: mstar: Add cpupll to base dtsi
  dt-bindings: clk: mstar msc313 cpupll binding description
  ARM: dts: mstar: Add board for 100ask DongShanPiOne
  dt-bindings: arm: mstar: Add compatible for 100ask DongShanPiOne
  dt-bindings: vendor-prefixes: Add prefix for 100ask
  ARM: dts: mstar: Add a dts for Miyoo Mini
  dt-bindings: arm: mstar: Add compatible for Miyoo Mini
  dt-bindings: vendor-prefixes: Add prefix for Miyoo
  ARM: dts: mstar: Add the Wireless Tag IDO-SBC2D06-V1B-22W
  dt-bindings: add vendor prefix for Wireless Tag
  ARM: dts: mstar: Set gpio compatible for ssd20xd

Link: https://lore.kernel.org/r/20220216193131.59794-1-romain.perier@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 21ed2f61 344118c3

Documentation/devicetree/bindings/arm/mstar/mstar.yaml

+4 −0
Original line number Diff line number Diff line
@@ -23,8 +23,12 @@ properties: 
      - description: infinity2m boards

        items:

          - enum:

              - 100ask,dongshanpione # 100ask DongShanPiOne

              - honestar,ssd201htv2 # Honestar SSD201_HT_V2 devkit

              - m5stack,unitv2 # M5Stack UnitV2

              - miyoo,miyoo-mini # Miyoo Mini

              - wirelesstag,ido-som2d01 # Wireless Tag IDO-SOM2D01

              - wirelesstag,ido-sbc2d06-v1b-22w # Wireless Tag IDO-SBC2D06-1VB-22W

          - const: mstar,infinity2m



      - description: infinity3 boards

Documentation/devicetree/bindings/clock/mstar,msc313-cpupll.yaml

0 → 100644
+45 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/clock/mstar,msc313-cpupll.yaml#

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



title: MStar/Sigmastar MSC313 CPU PLL



maintainers:

  - Daniel Palmer <daniel@thingy.jp>



description: |

  The MStar/SigmaStar MSC313 and later ARMv7 chips have a scalable

  PLL that can be used as the clock source for the CPU(s).



properties:

  compatible:

    const: mstar,msc313-cpupll



  "#clock-cells":

    const: 1



  clocks:

    maxItems: 1



  reg:

    maxItems: 1



required:

  - compatible

  - "#clock-cells"

  - clocks

  - reg



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/mstar-msc313-mpll.h>

    cpupll: cpupll@206400 {

        compatible = "mstar,msc313-cpupll";

        reg = <0x206400 0x200>;

        #clock-cells = <1>;

        clocks = <&mpll MSTAR_MSC313_MPLL_DIV2>;

    };

Documentation/devicetree/bindings/vendor-prefixes.yaml

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ patternProperties: 
  "^(simple-audio-card|st-plgpio|st-spics|ts),.*": true



  # Keep list in alphabetical order.

  "^100ask,.*":

    description: Baiwen.com (100ask).

  "^70mai,.*":

    description: 70mai Co., Ltd.

  "^8dev,.*":
@@ -769,6 +771,8 @@ patternProperties: 
    description: MiraMEMS Sensing Technology Co., Ltd.

  "^mitsubishi,.*":

    description: Mitsubishi Electric Corporation

  "^miyoo,.*":

    description: Miyoo

  "^mntre,.*":

    description: MNT Research GmbH

  "^modtronix,.*":
@@ -1350,6 +1354,8 @@ patternProperties: 
    description: WinLink Co., Ltd

  "^winstar,.*":

    description: Winstar Display Corp.

  "^wirelesstag,.*":

    description: Wireless Tag (qiming yunduan)

  "^wits,.*":

    description: Shenzhen Merrii Technology Co., Ltd. (WITS)

  "^wlf,.*":

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -1494,6 +1494,9 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ 
dtb-$(CONFIG_ARCH_MILBEAUT) += milbeaut-m10v-evb.dtb

dtb-$(CONFIG_ARCH_MSTARV7) += \

	mstar-infinity-msc313-breadbee_crust.dtb \

	mstar-infinity2m-ssd202d-100ask-dongshanpione.dtb \

	mstar-infinity2m-ssd202d-miyoo-mini.dtb \

	mstar-infinity2m-ssd202d-wirelesstag-ido-sbc2d06-v1b-22w.dtb \

	mstar-infinity2m-ssd202d-ssd201htv2.dtb \

	mstar-infinity2m-ssd202d-unitv2.dtb \

	mstar-infinity3-msc313e-breadbee.dtb \

arch/arm/boot/dts/mstar-infinity.dtsi

+34 −0
Original line number Diff line number Diff line
@@ -8,6 +8,40 @@ 


#include <dt-bindings/gpio/msc313-gpio.h>



/ {

	cpu0_opp_table: opp_table0 {

		compatible = "operating-points-v2";

		opp-shared;



		opp-240000000 {

			opp-hz = /bits/ 64 <240000000>;

			opp-microvolt = <1000000>;

			clock-latency-ns = <300000>;

		};



		opp-400000000 {

			opp-hz = /bits/ 64 <400000000>;

			opp-microvolt = <1000000>;

			clock-latency-ns = <300000>;

		};

		opp-600000000 {

			opp-hz = /bits/ 64 <600000000>;

			opp-microvolt = <1000000>;

			clock-latency-ns = <300000>;

		};



		opp-800000000 {

			opp-hz = /bits/ 64 <800000000>;

			opp-microvolt = <1000000>;

			clock-latency-ns = <300000>;

		};

	};

};



&cpu0 {

	operating-points-v2 = <&cpu0_opp_table>;

};



&imi {

	reg = <0xa0000000 0x16000>;

};