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

Commit bb51b535 authored by Neil Armstrong's avatar Neil Armstrong Committed by Kevin Hilman
Browse files

ARM64: dts: Add support for Meson GXM 



Following the Amlogic Linux kernel, it seem the only differences
between the GXL and GXM SoCs are the CPU Clusters.

This commit renames the gxl-s905d-p23x DTSI in a common file for
S905D p23x and S912 q20x boards.

Then adds a meson-gxm dtsi and reproduce the P23x to Q20x boards
dts files since the S905D and S912 SoCs shares the same pinout
and the P23x and Q20x boards are identical.

Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Tested-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent a5b1ef3c

Documentation/devicetree/bindings/arm/amlogic.txt

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ Boards with the Amlogic Meson GXL S905D SoC shall have the following properties: 
  Required root node property:

    compatible: "amlogic,s905d", "amlogic,meson-gxl";



Boards with the Amlogic Meson GXM S912 SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,s912", "amlogic,meson-gxm";



Board compatible values:

  - "geniatech,atv1200" (Meson6)

  - "minix,neo-x8" (Meson8)
@@ -39,3 +43,5 @@ Board compatible values: 
  - "amlogic,p212" (Meson gxl s905x)

  - "amlogic,p230" (Meson gxl s905d)

  - "amlogic,p231" (Meson gxl s905d)

  - "amlogic,q200" (Meson gxm s912)

  - "amlogic,q201" (Meson gxm s912)

arch/arm64/boot/dts/amlogic/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-q200.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-q201.dtb



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p23x.dtsi→arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -41,7 +41,9 @@ 
 *     OTHER DEALINGS IN THE SOFTWARE.

 */



#include "meson-gxl-s905d.dtsi"

/* Common DTSI for same Amlogic Q200/Q201 and P230/P231 boards using either

 * the pin-compatible S912 (GXM) or S905D (GXL) SoCs.

 */



/ {

	aliases {

arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ 


/dts-v1/;



#include "meson-gxl-s905d-p23x.dtsi"

#include "meson-gxl-s905d.dtsi"

#include "meson-gx-p23x-q20x.dtsi"



/ {

	compatible = "amlogic,p230", "amlogic,s905d", "amlogic,meson-gxl";

arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ 


/dts-v1/;



#include "meson-gxl-s905d-p23x.dtsi"

#include "meson-gxl-s905d.dtsi"

#include "meson-gx-p23x-q20x.dtsi"



/ {

	compatible = "amlogic,p231", "amlogic,s905d", "amlogic,meson-gxl";