rockchip: rk3328: rock64 - fix gen3 SPL hang

[oweals/u-boot.git] / arch / arm / dts / rk3399-rock960.dts

diff --git a/arch/arm/dts/rk3399-rock960.dts b/arch/arm/dts/rk3399-rock960.dts
index 25c58b426113f25818260dedab5b34758cf11dcc..437a75f31ad4db29e5b021aeb84944741bb1494a 100644 (file)
--- a/arch/arm/dts/rk3399-rock960.dts
+++ b/arch/arm/dts/rk3399-rock960.dts
@@ -1,11 +1,10 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+ * Copyright (c) 2018 Linaro Ltd.
  */
 
 /dts-v1/;
 #include "rk3399-rock960.dtsi"
-#include "rk3399-sdram-lpddr3-2GB-1600.dtsi"
 
 / {
        model = "96boards Rock960";
@@ -14,6 +13,53 @@
        chosen {
                stdout-path = "serial2:1500000n8";
        };
+
+       leds {
+               compatible = "gpio-leds";
+               pinctrl-names = "default";
+               pinctrl-0 = <&user_led1>, <&user_led2>, <&user_led3>,
+                           <&user_led4>, <&wlan_led>, <&bt_led>;
+
+               user_led1 {
+                       label = "green:user1";
+                       gpios = <&gpio4 RK_PC2 0>;
+                       linux,default-trigger = "heartbeat";
+               };
+
+               user_led2 {
+                       label = "green:user2";
+                       gpios = <&gpio4 RK_PC6 0>;
+                       linux,default-trigger = "mmc0";
+               };
+
+               user_led3 {
+                       label = "green:user3";
+                       gpios = <&gpio4 RK_PD0 0>;
+                       linux,default-trigger = "mmc1";
+               };
+
+               user_led4 {
+                       label = "green:user4";
+                       gpios = <&gpio4 RK_PD4 0>;
+                       panic-indicator;
+                       linux,default-trigger = "none";
+               };
+
+               wlan_active_led {
+                       label = "yellow:wlan";
+                       gpios = <&gpio4 RK_PD5 0>;
+                       linux,default-trigger = "phy0tx";
+                       default-state = "off";
+               };
+
+               bt_active_led {
+                       label = "blue:bt";
+                       gpios = <&gpio4 RK_PD6 0>;
+                       linux,default-trigger = "hci0-power";
+                       default-state = "off";
+               };
+       };
+
 };
 
 &pcie0 {
@@ -21,6 +67,38 @@
 };
 
 &pinctrl {
+       leds {
+               user_led1: user_led1 {
+                       rockchip,pins =
+                               <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+
+               user_led2: user_led2 {
+                       rockchip,pins =
+                               <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+
+               user_led3: user_led3 {
+                       rockchip,pins =
+                               <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+
+               user_led4: user_led4 {
+                       rockchip,pins =
+                               <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+
+               wlan_led: wlan_led {
+                       rockchip,pins =
+                               <4 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+
+               bt_led: bt_led {
+                       rockchip,pins =
+                               <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
+
        pcie {
                pcie_drv: pcie-drv {
                        rockchip,pins =
@@ -36,6 +114,63 @@
        };
 };
 
+&spi0 {
+       /* On Low speed expansion (LS-SPI0) */
+       status = "okay";
+};
+
+&spi4 {
+       /* On High speed expansion (HS-SPI1) */
+       status = "okay";
+};
+
+&thermal_zones {
+       cpu_thermal: cpu {
+               polling-delay-passive = <100>;
+               polling-delay = <1000>;
+               thermal-sensors = <&tsadc 0>;
+               sustainable-power = <1550>;
+
+               trips {
+                       cpu_alert0: cpu_alert0 {
+                                   temperature = <65000>;
+                                   hysteresis = <2000>;
+                                   type = "passive";
+                       };
+
+                       cpu_alert1: cpu_alert1 {
+                                   temperature = <75000>;
+                                   hysteresis = <2000>;
+                                   type = "passive";
+                       };
+
+                       cpu_crit: cpu_crit {
+                                 temperature = <95000>;
+                                 hysteresis = <2000>;
+                                 type = "critical";
+                       };
+               };
+
+               cooling-maps {
+                            map0 {
+
+                            trip = <&cpu_alert1>;
+                            cooling-device =
+                                       <&cpu_b0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                                       <&cpu_b1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                       };
+               };
+       };
+};
+
+&usbdrd_dwc3_0 {
+       dr_mode = "otg";
+};
+
+&usbdrd_dwc3_1 {
+       dr_mode = "host";
+};
+
 &vcc3v3_pcie {
        gpio = <&gpio2 5 GPIO_ACTIVE_HIGH>;
 };