Commit 8c915019 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'realtek-dt-for-5.8' of... 

Merge tag 'realtek-dt-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek into arm/dt

Realtek Arm based SoC DT for v5.8

Add RTD1195, RTD1395 and RTD1619 SoCs as well as Xnano X5 TV box.
Clean up memory nodes and /soc ranges. Factor out r-bus and partition it
into CRT, Iso, Misc, SB2 and SCPU Wrapper blocks.

* tag 'realtek-dt-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek: (35 commits)
  dt-bindings: reset: rtd1295: Add SB2 reset
  arm64: dts: realtek: rtd16xx: Add SB2 and SCPU Wrapper syscon nodes
  arm64: dts: realtek: rtd139x: Add SB2 and SCPU Wrapper syscon nodes
  arm64: dts: realtek: rtd129x: Add SB2 and SCPU Wrapper syscon nodes
  ARM: dts: rtd1195: Add SB2 and SCPU Wrapper syscon nodes
  arm64: dts: realtek: rtd16xx: Add CRT syscon node
  ARM: dts: rtd1195: Add UART resets
  ARM: dts: rtd1195: Add reset nodes
  dt-bindings: reset: Add Realtek RTD1195
  ARM: dts: rtd1195: Add CRT syscon node
  arm64: dts: realtek: rtd16xx: Introduce iso and misc syscon
  arm64: dts: realtek: rtd139x: Introduce CRT, iso and misc syscon
  arm64: dts: realtek: rtd129x: Introduce CRT, iso and misc syscon
  ARM: dts: rtd1195: Introduce iso and misc syscon
  arm64: dts: realtek: rtd1295: Add Xnano X5
  dt-bindings: arm: realtek: Add Xnano X5
  dt-bindings: vendor-prefixes: Add Xnano
  arm64: dts: realtek: rtd16xx: Add memory reservations
  arm64: dts: realtek: rtd16xx: Carve out boot ROM from memory
  arm64: dts: realtek: Add RTD1619 SoC and Realtek Mjolnir EVB
  ...

Link: https://lore.kernel.org/r/20200510232158.18477-2-afaerber@suse.de


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 18e48cc0 37878812

Documentation/devicetree/bindings/arm/realtek.yaml

+21 −0
Original line number Diff line number Diff line
@@ -14,6 +14,13 @@ properties: 
    const: '/'

  compatible:

    oneOf:

      # RTD1195 SoC based boards

      - items:

          - enum:

              - mele,x1000 # MeLE X1000

              - realtek,horseradish # Realtek Horseradish EVB

          - const: realtek,rtd1195



      # RTD1293 SoC based boards

      - items:

          - enum:
@@ -25,6 +32,7 @@ properties: 
          - enum:

              - mele,v9 # MeLE V9

              - probox2,ava # ProBox2 AVA

              - xnano,x5 # Xnano X5

              - zidoo,x9s # Zidoo X9S

          - const: realtek,rtd1295
@@ -33,4 +41,17 @@ properties: 
          - enum:

              - synology,ds418 # Synology DiskStation DS418

          - const: realtek,rtd1296



      # RTD1395 SoC based boards

      - items:

          - enum:

              - bananapi,bpi-m4 # Banana Pi BPI-M4

              - realtek,lion-skin # Realtek Lion Skin EVB

          - const: realtek,rtd1395



      # RTD1619 SoC based boards

      - items:

          - enum:

              - realtek,mjolnir # Realtek Mjolnir EVB

          - const: realtek,rtd1619

...

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -1125,6 +1125,8 @@ patternProperties: 
    description: Shenzhen Xinpeng Technology Co., Ltd

  "^xlnx,.*":

    description: Xilinx

  "^xnano,.*":

    description: Xnano

  "^xunlong,.*":

    description: Shenzhen Xunlong Software CO.,Limited

  "^xylon,.*":

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -898,6 +898,9 @@ dtb-$(CONFIG_ARCH_QCOM) += \ 
dtb-$(CONFIG_ARCH_RDA) += \

	rda8810pl-orangepi-2g-iot.dtb \

	rda8810pl-orangepi-i96.dtb

dtb-$(CONFIG_ARCH_REALTEK) += \

	rtd1195-horseradish.dtb \

	rtd1195-mele-x1000.dtb

dtb-$(CONFIG_ARCH_REALVIEW) += \

	arm-realview-pb1176.dtb \

	arm-realview-pb11mp.dtb \

arch/arm/boot/dts/rtd1195-horseradish.dts

0 → 100644
+32 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)

/*

 * Copyright (c) 2019 Andreas Färber

 */



/dts-v1/;



#include "rtd1195.dtsi"



/ {

	compatible = "realtek,horseradish", "realtek,rtd1195";

	model = "Realtek Horseradish EVB";



	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory@a800 {

		device_type = "memory";

		reg = <0x0000a800 0x17ff5800>, /* boot ROM to r-bus */

		      <0x18070000 0x00090000>, /* r-bus to NOR flash */

		      <0x19100000 0x26f00000>; /* NOR flash to 1 GiB */

	};

};



&uart0 {

	status = "okay";

};

arch/arm/boot/dts/rtd1195-mele-x1000.dts

0 → 100644
+32 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)

/*

 * Copyright (c) 2017-2019 Andreas Färber

 */



/dts-v1/;



#include "rtd1195.dtsi"



/ {

	compatible = "mele,x1000", "realtek,rtd1195";

	model = "MeLE X1000";



	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory@a800 {

		device_type = "memory";

		reg = <0x0000a800 0x17ff5800>, /* boot ROM to r-bus */

		      <0x18070000 0x00090000>, /* r-bus to NOR flash */

		      <0x19100000 0x26f00000>; /* NOR flash to 1 GiB */

	};

};



&uart0 {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE