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

Commit 940bf1d6 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

- mt7623: add mt7623n and mt7623a plattform
- add mt7623 based reference boards
- mt7623: add usb3, ethernet, cpufreq,
- Add banana-pi board
- add mt6323 pmic
- mt2701: add larb-id property to smi larb

* tag 'v4.13-next-dts32' of https://github.com/mbgg/linux-mediatek

:
  arm: dts: mt7623: cleanup binding file
  arm: dts: mt7623: Add SD-card and EMMC to bananapi-r2
  arm: dts: mediatek: add larbid property for larb
  arm: dts: mt7623: fix mmc interrupt assignment
  arm: dts: mt2701: Add usb3 device nodes
  arm: dts: mt2701: Add ethernet device node
  arm: dts: mt7623: add clock-frequency to CPU nodes
  arm: dts: mt7623: add support for Bananapi R2 (BPI-R2) board
  arm: dts: mt7623: enable the nand device on the mt7623n nand rfb
  arm: dts: mt7623: enable the usb device on the mt7623n rfb
  arm: dts: mt7623: cleanup the mt7623n rfb uart nodes
  arm: dts: mt7623: rename mt7623-evb.dts to arch/arm/boot/dts/mt7623n-rfb.dtsi
  arm: dts: mt7623: add mt6323.dtsi file
  dt-bindings: arm: mediatek: add bindings for mediatek MT7623a SoC Platform
  dt-bindings: arm: mediatek: update for MT7623n SoC and relevant boards
  arm: dts: mt7623: fixup binding violation missing reset in ethernet node
  dt-bindings: net: mediatek: update documentation for reset signals

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c32e176a dfff569a

Documentation/devicetree/bindings/arm/mediatek.txt

+8 −6
Original line number Diff line number Diff line 
MediaTek mt65xx, mt67xx & mt81xx Platforms Device Tree Bindings

MediaTek SoC based Platforms Device Tree Bindings



Boards with a MediaTek mt65xx/mt67xx/mt81xx SoC shall have the

following property:

Boards with a MediaTek SoC shall have the following property:



Required root node property:
@@ -14,7 +13,8 @@ compatible: Must contain one of 
   "mediatek,mt6795"

   "mediatek,mt6797"

   "mediatek,mt7622"

   "mediatek,mt7623"

   "mediatek,mt7623" which is referred to MT7623N SoC

   "mediatek,mt7623a"

   "mediatek,mt8127"

   "mediatek,mt8135"

   "mediatek,mt8173"
@@ -46,9 +46,11 @@ Supported boards: 
- Reference board variant 1 for MT7622:

    Required root node properties:

      - compatible = "mediatek,mt7622-rfb1", "mediatek,mt7622";

- Evaluation board for MT7623:

- Reference  board for MT7623n with NAND:

    Required root node properties:

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

      - compatible = "mediatek,mt7623n-rfb-nand", "mediatek,mt7623";

- Bananapi BPI-R2 board:

      - compatible = "bananapi,bpi-r2", "mediatek,mt7623";

- MTK mt8127 tablet moose EVB:

    Required root node properties:

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

Documentation/devicetree/bindings/net/mediatek-net.txt

+4 −2
Original line number Diff line number Diff line
@@ -15,8 +15,10 @@ Required properties: 
- clock-names: the names of the clock listed in the clocks property. These are

	"ethif", "esw", "gp2", "gp1"

- power-domains: phandle to the power domain that the ethernet is part of

- resets: Should contain a phandle to the ethsys reset signal

- reset-names: Should contain the reset signal name "eth"

- resets: Should contain phandles to the ethsys reset signals

- reset-names: Should contain the names of reset signal listed in the resets

		property

		These are "fe", "gmac" and "ppe"

- mediatek,ethsys: phandle to the syscon node that handles the port setup

- mediatek,pctl: phandle to the syscon node that handles the ports slew rate

	and driver current

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -1058,7 +1058,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ 
	mt6580-evbp1.dtb \

	mt6589-aquaris5.dtb \

	mt6592-evb.dtb \

	mt7623-evb.dtb \

	mt7623n-rfb-nand.dtb \

	mt7623n-bananapi-bpi-r2.dtb \

	mt8127-moose.dtb \

	mt8135-evbp1.dtb

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

