Skip to contentSkip to conversation

rk3399: Sync linux v5.7-rc1 dts(i)

PATCH Superseded Jagan Teki 1 participant 7 messages Apr 25, 2020 1 message not in the archive

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

cover rk3399: Sync linux v5.7-rc1 dts(i)

This would help to add new boards along with new drivers like PCIe on rk3399 platform.

So, add v5.7-rc1 linux-next dts(i) files on rk3399 platform.

Any inputs?
Jagan.

Jagan Teki (5):
arm64: dts: rk3399-puma: Move u-boot properties into -u-boot.dtsi
arm64: dts: rk3399-evb: Move u-boot properties into -u-boot.dtsi
clk: rk3399: Set empty for HCLK_SD assigned-clocks
arm64: dts: rk3399: Sync v5.7-rc1 from Linux
arm: dts: rk3399: Sync roc-pc-mezzanine from v5.7-rc1

Suniel Mahesh (1):
rk3399: Add ROC-RK3399-PC Mezzanine board

 arch/arm/dts/Makefile                         |   1 +
 arch/arm/dts/cros-ec-keyboard.dtsi            |  10 +-
 arch/arm/dts/cros-ec-sbs.dtsi                 |  39 +-
 arch/arm/dts/rk3399-evb-u-boot.dtsi           |   8 +
 arch/arm/dts/rk3399-evb.dts                   | 522 ++++++++----
 arch/arm/dts/rk3399-ficus.dts                 |   6 +
 arch/arm/dts/rk3399-firefly.dts               | 251 ++++--
 arch/arm/dts/rk3399-gru-bob.dts               |  16 +-
 arch/arm/dts/rk3399-gru-chromebook.dtsi       |  40 +-
 arch/arm/dts/rk3399-gru-kevin.dts             |  34 +-
 arch/arm/dts/rk3399-gru.dtsi                  |  90 +-
 arch/arm/dts/rk3399-khadas-edge.dtsi          |   3 +
 arch/arm/dts/rk3399-leez-p710.dts             |  36 +-
 arch/arm/dts/rk3399-nanopc-t4.dts             |  47 +-
 arch/arm/dts/rk3399-nanopi4.dtsi              |  66 +-
 arch/arm/dts/rk3399-orangepi.dts              |  79 +-
 arch/arm/dts/rk3399-puma-u-boot.dtsi          |  31 +-
 arch/arm/dts/rk3399-puma.dtsi                 | 578 +++++--------
 .../dts/rk3399-roc-pc-mezzanine-u-boot.dtsi   |  26 +
 arch/arm/dts/rk3399-roc-pc-mezzanine.dts      |  93 ++
 arch/arm/dts/rk3399-roc-pc.dts                |   3 +-
 arch/arm/dts/rk3399-roc-pc.dtsi               |  35 +-
 arch/arm/dts/rk3399-rock-pi-4.dts             | 129 +++
 arch/arm/dts/rk3399-rock960.dts               |  49 ++
 arch/arm/dts/rk3399-rock960.dtsi              |  13 +-
 arch/arm/dts/rk3399-rockpro64.dts             | 751 +----------------
 arch/arm/dts/rk3399-rockpro64.dtsi            | 797 ++++++++++++++++++
 arch/arm/dts/rk3399-u-boot.dtsi               |   1 +
 arch/arm/dts/rk3399.dtsi                      | 583 ++++++++-----
 board/firefly/roc-pc-rk3399/MAINTAINERS       |   2 +
 configs/roc-pc-mezzanine-rk3399_defconfig     |  67 ++
 drivers/clk/rockchip/clk_rk3399.c             |   1 +
 32 files changed, 2747 insertions(+), 1660 deletions(-)
 create mode 100644 arch/arm/dts/rk3399-roc-pc-mezzanine-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3399-roc-pc-mezzanine.dts
 create mode 100644 arch/arm/dts/rk3399-rockpro64.dtsi
 create mode 100644 configs/roc-pc-mezzanine-rk3399_defconfig
Signature · 1 line
2.17.1

A message that is not in the archive (sent off-list or not yet received): 20200425105319.12009-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org

author
#2 lore raw

