Skip to contentSkip to conversation

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

PATCH In review Jagan Teki 3 participants 14 messages Apr 28, 2020 6 messages not in the archive

Subsystems (4)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

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

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

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

Changes for v2:
- keep roc-rk3399-pc dc_12v changes to -u-boot.dtsi

[1] https://patchwork.ozlabs.org/project/uboot/cover/20200425105319.12009-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org/

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   |   6 +
 arch/arm/dts/rk3399-roc-pc-mezzanine.dts      |  93 ++
 arch/arm/dts/rk3399-roc-pc-u-boot.dtsi        |  36 +
 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 +
 33 files changed, 2763 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): 20200428100019.19155-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org

author
#2 lore raw

PATCH v2 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.

---
Changes for v2:
- none

 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
Reviewed-by on v2 1/6
#3 lore raw

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

Quoted 8 lines · Jagan Teki

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.

Cc Peter Robinson <[email protected]>

Thanks,
- Kever

Quoted 68 lines

---
Changes for v2:
- none

  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>;
Reviewed-by on v2 1/6
#4 lore raw

Re: [PATCH v2 1/6] arm64: dts: rk3399-puma: Move u-boot properties into -u-boot.dtsi【请注意,邮件由linux-rockchip-bounces+kever.yang=rock-chips.com@lists.infradead.org代发】

In reply to Jagan Teki
Quoted 8 lines · Jagan Teki

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.

Cc Peter Robinson <[email protected]>

Thanks,
- Kever

Quoted 68 lines

---
Changes for v2:
- none

  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>;
author
#5 lore raw

PATCH v2 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.

---
Changes for v2:
- none

 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

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

Reviewed-by
#7 lore raw

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

Quoted 7 lines · Jagan Teki

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.

Thanks,
- Kever

Quoted 37 lines

---
Changes for v2:
- none

  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 -1
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";

arch/arm/dts/rk3399-evb.dts line 215

Quoted 7 lines
arch/arm/dts/rk3399-evb.dts +0 -1
@@ -211,7 +210,6 @@
  		reg = <0x1b>;
  		rockchip,system-power-controller;
  		#clock-cells = <1>;
-		u-boot,dm-pre-reloc;
  		status = "okay";
 
  		vcc12-supply = <&vcc3v3_sys>;

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

author
#8 lore raw

PATCH v2 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.

---
Changes for v2:
- none

 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

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

Reviewed-by
#10 lore raw

Re: [PATCH v2 3/6] clk: rk3399: Set empty for HCLK_SD assigned-clocks

Quoted 10 lines · Jagan Teki

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.

Thanks,
- Kever

Quoted 12 lines

---
Changes for v2:
- none

  drivers/clk/rockchip/clk_rk3399.c | 1 +
  1 file changed, 1 insertion(+)
drivers/clk/rockchip/clk_rk3399.c +0 -0
index 1f62376595..d822acace1 100644

drivers/clk/rockchip/clk_rk3399.c static ulong rk3399_clk_set_rate(struct clk *clk, ulong rate) · line 1002

Quoted 7 lines
drivers/clk/rockchip/clk_rk3399.c +1 -0
@@ -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.

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

author
#11 lore raw

PATCH v2 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
- keep roc-rk3399-pc dc_12v changes to -u-boot.dtsi

---
Changes for v2:
- keep roc-rk3399-pc dc_12v changes to -u-boot.dtsi

 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-u-boot.dtsi  |  36 ++
 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 ++++++++++-------
 26 files changed, 2574 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-u-boot.dtsi +36 -0
index 5746442981..141dd0b306 100644
@@ -14,9 +14,45 @@
 	chosen {
 		u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
 	};
+
+	vcc_hub_en: vcc_hub_en-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio2 RK_PA4 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&hub_rst>;
+		regulator-name = "vcc_hub_en";
+		regulator-always-on;
+	};
+};
+
+/*
+ * should be placed inside mp8859, but not until mp8859 has
+ * its own dt-binding.
+ */
+&dc_12v {
+	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>;
 };
 
 &vdd_log {
 	regulator-min-microvolt = <430000>;
 	regulator-init-microvolt = <950000>;
 };
+
+&vcc5v0_host {
+	regulator-always-on;
+};
+
+&vcc_sys {
+	regulator-always-on;
+};
+
+&vcc_sdio {
+	regulator-always-on;
+};
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>;
[… more lines in the raw message]

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

arch/arm/dts/rk3399-rock-pi-4.dts +129 -0

129 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.

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

Reviewed-by
#13 lore raw

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

Quoted 15 lines · Jagan Teki

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
- keep roc-rk3399-pc dc_12v changes to -u-boot.dtsi

Quoted 1 line

Thanks,
- Kever

arch/arm/dts/rk3399.dtsi

Quoted 6,419 lines

---
Changes for v2:
- keep roc-rk3399-pc dc_12v changes to -u-boot.dtsi

  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-u-boot.dtsi  |  36 ++
  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 ++++++++++-------
  26 files changed, 2574 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
index c72719c0d3..694b0d08d6 100644
@@ -1,86 +1,18 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  /*
- * (C) Copyright 2016 Rockchip Electronics Co., Ltd
+ * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd
   */
 
  /dts-v1/;
  #include <dt-bindings/pwm/pwm.h>
-#include <dt-bindings/pinctrl/rockchip.h>
  #include "rk3399.dtsi"
 
  / {
  	model = "Rockchip RK3399 Evaluation Board";
-	compatible = "rockchip,rk3399-evb", "rockchip,rk3399",
-		     "google,rk3399evb-rev2";
-
-	chosen {
-		stdout-path = &uart2;
-	};
-
-	vdd_center: vdd-center {
-		compatible = "pwm-regulator";
-		pwms = <&pwm3 0 25000 1>;
-		regulator-name = "vdd_center";
-		regulator-min-microvolt = <800000>;
-		regulator-max-microvolt = <1400000>;
-		regulator-init-microvolt = <950000>;
-		regulator-always-on;
-		regulator-boot-on;
-		status = "okay";
-	};
-
-	vccsys: vccsys {
-		compatible = "regulator-fixed";
-		regulator-name = "vccsys";
-		regulator-boot-on;
-		regulator-always-on;
-	};
-
-	vcc3v3_sys: vcc3v3-sys {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc3v3_sys";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-	};
-
-	vcc_phy: vcc-phy-regulator {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc_phy";
-		regulator-always-on;
-		regulator-boot-on;
-	};
-
-	vcc5v0_host: vcc5v0-host-en {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc5v0_host";
-		gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>;
-	};
-
-	vcc5v0_typec0: vcc5v0-typec0-en {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc5v0_typec0";
-		gpio = <&gpio1 3 GPIO_ACTIVE_HIGH>;
-	};
-
-	vcc5v0_typec1: vcc5v0-typec1-en {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc5v0_typec1";
-		gpio = <&gpio1 4 GPIO_ACTIVE_HIGH>;
-	};
-
-	clkin_gmac: external-gmac-clock {
-		compatible = "fixed-clock";
-		clock-frequency = <125000000>;
-		clock-output-names = "clkin_gmac";
-		#clock-cells = <0>;
-	};
+	compatible = "rockchip,rk3399-evb", "rockchip,rk3399";
 
  	backlight: backlight {
  		compatible = "pwm-backlight";
-		power-supply = <&vccsys>;
-		enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
  		brightness-levels = <
  			  0   1   2   3   4   5   6   7
  			  8   9  10  11  12  13  14  15
@@ -116,18 +48,98 @@
  			248 249 250 251 252 253 254 255>;
  		default-brightness-level = <200>;
  		pwms = <&pwm0 0 25000 0>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pwm0_pin>;
-		pwm-delay-us = <10000>;
-		status = "disabled";
  	};
 
-	panel:panel {
-		compatible = "simple-panel";
-		power-supply = <&vcc33_lcd>;
+	edp_panel: edp-panel {
+		compatible ="lg,lp079qx1-sp0v";
  		backlight = <&backlight>;
-		/*enable-gpios = <&gpio4 18 GPIO_ACTIVE_HIGH>;*/
-		status = "disabled";
+		enable-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
+		power-supply = <&vcc3v3_s0>;
+
+		port {
+			panel_in_edp: endpoint {
+				remote-endpoint = <&edp_out_panel>;
+			};
+		};
+	};
+
+	clkin_gmac: external-gmac-clock {
+		compatible = "fixed-clock";
+		clock-frequency = <125000000>;
+		clock-output-names = "clkin_gmac";
+		#clock-cells = <0>;
+	};
+
+	vdd_center: vdd-center {
+		compatible = "pwm-regulator";
+		pwms = <&pwm3 0 25000 0>;
+		regulator-name = "vdd_center";
+		regulator-min-microvolt = <800000>;
+		regulator-max-microvolt = <1400000>;
+		regulator-always-on;
+		regulator-boot-on;
+		status = "okay";
+	};
+
+	vcc3v3_sys: vcc3v3-sys {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc3v3_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
+	vcc5v0_sys: vcc5v0-sys {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+	};
+
+	vcc5v0_host: vcc5v0-host-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&vcc5v0_host_en>;
+		regulator-name = "vcc5v0_host";
+		vin-supply = <&vcc5v0_sys>;
+	};
+
+	vcc_phy: vcc-phy-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_phy";
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
+	vcc_phy: vcc-phy-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_phy";
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
+};
+
+&edp {
+	status = "okay";
+	force-hpd;
+
+	ports {
+		edp_out: port@1 {
+			reg = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			edp_out_panel: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&panel_in_edp>;
+			};
+		};
  	};
  };
 
@@ -135,24 +147,253 @@
  	status = "okay";
  };
 