arch/arm/boot/dts/mt2701.dtsi

+106 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 */



#include <dt-bindings/clock/mt2701-clk.h>

#include <dt-bindings/phy/phy.h>

#include <dt-bindings/power/mt2701-power.h>

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

#include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -533,6 +534,7 @@ 
		compatible = "mediatek,mt2701-smi-larb";

		reg = <0 0x14010000 0 0x1000>;

		mediatek,smi = <&smi_common>;

		mediatek,larb-id = <0>;

		clocks = <&mmsys CLK_MM_SMI_LARB0>,

			 <&mmsys CLK_MM_SMI_LARB0>;

		clock-names = "apb", "smi";
@@ -549,6 +551,7 @@ 
		compatible = "mediatek,mt2701-smi-larb";

		reg = <0 0x15001000 0 0x1000>;

		mediatek,smi = <&smi_common>;

		mediatek,larb-id = <2>;

		clocks = <&imgsys CLK_IMG_SMI_COMM>,

			 <&imgsys CLK_IMG_SMI_COMM>;

		clock-names = "apb", "smi";
@@ -579,6 +582,7 @@ 
		compatible = "mediatek,mt2701-smi-larb";

		reg = <0 0x16010000 0 0x1000>;

		mediatek,smi = <&smi_common>;

		mediatek,larb-id = <1>;

		clocks = <&vdecsys CLK_VDEC_CKGEN>,

			 <&vdecsys CLK_VDEC_LARB>;

		clock-names = "apb", "smi";