PATCH 1/6 arm64: dts: rk3399-puma: Move u-boot properties into -u-boot.dtsi

Move U-Boot specific properties into rk3399-puma u-boot specific dtsi file.

This would help to sync the devicetrees from Linux whenever required instead of adding specific nodes.

---
 arch/arm/dts/rk3399-puma-u-boot.dtsi | 16 ++++++++++++++++
 arch/arm/dts/rk3399-puma.dtsi        | 11 -----------
 2 files changed, 16 insertions(+), 11 deletions(-)
arch/arm/dts/rk3399-puma-u-boot.dtsi +16 -0
index 52f62b5d39..e664779227 100644
@@ -22,3 +22,19 @@
        };
 
 };
+
+&bios_enable {
+	u-boot,dm-pre-reloc;
+};
+
+&gpio1 {
+	u-boot,dm-pre-reloc;
+};
+
+&gpio3 {
+	u-boot,dm-pre-reloc;
+};
+
+&spiflash {
+	u-boot,dm-pre-reloc;
+};
arch/arm/dts/rk3399-puma.dtsi +0 -11
index 558b6337df..246a892cb7 100644
@@ -91,7 +91,6 @@
 	 */
 	bios_enable: bios_enable {
 		compatible = "regulator-fixed";
-		u-boot,dm-pre-reloc;
 		regulator-name = "bios_enable";
 		enable-active-high;
 		gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
@@ -520,14 +519,6 @@
 	status = "okay";
 };
 
-&gpio1 {
-	u-boot,dm-pre-reloc;
-};
-
-&gpio3 {
-	u-boot,dm-pre-reloc;
-};
-
 &pinctrl {
 	/* Pins that are not explicitely used by any devices */
 	pinctrl-names = "default";
@@ -633,8 +624,6 @@
 	#size-cells = <0>;
 
 	spiflash: w25q32dw@0 {
-		u-boot,dm-pre-reloc;
-
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <49500000>;
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH 2/6 arm64: dts: rk3399-evb: Move u-boot properties into -u-boot.dtsi

In reply to a message not in the archive

Move U-Boot specific properties into rk3399-evb u-boot specific dtsi file.

This would help to sync the devicetrees from Linux whenever required instead of adding specific nodes.

---
 arch/arm/dts/rk3399-evb-u-boot.dtsi | 8 ++++++++
 arch/arm/dts/rk3399-evb.dts         | 2 --
 2 files changed, 8 insertions(+), 2 deletions(-)
arch/arm/dts/rk3399-evb-u-boot.dtsi +8 -0
index ccb33d34d1..a4d68f3b98 100644
@@ -11,3 +11,11 @@
 		u-boot,spl-boot-order = &sdhci, &sdmmc;
 	};
 };
+
+&i2c0 {
+	u-boot,dm-pre-reloc;
+};
+
+&rk808 {
+	u-boot,dm-pre-reloc;
+};
arch/arm/dts/rk3399-evb.dts +0 -2
index 4129e902a8..c72719c0d3 100644
@@ -199,7 +199,6 @@
 	clock-frequency = <400000>;
 	i2c-scl-falling-time-ns = <50>;
 	i2c-scl-rising-time-ns = <100>;
