64b53247c4
Refresh patches. Remove upstreamed patch: generic/pending/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch Update patches that no longer applies: generic/hack/901-debloat_sock_diag.patch Compile-tested on: x86/64. Runtime-tested on: x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
156 lines
4.1 KiB
Diff
156 lines
4.1 KiB
Diff
From 78e92290c8c9511d0d540dfd0450e64169f08c20 Mon Sep 17 00:00:00 2001
|
|
From: Sean Wang <sean.wang@mediatek.com>
|
|
Date: Mon, 5 Feb 2018 22:44:44 +0800
|
|
Subject: [PATCH 213/224] arm64: dts: mt7622: add PMIC MT6380 related nodes
|
|
|
|
Enable pwrap and MT6380 on mt7622-rfb1 board. Also add all mt6380
|
|
regulator nodes in an alone file to allow similar boards using MT6380
|
|
able to resue the configuration.
|
|
|
|
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
|
|
Cc: Mark Brown <broonie@kernel.org>
|
|
Cc: Matthias Brugger <matthias.bgg@gmail.com>
|
|
Cc: Philippe Ombredanne <pombredanne@nexb.com>
|
|
Acked-by: Philippe Ombredanne <pombredanne@nexb.com>
|
|
---
|
|
arch/arm64/boot/dts/mediatek/mt6380.dtsi | 86 ++++++++++++++++++++++++++++
|
|
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 8 +++
|
|
arch/arm64/boot/dts/mediatek/mt7622.dtsi | 12 ++++
|
|
3 files changed, 106 insertions(+)
|
|
create mode 100644 arch/arm64/boot/dts/mediatek/mt6380.dtsi
|
|
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/mediatek/mt6380.dtsi
|
|
@@ -0,0 +1,86 @@
|
|
+// SPDX-License-Identifier: GPL-2.0
|
|
+/*
|
|
+ * dts file for MediaTek MT6380 regulator
|
|
+ *
|
|
+ * Copyright (c) 2018 MediaTek Inc.
|
|
+ * Author: Chenglin Xu <chenglin.xu@mediatek.com>
|
|
+ * Sean Wang <sean.wang@mediatek.com>
|
|
+ */
|
|
+
|
|
+&pwrap {
|
|
+ regulators {
|
|
+ compatible = "mediatek,mt6380-regulator";
|
|
+
|
|
+ mt6380_vcpu_reg: buck-vcore1 {
|
|
+ regulator-name = "vcore1";
|
|
+ regulator-min-microvolt = < 600000>;
|
|
+ regulator-max-microvolt = <1393750>;
|
|
+ regulator-ramp-delay = <6250>;
|
|
+ regulator-always-on;
|
|
+ regulator-boot-on;
|
|
+ };
|
|
+
|
|
+ mt6380_vcore_reg: buck-vcore {
|
|
+ regulator-name = "vcore";
|
|
+ regulator-min-microvolt = <600000>;
|
|
+ regulator-max-microvolt = <1393750>;
|
|
+ regulator-ramp-delay = <6250>;
|
|
+ regulator-always-on;
|
|
+ regulator-boot-on;
|
|
+ };
|
|
+
|
|
+ mt6380_vrf_reg: buck-vrf {
|
|
+ regulator-name = "vrf";
|
|
+ regulator-min-microvolt = <1200000>;
|
|
+ regulator-max-microvolt = <1575000>;
|
|
+ regulator-ramp-delay = <0>;
|
|
+ regulator-always-on;
|
|
+ regulator-boot-on;
|
|
+ };
|
|
+
|
|
+ mt6380_vm_reg: ldo-vm {
|
|
+ regulator-name = "vm";
|
|
+ regulator-min-microvolt = <1050000>;
|
|
+ regulator-max-microvolt = <1400000>;
|
|
+ regulator-ramp-delay = <0>;
|
|
+ regulator-always-on;
|
|
+ regulator-boot-on;
|
|
+ };
|
|
+
|
|
+ mt6380_va_reg: ldo-va {
|
|
+ regulator-name = "va";
|
|
+ regulator-min-microvolt = <2200000>;
|
|
+ regulator-max-microvolt = <3300000>;
|
|
+ regulator-ramp-delay = <0>;
|
|
+ regulator-always-on;
|
|
+ regulator-boot-on;
|
|
+ };
|
|
+
|
|
+ mt6380_vphy_reg: ldo-vphy {
|
|
+ regulator-name = "vphy";
|
|
+ regulator-min-microvolt = <1800000>;
|
|
+ regulator-max-microvolt = <1800000>;
|
|
+ regulator-ramp-delay = <0>;
|
|
+ regulator-always-on;
|
|
+ regulator-boot-on;
|
|
+ };
|
|
+
|
|
+ mt6380_vddr_reg: ldo-vddr {
|
|
+ regulator-name = "vddr";
|
|
+ regulator-min-microvolt = <1240000>;
|
|
+ regulator-max-microvolt = <1840000>;
|
|
+ regulator-ramp-delay = <0>;
|
|
+ regulator-always-on;
|
|
+ regulator-boot-on;
|
|
+ };
|
|
+
|
|
+ mt6380_vt_reg: ldo-vt {
|
|
+ regulator-name = "vt";
|
|
+ regulator-min-microvolt = <2200000>;
|
|
+ regulator-max-microvolt = <3300000>;
|
|
+ regulator-ramp-delay = <0>;
|
|
+ regulator-always-on;
|
|
+ regulator-boot-on;
|
|
+ };
|
|
+ };
|
|
+};
|
|
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
|
@@ -10,6 +10,7 @@
|
|
#include <dt-bindings/input/input.h>
|
|
|
|
#include "mt7622.dtsi"
|
|
+#include "mt6380.dtsi"
|
|
|
|
/ {
|
|
model = "MediaTek MT7622 RFB1 board";
|
|
@@ -222,6 +223,13 @@
|
|
};
|
|
};
|
|
|
|
+&pwrap {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pmic_bus_pins>;
|
|
+
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
status = "okay";
|
|
};
|
|
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
|
@@ -102,6 +102,18 @@
|
|
#reset-cells = <1>;
|
|
};
|
|
|
|
+ pwrap: pwrap@10001000 {
|
|
+ compatible = "mediatek,mt7622-pwrap";
|
|
+ reg = <0 0x10001000 0 0x250>;
|
|
+ reg-names = "pwrap";
|
|
+ clocks = <&infracfg CLK_INFRA_PMIC_PD>,<&pwrap_clk>;
|
|
+ clock-names = "spi","wrap";
|
|
+ resets = <&infracfg MT7622_INFRA_PMIC_WRAP_RST>;
|
|
+ reset-names = "pwrap";
|
|
+ interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
pericfg: pericfg@10002000 {
|
|
compatible = "mediatek,mt7622-pericfg",
|
|
"syscon";
|