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

Commit 3af1fda3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Pull "Add support for mt6592, mt8127 and mt8135 Socs from Mediatek"
from Matthias Brugger:

Here comes the pull request which introduces basic support for
Mediatek SoCs mt6592, mt8127 and mt8135.

The patches for the mt81xx got merged in the late tree for v3.18 but
were not be merged at the end. They got a small fix regarding the
compatible and model string in the dts files.

* tag 'v3.19-next-dts' of https://github.com/mbgg/linux-mediatek:
  dt-bindings: add documentation for Mediatek SoC
  ARM: mediatek: add dts for mt6592-evb
  ARM: mediatek: Add basic support for mt6592
  dt-bindings: add more chips in documentation for Mediatek SoC
  ARM: dts: Build dtb for mt8127 & mt8135
  ARM: mediatek: add dts for MT8135 evaluation board.
  ARM: mediatek: Add basic support for mt8135
  ARM: mediatek: add dts for 8127 Moose board
  ARM: mediatek: Add basic support for mt8127

Signed-off-by; Arnd Bergmann <arnd@arndb.de>
parents 9e64b2a4 256e7653

Documentation/devicetree/bindings/arm/mediatek.txt

+16 −3
Original line number Diff line number Diff line 
Mediatek MT6589 Platforms Device Tree Bindings

MediaTek mt65xx & mt81xx Platforms Device Tree Bindings



Boards with a SoC of the Mediatek MT6589 shall have the following property:

Boards with a MediaTek mt65xx/mt81xx SoC shall have the following property:



Required root node property:



compatible: must contain "mediatek,mt6589"

compatible: Must contain one of

   "mediatek,mt6589"

   "mediatek,mt6592"

   "mediatek,mt8127"

   "mediatek,mt8135"





Supported boards:
@@ -12,3 +16,12 @@ Supported boards: 
- bq Aquaris5 smart phone:

    Required root node properties:

      - compatible = "mundoreader,bq-aquaris5", "mediatek,mt6589";

- Evaluation board for MT6592:

    Required root node properties:

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

- MTK mt8127 tablet moose EVB:

    Required root node properties:

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

- MTK mt8135 tablet EVB:

    Required root node properties:

      - compatible = "mediatek,mt8135-evbp1", "mediatek,mt8135";

arch/arm/boot/dts/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -526,7 +526,10 @@ dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \ 
	dove-d2plug.dtb \

	dove-d3plug.dtb \

	dove-dove-db.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt6589-aquaris5.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt6589-aquaris5.dtb \

	mt6592-evb.dtb \

	mt8127-moose.dtb \

	mt8135-evbp1.dtb



targets += dtbs dtbs_install

targets += $(dtb-y)

arch/arm/boot/dts/mt6592-evb.dts

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

 * Copyright (c) 2014 MediaTek Inc.

 * Author: Howard Chen <ibanezchen@gmail.com>

 *

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

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/dts-v1/;

#include "mt6592.dtsi"



/ {

	model = "mt6592 evb";

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



	memory {

		reg = <0x80000000 0x40000000>;

	};

};

arch/arm/boot/dts/mt6592.dtsi

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

 * Copyright (c) 2014 MediaTek Inc.

 * Author: Howard Chen <ibanezchen@gmail.com>

 *

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

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



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

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

#include "skeleton.dtsi"



/ {

	compatible = "mediatek,mt6592";

	interrupt-parent = <&gic>;



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x0>;

		};

		cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x1>;

		};

		cpu@2 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x2>;

		};

		cpu@3 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x3>;

		};

		cpu@4 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x4>;

		};

		cpu@5 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x5>;

		};

		cpu@6 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x6>;

		};

		cpu@7 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x7>;

		};

	};



	system_clk: dummy13m {

		compatible = "fixed-clock";

		clock-frequency = <13000000>;

		#clock-cells = <0>;

	};



	rtc_clk: dummy32k {

		compatible = "fixed-clock";

		clock-frequency = <32000>;

		#clock-cells = <0>;

	};



	timer: timer@10008000 {

		compatible = "mediatek,mt6577-timer";

		reg = <0x10008000 0x80>;

		interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&system_clk>, <&rtc_clk>;

		clock-names = "system-clk", "rtc-clk";

	};



	gic: interrupt-controller@10211000 {

		compatible = "arm,cortex-a7-gic";

		interrupt-controller;

		#interrupt-cells = <3>;

		reg = <0x10211000 0x1000>,

		      <0x10212000 0x1000>;

	};



};

arch/arm/boot/dts/mt8127-moose.dts

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

 * Copyright (c) 2014 MediaTek Inc.

 * Author: Joe.C <yingjoe.chen@mediatek.com>

 *

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

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/dts-v1/;

#include "mt8127.dtsi"



/ {

	model = "MediaTek MT8127 Moose Board";

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



	memory {

		reg = <0 0x80000000 0 0x40000000>;

	};

};