-	u-boot,dm-pre-reloc;
 
 	rk808: pmic@1b {
 		compatible = "rockchip,rk808";
@@ -211,7 +210,6 @@
 		reg = <0x1b>;
 		rockchip,system-power-controller;
 		#clock-cells = <1>;
-		u-boot,dm-pre-reloc;
 		status = "okay";
 
 		vcc12-supply = <&vcc3v3_sys>;
Signature · 1 line
2.17.1
author
#4 lore raw

PATCH 3/6 clk: rk3399: Set empty for HCLK_SD assigned-clocks

In reply to a message not in the archive

Due to v5.7-rc1 sync the SD controller nodes in rk3399.dtsi have HCLK_SD assigned-clocks which are usually required for Linux and don't require to handle them in U-Boot.

assigned-clocks = <&cru HCLK_SD>;

So, mark them as empty in clock otherwise device probe on those SD controllers would fail.

---
 drivers/clk/rockchip/clk_rk3399.c | 1 +
 1 file changed, 1 insertion(+)
drivers/clk/rockchip/clk_rk3399.c +1 -0
index 1f62376595..d822acace1 100644
@@ -996,6 +996,7 @@ static ulong rk3399_clk_set_rate(struct clk *clk, ulong rate)
 		break;
 	case ACLK_VOP1:
 	case HCLK_VOP1:
+	case HCLK_SD:
 		/**
 		 * assigned-clocks handling won't require for vopl, so
 		 * return 0 to satisfy clk_set_defaults during device probe.
Signature · 1 line
2.17.1
author
#5 lore raw

PATCH 4/6 arm64: dts: rk3399: Sync v5.7-rc1 from Linux

In reply to a message not in the archive

Sync rk3399 dts(i) files from v5.7-rc1 linux-next.

Reason:
To get updated PCIe nodes and properties on respective dts(i) files.

Summary:
- sync won't include new board dts(i)
- sync will add required files used on respective dts(i)
- rk3399-puma-u-boot.dtsi spiflash label changed to norflash
- move puma.dtsi bios_enable into rk3399-puma-u-boot.dtsi
- move legacy max-frequency of sdhci into rk3399-u-boot.dtsi
- update cross-ec-[keyboard|sbs].dtsi path as per U-Boot

---
 arch/arm/dts/cros-ec-keyboard.dtsi      |  10 +-
 arch/arm/dts/cros-ec-sbs.dtsi           |  39 +-
 arch/arm/dts/rk3399-evb.dts             | 520 +++++++++++-----
 arch/arm/dts/rk3399-ficus.dts           |   6 +
 arch/arm/dts/rk3399-firefly.dts         | 251 ++++++--
 arch/arm/dts/rk3399-gru-bob.dts         |  16 +-
 arch/arm/dts/rk3399-gru-chromebook.dtsi |  40 +-
 arch/arm/dts/rk3399-gru-kevin.dts       |  34 +-
 arch/arm/dts/rk3399-gru.dtsi            |  90 ++-
 arch/arm/dts/rk3399-khadas-edge.dtsi    |   3 +
 arch/arm/dts/rk3399-leez-p710.dts       |  36 +-
 arch/arm/dts/rk3399-nanopc-t4.dts       |  47 +-
 arch/arm/dts/rk3399-nanopi4.dtsi        |  66 +-
 arch/arm/dts/rk3399-orangepi.dts        |  79 ++-
 arch/arm/dts/rk3399-puma-u-boot.dtsi    |  25 +-
 arch/arm/dts/rk3399-puma.dtsi           | 567 +++++++----------
 arch/arm/dts/rk3399-roc-pc.dts          |   3 +-
 arch/arm/dts/rk3399-roc-pc.dtsi         |  35 +-
 arch/arm/dts/rk3399-rock-pi-4.dts       | 129 ++++
 arch/arm/dts/rk3399-rock960.dts         |  49 ++
 arch/arm/dts/rk3399-rock960.dtsi        |  13 +-
 arch/arm/dts/rk3399-rockpro64.dts       | 751 +---------------------
 arch/arm/dts/rk3399-rockpro64.dtsi      | 797 ++++++++++++++++++++++++
 arch/arm/dts/rk3399-u-boot.dtsi         |   1 +
 arch/arm/dts/rk3399.dtsi                | 583 ++++++++++-------
 25 files changed, 2538 insertions(+), 1652 deletions(-)
 create mode 100644 arch/arm/dts/rk3399-rockpro64.dtsi
arch/arm/dts/cros-ec-keyboard.dtsi +6 -4
index 9c7fb0acae..4a0c1037fb 100644
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Keyboard dts fragment for devices that use cros-ec-keyboard
  *
  * Copyright (c) 2014 Google, Inc
- *
- * 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.
 */
 
 #include <dt-bindings/input/input.h>
@@ -22,6 +19,7 @@
 			MATRIX_KEY(0x00, 0x02, KEY_F1)
 			MATRIX_KEY(0x00, 0x03, KEY_B)
 			MATRIX_KEY(0x00, 0x04, KEY_F10)
+			MATRIX_KEY(0x00, 0x05, KEY_RO)
 			MATRIX_KEY(0x00, 0x06, KEY_N)
 			MATRIX_KEY(0x00, 0x08, KEY_EQUAL)
 			MATRIX_KEY(0x00, 0x0a, KEY_RIGHTALT)
@@ -34,6 +32,7 @@
 			MATRIX_KEY(0x01, 0x08, KEY_APOSTROPHE)
 			MATRIX_KEY(0x01, 0x09, KEY_F9)
 			MATRIX_KEY(0x01, 0x0b, KEY_BACKSPACE)
+			MATRIX_KEY(0x01, 0x0c, KEY_HENKAN)
 
 			MATRIX_KEY(0x02, 0x00, KEY_LEFTCTRL)
 			MATRIX_KEY(0x02, 0x01, KEY_TAB)
@@ -45,6 +44,7 @@
 			MATRIX_KEY(0x02, 0x07, KEY_102ND)
 			MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE)
 			MATRIX_KEY(0x02, 0x09, KEY_F8)
