Commit 262c083d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'berlin64-dt-for-v4.20' of... 

Merge tag 'berlin64-dt-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin into next/dt

Berlin64 DT changes for v4.20

* tag 'berlin64-dt-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin

:
  arm64: dts: synaptics: add dtsi file for Synaptics AS370 SoC
  dt-bindings: arm: syna: add support for the AS370 SoC
  dt-bindings: arm: move berlin binding documentation to syna.txt

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f3b1859b 087682f5

Documentation/devicetree/bindings/arm/marvell/marvell,berlin.txt→Documentation/devicetree/bindings/arm/syna.txt

+10 −1
Original line number Diff line number Diff line 
Marvell Berlin SoC Family Device Tree Bindings

Synaptics SoC Device Tree Bindings



According to https://www.synaptics.com/company/news/conexant-marvell

Synaptics has acquired the Multimedia Solutions Business of Marvell, so

berlin SoCs are now Synaptics' SoCs now.



---------------------------------------------------------------



Work in progress statement:
@@ -13,6 +18,10 @@ stable binding/ABI. 


---------------------------------------------------------------



Boards with the Synaptics AS370 SoC shall have the following properties:

  Required root node property:

    compatible: "syna,as370"



Boards with a SoC of the Marvell Berlin family, e.g. Armada 1500

shall have the following properties:

arch/arm64/boot/dts/synaptics/as370.dtsi

0 → 100644
+173 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR MIT)

/*

 * Copyright (C) 2018 Synaptics Incorporated

 *

 * Author: Jisheng Zhang <jszhang@kernel.org>

 */



#include <dt-bindings/interrupt-controller/arm-gic.h>



/ {

	compatible = "syna,as370";

	interrupt-parent = <&gic>;

	#address-cells = <2>;

	#size-cells = <2>;



	psci {

		compatible = "arm,psci-1.0";

		method = "smc";

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu0: cpu@0 {

			compatible = "arm,cortex-a53", "arm,armv8";

			device_type = "cpu";

			reg = <0x0>;

			enable-method = "psci";

			next-level-cache = <&l2>;

			cpu-idle-states = <&CPU_SLEEP_0>;

		};



		cpu1: cpu@1 {

			compatible = "arm,cortex-a53", "arm,armv8";

			device_type = "cpu";

			reg = <0x1>;

			enable-method = "psci";

			next-level-cache = <&l2>;

			cpu-idle-states = <&CPU_SLEEP_0>;

		};



		cpu2: cpu@2 {

			compatible = "arm,cortex-a53", "arm,armv8";

			device_type = "cpu";

			reg = <0x2>;

			enable-method = "psci";

			next-level-cache = <&l2>;

			cpu-idle-states = <&CPU_SLEEP_0>;

		};



		cpu3: cpu@3 {

			compatible = "arm,cortex-a53", "arm,armv8";

			device_type = "cpu";

			reg = <0x3>;

			enable-method = "psci";

			next-level-cache = <&l2>;

			cpu-idle-states = <&CPU_SLEEP_0>;

		};



		l2: cache {

			compatible = "cache";

		};



		idle-states {

			entry-method = "psci";

			CPU_SLEEP_0: cpu-sleep-0 {

				compatible = "arm,idle-state";

				local-timer-stop;

				arm,psci-suspend-param = <0x0010000>;

				entry-latency-us = <75>;

				exit-latency-us = <155>;

				min-residency-us = <1000>;

			};

		};

	};



	osc: osc {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <25000000>;

	};



	pmu {

		compatible = "arm,cortex-a53-pmu";

		interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-affinity = <&cpu0>,

				     <&cpu1>,

				     <&cpu2>,

				     <&cpu3>;

	};



	timer {

		compatible = "arm,armv8-timer";

		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;

	};



	soc@f7000000 {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0 0xf7000000 0x1000000>;



		gic: interrupt-controller@901000 {

			compatible = "arm,gic-400";

			#interrupt-cells = <3>;

			interrupt-controller;

			reg = <0x901000 0x1000>,

			      <0x902000 0x2000>,

			      <0x904000 0x2000>,

			      <0x906000 0x2000>;

			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;

		};



		apb@e80000 {

			compatible = "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0xe80000 0x10000>;



			uart0: serial@c00 {

				compatible = "snps,dw-apb-uart";

				reg = <0xc00 0x100>;

				interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&osc>;

				reg-shift = <2>;

				status = "disabled";

			};



			gpio0: gpio@1800 {

				compatible = "snps,dw-apb-gpio";

				reg = <0x1800 0x400>;

				#address-cells = <1>;

				#size-cells = <0>;



				porta: gpio-port@0 {

					compatible = "snps,dw-apb-gpio-port";

					gpio-controller;

					#gpio-cells = <2>;

					snps,nr-gpios = <32>;

					reg = <0>;

					interrupt-controller;

					#interrupt-cells = <2>;

					interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;

				};

			};



			gpio1: gpio@2000 {

				compatible = "snps,dw-apb-gpio";

				reg = <0x2000 0x400>;

				#address-cells = <1>;

				#size-cells = <0>;



				portb: gpio-port@1 {

					compatible = "snps,dw-apb-gpio-port";

					gpio-controller;

					#gpio-cells = <2>;

					snps,nr-gpios = <32>;

					reg = <0>;

					interrupt-controller;

					#interrupt-cells = <2>;

					interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;

				};

			};

		};

	};

};