@@ -591,12 +595,114 @@ 
		#clock-cells = <1>;

	};



	usb0: usb@1a1c0000 {

		compatible = "mediatek,mt8173-xhci";

		reg = <0 0x1a1c0000 0 0x1000>,

		      <0 0x1a1c4700 0 0x0100>;

		reg-names = "mac", "ippc";

		interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_LOW>;

		clocks = <&hifsys CLK_HIFSYS_USB0PHY>,

			 <&topckgen CLK_TOP_ETHIF_SEL>;

		clock-names = "sys_ck", "ref_ck";

		power-domains = <&scpsys MT2701_POWER_DOMAIN_HIF>;

		phys = <&u2port0 PHY_TYPE_USB2>, <&u3port0 PHY_TYPE_USB3>;

		status = "disabled";

	};



	u3phy0: usb-phy@1a1c4000 {

		compatible = "mediatek,mt2701-u3phy";

		reg = <0 0x1a1c4000 0 0x0700>;

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;

		status = "disabled";



		u2port0: usb-phy@1a1c4800 {

			reg = <0 0x1a1c4800 0 0x0100>;

			clocks = <&topckgen CLK_TOP_USB_PHY48M>;

			clock-names = "ref";

			#phy-cells = <1>;

			status = "okay";

		};



		u3port0: usb-phy@1a1c4900 {

			reg = <0 0x1a1c4900 0 0x0700>;

			clocks = <&clk26m>;

			clock-names = "ref";

			#phy-cells = <1>;

			status = "okay";

		};

	};



	usb1: usb@1a240000 {

		compatible = "mediatek,mt8173-xhci";

		reg = <0 0x1a240000 0 0x1000>,

		      <0 0x1a244700 0 0x0100>;

		reg-names = "mac", "ippc";

		interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_LOW>;

		clocks = <&hifsys CLK_HIFSYS_USB1PHY>,

			 <&topckgen CLK_TOP_ETHIF_SEL>;

		clock-names = "sys_ck", "ref_ck";

		power-domains = <&scpsys MT2701_POWER_DOMAIN_HIF>;

		phys = <&u2port1 PHY_TYPE_USB2>, <&u3port1 PHY_TYPE_USB3>;

		status = "disabled";

	};



	u3phy1: usb-phy@1a244000 {

		compatible = "mediatek,mt2701-u3phy";

		reg = <0 0x1a244000 0 0x0700>;

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;

		status = "disabled";



		u2port1: usb-phy@1a244800 {

			reg = <0 0x1a244800 0 0x0100>;

			clocks = <&topckgen CLK_TOP_USB_PHY48M>;

			clock-names = "ref";

			#phy-cells = <1>;

			status = "okay";

		};



		u3port1: usb-phy@1a244900 {

			reg = <0 0x1a244900 0 0x0700>;

			clocks = <&clk26m>;

			clock-names = "ref";

			#phy-cells = <1>;

			status = "okay";

		};

	};



	ethsys: syscon@1b000000 {

		compatible = "mediatek,mt2701-ethsys", "syscon";

		reg = <0 0x1b000000 0 0x1000>;

		#clock-cells = <1>;

	};



	eth: ethernet@1b100000 {

		compatible = "mediatek,mt2701-eth", "syscon";

		reg = <0 0x1b100000 0 0x20000>;

		interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_LOW>,

			     <GIC_SPI 199 IRQ_TYPE_LEVEL_LOW>,

			     <GIC_SPI 198 IRQ_TYPE_LEVEL_LOW>;

		clocks = <&topckgen CLK_TOP_ETHIF_SEL>,

			 <&ethsys CLK_ETHSYS_ESW>,

			 <&ethsys CLK_ETHSYS_GP1>,

			 <&ethsys CLK_ETHSYS_GP2>,

			 <&apmixedsys CLK_APMIXED_TRGPLL>;

		clock-names = "ethif", "esw", "gp1", "gp2", "trgpll";

		resets = <&ethsys MT2701_ETHSYS_FE_RST>,

			 <&ethsys MT2701_ETHSYS_GMAC_RST>,

			 <&ethsys MT2701_ETHSYS_PPE_RST>;

		reset-names = "fe", "gmac", "ppe";

		power-domains = <&scpsys MT2701_POWER_DOMAIN_ETH>;

		mediatek,ethsys = <&ethsys>;

		mediatek,pctl = <&syscfg_pctl_a>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};



	bdpsys: syscon@1c000000 {

		compatible = "mediatek,mt2701-bdpsys", "syscon";

		reg = <0 0x1c000000 0 0x1000>;

arch/arm/boot/dts/mt6323.dtsi

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

 * Copyright (c) 2017 MediaTek Inc.

 * Author: John Crispin <john@phrozen.org>

 *	   Sean Wang <sean.wang@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.

 */



&pwrap {

	pmic: mt6323 {

		compatible = "mediatek,mt6323";

		interrupt-parent = <&pio>;

		interrupts = <150 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-controller;

		#interrupt-cells = <2>;



		mt6323regulator: mt6323regulator{

			compatible = "mediatek,mt6323-regulator";



			mt6323_vproc_reg: buck_vproc{

				regulator-name = "vproc";

				regulator-min-microvolt = < 700000>;

				regulator-max-microvolt = <1350000>;

				regulator-ramp-delay = <12500>;

				regulator-always-on;

				regulator-boot-on;

			};



			mt6323_vsys_reg: buck_vsys{

				regulator-name = "vsys";

				regulator-min-microvolt = <1400000>;

				regulator-max-microvolt = <2987500>;

				regulator-ramp-delay = <25000>;

				regulator-always-on;

				regulator-boot-on;

			};



			mt6323_vpa_reg: buck_vpa{

				regulator-name = "vpa";

				regulator-min-microvolt = < 500000>;

				regulator-max-microvolt = <3650000>;

			};



			mt6323_vtcxo_reg: ldo_vtcxo{

				regulator-name = "vtcxo";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

				regulator-enable-ramp-delay = <90>;

				regulator-always-on;

				regulator-boot-on;

			};



			mt6323_vcn28_reg: ldo_vcn28{

				regulator-name = "vcn28";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

				regulator-enable-ramp-delay = <185>;

			};



			mt6323_vcn33_bt_reg: ldo_vcn33_bt{

				regulator-name = "vcn33_bt";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3600000>;

				regulator-enable-ramp-delay = <185>;

			};



			mt6323_vcn33_wifi_reg: ldo_vcn33_wifi{

				regulator-name = "vcn33_wifi";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3600000>;

				regulator-enable-ramp-delay = <185>;

			};



			mt6323_va_reg: ldo_va{

				regulator-name = "va";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

				regulator-enable-ramp-delay = <216>;

				regulator-always-on;

				regulator-boot-on;

			};



			mt6323_vcama_reg: ldo_vcama{

				regulator-name = "vcama";

				regulator-min-microvolt = <1500000>;

				regulator-max-microvolt = <2800000>;

				regulator-enable-ramp-delay = <216>;

			};



			mt6323_vio28_reg: ldo_vio28{

				regulator-name = "vio28";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

				regulator-enable-ramp-delay = <216>;

				regulator-always-on;

				regulator-boot-on;

			};



			mt6323_vusb_reg: ldo_vusb{

				regulator-name = "vusb";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-enable-ramp-delay = <216>;

				regulator-boot-on;

			};



			mt6323_vmc_reg: ldo_vmc{

				regulator-name = "vmc";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-enable-ramp-delay = <36>;

				regulator-boot-on;

			};



			mt6323_vmch_reg: ldo_vmch{

				regulator-name = "vmch";

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <3300000>;

				regulator-enable-ramp-delay = <36>;

				regulator-boot-on;

			};



			mt6323_vemc3v3_reg: ldo_vemc3v3{

				regulator-name = "vemc3v3";

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <3300000>;

				regulator-enable-ramp-delay = <36>;

				regulator-boot-on;

			};



			mt6323_vgp1_reg: ldo_vgp1{

				regulator-name = "vgp1";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <3300000>;

				regulator-enable-ramp-delay = <216>;

			};



			mt6323_vgp2_reg: ldo_vgp2{

				regulator-name = "vgp2";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <3000000>;

				regulator-enable-ramp-delay = <216>;

			};



			mt6323_vgp3_reg: ldo_vgp3{

				regulator-name = "vgp3";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <1800000>;

				regulator-enable-ramp-delay = <216>;

			};



			mt6323_vcn18_reg: ldo_vcn18{

				regulator-name = "vcn18";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-enable-ramp-delay = <216>;

			};



			mt6323_vsim1_reg: ldo_vsim1{

				regulator-name = "vsim1";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3000000>;

				regulator-enable-ramp-delay = <216>;

			};



			mt6323_vsim2_reg: ldo_vsim2{

				regulator-name = "vsim2";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3000000>;

				regulator-enable-ramp-delay = <216>;

			};



			mt6323_vrtc_reg: ldo_vrtc{

				regulator-name = "vrtc";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

				regulator-always-on;

				regulator-boot-on;

			};



			mt6323_vcamaf_reg: ldo_vcamaf{

				regulator-name = "vcamaf";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <3300000>;

				regulator-enable-ramp-delay = <216>;

			};



			mt6323_vibr_reg: ldo_vibr{

				regulator-name = "vibr";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <3300000>;

				regulator-enable-ramp-delay = <36>;

			};



			mt6323_vrf18_reg: ldo_vrf18{

				regulator-name = "vrf18";

				regulator-min-microvolt = <1825000>;

				regulator-max-microvolt = <1825000>;

				regulator-enable-ramp-delay = <187>;

			};



			mt6323_vm_reg: ldo_vm{

				regulator-name = "vm";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <1800000>;

				regulator-enable-ramp-delay = <216>;

				regulator-always-on;

				regulator-boot-on;

			};



			mt6323_vio18_reg: ldo_vio18{

				regulator-name = "vio18";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-enable-ramp-delay = <216>;

				regulator-always-on;

				regulator-boot-on;

			};



			mt6323_vcamd_reg: ldo_vcamd{

				regulator-name = "vcamd";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <1800000>;

				regulator-enable-ramp-delay = <216>;

			};



			mt6323_vcamio_reg: ldo_vcamio{

				regulator-name = "vcamio";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-enable-ramp-delay = <216>;

			};

		};

	};

};