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

Commit 1df1e5bf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.5-next-dts' of https://github.com/mbgg/linux-mediatek into next/dt 

Merge "ARM: mediatek: dts updates for v4.6" from Matthias Brugger:

Add support for mt7623 SoC.
Enable SMP support for mt7623.
Enable SMP support for mt2701
Add pinctrl for mt2701

* tag 'v4.5-next-dts' of https://github.com/mbgg/linux-mediatek:
  arm: dts: Add pinctrl/GPIO/EINT node for mt2701
  ARM: dts: mt2701: enable basic SMP bringup for mt2701
  ARM: dts: mt7623: enable SMP bringup
  ARM: dts: mediatek: add MT7623 basic support
  Document: DT: Add bindings for mediatek MT7623 SoC Platform
parents 2bc51d76 8ba671ef

Documentation/devicetree/bindings/arm/mediatek.txt

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ compatible: Must contain one of 
   "mediatek,mt6589"

   "mediatek,mt6592"

   "mediatek,mt6795"

   "mediatek,mt7623"

   "mediatek,mt8127"

   "mediatek,mt8135"

   "mediatek,mt8173"
@@ -33,6 +34,9 @@ Supported boards: 
- Evaluation board for MT6795(Helio X10):

    Required root node properties:

      - compatible = "mediatek,mt6795-evb", "mediatek,mt6795";

- Evaluation board for MT7623:

    Required root node properties:

      - compatible = "mediatek,mt7623-evb", "mediatek,mt7623";

- MTK mt8127 tablet moose EVB:

    Required root node properties:

      - compatible = "mediatek,mt8127-moose", "mediatek,mt8127";

Documentation/devicetree/bindings/serial/mtk-uart.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
  * "mediatek,mt6582-uart" for MT6582 compatible UARTS

  * "mediatek,mt6589-uart" for MT6589 compatible UARTS

  * "mediatek,mt6795-uart" for MT6795 compatible UARTS

  * "mediatek,mt7623-uart" for MT7623 compatible UARTS

  * "mediatek,mt8127-uart" for MT8127 compatible UARTS

  * "mediatek,mt8135-uart" for MT8135 compatible UARTS

  * "mediatek,mt8173-uart" for MT8173 compatible UARTS

Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
	* "mediatek,mt2701-timer" for MT2701 compatible timers

	* "mediatek,mt6580-timer" for MT6580 compatible timers

	* "mediatek,mt6589-timer" for MT6589 compatible timers

	* "mediatek,mt7623-timer" for MT7623 compatible timers

	* "mediatek,mt8127-timer" for MT8127 compatible timers

	* "mediatek,mt8135-timer" for MT8135 compatible timers

	* "mediatek,mt8173-timer" for MT8173 compatible timers

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -814,6 +814,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ 
	mt6580-evbp1.dtb \

	mt6589-aquaris5.dtb \

	mt6592-evb.dtb \

	mt7623-evb.dtb \

	mt8127-moose.dtb \

	mt8135-evbp1.dtb

dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb

arch/arm/boot/dts/mt2701.dtsi

+31 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <dt-bindings/interrupt-controller/irq.h>

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

#include "skeleton64.dtsi"

#include "mt2701-pinfunc.h"



/ {

	compatible = "mediatek,mt2701";
@@ -23,6 +24,7 @@ 
	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		enable-method = "mediatek,mt81xx-tz-smp";



		cpu@0 {

			device_type = "cpu";
@@ -46,6 +48,17 @@ 
		};

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		trustzone-bootinfo@80002000 {

			compatible = "mediatek,trustzone-bootinfo";

			reg = <0 0x80002000 0 0x1000>;

		};

	};



	system_clk: dummy13m {

		compatible = "fixed-clock";

		clock-frequency = <13000000>;
@@ -73,6 +86,24 @@ 
			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;

	};



	pio: pinctrl@10005000 {

		compatible = "mediatek,mt2701-pinctrl";

		reg = <0 0x1000b000 0 0x1000>;

		mediatek,pctl-regmap = <&syscfg_pctl_a>;

		pins-are-numbered;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

		interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;

	};



	syscfg_pctl_a: syscfg@10005000 {

		compatible = "mediatek,mt2701-pctl-a-syscfg", "syscon";

		reg = <0 0x10005000 0 0x1000>;

	};



	watchdog: watchdog@10007000 {

		compatible = "mediatek,mt2701-wdt",

			     "mediatek,mt6589-wdt";