+			MATRIX_KEY(0x02, 0x0a, KEY_YEN)
 
 			MATRIX_KEY(0x03, 0x01, KEY_GRAVE)
 			MATRIX_KEY(0x03, 0x02, KEY_F2)
@@ -52,7 +52,9 @@
 			MATRIX_KEY(0x03, 0x04, KEY_F5)
 			MATRIX_KEY(0x03, 0x06, KEY_6)
 			MATRIX_KEY(0x03, 0x08, KEY_MINUS)
+			MATRIX_KEY(0x03, 0x09, KEY_F13)
 			MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH)
+			MATRIX_KEY(0x03, 0x0c, KEY_MUHENKAN)
 
 			MATRIX_KEY(0x04, 0x00, KEY_RIGHTCTRL)
 			MATRIX_KEY(0x04, 0x01, KEY_A)
arch/arm/dts/cros-ec-sbs.dtsi +38 -1
index dfe5ea6ca2..71f5c5ecce 100644
@@ -1,8 +1,45 @@
-// SPDX-License-Identifier: GPL-2.0
 /*
  * Smart battery dts fragment for devices that use cros-ec-sbs
  *
  * Copyright (c) 2015 Google, Inc
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file 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.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
 &i2c_tunnel {
arch/arm/dts/rk3399-evb.dts +361 -159

604 lines not on this page · raw message

arch/arm/dts/rk3399-ficus.dts +6 -0
index 6b059bd7a0..ebe2ee77ba 100644
@@ -146,6 +146,12 @@
 	};
 };
 
+&spi1 {
+	/* On both Low speed and High speed expansion */
+	cs-gpios = <0>, <&gpio4 RK_PA6 0>, <&gpio4 RK_PA7 0>;
+	status = "okay";
+};
+
 &usbdrd_dwc3_0 {
 	dr_mode = "host";
 };
arch/arm/dts/rk3399-firefly.dts +197 -54

434 lines not on this page · raw message

