Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64b1b217 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-newsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM new SoC family support from Arnd Bergmann:
 "Two new SoC families are added this time.

  Sugaya Taichi submitted support for the Milbeaut SoC family from
  Socionext and explains:

    "SC2000 is a SoC of the Milbeaut series. equipped with a DSP
     optimized for computer vision. It also features advanced
     functionalities such as 360-degree, real-time spherical stitching
     with multi cameras, image stabilization for without mechanical
     gimbals, and rolling shutter correction. More detail is below:

       https://www.socionext.com/en/products/assp/milbeaut/SC2000.html"

  Interestingly, this one has a history dating back to older chips made
  by Socionext and previously Matsushita/Panasonic based on their own
  mn10300 CPU architecture that was removed from the kernel last year.

  Manivannan Sadhasivam adds support for another SoC family, this is the
  Bitmain BM1880 chip used in the Sophon Edge TPU developer board.

  The chip is intended for Deep Learning applications, and comes with
  dual-core Arm Cortex-A53 to run Linux as well as a RISC-V
  microcontroller core to control the tensor unit. For the moment, the
  TPU is not accessible in mainline Linux, so we treat it as a generic
  Arm SoC.

  More information is available at

       https://www.sophon.ai/"

* tag 'armsoc-newsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: multi_v7_defconfig: add ARCH_MILBEAUT and ARCH_MILBEAUT_M10V
  ARM: configs: Add Milbeaut M10V defconfig
  ARM: dts: milbeaut: Add device tree set for the Milbeaut M10V board
  clocksource/drivers/timer-milbeaut: Introduce timer for Milbeaut SoCs
  dt-bindings: timer: Add Milbeaut M10V timer description
  ARM: milbeaut: Add basic support for Milbeaut m10v SoC
  dt-bindings: Add documentation for Milbeaut SoCs
  dt-bindings: arm: Add SMP enable-method for Milbeaut
  dt-bindings: sram: milbeaut: Add binding for Milbeaut smp-sram
  MAINTAINERS: Add entry for Bitmain SoC platform
  arm64: dts: bitmain: Add Sophon Egde board support
  arm64: dts: bitmain: Add BM1880 SoC support
  arm64: Add ARCH_BITMAIN platform
  dt-bindings: arm: Document Bitmain BM1880 SoC
parents fb686ad2 c889e2a0

Documentation/devicetree/bindings/arm/bitmain.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/bitmain.yaml#

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



title: Bitmain platform device tree bindings



maintainers:

  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>



properties:

  compatible:

    items:

      - enum:

        - bitmain,sophon-edge

      - const: bitmain,bm1880

...

Documentation/devicetree/bindings/arm/cpus.yaml

+1 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ patternProperties: 
                - renesas,r9a06g032-smp

                - rockchip,rk3036-smp

                - rockchip,rk3066-smp

		- socionext,milbeaut-m10v-smp

                - ste,dbx500-smp



      cpu-release-addr:

Documentation/devicetree/bindings/arm/socionext/milbeaut.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/milbeaut.yaml#

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



title: Milbeaut platforms device tree bindings



maintainers:

  - Taichi Sugaya <sugaya.taichi@socionext.com>

  - Takao Orito <orito.takao@socionext.com>



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:

      - items:

          - enum:

              - socionext,milbeaut-m10v-evb

          - const: socionext,sc2000a

...

Documentation/devicetree/bindings/sram/milbeaut-smp-sram.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
Milbeaut SRAM for smp bringup



Milbeaut SoCs use a part of the sram for the bringup of the secondary cores.

Once they get powered up in the bootloader, they stay at the specific part

of the sram.

Therefore the part needs to be added as the sub-node of mmio-sram.



Required sub-node properties:

- compatible : should be "socionext,milbeaut-smp-sram"



Example:



        sram: sram@0 {

                compatible = "mmio-sram";

                reg = <0x0 0x10000>;

                #address-cells = <1>;

                #size-cells = <1>;

                ranges = <0 0x0 0x10000>;



                smp-sram@f100 {

                        compatible = "socionext,milbeaut-smp-sram";

                        reg = <0xf100 0x20>;

                };

        };

Documentation/devicetree/bindings/timer/socionext,milbeaut-timer.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Milbeaut SoCs Timer Controller



Required properties:



- compatible : should be "socionext,milbeaut-timer".

- reg : Specifies base physical address and size of the registers.

- interrupts : The interrupt of the first timer.

- clocks: phandle to the input clk.



Example:



timer {

	compatible = "socionext,milbeaut-timer";

	reg = <0x1e000050 0x20>

	interrupts = <0 91 4>;

	clocks = <&clk 4>;

};