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

Commit b8faca6a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'xgene-dts-for-v4.4-1' of https://github.com/AppliedMicro/xgene-next into next/dt 

Merge "X-Gene DTS changes queued for v4.4" from Duc Dang:

* tag 'xgene-dts-for-v4.4-1' of https://github.com/AppliedMicro/xgene-next:
  arm64: dts: Add poweroff device nodes for APM X-Gene 2 platform
  arm64: dts: Add APM X-Gene 2 standby GPIO controller DTS entries
  arm64: dts: Add PMU node for APM X-Gene Storm SOC
  Documentation: arm: pmu: Add Potenza PMU binding
  arm64: dts: Add X-Gene v2 reboot driver dts node
  arm64: dts: add APM Merlin Board device tree
  power: reset: Add syscon poweroff device node for APM X-Gene platform
  arm64: dts: Add X-Gene reboot driver dts node
  Documentation: arm64: add SCU dts binding documentation to linux kernel
  MAINTAINERS: Add Applied Micro (APM) X-Gene Device Tree maintainer
parents d1176d17 1d8d53b6

Documentation/devicetree/bindings/arm/apm/scu.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
APM X-GENE SoC series SCU Registers



This system clock unit contain various register that control block resets,

clock enable/disables, clock divisors and other deepsleep registers.



Properties:

 - compatible : should contain two values. First value must be:

		   - "apm,xgene-scu"

		second value must be always "syscon".



 - reg : offset and length of the register set.



Example :

	scu: system-clk-controller@17000000 {

		compatible = "apm,xgene-scu","syscon";

		reg = <0x0 0x17000000 0x0 0x400>;

	};

Documentation/devicetree/bindings/arm/pmu.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ representation in the device tree should be done as under:- 
Required properties:



- compatible : should be one of

	"apm,potenza-pmu"

	"arm,armv8-pmuv3"

	"arm,cortex-a17-pmu"

	"arm,cortex-a15-pmu"

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -788,6 +788,11 @@ S: Maintained 
F:	drivers/net/appletalk/

F:	net/appletalk/



APPLIED MICRO (APM) X-GENE DEVICE TREE SUPPORT

M:	Duc Dang <dhdang@apm.com>

S:	Supported

F:	arch/arm64/boot/dts/apm/



APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER

M:	Iyappan Subramanian <isubramanian@apm.com>

M:	Keyur Chudgar <kchudgar@apm.com>

arch/arm64/boot/dts/apm/Makefile

+1 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb

dtb-$(CONFIG_ARCH_XGENE) += apm-merlin.dtb



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

arch/arm64/boot/dts/apm/apm-merlin.dts

0 → 100644
+72 −0
Original line number Diff line number Diff line 
/*

 * dts file for AppliedMicro (APM) Merlin Board

 *

 * Copyright (C) 2015, Applied Micro Circuits Corporation

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation; either version 2 of

 * the License, or (at your option) any later version.

 */



/dts-v1/;



/include/ "apm-shadowcat.dtsi"



/ {

	model = "APM X-Gene Merlin board";

	compatible = "apm,merlin", "apm,xgene-shadowcat";



	chosen { };



	memory {

		device_type = "memory";

		reg = < 0x1 0x00000000 0x0 0x80000000 >;

	};



	gpio-keys {

		compatible = "gpio-keys";

		button@1 {

			label = "POWER";

			linux,code = <116>;

			linux,input-type = <0x1>;

			interrupts = <0x0 0x28 0x1>;

		};

	};



	poweroff_mbox: poweroff_mbox@10548000 {

		compatible = "syscon";

		reg = <0x0 0x10548000 0x0 0x30>;

	};



	poweroff: poweroff@10548010 {

		compatible = "syscon-poweroff";

		regmap = <&poweroff_mbox>;

		offset = <0x10>;

		mask = <0x1>;

	};

};



&serial0 {

	status = "ok";

};



&sata1 {

	status = "ok";

};



&sata2 {

	status = "ok";

};



&sata3 {

	status = "ok";

};



&sgenet0 {

	status = "ok";

};



&xgenet1 {

	status = "ok";

};