arch/arm/dts/rk3399-gru-bob.dts +13 -3
index 1ee0dc0d9f..e6c1c94c8d 100644
@@ -18,11 +18,11 @@
 		     "google,bob", "google,gru", "rockchip,rk3399";
 
 	edp_panel: edp-panel {
-		compatible = "boe,nv101wxmn51", "simple-panel";
+		compatible = "boe,nv101wxmn51";
 		backlight = <&backlight>;
 		power-supply = <&pp3300_disp>;
 
-		ports {
+		port {
 			panel_in_edp: endpoint {
 				remote-endpoint = <&edp_out_panel>;
 			};
@@ -68,12 +68,22 @@
 
 &spi0 {
 	status = "okay";
+
+	cr50@0 {
+		compatible = "google,cr50";
+		reg = <0>;
+		interrupt-parent = <&gpio0>;
+		interrupts = <5 IRQ_TYPE_EDGE_RISING>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&h1_int_od_l>;
+		spi-max-frequency = <800000>;
+	};
 };
 
 &pinctrl {
 	tpm {
 		h1_int_od_l: h1-int-od-l {
-			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
arch/arm/dts/rk3399-gru-chromebook.dtsi +21 -19
index c6495adcca..1384dabbdf 100644
@@ -194,20 +194,25 @@
 
 	backlight: backlight {
 		compatible = "pwm-backlight";
-		brightness-levels = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
-				     17 18 19 20 21 22 23 24 25 26 27 28 29 30
-				     31 32 33 34 35 36 37 38 39 40 41 42 43 44
-				     45 46 47 48 49 50 51 52 53 54 55 56 57 58
-				     59 60 61 62 63 64 65 66 67 68 69 70 71 72
-				     73 74 75 76 77 78 79 80 81 82 83 84 85 86
-				     87 88 89 90 91 92 93 94 95 96 97 98 99 100>;
-		default-brightness-level = <51>;
 		enable-gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
 		power-supply = <&pp3300_disp>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&bl_en>;
 		pwm-delay-us = <10000>;
 	};
+
+	gpio_keys: gpio-keys {
+		compatible = "gpio-keys";
+		pinctrl-names = "default";
+		pinctrl-0 = <&bt_host_wake_l>;
+
+		wake_on_bt: wake-on-bt {
+			label = "Wake-on-Bluetooth";
+			gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WAKEUP>;
+			wakeup-source;
+		};
+	};
 };
 
 &ppvar_bigcpu {
@@ -232,7 +237,6 @@
 &edp {
 	status = "okay";
 
-	rockchip,panel = <&edp_panel>;
 	ports {
 		edp_out: port@1 {
 			reg = <1>;
@@ -287,11 +291,9 @@ ap_i2c_tp: &i2c5 {
 		#pwm-cells = <1>;
 	};
 
-	usbc_extcon1: extcon@1 {
+	usbc_extcon1: extcon1 {
 		compatible = "google,extcon-usbc-cros-ec";
 		google,usb-port-id = <1>;
-
-		#extcon-cells = <0>;
 	};
 };
 
@@ -361,27 +363,27 @@ ap_i2c_tp: &i2c5 {
 &pinctrl {
 	discrete-regulators {
 		pp1500_en: pp1500-en {
-			rockchip,pins = <RK_GPIO0 10 RK_FUNC_GPIO
+			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO
 					 &pcfg_pull_none>;
 		};
 
 		pp1800_audio_en: pp1800-audio-en {
-			rockchip,pins = <RK_GPIO0 2 RK_FUNC_GPIO
+			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO
 					 &pcfg_pull_down>;
 		};
 
 		pp3000_en: pp3000-en {
-			rockchip,pins = <RK_GPIO0 12 RK_FUNC_GPIO
+			rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO
 					 &pcfg_pull_none>;
 		};
 
 		pp3300_disp_en: pp3300-disp-en {
-			rockchip,pins = <RK_GPIO4 27 RK_FUNC_GPIO
+			rockchip,pins = <4 RK_PD3 RK_FUNC_GPIO
 					 &pcfg_pull_none>;
 		};
 
 		wlan_module_pd_l: wlan-module-pd-l {
-			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO
+			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO
 					 &pcfg_pull_down>;
 		};
 	};
@@ -389,10 +391,10 @@ ap_i2c_tp: &i2c5 {
 
 &wifi {
 	wifi_perst_l: wifi-perst-l {
-		rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
+		rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 	};
 
 	wlan_host_wake_l: wlan-host-wake-l {
-		rockchip,pins = <0 8 RK_FUNC_GPIO &pcfg_pull_none>;
+		rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
 	};
 };
arch/arm/dts/rk3399-gru-kevin.dts +26 -8
index 2cc7c47d6a..2bbef9fcbe 100644
@@ -39,11 +39,25 @@
 	};
 
 	edp_panel: edp-panel {
-		compatible = "sharp,lq123p1jx31", "simple-panel";
+		compatible = "sharp,lq123p1jx31";
 		backlight = <&backlight>;
 		power-supply = <&pp3300_disp>;
 
-		ports {
+		panel-timing {
+			clock-frequency = <266666667>;
+			hactive = <2400>;
+			hfront-porch = <48>;
+			hback-porch = <84>;
+			hsync-len = <32>;
+			hsync-active = <0>;
+			vactive = <1600>;
+			vfront-porch = <3>;
+			vback-porch = <120>;
+			vsync-len = <10>;
+			vsync-active = <0>;
+		};
+
+		port {
 			panel_in_edp: endpoint {
 				remote-endpoint = <&edp_out_panel>;
 			};
@@ -118,13 +132,17 @@
 			map0 {
 				trip = <&ppvar_bigcpu_alert>;
 				cooling-device =
-					<&cpu_l0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+					<&cpu_l0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					<&cpu_l1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					<&cpu_l2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					<&cpu_l3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
 				contribution = <4096>;
 			};
 			map1 {
 				trip = <&ppvar_bigcpu_alert>;
 				cooling-device =
-					<&cpu_b0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+					<&cpu_b0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					<&cpu_b1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
 				contribution = <1024>;
 			};
 		};
@@ -286,24 +304,24 @@ ap_i2c_dig: &i2c2 {
 	digitizer {
 		/* Has external pullup */
 		cpu1_dig_irq_l: cpu1-dig-irq-l {
-			rockchip,pins = <2 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		/* Has external pullup */
 		cpu1_dig_pdct_l: cpu1-dig-pdct-l {
-			rockchip,pins = <2 5 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	discrete-regulators {
 		cpu3_pen_pwr_en: cpu3-pen-pwr-en {
-			rockchip,pins = <4 30 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	pen {
 		cpu1_pen_eject: cpu1-pen-eject {
-			rockchip,pins = <0 13 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
arch/arm/dts/rk3399-gru.dtsi +36 -54

239 lines not on this page · raw message

arch/arm/dts/rk3399-khadas-edge.dtsi +3 -0
index 4944d78a0a..e87a044774 100644
@@ -654,9 +654,12 @@
 	sd-uhs-sdr104;
 	vqmmc-supply = <&vcc1v8_s3>;
 	vmmc-supply = <&vccio_sd>;
+	#address-cells = <1>;
+	#size-cells = <0>;
 	status = "okay";
 
 	brcmf: wifi@1 {
+		reg = <1>;
 		compatible = "brcm,bcm4329-fmac";
 		interrupt-parent = <&gpio0>;
 		interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
arch/arm/dts/rk3399-leez-p710.dts +18 -18
index 32baa57b94..73be38a537 100644
@@ -42,14 +42,14 @@
 		regulator-max-microvolt = <5000000>;
 	};
 
-	vcc5v0_sys: vcc5v0-sys {
+	vcc3v3_lan: vcc3v3-lan {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc5v0_sys";
+		regulator-name = "vcc3v3_lan";
 		regulator-always-on;
 		regulator-boot-on;
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		vin-supply = <&dc5v_adp>;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vim-supply = <&vcc3v3_sys>;
 	};
 
 	vcc3v3_sys: vcc3v3-sys {
@@ -83,14 +83,14 @@
 		vin-supply = <&vcc5v0_sys>;
 	};
 
-	vcc3v3_lan: vcc3v3-lan {
+	vcc5v0_sys: vcc5v0-sys {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc3v3_lan";
+		regulator-name = "vcc5v0_sys";
 		regulator-always-on;
 		regulator-boot-on;
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		vim-supply = <&vcc3v3_sys>;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&dc5v_adp>;
 	};
 
 	vdd_log: vdd-log {
@@ -510,6 +510,14 @@
 	};
 };
 
+&sdhci {
+	bus-width = <8>;
+	mmc-hs400-1_8v;
+	mmc-hs400-enhanced-strobe;
+	non-removable;
+	status = "okay";
+};
+
 &sdmmc {
 	bus-width = <4>;
 	cap-mmc-highspeed;
@@ -522,14 +530,6 @@
 	status = "okay";
 };
 
-&sdhci {
-	bus-width = <8>;
-	mmc-hs400-1_8v;
-	mmc-hs400-enhanced-strobe;
-	non-removable;
-	status = "okay";
-};
-
 &tcphy0 {
 	status = "okay";
 };
arch/arm/dts/rk3399-nanopc-t4.dts +46 -1

59 lines not on this page · raw message

arch/arm/dts/rk3399-nanopi4.dtsi +60 -6

113 lines not on this page · raw message

arch/arm/dts/rk3399-orangepi.dts +68 -11

174 lines not on this page · raw message

arch/arm/dts/rk3399-puma-u-boot.dtsi +19 -6
index e664779227..0253c6525f 100644
@@ -13,7 +13,7 @@
        chosen {
                stdout-path = "serial0:115200n8";
                u-boot,spl-boot-order = \
-                       "same-as-spl", &spiflash, &sdhci, &sdmmc;
+                       "same-as-spl", &norflash, &sdhci, &sdmmc;
        };
 
        aliases {
@@ -21,10 +21,23 @@
                spi1 = &spi5;
        };
 
-};
-
-&bios_enable {
-	u-boot,dm-pre-reloc;
+	/*
+	 * The Qseven BIOS_DISABLE signal on the RK3399-Q7 keeps the on-module
+	 * eMMC and SPI flash powered-down initially (in fact it keeps the
+	 * reset signal asserted).  Even though it is an enable signal, we
+	 * model this as a regulator.
+	 */
+	bios_enable: bios_enable {
+		compatible = "regulator-fixed";
+		u-boot,dm-pre-reloc;
+		regulator-name = "bios_enable";
+		enable-active-high;
+		gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+	};
 };
 
 &gpio1 {
@@ -35,6 +48,6 @@
 	u-boot,dm-pre-reloc;
 };
 
-&spiflash {
+&norflash {
 	u-boot,dm-pre-reloc;
 };
arch/arm/dts/rk3399-puma.dtsi +232 -335

840 lines not on this page · raw message

arch/arm/dts/rk3399-roc-pc.dts +1 -2
index 6a909e4eef..cd41954253 100644
@@ -8,6 +8,5 @@
 
 / {
 	model = "Firefly ROC-RK3399-PC Board";
-	compatible = "libretech,roc-rk3399-pc", "firefly,roc-rk3399-pc",
-		     "rockchip,rk3399";
+	compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399";
 };
arch/arm/dts/rk3399-roc-pc.dtsi +18 -17
index 9a1ce3a4ae..9f225e9c3d 100644
@@ -110,20 +110,6 @@
 		regulator-max-microvolt = <5000000>;
 	};
 
-	/*
-	 * should be placed inside mp8859, but not until mp8859 has
-	 * its own dt-binding.
-	 */
-	dc_12v: mp8859-dcdc1 {
-		compatible = "regulator-fixed";
-		regulator-name = "dc_12v";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <12000000>;
-		regulator-max-microvolt = <12000000>;
-		vin-supply = <&vcc_vbus_typec0>;
-	};
-
 	/* switched by pmic_sleep */
 	vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
 		compatible = "regulator-fixed";
@@ -176,7 +162,6 @@
 		pinctrl-names = "default";
 		pinctrl-0 = <&vcc5v0_host_en &hub_rst>;
 		regulator-name = "vcc5v0_host";
-		regulator-always-on;
 		vin-supply = <&vcc_sys>;
 	};
 
@@ -198,7 +183,6 @@
 		pinctrl-names = "default";
 		pinctrl-0 = <&vcc_sys_en>;
 		regulator-name = "vcc_sys";
-		regulator-always-on;
 		regulator-boot-on;
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
@@ -392,7 +376,6 @@
 
 			vcc_sdio: LDO_REG4 {
 				regulator-name = "vcc_sdio";
-				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <3000000>;
@@ -549,6 +532,24 @@
 		vbus-supply = <&vcc_vbus_typec0>;
 		status = "okay";
 	};
+
+	mp8859: regulator@66 {
+		compatible = "mps,mp8859";
+		reg = <0x66>;
+		dc_12v: mp8859_dcdc {
+			regulator-name = "dc_12v";
+			regulator-min-microvolt = <12000000>;
+			regulator-max-microvolt = <12000000>;
+			regulator-always-on;
+			regulator-boot-on;
+			vin-supply = <&vcc_vbus_typec0>;
+
+			regulator-state-mem {
+				regulator-on-in-suspend;
+				regulator-suspend-microvolt = <12000000>;
+			};
+		};
+	};
 };
 
 &i2s0 {
arch/arm/dts/rk3399-rock-pi-4.dts +129 -0

39 lines not on this page · raw message

arch/arm/dts/rk3399-rock960.dts +49 -0

49 lines not on this page · raw message

arch/arm/dts/rk3399-rock960.dtsi +12 -1
index c7d48d41e1..ba7c75c9f2 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/rk3399-rockpro64.dts +14 -737

751 lines not on this page · raw message

arch/arm/dts/rk3399-rockpro64.dtsi new file +797 -0

797 lines not on this page · raw message

arch/arm/dts/rk3399-u-boot.dtsi +1 -0
index 8b857ccfc7..ef57c36e73 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/rk3399.dtsi +367 -216

583 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.17.1

Part of the diff is not shown here. View the raw message.

author
#6 lore raw

PATCH 5/6 arm: dts: rk3399: Sync roc-pc-mezzanine from v5.7-rc1

In reply to a message not in the archive

Sync Firefly ROC-RK3399-PC Mezzanine Board dts file from Linux v5.7-rc1.

---
 arch/arm/dts/Makefile                    |  1 +
 arch/arm/dts/rk3399-roc-pc-mezzanine.dts | 93 ++++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 arch/arm/dts/rk3399-roc-pc-mezzanine.dts
arch/arm/dts/Makefile +1 -0
index 6d1e8668e7..747f5f1e8a 100644
@@ -129,6 +129,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
 	rk3399-puma-ddr1600.dtb \
 	rk3399-puma-ddr1866.dtb \
 	rk3399-roc-pc.dtb \
+	rk3399-roc-pc-mezzanine.dtb \
 	rk3399-rock-pi-4.dtb \
 	rk3399-rock960.dtb \
 	rk3399-rockpro64.dtb
arch/arm/dts/rk3399-roc-pc-mezzanine.dts new file +93 -0

93 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#7 lore raw

PATCH 6/6 rk3399: Add ROC-RK3399-PC Mezzanine board

In reply to a message not in the archive

From: Suniel Mahesh <sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>

Add Firefly ROC-RK3399-PC Mezzanine board which is an extension board on top of roc-rk3399-pc.

Will drop the separate defconfig file, once we support the board detection at runtime.

---
 .../dts/rk3399-roc-pc-mezzanine-u-boot.dtsi   | 26 +++++++
 board/firefly/roc-pc-rk3399/MAINTAINERS       |  2 +
 configs/roc-pc-mezzanine-rk3399_defconfig     | 67 +++++++++++++++++++
 3 files changed, 95 insertions(+)
 create mode 100644 arch/arm/dts/rk3399-roc-pc-mezzanine-u-boot.dtsi
 create mode 100644 configs/roc-pc-mezzanine-rk3399_defconfig
arch/arm/dts/rk3399-roc-pc-mezzanine-u-boot.dtsi new file +26 -0
new file mode 100644
index 0000000000..29325da71f
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Levin Du <[email protected]>
+ */
+
+#include "rk3399-u-boot.dtsi"
+#include "rk3399-sdram-lpddr4-100.dtsi"
+
+/ {
+	aliases {
+		spi0 = &spi1;
+	};
+
+	chosen {
+		u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
+	};
+
+	config {
+                pcie-pwr-gpio = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>;
+        };
+};
+
+&vdd_log {
+	regulator-min-microvolt = <430000>;
+	regulator-init-microvolt = <950000>;
+};
board/firefly/roc-pc-rk3399/MAINTAINERS +2 -0
index 7564dd252d..68a5b757d1 100644
@@ -1,6 +1,8 @@
 ROC-RK3399-PC
 M:	Levin Du <[email protected]>
+M:	Suniel Mahesh <sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
 S:	Maintained
 F:	board/firefly/roc-pc-rk3399
 F:	include/configs/roc-pc-rk3399.h
 F:	configs/roc-pc-rk3399_defconfig
+F:	configs/roc-pc-mezzanine-rk3399_defconfig
configs/roc-pc-mezzanine-rk3399_defconfig new file +67 -0

67 lines not on this page · raw message

Signature · 1 line
2.17.1