-&pwm0 {
+&gmac {
+	assigned-clocks = <&cru SCLK_RMII_SRC>;
+	assigned-clock-parents = <&clkin_gmac>;
+	clock_in_out = "input";
+	phy-supply = <&vcc_phy>;
+	phy-mode = "rgmii";
+	pinctrl-names = "default";
+	pinctrl-0 = <&rgmii_pins>;
+	snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
+	snps,reset-active-low;
+	snps,reset-delays-us = <0 10000 50000>;
+	tx_delay = <0x28>;
+	rx_delay = <0x11>;
  	status = "okay";
  };
 
-&pwm2 {
+&i2c0 {
  	status = "okay";
+
+	rk808: pmic@1b {
+		compatible = "rockchip,rk808";
+		reg = <0x1b>;
+		interrupt-parent = <&gpio1>;
+		interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pmic_int_l>;
+		rockchip,system-power-controller;
+		wakeup-source;
+		#clock-cells = <1>;
+		clock-output-names = "rk808-clkout1", "rk808-clkout2";
+
+		vcc1-supply = <&vcc3v3_sys>;
+		vcc2-supply = <&vcc3v3_sys>;
+		vcc3-supply = <&vcc3v3_sys>;
+		vcc4-supply = <&vcc3v3_sys>;
+		vcc6-supply = <&vcc3v3_sys>;
+		vcc7-supply = <&vcc3v3_sys>;
+		vcc8-supply = <&vcc3v3_sys>;
+		vcc9-supply = <&vcc3v3_sys>;
+		vcc10-supply = <&vcc3v3_sys>;
+		vcc11-supply = <&vcc3v3_sys>;
+		vcc12-supply = <&vcc3v3_sys>;
+		vddio-supply = <&vcc1v8_pmu>;
+
+		regulators {
+			vdd_log: DCDC_REG1 {
+				regulator-name = "vdd_log";
+				regulator-min-microvolt = <750000>;
+				regulator-max-microvolt = <1350000>;
+				regulator-ramp-delay = <6001>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <900000>;
+				};
+			};
+
+			vdd_cpu_l: DCDC_REG2 {
+				regulator-name = "vdd_cpu_l";
+				regulator-min-microvolt = <750000>;
+				regulator-max-microvolt = <1350000>;
+				regulator-ramp-delay = <6001>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc_ddr: DCDC_REG3 {
+				regulator-name = "vcc_ddr";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vcc_1v8: DCDC_REG4 {
+				regulator-name = "vcc_1v8";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vcc1v8_dvp: LDO_REG1 {
+				regulator-name = "vcc1v8_dvp";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc3v0_tp: LDO_REG2 {
+				regulator-name = "vcc3v0_tp";
+				regulator-min-microvolt = <3000000>;
+				regulator-max-microvolt = <3000000>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc1v8_pmu: LDO_REG3 {
+				regulator-name = "vcc1v8_pmu";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vcc_sd: LDO_REG4 {
+				regulator-name = "vcc_sd";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <3000000>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3000000>;
+				};
+			};
+
+			vcca3v0_codec: LDO_REG5 {
+				regulator-name = "vcca3v0_codec";
+				regulator-min-microvolt = <3000000>;
+				regulator-max-microvolt = <3000000>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc_1v5: LDO_REG6 {
+				regulator-name = "vcc_1v5";
+				regulator-min-microvolt = <1500000>;
+				regulator-max-microvolt = <1500000>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1500000>;
+				};
+			};
+
+			vcca1v8_codec: LDO_REG7 {
+				regulator-name = "vcca1v8_codec";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc_3v0: LDO_REG8 {
+				regulator-name = "vcc_3v0";
+				regulator-min-microvolt = <3000000>;
+				regulator-max-microvolt = <3000000>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3000000>;
+				};
+			};
+
+			vcc3v3_s3: SWITCH_REG1 {
+				regulator-name = "vcc3v3_s3";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vcc3v3_s0: SWITCH_REG2 {
+				regulator-name = "vcc3v3_s0";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+		};
+	};
+
+	vdd_cpu_b: regulator@40 {
+		compatible = "silergy,syr827";
+		reg = <0x40>;
+		fcs,suspend-voltage-selector = <1>;
+		regulator-name = "vdd_cpu_b";
+		regulator-min-microvolt = <712500>;
+		regulator-max-microvolt = <1500000>;
+		regulator-ramp-delay = <1000>;
+		regulator-always-on;
+		regulator-boot-on;
+		vin-supply = <&vcc5v0_sys>;
+
+		regulator-state-mem {
+			regulator-off-in-suspend;
+		};
+	};
+
+	vdd_gpu: regulator@41 {
+		compatible = "silergy,syr828";
+		reg = <0x41>;
+		fcs,suspend-voltage-selector = <1>;
+		regulator-name = "vdd_gpu";
+		regulator-min-microvolt = <712500>;
+		regulator-max-microvolt = <1500000>;
+		regulator-ramp-delay = <1000>;
+		regulator-always-on;
+		regulator-boot-on;
+		vin-supply = <&vcc5v0_sys>;
+
+		regulator-state-mem {
+			regulator-off-in-suspend;
+		};
+	};
  };
 
-&pwm3 {
+&pwm0 {
  	status = "okay";
  };
 
-&saradc {
+&pwm2 {
  	status = "okay";
  };
 
-&sdmmc {
-	bus-width = <4>;
+&pwm3 {
  	status = "okay";
  };
 
@@ -164,115 +405,76 @@
  	status = "okay";
  };
 
-&uart2 {
-	status = "okay";
+&pcie_phy {
+	status = "disabled";
  };
 
-&usb_host0_ehci {
-	status = "okay";
+&pcie0 {
+	ep-gpios = <&gpio3 RK_PB5 GPIO_ACTIVE_HIGH>;
+	num-lanes = <4>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie_clkreqn_cpm>;
+	status = "disabled";
  };
 
-&usb_host0_ohci {
+&u2phy0 {
  	status = "okay";
  };
 
-&usbdrd3_0 {
-	vbus-supply = <&vcc5v0_typec0>;
+&u2phy0_host {
+	phy-supply = <&vcc5v0_host>;
  	status = "okay";
  };
 
-&usb_host1_ehci {
+&u2phy1 {
  	status = "okay";
  };
 
-&usb_host1_ohci {
+&u2phy1_host {
+	phy-supply = <&vcc5v0_host>;
  	status = "okay";
  };
 
-&usbdrd3_1 {
-	vbus-supply = <&vcc5v0_typec1>;
+&uart2 {
  	status = "okay";
  };
 
-&i2c0 {
+&usb_host0_ehci {
  	status = "okay";
-	clock-frequency = <400000>;
-	i2c-scl-falling-time-ns = <50>;
-	i2c-scl-rising-time-ns = <100>;
-
-	rk808: pmic@1b {
-		compatible = "rockchip,rk808";
-		clock-output-names = "xin32k", "wifibt_32kin";
-		interrupt-parent = <&gpio0>;
-		interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pmic_int_l>;
-		reg = <0x1b>;
-		rockchip,system-power-controller;
-		#clock-cells = <1>;
-		status = "okay";
+};
 
-		vcc12-supply = <&vcc3v3_sys>;
+&usb_host0_ohci {
+	status = "okay";
+};
 
-		regulators {
-			vcc33_lcd: SWITCH_REG2 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-name = "vcc33_lcd";
-			};
-		};
-	};
+&usb_host1_ehci {
+	status = "okay";
  };
 
-&mipi_dsi {
-	status = "disabled";
-	rockchip,panel = <&panel>;
-	display-timings {
-		timing0 {
-		bits-per-pixel = <24>;
-		clock-frequency = <160000000>;
-		hfront-porch = <120>;
-		hsync-len = <20>;
-		hback-porch = <21>;
-		hactive = <1200>;
-		vfront-porch = <21>;
-		vsync-len = <3>;
-		vback-porch = <18>;
-		vactive = <1920>;
-		hsync-active = <0>;
-		vsync-active = <0>;
-		de-active = <1>;
-		pixelclk-active = <0>;
-		};
-	};
+&usb_host1_ohci {
+	status = "okay";
  };
 
  &pinctrl {
  	pmic {
  		pmic_int_l: pmic-int-l {
  			rockchip,pins =
-				<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
+				<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
  		};
+	};
 
-		pmic_dvs2: pmic-dvs2 {
+	usb2 {
+		vcc5v0_host_en: vcc5v0-host-en {
  			rockchip,pins =
-				<1 18 RK_FUNC_GPIO &pcfg_pull_down>;
+				<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
  	};
  };
 
-&gmac {
-        phy-supply = <&vcc_phy>;
-	phy-mode = "rgmii";
-	clock_in_out = "input";
-	snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
-	snps,reset-active-low;
-	snps,reset-delays-us = <0 10000 50000>;
-	assigned-clocks = <&cru SCLK_RMII_SRC>;
-	assigned-clock-parents = <&clkin_gmac>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&rgmii_pins>;
-	tx_delay = <0x28>;
-	rx_delay = <0x11>;
+&vopb {
+	status = "okay";
+};
+
+&vopb_mmu {
  	status = "okay";
  };
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
index 89c67fd24c..d63faf38cc 100644
@@ -1,19 +1,20 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  /*
   * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
   */
 
  /dts-v1/;
+#include <dt-bindings/input/linux-event-codes.h>
  #include <dt-bindings/pwm/pwm.h>
-#include <dt-bindings/pinctrl/rockchip.h>
  #include "rk3399.dtsi"
+#include "rk3399-opp.dtsi"
 
  / {
  	model = "Firefly-RK3399 Board";
  	compatible = "firefly,firefly-rk3399", "rockchip,rk3399";
 
  	chosen {
-		stdout-path = &uart2;
+		stdout-path = "serial2:1500000n8";
  	};
 
  	backlight: backlight {
@@ -63,6 +64,48 @@
  		#clock-cells = <0>;
  	};
 
+	dc_12v: dc-12v {
+		compatible = "regulator-fixed";
+		regulator-name = "dc_12v";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+		autorepeat;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pwrbtn>;
+
+		power {
+			debounce-interval = <100>;
+			gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
+			label = "GPIO Key Power";
+			linux,code = <KEY_POWER>;
+			wakeup-source;
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&work_led_gpio>, <&diy_led_gpio>;
+
+		work-led {
+			label = "work";
+			default-state = "on";
+			gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
+		};
+
+		diy-led {
+			label = "diy";
+			default-state = "off";
+			gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
  	rt5640-sound {
  		compatible = "simple-audio-card";
  		simple-audio-card,name = "rockchip,rt5640-codec";
@@ -102,15 +145,27 @@
  		reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
  	};
 
+	/* switched by pmic_sleep */
+	vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc1v8_s3";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		vin-supply = <&vcc_1v8>;
+	};
+
  	vcc3v3_pcie: vcc3v3-pcie-regulator {
  		compatible = "regulator-fixed";
  		enable-active-high;
  		gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>;
  		pinctrl-names = "default";
-		pinctrl-0 = <&pcie_drv>;
+		pinctrl-0 = <&pcie_pwr_en>;
  		regulator-name = "vcc3v3_pcie";
  		regulator-always-on;
  		regulator-boot-on;
+		vin-supply = <&dc_12v>;
  	};
 
  	vcc3v3_sys: vcc3v3-sys {
@@ -120,32 +175,29 @@
  		regulator-boot-on;
  		regulator-min-microvolt = <3300000>;
  		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc_sys>;
  	};
 
+	/* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
  	vcc5v0_host: vcc5v0-host-regulator {
  		compatible = "regulator-fixed";
  		enable-active-high;
  		gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
  		pinctrl-names = "default";
-		pinctrl-0 = <&host_vbus_drv>;
+		pinctrl-0 = <&vcc5v0_host_en>;
  		regulator-name = "vcc5v0_host";
  		regulator-always-on;
+		vin-supply = <&vcc_sys>;
  	};
 
-	vcc5v0_sys: vcc5v0-sys {
+	vcc_sys: vcc-sys {
  		compatible = "regulator-fixed";
-		regulator-name = "vcc5v0_sys";
+		regulator-name = "vcc_sys";
  		regulator-always-on;
  		regulator-boot-on;
  		regulator-min-microvolt = <5000000>;
  		regulator-max-microvolt = <5000000>;
-	};
-
-	vcc_phy: vcc-phy-regulator {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc_phy";
-		regulator-always-on;
-		regulator-boot-on;
+		vin-supply = <&dc_12v>;
  	};
 
  	vdd_log: vdd-log {
@@ -156,16 +208,7 @@
  		regulator-boot-on;
  		regulator-min-microvolt = <430000>;
  		regulator-max-microvolt = <1400000>;
-		regulator-init-microvolt = <950000>;
-	};
-
-	vccadc_ref: vccadc-ref {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc1v8_sys";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
+		vin-supply = <&vcc_sys>;
  	};
  };
 
@@ -201,15 +244,22 @@
  	assigned-clocks = <&cru SCLK_RMII_SRC>;
  	assigned-clock-parents = <&clkin_gmac>;
  	clock_in_out = "input";
-	phy-supply = <&vcc_phy>;
+	phy-supply = <&vcc_lan>;
  	phy-mode = "rgmii";
  	pinctrl-names = "default";
  	pinctrl-0 = <&rgmii_pins>;
  	snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
  	snps,reset-active-low;
  	snps,reset-delays-us = <0 10000 50000>;
-	tx_delay = <0x33>;
-	rx_delay = <0x45>;
+	tx_delay = <0x28>;
+	rx_delay = <0x11>;
+	status = "okay";
+};
+
+&hdmi {
+	ddc-i2c-bus = <&i2c3>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&hdmi_cec>;
  	status = "okay";
  };
 
@@ -231,16 +281,16 @@
  		rockchip,system-power-controller;
  		wakeup-source;
 
-		vcc1-supply = <&vcc3v3_sys>;
-		vcc2-supply = <&vcc3v3_sys>;
-		vcc3-supply = <&vcc3v3_sys>;
-		vcc4-supply = <&vcc3v3_sys>;
-		vcc6-supply = <&vcc3v3_sys>;
-		vcc7-supply = <&vcc3v3_sys>;
+		vcc1-supply = <&vcc_sys>;
+		vcc2-supply = <&vcc_sys>;
+		vcc3-supply = <&vcc_sys>;
+		vcc4-supply = <&vcc_sys>;
+		vcc6-supply = <&vcc_sys>;
+		vcc7-supply = <&vcc_sys>;
  		vcc8-supply = <&vcc3v3_sys>;
-		vcc9-supply = <&vcc3v3_sys>;
-		vcc10-supply = <&vcc3v3_sys>;
-		vcc11-supply = <&vcc3v3_sys>;
+		vcc9-supply = <&vcc_sys>;
+		vcc10-supply = <&vcc_sys>;
+		vcc11-supply = <&vcc_sys>;
  		vcc12-supply = <&vcc3v3_sys>;
  		vddio-supply = <&vcc1v8_pmu>;
 
@@ -301,12 +351,12 @@
  				};
  			};
 
-			vcc3v0_tp: LDO_REG2 {
-				regulator-name = "vcc3v0_tp";
+			vcc2v8_dvp: LDO_REG2 {
+				regulator-name = "vcc2v8_dvp";
  				regulator-always-on;
  				regulator-boot-on;
-				regulator-min-microvolt = <3000000>;
-				regulator-max-microvolt = <3000000>;
+				regulator-min-microvolt = <2800000>;
+				regulator-max-microvolt = <2800000>;
  				regulator-state-mem {
  					regulator-off-in-suspend;
  				};
@@ -324,8 +374,8 @@
  				};
  			};
 
-			vcc_sd: LDO_REG4 {
-				regulator-name = "vcc_sd";
+			vcc_sdio: LDO_REG4 {
+				regulator-name = "vcc_sdio";
  				regulator-always-on;
  				regulator-boot-on;
  				regulator-min-microvolt = <1800000>;
@@ -382,7 +432,7 @@
  				};
  			};
 
-			vcc3v3_s3: SWITCH_REG1 {
+			vcc3v3_s3: vcc_lan: SWITCH_REG1 {
  				regulator-name = "vcc3v3_s3";
  				regulator-always-on;
  				regulator-boot-on;
@@ -412,7 +462,7 @@
  		regulator-ramp-delay = <1000>;
  		regulator-always-on;
  		regulator-boot-on;
-		vin-supply = <&vcc5v0_sys>;
+		vin-supply = <&vcc_sys>;
 
  		regulator-state-mem {
  			regulator-off-in-suspend;
@@ -429,7 +479,7 @@
  		regulator-ramp-delay = <1000>;
  		regulator-always-on;
  		regulator-boot-on;
-		vin-supply = <&vcc5v0_sys>;
+		vin-supply = <&vcc_sys>;
 
  		regulator-state-mem {
  			regulator-off-in-suspend;
@@ -476,19 +526,16 @@
  &i2s0 {
  	rockchip,playback-channels = <8>;
  	rockchip,capture-channels = <8>;
-	#sound-dai-cells = <0>;
  	status = "okay";
  };
 
  &i2s1 {
  	rockchip,playback-channels = <2>;
  	rockchip,capture-channels = <2>;
-	#sound-dai-cells = <0>;
  	status = "okay";
  };
 
  &i2s2 {
-	#sound-dai-cells = <0>;
  	status = "okay";
  };
 
@@ -497,7 +544,7 @@
 
  	bt656-supply = <&vcc1v8_dvp>;
  	audio-supply = <&vcca1v8_codec>;
-	sdmmc-supply = <&vcc_sd>;
+	sdmmc-supply = <&vcc_sdio>;
  	gpio1830-supply = <&vcc_3v0>;
  };
 
@@ -509,7 +556,7 @@
  	ep-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
  	num-lanes = <4>;
  	pinctrl-names = "default";
-	pinctrl-0 = <&pcie_clkreqn>;
+	pinctrl-0 = <&pcie_clkreqn_cpm>;
  	status = "okay";
  };
 
@@ -532,7 +579,7 @@
  	};
 
  	pcie {
-		pcie_drv: pcie-drv {
+		pcie_pwr_en: pcie-pwr-en {
  			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
 
@@ -570,10 +617,26 @@
  	};
 
  	usb2 {
-		host_vbus_drv: host-vbus-drv {
+		vcc5v0_host_en: vcc5v0-host-en {
  			rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
  	};
+
+	wifi {
+		wifi_host_wake_l: wifi-host-wake-l {
+			rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	leds {
+		work_led_gpio: work_led-gpio {
+			rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		diy_led_gpio: diy_led-gpio {
+			rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
  };
 
  &pwm0 {
@@ -585,24 +648,70 @@
  };
 
  &saradc {
-	vref-supply = <&vccadc_ref>;
+	vref-supply = <&vcca1v8_s3>;
  	status = "okay";
  };
 
+&sdio0 {
+	/* WiFi & BT combo module Ampak AP6356S */
+	bus-width = <4>;
+	cap-sdio-irq;
+	cap-sd-highspeed;
+	keep-power-in-suspend;
+	mmc-pwrseq = <&sdio_pwrseq>;
+	non-removable;
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
+	sd-uhs-sdr104;
+
+	/* Power supply */
+	vqmmc-supply = &vcc1v8_s3;	/* IO line */
+	vmmc-supply = &vcc_sdio;	/* card's power */
+
+	#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>;
+		interrupt-names = "host-wake";
+		brcm,drive-strength = <5>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&wifi_host_wake_l>;
+	};
+};
+
  &sdmmc {
  	bus-width = <4>;
+	cap-mmc-highspeed;
+	cap-sd-highspeed;
+	cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+	disable-wp;
+	max-frequency = <150000000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
  	status = "okay";
  };
 
  &sdhci {
  	bus-width = <8>;
-	keep-power-in-suspend;
  	mmc-hs400-1_8v;
  	mmc-hs400-enhanced-strobe;
  	non-removable;
  	status = "okay";
  };
 
+&tcphy0 {
+	status = "okay";
+};
+
+&tcphy1 {
+	status = "okay";
+};
+
  &tsadc {
  	/* tshut mode 0:CRU 1:GPIO */
  	rockchip,hw-tshut-mode = <1>;
@@ -662,3 +771,37 @@
  &usb_host1_ohci {
  	status = "okay";
  };
+
+&usbdrd3_0 {
+	status = "okay";
+};
+
+&usbdrd_dwc3_0 {
+	status = "okay";
+	dr_mode = "otg";
+};
+
+&usbdrd3_1 {
+	status = "okay";
+};
+
+&usbdrd_dwc3_1 {
+	status = "okay";
+	dr_mode = "host";
+};
+
+&vopb {
+	status = "okay";
+};
+
+&vopb_mmu {
+	status = "okay";
+};
+
+&vopl {
+	status = "okay";
+};
+
+&vopl_mmu {
+	status = "okay";
+};
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
index 0e2e047180..34f03cf92d 100644
@@ -11,13 +11,7 @@
 
  / {
  	chosen {
-		u-boot,dm-pre-reloc;
  		stdout-path = "serial2:115200n8";
-		u-boot,spl-boot-order = &spi_flash;
-	};
-
-	config {
-		u-boot,spl-payload-offset = <0x40000>;
  	};
 
  	/*
@@ -268,17 +262,11 @@
  	pp5000_usb_a_vbus: pp5000 {
  	};
 
-	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;
-		};
+	ap_rtc_clk: ap-rtc-clk {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		clock-output-names = "xin32k";
+		#clock-cells = <0>;
  	};
 
  	max98357a: max98357a {
@@ -354,6 +342,7 @@
  	cpu-supply = <&ppvar_bigcpu>;
  };
 
+
  &cru {
  	assigned-clocks =
  		<&cru PLL_GPLL>, <&cru PLL_CPLL>,
@@ -549,8 +538,7 @@ ap_i2c_audio: &i2c8 {
  	pinctrl-names = "default", "sleep";
  	pinctrl-1 = <&spi1_sleep>;
 
-	spi_flash: spiflash@0 {
-		u-boot,dm-pre-reloc;
+	spiflash@0 {
  		compatible = "jedec,spi-nor";
  		reg = <0>;
 
@@ -565,16 +553,12 @@ ap_i2c_audio: &i2c8 {
 
  &spi5 {
  	status = "okay";
-	spi-activate-delay = <100>;
-	spi-max-frequency = <3000000>;
-	spi-deactivate-delay = <200>;
 
  	cros_ec: ec@0 {
  		compatible = "google,cros-ec-spi";
  		reg = <0>;
  		interrupt-parent = <&gpio0>;
  		interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
-		ec-interrupt = <&gpio0 1 GPIO_ACTIVE_LOW>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&ec_ap_int_l>;
  		spi-max-frequency = <3000000>;
@@ -586,11 +570,9 @@ ap_i2c_audio: &i2c8 {
  			#size-cells = <0>;
  		};
 
-		usbc_extcon0: extcon@0 {
+		usbc_extcon0: extcon0 {
  			compatible = "google,extcon-usbc-cros-ec";
  			google,usb-port-id = <0>;
-
-			#extcon-cells = <0>;
  		};
  	};
  };
@@ -692,29 +674,29 @@ ap_i2c_audio: &i2c8 {
 
  	backlight-enable {
  		bl_en: bl-en {
-			rockchip,pins = <1 17 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
  	};
 
  	cros-ec {
  		ec_ap_int_l: ec-ap-int-l {
-			rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
  		};
  	};
 
  	discrete-regulators {
  		sd_io_pwr_en: sd-io-pwr-en {
-			rockchip,pins = <RK_GPIO2 2 RK_FUNC_GPIO
+			rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO
  					 &pcfg_pull_none>;
  		};
 
  		sd_pwr_1800_sel: sd-pwr-1800-sel {
-			rockchip,pins = <RK_GPIO2 28 RK_FUNC_GPIO
+			rockchip,pins = <2 RK_PD4 RK_FUNC_GPIO
  					 &pcfg_pull_none>;
  		};
 
  		sd_slot_pwr_en: sd-slot-pwr-en {
-			rockchip,pins = <RK_GPIO4 29 RK_FUNC_GPIO
+			rockchip,pins = <4 RK_PD5 RK_FUNC_GPIO
  					 &pcfg_pull_none>;
  		};
  	};
@@ -722,17 +704,17 @@ ap_i2c_audio: &i2c8 {
  	codec {
  		/* Has external pullup */
  		headset_int_l: headset-int-l {
-			rockchip,pins = <1 23 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
 
  		mic_int: mic-int {
-			rockchip,pins = <1 13 RK_FUNC_GPIO &pcfg_pull_down>;
+			rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>;
  		};
  	};
 
  	max98357a {
  		sdmode_en: sdmode-en {
-			rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_down>;
+			rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_down>;
  		};
  	};
 
@@ -743,7 +725,7 @@ ap_i2c_audio: &i2c8 {
  			 * to hack this as gpio, so the EP could be able to
  			 * de-assert it along and make ClockPM(CPM) work.
  			 */
-			rockchip,pins = <2 26 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
  	};
 
@@ -754,20 +736,20 @@ ap_i2c_audio: &i2c8 {
  		 */
  		sdmmc_bus4: sdmmc-bus4 {
  			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_none_8ma>,
-				<4 9 RK_FUNC_1 &pcfg_pull_none_8ma>,
-				<4 10 RK_FUNC_1 &pcfg_pull_none_8ma>,
-				<4 11 RK_FUNC_1 &pcfg_pull_none_8ma>;
+				<4 RK_PB0 1 &pcfg_pull_none_8ma>,
+				<4 RK_PB1 1 &pcfg_pull_none_8ma>,
+				<4 RK_PB2 1 &pcfg_pull_none_8ma>,
+				<4 RK_PB3 1 &pcfg_pull_none_8ma>;
  		};
 
  		sdmmc_clk: sdmmc-clk {
  			rockchip,pins =
-				<4 12 RK_FUNC_1 &pcfg_pull_none_8ma>;
+				<4 RK_PB4 1 &pcfg_pull_none_8ma>;
  		};
 
  		sdmmc_cmd: sdmmc-cmd {
  			rockchip,pins =
-				<4 13 RK_FUNC_1 &pcfg_pull_none_8ma>;
+				<4 RK_PB5 1 &pcfg_pull_none_8ma>;
  		};
 
  		/*
@@ -781,12 +763,12 @@ ap_i2c_audio: &i2c8 {
  		 */
  		sdmmc_cd: sdmmc-cd {
  			rockchip,pins =
-				<0 7 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA7 1 &pcfg_pull_none>;
  		};
 
  		/* This is where we actually hook up CD; has external pull */
  		sdmmc_cd_gpio: sdmmc-cd-gpio {
-			rockchip,pins = <4 24 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
  	};
 
@@ -796,47 +778,47 @@ ap_i2c_audio: &i2c8 {
  			 * Pull down SPI1 CLK/CS/RX/TX during suspend, to
  			 * prevent leakage.
  			 */
-			rockchip,pins = <1 9 RK_FUNC_GPIO &pcfg_pull_down>,
-					<1 10 RK_FUNC_GPIO &pcfg_pull_down>,
-					<1 7 RK_FUNC_GPIO &pcfg_pull_down>,
-					<1 8 RK_FUNC_GPIO &pcfg_pull_down>;
+			rockchip,pins = <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_down>,
+					<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>,
+					<1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_down>,
+					<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>;
  		};
  	};
 
  	touchscreen {
  		touch_int_l: touch-int-l {
-			rockchip,pins = <3 13 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
  		};
 
  		touch_reset_l: touch-reset-l {
-			rockchip,pins = <4 26 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
  	};
 
  	trackpad {
  		ap_i2c_tp_pu_en: ap-i2c-tp-pu-en {
-			rockchip,pins = <3 12 RK_FUNC_GPIO &pcfg_output_high>;
+			rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_output_high>;
  		};
 
  		trackpad_int_l: trackpad-int-l {
-			rockchip,pins = <1 4 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
  		};
  	};
 
  	wifi: wifi {
  		wlan_module_reset_l: wlan-module-reset-l {
-			rockchip,pins = <1 11 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
 
  		bt_host_wake_l: bt-host-wake-l {
  			/* Kevin has an external pull up, but Gru does not */
-			rockchip,pins = <0 3 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
  		};
  	};
 
  	write-protect {
  		ap_fw_wp: ap-fw-wp {
-			rockchip,pins = <1 18 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
  		};
  	};
  };
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
index 84433cf02b..e0d75617bb 100644
@@ -52,13 +52,58 @@
  		pinctrl-names = "default";
  		pinctrl-0 = <&ir_rx>;
  	};
+
+	fan: pwm-fan {
+		compatible = "pwm-fan";
+		/*
+		 * With 20KHz PWM and an EVERCOOL EC4007H12SA fan, these levels
+		 * work out to 0, ~1200, ~3000, and 5000RPM respectively.
+		 */
+		cooling-levels = <0 12 18 255>;
+		#cooling-cells = <2>;
+		fan-supply = <&vcc12v0_sys>;
+		pwms = <&pwm1 0 50000 0>;
+	};
+};
+
+&cpu_thermal {
+	trips {
+		cpu_warm: cpu_warm {
+			temperature = <55000>;
+			hysteresis = <2000>;
+			type = "active";
+		};
+
+		cpu_hot: cpu_hot {
+			temperature = <65000>;
+			hysteresis = <2000>;
+			type = "active";
+		};
+	};
+
+	cooling-maps {
+		map2 {
+			trip = <&cpu_warm>;
+			cooling-device = <&fan THERMAL_NO_LIMIT 1>;
+		};
+
+		map3 {
+			trip = <&cpu_hot>;
+			cooling-device = <&fan 2 THERMAL_NO_LIMIT>;
+		};
+	};
+};
+
+&pcie0 {
+	num-lanes = <4>;
+	vpcie3v3-supply = <&vcc3v3_sys>;
  };
 
  &pinctrl {
  	ir {
  		ir_rx: ir-rx {
  			/* external pullup to VCC3V3_SYS, despite being 1.8V :/ */
-			rockchip,pins = <0 RK_PA6 RK_FUNC_1 &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA6 1 &pcfg_pull_none>;
  		};
  	};
  };
arch/arm/dts/rk3399-nanopi4.dtsi +60 -6
index d325e11728..c88018a0ef 100644
@@ -48,7 +48,7 @@
  	};
 
  	/* switched by pmic_sleep */
-	vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
+	vcc1v8_s3: vcc1v8-s3 {
  		compatible = "regulator-fixed";
  		regulator-always-on;
  		regulator-boot-on;
@@ -71,6 +71,27 @@
  		vin-supply = <&vcc3v3_sys>;
  	};
 
+	/*
+	 * Really, this is supplied by vcc_1v8, and vcc1v8_s3 only
+	 * drives the enable pin, but we can't quite model that.
+	 */
+	vcca0v9_s3: vcca0v9-s3 {
+		compatible = "regulator-fixed";
+		regulator-min-microvolt = <900000>;
+		regulator-max-microvolt = <900000>;
+		regulator-name = "vcca0v9_s3";
+		vin-supply = <&vcc1v8_s3>;
+	};
+
+	/* As above, actually supplied by vcc3v3_sys */
+	vcca1v8_s3: vcca1v8-s3 {
+		compatible = "regulator-fixed";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-name = "vcca1v8_s3";
+		vin-supply = <&vcc1v8_s3>;
+	};
+
  	vbus_typec: vbus-typec {
  		compatible = "regulator-fixed";
  		regulator-min-microvolt = <5000000>;
@@ -148,15 +169,28 @@
  	assigned-clocks = <&cru SCLK_RMII_SRC>;
  	clock_in_out = "input";
  	pinctrl-names = "default";
-	pinctrl-0 = <&rgmii_pins>;
+	pinctrl-0 = <&rgmii_pins>, <&phy_intb>, <&phy_rstb>;
+	phy-handle = <&rtl8211e>;
  	phy-mode = "rgmii";
  	phy-supply = <&vcc3v3_s3>;
-	snps,reset-active-low;
-	snps,reset-delays-us = <0 10000 50000>;
-	snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
  	tx_delay = <0x28>;
  	rx_delay = <0x11>;
  	status = "okay";
+
+	mdio {
+		compatible = "snps,dwmac-mdio";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		rtl8211e: phy@1 {
+			reg = <1>;
+			interrupt-parent = <&gpio3>;
+			interrupts = <RK_PB2 IRQ_TYPE_LEVEL_LOW>;
+			reset-assert-us = <10000>;
+			reset-deassert-us = <30000>;
+			reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
+		};
+	};
  };
 
  &gpu {
@@ -171,6 +205,10 @@
  	status = "okay";
  };
 
+&hdmi_sound {
+	status = "okay";
+};
+
  &i2c0 {
  	clock-frequency = <400000>;
  	i2c-scl-rising-time-ns = <160>;
@@ -446,6 +484,10 @@
  	status = "okay";
  };
 
+&i2s2 {
+	status = "okay";
+};
+
  &io_domains {
  	bt656-supply = <&vcc_1v8>;
  	audio-supply = <&vcca1v8_codec>;
@@ -464,7 +506,9 @@
  &pcie0 {
  	ep-gpios = <&gpio2 RK_PA4 GPIO_ACTIVE_HIGH>;
  	max-link-speed = <2>;
-	num-lanes = <4>;
+	num-lanes = <2>;
+	vpcie0v9-supply = <&vcca0v9_s3>;
+	vpcie1v8-supply = <&vcca1v8_s3>;
  	status = "okay";
  };
 
@@ -481,6 +525,16 @@
  		};
  	};
 
+	phy {
+		phy_intb: phy-intb {
+			rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		phy_rstb: phy-rstb {
+			rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
  	pmic {
  		cpu_b_sleep: cpu-b-sleep {
  			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
arch/arm/dts/rk3399-orangepi.dts +68 -11
index cf37b96a6b..f9f7246d4d 100644
@@ -136,13 +136,13 @@
  		vin-supply = <&vcc_sys>;
  	};
 
-	vcc5v0_typec0: vcc5v0-typec0-regulator {
+	vbus_typec: vbus-typec-regulator {
  		compatible = "regulator-fixed";
  		enable-active-high;
  		gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
  		pinctrl-names = "default";
-		pinctrl-0 = <&vcc5v0_typec0_en>;
-		regulator-name = "vcc5v0_typec0";
+		pinctrl-0 = <&vcc5v0_typec_en>;
+		regulator-name = "vbus_typec";
  		vin-supply = <&vcc_sys>;
  	};
 
@@ -202,14 +202,27 @@
  	clock_in_out = "input";
  	phy-supply = <&vcc3v3_s3>;
  	phy-mode = "rgmii";
+	phy-handle = <&rtl8211e>;
  	pinctrl-names = "default";
-	pinctrl-0 = <&rgmii_pins>;
-	snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
-	snps,reset-active-low;
-	snps,reset-delays-us = <0 10000 50000>;
+	pinctrl-0 = <&rgmii_pins>, <&phy_intb>, <&phy_rstb>;
  	tx_delay = <0x28>;
  	rx_delay = <0x11>;
  	status = "okay";
+
+	mdio {
+		compatible = "snps,dwmac-mdio";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		rtl8211e: phy@1 {
+			reg = <1>;
+			interrupt-parent = <&gpio3>;
+			interrupts = <RK_PB2 IRQ_TYPE_LEVEL_LOW>;
+			reset-assert-us = <10000>;
+			reset-deassert-us = <30000>;
+			reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
+		};
+	};
  };
 
  &gpu {
@@ -419,6 +432,8 @@
  		compatible = "silergy,syr827";
  		reg = <0x40>;
  		fcs,suspend-voltage-selector = <1>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&cpu_b_sleep>;
  		regulator-name = "vdd_cpu_b";
  		regulator-min-microvolt = <712500>;
  		regulator-max-microvolt = <1500000>;
@@ -436,6 +451,8 @@
  		compatible = "silergy,syr828";
  		reg = <0x41>;
  		fcs,suspend-voltage-selector = <1>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&gpu_sleep>;
  		regulator-name = "vdd_gpu";
  		regulator-min-microvolt = <712500>;
  		regulator-max-microvolt = <1500000>;
@@ -472,6 +489,7 @@
  		compatible = "asahi-kasei,ak09911";
  		reg = <0x0c>;
  		vdd-supply = <&vcc3v3_s3>;
+		vid-supply = <&vcc3v3_s3>;
  	};
 
  	mpu6500@68 {
@@ -504,6 +522,16 @@
  		pinctrl-0 = <&light_int_l>;
  		vdd-supply = <&vcc3v3_s3>;
  	};
+
+	fusb302@22 {
+		compatible = "fcs,fusb302";
+		reg = <0x22>;
+		interrupt-parent = <&gpio1>;
+		interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&chg_cc_int_l>;
+		vbus-supply = <&vbus_typec>;
+	};
  };
 
  &io_domains {
@@ -526,7 +554,25 @@
  		};
  	};
 
+	phy {
+		phy_intb: phy-intb {
+			rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		phy_rstb: phy-rstb {
+			rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
  	pmic {
+		cpu_b_sleep: cpu-b-sleep {
+			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+
+		gpu_sleep: gpu-sleep {
+			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+
  		pmic_int_l: pmic-int-l {
  			rockchip,pins =
  				<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -536,7 +582,7 @@
  	sd {
  		sdmmc0_pwr_h: sdmmc0-pwr-h {
  			rockchip,pins =
-				<RK_GPIO0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
  	};
 
@@ -546,7 +592,7 @@
  				<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
 
-		vcc5v0_typec0_en: vcc5v0-typec0-en {
+		vcc5v0_typec_en: vcc5v0-typec-en {
  			rockchip,pins =
  				<1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
@@ -595,6 +641,12 @@
  			rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
  	};
+
+	fusb302 {
+		chg_cc_int_l: chg-cc-int-l {
+			rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
  };
 
  &pwm0 {
@@ -631,9 +683,12 @@
  	pinctrl-names = "default";
  	pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
  	sd-uhs-sdr104;
+	#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>;
@@ -676,7 +731,7 @@
  	status = "okay";
 
  	u2phy0_otg: otg-port {
-		phy-supply = <&vcc5v0_typec0>;
+		phy-supply = <&vbus_typec>;
  		status = "okay";
  	};
 
@@ -707,12 +762,14 @@
  	bluetooth {
  		compatible = "brcm,bcm43438-bt";
  		clocks = <&rk808 1>;
-		clock-names = "ext_clock";
+		clock-names = "lpo";
  		device-wakeup-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>;
  		host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
  		shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_reg_on_h>;
+		vbat-supply = <&vcc3v3_sys>;
+		vddio-supply = <&vcc_1v8>;
  	};
  };
 
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
index 246a892cb7..07694b196f 100644
@@ -1,30 +1,74 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  /*
- * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
+ * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH
   */
 
  #include <dt-bindings/pwm/pwm.h>
  #include "rk3399.dtsi"
+#include "rk3399-opp.dtsi"
 
  / {
-	model = "Theobroma Systems RK3399-Q7 SoM";
-	compatible = "tsd,rk3399-q7", "tsd,puma", "rockchip,rk3399";
-
  	leds {
  		compatible = "gpio-leds";
  		pinctrl-names = "default";
-		pinctrl-0 = <&leds_pins_puma>;
+		pinctrl-0 = <&led_pin_module>;
 
-		module_led {
+		module-led {
  			label = "module_led";
  			gpios = <&gpio2 RK_PD1 GPIO_ACTIVE_HIGH>;
  			linux,default-trigger = "heartbeat";
+			panic-indicator;
  		};
+	};
 
-		sd_card_led {
-			label = "sd_card_led";
-			gpios = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "mmc0";
+	/*
+	 * Overwrite the opp-table for CPUB as this board uses a different
+	 * regulator (FAN53555) that only allows 10mV steps and therefore
+	 * can't reach the operation point target voltages from rk3399-opp.dtsi
+	 */
+	/delete-node/ opp-table1;
+	cluster1_opp: opp-table1 {
+		compatible = "operating-points-v2";
+		opp-shared;
+
+		opp00 {
+			opp-hz = /bits/ 64 <408000000>;
+			opp-microvolt = <800000>;
+			clock-latency-ns = <40000>;
+		};
+		opp01 {
+			opp-hz = /bits/ 64 <600000000>;
+			opp-microvolt = <800000>;
+		};
+		opp02 {
+			opp-hz = /bits/ 64 <816000000>;
+			opp-microvolt = <830000>;
+			opp-suspend;
+		};
+		opp03 {
+			opp-hz = /bits/ 64 <1008000000>;
+			opp-microvolt = <880000>;
+		};
+		opp04 {
+			opp-hz = /bits/ 64 <1200000000>;
+			opp-microvolt = <950000>;
+		};
+		opp05 {
+			opp-hz = /bits/ 64 <1416000000>;
+			opp-microvolt = <1030000>;
+		};
+		opp06 {
+			opp-hz = /bits/ 64 <1608000000>;
+			opp-microvolt = <1100000>;
+		};
+		opp07 {
+			opp-hz = /bits/ 64 <1800000000>;
+			opp-microvolt = <1200000>;
+		};
+		opp08 {
+			opp-hz = /bits/ 64 <1992000000>;
+			opp-microvolt = <1230000>;
+			turbo-mode;
  		};
  	};
 
@@ -35,78 +79,14 @@
  		#clock-cells = <0>;
  	};
 
-	dw_hdmi_audio: dw-hdmi-audio {
-		status = "enabled";
-		compatible = "rockchip,dw-hdmi-audio";
-		#sound-dai-cells = <0>;
-	};
-
-	hdmi_codec: hdmi-codec {
-		compatible = "simple-audio-card";
-		simple-audio-card,format = "i2s";
-		simple-audio-card,mclk-fs = <256>;
-		simple-audio-card,name = "HDMI-CODEC";
-
-		simple-audio-card,cpu {
-			sound-dai = <&i2s2>;
-		};
-
-		simple-audio-card,codec {
-			sound-dai = <&hdmi>;
-		};
-	};
-
-	hdmi_sound: hdmi-sound {
-		status = "disabled";
-		compatible = "simple-audio-card";
-		simple-audio-card,format = "i2s";
-		simple-audio-card,mclk-fs = <256>;
-		simple-audio-card,name = "rockchip,hdmi";
-
-		simple-audio-card,cpu {
-			sound-dai = <&i2s2>;
-		};
-		simple-audio-card,codec {
-			sound-dai = <&hdmi>;
-		};
-	};
-
-	usbhub_enable: usbhub_enable {
+	vcc1v2_phy: vcc1v2-phy {
  		compatible = "regulator-fixed";
-		regulator-name = "usbhub_enable";
-		enable-active-low;
-		gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&host_vbus_drv>;
-		regulator-boot-on;
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-	};
-
-	/*
-	 * 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";
-		regulator-name = "bios_enable";
-		enable-active-high;
-		gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
+		regulator-name = "vcc1v2_phy";
  		regulator-always-on;
  		regulator-boot-on;
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-	};
-
-	vccadc_ref: vccadc-ref {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc1v8_sys";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
+		regulator-min-microvolt = <1200000>;
+		regulator-max-microvolt = <1200000>;
+		vin-supply = <&vcc5v0_sys>;
  	};
 
  	vcc3v3_sys: vcc3v3-sys {
@@ -116,16 +96,18 @@
  		regulator-boot-on;
  		regulator-min-microvolt = <3300000>;
  		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc5v0_sys>;
  	};
 
-	vcc5v0_otg: vcc5v0-otg-regulator {
+	vcc5v0_host: vcc5v0-host-regulator {
  		compatible = "regulator-fixed";
-		enable-active-high;
-		gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
+		gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_HIGH>;
+		enable-active-low;
  		pinctrl-names = "default";
-		pinctrl-0 = <&otg_vbus_drv>;
-		regulator-name = "vcc5v0_otg";
+		pinctrl-0 = <&vcc5v0_host_en>;
+		regulator-name = "vcc5v0_host";
  		regulator-always-on;
+		vin-supply = <&vcc5v0_sys>;
  	};
 
  	vcc5v0_sys: vcc5v0-sys {
@@ -136,48 +118,55 @@
  		regulator-min-microvolt = <5000000>;
  		regulator-max-microvolt = <5000000>;
  	};
+};
 
-	vcc_phy: vcc-phy-regulator {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc_phy";
-		regulator-always-on;
-		regulator-boot-on;
-	};
+&cpu_b0 {
+	cpu-supply = <&vdd_cpu_b>;
+};
 
-	vdd_log: vdd-log {
-		compatible = "pwm-regulator";
-		pwms = <&pwm2 0 25000 1>;
-		regulator-name = "vdd_log";
-		regulator-min-microvolt = <800000>;
-		regulator-max-microvolt = <1400000>;
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-init-microvolt = <950000>;
-	};
+&cpu_b1 {
+	cpu-supply = <&vdd_cpu_b>;
+};
+
+&cpu_l0 {
+	cpu-supply = <&vdd_cpu_l>;
+};
+
+&cpu_l1 {
+	cpu-supply = <&vdd_cpu_l>;
+};
+
+&cpu_l2 {
+	cpu-supply = <&vdd_cpu_l>;
+};
+
+&cpu_l3 {
+	cpu-supply = <&vdd_cpu_l>;
  };
 
  &emmc_phy {
  	status = "okay";
+	drive-impedance-ohm = <33>;
  };
 
  &gmac {
-	phy-supply = <&vcc_phy>;
-	phy-mode = "rgmii";
-	clock_in_out = "input";
-	snps,reset-gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_LOW>;
-	snps,reset-active-low;
-	snps,reset-delays-us = <2 10000 50000>;
  	assigned-clocks = <&cru SCLK_RMII_SRC>;
  	assigned-clock-parents = <&clkin_gmac>;
+	clock_in_out = "input";
+	phy-supply = <&vcc1v2_phy>;
+	phy-mode = "rgmii";
  	pinctrl-names = "default";
  	pinctrl-0 = <&rgmii_pins>;
+	snps,reset-gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;
+	snps,reset-active-low;
+	snps,reset-delays-us = <0 10000 50000>;
  	tx_delay = <0x10>;
  	rx_delay = <0x10>;
  	status = "okay";
  };
 
-&hdmi {
-	#sound-dai-cells = <0>;
+&gpu {
+	mali-supply = <&vdd_gpu>;
  	status = "okay";
  };
 
@@ -187,37 +176,17 @@
  	i2c-scl-falling-time-ns = <4>;
  	clock-frequency = <400000>;
 
-	vdd_gpu: vdd_gpu {
-		status = "okay";
-		compatible = "fcs,fan53555";
-		reg = <0x60>;
-		vsel-gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_HIGH>;
-		vin-supply = <&vcc5v0_sys>;
-		regulator-compatible = "fan53555-reg";
-		regulator-name = "vdd_gpu";
-		regulator-min-microvolt = <600000>;
-		regulator-max-microvolt = <1230000>;
-		regulator-ramp-delay = <1000>;
-		fcs,suspend-voltage-selector = <1>;
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-initial-state = <3>;
-			regulator-state-mem {
-			regulator-off-in-suspend;
-		};
-	};
-
  	rk808: pmic@1b {
  		compatible = "rockchip,rk808";
  		reg = <0x1b>;
  		interrupt-parent = <&gpio1>;
-		interrupts = <22 IRQ_TYPE_LEVEL_LOW>;  // TODO check interrupt?
+		interrupts = <22 IRQ_TYPE_LEVEL_LOW>;
+		#clock-cells = <1>;
+		clock-output-names = "xin32k", "rk808-clkout2";
  		pinctrl-names = "default";
  		pinctrl-0 = <&pmic_int_l>;
  		rockchip,system-power-controller;
  		wakeup-source;
-		#clock-cells = <1>;
-		clock-output-names = "xin32k", "rk808-clkout2";
 
  		vcc1-supply = <&vcc5v0_sys>;
  		vcc2-supply = <&vcc5v0_sys>;
@@ -234,44 +203,44 @@
 
  		regulators {
  			vdd_center: DCDC_REG1 {
-				regulator-always-on;
-				regulator-boot-on;
+				regulator-name = "vdd_center";
  				regulator-min-microvolt = <750000>;
  				regulator-max-microvolt = <1350000>;
  				regulator-ramp-delay = <6001>;
-				regulator-name = "vdd_center";
+				regulator-always-on;
+				regulator-boot-on;
  				regulator-state-mem {
  					regulator-off-in-suspend;
  				};
  			};
 
  			vdd_cpu_l: DCDC_REG2 {
-				regulator-always-on;
-				regulator-boot-on;
+				regulator-name = "vdd_cpu_l";
  				regulator-min-microvolt = <750000>;
  				regulator-max-microvolt = <1350000>;
  				regulator-ramp-delay = <6001>;
-				regulator-name = "vdd_cpu_l";
+				regulator-always-on;
+				regulator-boot-on;
  				regulator-state-mem {
  					regulator-off-in-suspend;
  				};
  			};
 
  			vcc_ddr: DCDC_REG3 {
+				regulator-name = "vcc_ddr";
  				regulator-always-on;
  				regulator-boot-on;
-				regulator-name = "vcc_ddr";
  				regulator-state-mem {
  					regulator-on-in-suspend;
  				};
  			};
 
  			vcc_1v8: DCDC_REG4 {
-				regulator-always-on;
-				regulator-boot-on;
+				regulator-name = "vcc_1v8";
  				regulator-min-microvolt = <1800000>;
  				regulator-max-microvolt = <1800000>;
-				regulator-name = "vcc_1v8";
+				regulator-always-on;
+				regulator-boot-on;
  				regulator-state-mem {
  					regulator-on-in-suspend;
  					regulator-suspend-microvolt = <1800000>;
@@ -279,32 +248,32 @@
  			};
 
  			vcc_ldo1: LDO_REG1 {
-				regulator-boot-on;
+				regulator-name = "vcc_ldo1";
  				regulator-min-microvolt = <1800000>;
  				regulator-max-microvolt = <1800000>;
-				regulator-name = "vcc_ldo1";
+				regulator-boot-on;
  				regulator-state-mem {
  					regulator-off-in-suspend;
  				};
  			};
 
  			vcc1v8_hdmi: LDO_REG2 {
-				regulator-always-on;
-				regulator-boot-on;
+				regulator-name = "vcc1v8_hdmi";
  				regulator-min-microvolt = <1800000>;
  				regulator-max-microvolt = <1800000>;
-				regulator-name = "vcc1v8_hdmi";
+				regulator-always-on;
+				regulator-boot-on;
  				regulator-state-mem {
  					regulator-off-in-suspend;
  				};
  			};
 
  			vcc1v8_pmu: LDO_REG3 {
-				regulator-always-on;
-				regulator-boot-on;
+				regulator-name = "vcc1v8_pmu";
  				regulator-min-microvolt = <1800000>;
  				regulator-max-microvolt = <1800000>;
-				regulator-name = "vcc1v8_pmu";
+				regulator-always-on;
+				regulator-boot-on;
  				regulator-state-mem {
  					regulator-on-in-suspend;
  					regulator-suspend-microvolt = <1800000>;
@@ -312,11 +281,11 @@
  			};
 
  			vcc_sd: LDO_REG4 {
-				regulator-always-on;
-				regulator-boot-on;
+				regulator-name = "vcc_sd";
  				regulator-min-microvolt = <1800000>;
  				regulator-max-microvolt = <3000000>;
-				regulator-name = "vcc_sd";
+				regulator-always-on;
+				regulator-boot-on;
  				regulator-state-mem {
  					regulator-on-in-suspend;
  					regulator-suspend-microvolt = <3000000>;
@@ -324,79 +293,105 @@
  			};
 
  			vcc_ldo5: LDO_REG5 {
-				regulator-boot-on;
+				regulator-name = "vcc_ldo5";
  				regulator-min-microvolt = <3000000>;
  				regulator-max-microvolt = <3000000>;
-				regulator-name = "vcc_ldo5";
+				regulator-boot-on;
  				regulator-state-mem {
  					regulator-off-in-suspend;
  				};
  			};
 
  			vcc_ldo6: LDO_REG6 {
-				regulator-boot-on;
+				regulator-name = "vcc_ldo6";
  				regulator-min-microvolt = <1500000>;
  				regulator-max-microvolt = <1500000>;
-				regulator-name = "vcc_ldo6";
+				regulator-boot-on;
  				regulator-state-mem {
  					regulator-off-in-suspend;
  				};
  			};
 
  			vcc0v9_hdmi: LDO_REG7 {
-				regulator-always-on;
-				regulator-boot-on;
+				regulator-name = "vcc0v9_hdmi";
  				regulator-min-microvolt = <900000>;
  				regulator-max-microvolt = <900000>;
-				regulator-name = "vcc0v9_hdmi";
+				regulator-always-on;
+				regulator-boot-on;
  				regulator-state-mem {
  					regulator-off-in-suspend;
  				};
  			};
 
  			vcc_efuse: LDO_REG8 {
-				regulator-always-on;
-				regulator-boot-on;
+				regulator-name = "vcc_efuse";
  				regulator-min-microvolt = <1800000>;
  				regulator-max-microvolt = <1800000>;
-				regulator-name = "vcc_efuse";
+				regulator-always-on;
+				regulator-boot-on;
  				regulator-state-mem {
  					regulator-off-in-suspend;
  				};
  			};
 
  			vcc3v3_s3: SWITCH_REG1 {
+				regulator-name = "vcc3v3_s3";
  				regulator-always-on;
  				regulator-boot-on;
-				regulator-name = "vcc3v3_s3";
  				regulator-state-mem {
  					regulator-off-in-suspend;
  				};
  			};
 
  			vcc3v3_s0: SWITCH_REG2 {
+				regulator-name = "vcc3v3_s0";
  				regulator-always-on;
  				regulator-boot-on;
-				regulator-name = "vcc3v3_s0";
  				regulator-state-mem {
  					regulator-off-in-suspend;
  				};
  			};
  		};
  	};
+
+	vdd_gpu: regulator@60 {
+		compatible = "fcs,fan53555";
+		reg = <0x60>;
+		fcs,suspend-voltage-selector = <1>;
+		regulator-name = "vdd_gpu";
+		regulator-min-microvolt = <600000>;
+		regulator-max-microvolt = <1230000>;
+		regulator-ramp-delay = <1000>;
+		regulator-always-on;
+		regulator-boot-on;
+		vin-supply = <&vcc5v0_sys>;
+	};
+};
+
+&i2c7 {
+	status = "okay";
+	clock-frequency = <400000>;
+
+	fan: fan@18 {
+		compatible = "ti,amc6821";
+		reg = <0x18>;
+		#cooling-cells = <2>;
+	};
+
+	rtc_twi: rtc@6f {
+		compatible = "isil,isl1208";
+		reg = <0x6f>;
+	};
  };
 
  &i2c8 {
  	status = "okay";
  	clock-frequency = <400000>;
 
-	vdd_cpu_b: vdd_cpu_b {
-		status = "okay";
+	vdd_cpu_b: regulator@60 {
  		compatible = "fcs,fan53555";
  		reg = <0x60>;
-		vsel-gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
  		vin-supply = <&vcc5v0_sys>;
-		regulator-compatible = "fan53555-reg";
  		regulator-name = "vdd_cpu_b";
  		regulator-min-microvolt = <600000>;
  		regulator-max-microvolt = <1230000>;
@@ -404,48 +399,36 @@
  		fcs,suspend-voltage-selector = <1>;
  		regulator-always-on;
  		regulator-boot-on;
-		regulator-initial-state = <3>;
-			regulator-state-mem {
-			regulator-off-in-suspend;
-		};
  	};
  };
 
  &i2s0 {
+	pinctrl-0 = <&i2s0_2ch_bus>;
+	rockchip,playback-channels = <2>;
+	rockchip,capture-channels = <2>;
  	status = "okay";
-	rockchip,i2s-broken-burst-len;
-	rockchip,playback-channels = <8>;
-	rockchip,capture-channels = <8>;
-	#sound-dai-cells = <0>;
  };
 
-&i2s2 {
-	#sound-dai-cells = <0>;
-	status = "okay";
+/*
+ * As Q7 does not specify neither a global nor a RX clock for I2S these
+ * signals are not used. Furthermore I2S0_LRCK_RX is used as GPIO.
+ * Therefore we have to redefine the i2s0_2ch_bus definition to prevent
+ * conflicts.
+ */
+&i2s0_2ch_bus {
+	rockchip,pins =
+		<3 RK_PD0 1 &pcfg_pull_none>,
+		<3 RK_PD2 1 &pcfg_pull_none>,
+		<3 RK_PD3 1 &pcfg_pull_none>,
+		<3 RK_PD7 1 &pcfg_pull_none>;
  };
 
  &io_domains {
  	status = "okay";
-
-	bt656-supply = <&vcc_1v8>;	/* bt656_gpio2ab_ms */
-	audio-supply = <&vcc_1v8>;	/* audio_gpio3d4a_ms */
-	sdmmc-supply = <&vcc_sd>;	/* sdmmc_gpio4b_ms */
-	gpio1830-supply = <&vcc_1v8>;	/* gpio1833_gpio4cd_ms */
-};
-
-&pcie0 {
-	assigned-clocks = <&cru SCLK_PCIEPHY_REF>;
-	assigned-clock-parents = <&cru SCLK_PCIEPHY_REF100M>;
-	assigned-clock-rates = <100000000>;
-	ep-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
-	num-lanes = <4>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pcie_clkreqn>;
-	status = "okay";
-};
-
-&pcie_phy {
-		status = "okay";
+	bt656-supply = <&vcc_1v8>;
+	audio-supply = <&vcc_1v8>;
+	sdmmc-supply = <&vcc_sd>;
+	gpio1830-supply = <&vcc_1v8>;
  };
 
  &pmu_io_domains {
@@ -453,185 +436,99 @@
  	pmu1830-supply = <&vcc_1v8>;
  };
 
-&pwm0 {
-	status = "okay";
-};
-
  &pwm2 {
  	status = "okay";
  };
 
-&sdhci {
-	bus-width = <8>;
-	mmc-hs400-1_8v;
-	supports-emmc;
-	non-removable;
-	keep-power-in-suspend;
-	mmc-hs400-enhanced-strobe;
-	status = "okay";
-};
-
-&sdmmc {
-	clock-frequency = <150000000>;
-	max-frequency = <40000000>;
-	supports-sd;
-	bus-width = <4>;
-	cap-mmc-highspeed;
-	cap-sd-highspeed;
-	disable-wp;
-	num-slots = <1>;
-	vqmmc-supply = <&vcc_sd>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
-	status = "okay";
-};
-
-&uart2 {
-	status = "okay";
-};
-
-&usb_host0_ehci {
-	status = "disabled";
-};
-
-&usb_host0_ohci {
-	status = "disabled";
-};
-
-&usbdrd3_0 {
-	status = "okay";
-};
-
-&usb_host1_ehci {
-	status = "disabled";
-};
-
-&usb_host1_ohci {
-	status = "disabled";
-};
-
-&usbdrd3_1 {
-	status = "okay";
-	tsd,usb-port-power = "usbhub_enable";
-};
-
-&vopb {
-	status = "okay";
-};
-
  &pinctrl {
-	/* Pins that are not explicitely used by any devices */
-	pinctrl-names = "default";
-	pinctrl-0 = <&puma_pin_hog>;
-
-	hog {
-		puma_pin_hog: puma_pin_hog {
+	i2c8 {
+		i2c8_xfer_a: i2c8-xfer {
  			rockchip,pins =
-				/* We need pull-ups on Q7 buttons */
-				<RK_GPIO0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>, /* LID_BTN# */
-				<RK_GPIO0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>, /* BATLOW# */
-				<RK_GPIO0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>, /* SLP_BTN# */
-				<RK_GPIO0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>; /* BIOS_DISABLE# */
+			  <1 RK_PC4 1 &pcfg_pull_up>,
+			  <1 RK_PC5 1 &pcfg_pull_up>;
  		};
  	};
 
-	pmic {
-		pmic_int_l: pmic-int-l {
+	leds {
+		led_pin_module: led-module-gpio {
  			rockchip,pins =
-				<RK_GPIO1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
+			  <2 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
  	};
 
-	leds_pins_puma: led_pins@0 {
-			rockchip,pins =
-				<RK_GPIO2 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
-				<RK_GPIO1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
-	};
-
-	usb2 {
-		otg_vbus_drv: otg-vbus-drv {
-			rockchip,pins =
-				<RK_GPIO0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-
-		host_vbus_drv: host-vbus-drv {
+	pmic {
+		pmic_int_l: pmic-int-l {
  			rockchip,pins =
-				<RK_GPIO4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
+			  <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
  		};
  	};
 
-	i2c8 {
-		i2c8_xfer_a: i2c8-xfer {
+	usb2 {
+		vcc5v0_host_en: vcc5v0-host-en {
  			rockchip,pins =
-				<RK_GPIO1 RK_PC5 RK_FUNC_1 &pcfg_pull_up>,
-				<RK_GPIO1 RK_PC4 RK_FUNC_1 &pcfg_pull_up>;
+			  <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
  	};
  };
 
-&i2c1 {
+&sdhci {
+	bus-width = <8>;
+	mmc-hs400-1_8v;
+	mmc-hs400-enhanced-strobe;
+	non-removable;
  	status = "okay";
-	clock-frequency = <400000>;
  };
-&i2c2 {
-	status = "okay";
-	clock-frequency = <400000>;
+
+&sdmmc {
+	vqmmc-supply = <&vcc_sd>;
  };
-&i2c4 {
+
+&spi1 {
  	status = "okay";
-	clock-frequency = <400000>;
+
+	norflash: flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <50000000>;
+	};
  };
-&i2c6 {
+
+&tcphy1 {
  	status = "okay";
-	clock-frequency = <400000>;
  };
 
-&i2c6_xfer {
-	/* Enable pull-ups, the pins would float otherwise. */
-	rockchip,pins =
-		<RK_GPIO2 RK_PB2 RK_FUNC_2 &pcfg_pull_up>,
-		<RK_GPIO2 RK_PB1 RK_FUNC_2 &pcfg_pull_up>;
+&tsadc {
+	rockchip,hw-tshut-mode = <1>;
+	rockchip,hw-tshut-polarity = <1>;
+	status = "okay";
  };
 
-&i2c7 {
+&u2phy1 {
  	status = "okay";
-	clock-frequency = <400000>;
 
-	rtc_twi: rtc@6f {
-		compatible = "isil,isl1208";
-		reg = <0x6f>;
+	u2phy1_otg: otg-port {
+		status = "okay";
  	};
-	fan: fan@18 {
-		compatible = "ti,amc6821";
-		reg = <0x18>;
-		cooling-min-state = <0>;
-		cooling-max-state = <9>;
-		#cooling-cells = <2>;
+
+	u2phy1_host: host-port {
+		phy-supply = <&vcc5v0_host>;
+		status = "okay";
  	};
  };
 
-&uart0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&uart0_xfer &uart0_cts>;
+&usbdrd3_1 {
  	status = "okay";
  };
 
-
-&spi1 {
+&usbdrd_dwc3_1 {
  	status = "okay";
+	dr_mode = "host";
+};
 
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	spiflash: w25q32dw@0 {
-		compatible = "jedec,spi-nor";
-		reg = <0>;
-		spi-max-frequency = <49500000>;
-		spi-cpol;
-		spi-cpha;
-	};
+&usb_host1_ehci {
+	status = "okay";
  };
 
-&spi5 {
+&usb_host1_ohci {
  	status = "okay";
  };
arch/arm/dts/rk3399-roc-pc-u-boot.dtsi +36 -0
index 5746442981..141dd0b306 100644
@@ -14,9 +14,45 @@
  	chosen {
  		u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
  	};
+
+	vcc_hub_en: vcc_hub_en-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio2 RK_PA4 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&hub_rst>;
+		regulator-name = "vcc_hub_en";
+		regulator-always-on;
+	};
+};
+
+/*
+ * should be placed inside mp8859, but not until mp8859 has
+ * its own dt-binding.
+ */
+&dc_12v {
+	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>;
  };
 
  &vdd_log {
  	regulator-min-microvolt = <430000>;
  	regulator-init-microvolt = <950000>;
  };
+
+&vcc5v0_host {
+	regulator-always-on;
+};
+
+&vcc_sys {
+	regulator-always-on;
+};
+
+&vcc_sdio {
+	regulator-always-on;
+};
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>;
[… more lines in the raw message]

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

arch/arm/dts/rk3399-rock-pi-4.dts +129 -0
index 4a543f2117..3923ec01ef 100644

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

arch/arm/dts/rk3399-rock960.dts +49 -0
index 12285c51cc..437a75f31a 100644

Lines of this file are not shown. View the 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
index e544deb61d..4b42717800 100644

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

arch/arm/dts/rk3399-rockpro64.dtsi new file +797 -0
new file mode 100644
index 0000000000..9bca258012

Lines of this file are not shown. View the 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
index 6b7c136ab8..74f2c3d490 100644

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

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

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

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

author
#14 lore raw

PATCH v2 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.

---
Changes for v2:
- none

 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 af7d804b66..409b0d1b3f 100644
@@ -131,6 +131,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

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

Reviewed-by
#16 lore raw

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

Quoted 5 lines · Jagan Teki

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

Thanks,
- Kever

Quoted 110 lines

---
Changes for v2:
- none

  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 af7d804b66..409b0d1b3f 100644
@@ -131,6 +131,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 +83 -0
new file mode 100644
index 0000000000..2acb3d500f
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd
+ * Copyright (c) 2019 Markus Reichl <[email protected]>
+ */
+
+/dts-v1/;
+#include "rk3399-roc-pc.dtsi"
+
+/ {
+	model = "Firefly ROC-RK3399-PC Mezzanine Board";
+	compatible = "firefly,roc-rk3399-pc-mezzanine", "rockchip,rk3399";
+
+	vcc3v3_ngff: vcc3v3-ngff {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc3v3_ngff";
+		enable-active-high;
+		gpio = <&gpio4 RK_PD3 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&vcc3v3_ngff_en>;
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&dc_12v>;
+	};
+
+	vcc3v3_pcie: vcc3v3-pcie {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc3v3_pcie";
+		enable-active-high;
+		gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&vcc3v3_pcie_en>;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&dc_12v>;
+	};
+};
+
+&pcie_phy {
+	status = "okay";
+};
+
+&pcie0 {
+	ep-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
+	num-lanes = <4>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie_perst>;
+	vpcie3v3-supply = <&vcc3v3_pcie>;
+	vpcie1v8-supply = <&vcc1v8_pmu>;
+	vpcie0v9-supply = <&vcca_0v9>;
+	status = "okay";
+};
+
+&pinctrl {
+	ngff {
+		vcc3v3_ngff_en: vcc3v3-ngff-en {
+			rockchip,pins = <4 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	pcie {
+		vcc3v3_pcie_en: vcc3v3-pcie-en {
+			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		pcie_perst: pcie-perst {
+			rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+};
+
+&sdio0 {
+	bus-width = <4>;
+	cap-sd-highspeed;
+	cap-sdio-irq;
+	keep-power-in-suspend;
+	mmc-pwrseq = <&sdio_pwrseq>;
+	non-removable;
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
+	sd-uhs-sdr104;

arch/arm/dts/rk3399-roc-pc-mezzanine.dts line 93

Quoted 10 lines
arch/arm/dts/rk3399-roc-pc-mezzanine.dts new file +10 -0
+	vmmc-supply = <&vcc3v3_ngff>;
+	vqmmc-supply = <&vcc_1v8>;
+	status = "okay";
+};
+
+&uart0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
+	status = "okay";
+};

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

author
#17 lore raw

PATCH v2 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.

---
Changes for v2:
- include rk3399-roc-pc-u-boot.dtsi

 .../dts/rk3399-roc-pc-mezzanine-u-boot.dtsi   |  6 ++
 board/firefly/roc-pc-rk3399/MAINTAINERS       |  2 +
 configs/roc-pc-mezzanine-rk3399_defconfig     | 67 +++++++++++++++++++
 3 files changed, 75 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 +6 -0
new file mode 100644
index 0000000000..f50c18dd3d
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2020 Amarula Solutions(India)
+ */
+
+#include "rk3399-roc-pc-u-boot.dtsi"
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

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

Reviewed-by
#19 lore raw

Re: [PATCH v2 6/6] rk3399: Add ROC-RK3399-PC Mezzanine board

Quoted 10 lines · Jagan Teki

From: Suniel Mahesh <[email protected]>

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.

Thanks,
- Kever

Quoted 99 lines

---
Changes for v2:
- include rk3399-roc-pc-u-boot.dtsi

  .../dts/rk3399-roc-pc-mezzanine-u-boot.dtsi   |  6 ++
  board/firefly/roc-pc-rk3399/MAINTAINERS       |  2 +
  configs/roc-pc-mezzanine-rk3399_defconfig     | 67 +++++++++++++++++++
  3 files changed, 75 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 +6 -0
new file mode 100644
index 0000000000..f50c18dd3d
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2020 Amarula Solutions(India)
+ */
+
+#include "rk3399-roc-pc-u-boot.dtsi"
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 <[email protected]>
  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 +57 -0
new file mode 100644
index 0000000000..5a694edc03
@@ -0,0 +1,67 @@
+CONFIG_ARM=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SYS_TEXT_BASE=0x00200000
+CONFIG_ENV_OFFSET=0x3F8000
+CONFIG_ROCKCHIP_RK3399=y
+CONFIG_TARGET_ROC_PC_RK3399=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_DEBUG_UART_BASE=0xFF1A0000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_DEBUG_UART=y
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc-mezzanine.dtb"
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
+CONFIG_TPL=y
+CONFIG_TPL_GPIO_SUPPORT=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TIME=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="rk3399-roc-pc-mezzanine"
+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ROCKCHIP=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_DM_ETH=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_GMAC_ROCKCHIP=y
+CONFIG_PMIC_RK8XX=y
+CONFIG_REGULATOR_PWM=y
+CONFIG_REGULATOR_RK8XX=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_RAM_RK3399_LPDDR4=y
+CONFIG_BAUDRATE=1500000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_ROCKCHIP_SPI=y
+CONFIG_SYSRESET=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_USB_ETHER_ASIX88179=y
+CONFIG_USB_ETHER_MCS7830=y
+CONFIG_USB_ETHER_RTL8152=y

configs/roc-pc-mezzanine-rk3399_defconfig line 67

Quoted 10 lines
configs/roc-pc-mezzanine-rk3399_defconfig new file +10 -0
+CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_USB_KEYBOARD=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip