Commit 42d76db9 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'v4.21-rockchip-dts64-1' of...

Merge tag 'v4.21-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

New dts for Gru-Scarlet (tablet device), default backlight brightness
for all Gru devices, rk3399 spi dma properties, some improvements for
the rk3399-sapphire board (fan, chosen, backlight), hs200 mode for the
emmc on the rock64 and declaring all cpu cores in the cooling maps
instead of just cpu0.

* tag 'v4.21-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Add all CPUs in cooling maps
  arm64: dts: rockchip: add Gru Scarlet devicetrees
  arm64: dts: rockchip: move backlight from rk3399 sapphire to excavator
  arm64: dts: rockchip: Use default brightness table for rk3399-gru
  arm64: dts: rockchip: add chosen node on rk3399-sapphire
  arm64: dts: rockchip: enable HS200 for eMMC on rock64
  arm64: dts: rockchip: add fan on rk3399-sapphire board
  arm64: dts: rockchip: add rk3399 SPI DMAs
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 97334883 cdd46460
......@@ -152,6 +152,40 @@ Rockchip platforms device tree bindings
- compatible = "google,veyron-pinky-rev2", "google,veyron-pinky",
"google,veyron", "rockchip,rk3288";
- Google Scarlet - with display from Kingdisplay
Required root node properties:
- compatible = "google,scarlet-rev15-sku7", "google,scarlet-rev15",
"google,scarlet-rev14-sku7", "google,scarlet-rev14",
"google,scarlet-rev13-sku7", "google,scarlet-rev13",
"google,scarlet-rev12-sku7", "google,scarlet-rev12",
"google,scarlet-rev11-sku7", "google,scarlet-rev11",
"google,scarlet-rev10-sku7", "google,scarlet-rev10",
"google,scarlet-rev9-sku7", "google,scarlet-rev9",
"google,scarlet-rev8-sku7", "google,scarlet-rev8",
"google,scarlet-rev7-sku7", "google,scarlet-rev7",
"google,scarlet-rev6-sku7", "google,scarlet-rev6",
"google,scarlet-rev5-sku7", "google,scarlet-rev5",
"google,scarlet-rev4-sku7", "google,scarlet-rev4",
"google,scarlet-rev3-sku7", "google,scarlet-rev3",
"google,scarlet", "google,gru", "rockchip,rk3399";
- Google Scarlet - with display from Innolux
Required root node properties:
- compatible = "google,scarlet-rev15-sku6", "google,scarlet-rev15",
"google,scarlet-rev14-sku6", "google,scarlet-rev14",
"google,scarlet-rev13-sku6", "google,scarlet-rev13",
"google,scarlet-rev12-sku6", "google,scarlet-rev12",
"google,scarlet-rev11-sku6", "google,scarlet-rev11",
"google,scarlet-rev10-sku6", "google,scarlet-rev10",
"google,scarlet-rev9-sku6", "google,scarlet-rev9",
"google,scarlet-rev8-sku6", "google,scarlet-rev8",
"google,scarlet-rev7-sku6", "google,scarlet-rev7",
"google,scarlet-rev6-sku6", "google,scarlet-rev6",
"google,scarlet-rev5-sku6", "google,scarlet-rev5",
"google,scarlet-rev4-sku6", "google,scarlet-rev4",
"google,scarlet", "google,gru", "rockchip,rk3399";
- Google Speedy (Asus C201 Chromebook):
Required root node properties:
- compatible = "google,veyron-speedy-rev9", "google,veyron-speedy-rev8",
......
......@@ -14,6 +14,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb
......
......@@ -100,6 +100,7 @@ &cpu3 {
&emmc {
bus-width = <8>;
cap-mmc-highspeed;
mmc-hs200-1_8v;
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
......
......@@ -479,7 +479,10 @@ soc_crit: soc-crit {
cooling-maps {
map0 {
trip = <&target>;
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
contribution = <4096>;
};
};
......
......@@ -426,12 +426,18 @@ cooling-maps {
map0 {
trip = <&cpu_alert0>;
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>,
<&cpu_b2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu_b3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
map1 {
trip = <&cpu_alert1>;
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>;
};
};
};
......@@ -459,7 +465,10 @@ cooling-maps {
map0 {
trip = <&gpu_alert0>;
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>,
<&cpu_b2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu_b3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};
......
......@@ -194,14 +194,6 @@ wlan_pd_n: wlan-pd-n {
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";
......
......@@ -118,13 +118,17 @@ cooling-maps {
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>;
};
};
......
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Google Gru-Scarlet Rev4+ (SKU-6/Innolux) board device tree source
*
* Copyright 2018 Google, Inc
*/
/dts-v1/;
#include "rk3399-gru-scarlet.dtsi"
/ {
model = "Google Scarlet";
compatible = "google,scarlet-rev15-sku6", "google,scarlet-rev15",
"google,scarlet-rev14-sku6", "google,scarlet-rev14",
"google,scarlet-rev13-sku6", "google,scarlet-rev13",
"google,scarlet-rev12-sku6", "google,scarlet-rev12",
"google,scarlet-rev11-sku6", "google,scarlet-rev11",
"google,scarlet-rev10-sku6", "google,scarlet-rev10",
"google,scarlet-rev9-sku6", "google,scarlet-rev9",
"google,scarlet-rev8-sku6", "google,scarlet-rev8",
"google,scarlet-rev7-sku6", "google,scarlet-rev7",
"google,scarlet-rev6-sku6", "google,scarlet-rev6",
"google,scarlet-rev5-sku6", "google,scarlet-rev5",
"google,scarlet-rev4-sku6", "google,scarlet-rev4",
"google,scarlet", "google,gru", "rockchip,rk3399";
};
&mipi_panel {
compatible = "innolux,p097pfg";
avdd-supply = <&ppvarp_lcd>;
avee-supply = <&ppvarn_lcd>;
};
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Google Gru-Scarlet Rev3+ (SKU-7/Kingdisplay) board device tree source
*
* Copyright 2018 Google, Inc
*/
/dts-v1/;
#include "rk3399-gru-scarlet.dtsi"
/ {
model = "Google Scarlet";
compatible = "google,scarlet-rev15-sku7", "google,scarlet-rev15",
"google,scarlet-rev14-sku7", "google,scarlet-rev14",
"google,scarlet-rev13-sku7", "google,scarlet-rev13",
"google,scarlet-rev12-sku7", "google,scarlet-rev12",
"google,scarlet-rev11-sku7", "google,scarlet-rev11",
"google,scarlet-rev10-sku7", "google,scarlet-rev10",
"google,scarlet-rev9-sku7", "google,scarlet-rev9",
"google,scarlet-rev8-sku7", "google,scarlet-rev8",
"google,scarlet-rev7-sku7", "google,scarlet-rev7",
"google,scarlet-rev6-sku7", "google,scarlet-rev6",
"google,scarlet-rev5-sku7", "google,scarlet-rev5",
"google,scarlet-rev4-sku7", "google,scarlet-rev4",
"google,scarlet-rev3-sku7", "google,scarlet-rev3",
"google,scarlet", "google,gru", "rockchip,rk3399";
};
&mipi_panel {
compatible = "kingdisplay,kd097d04";
power-supply = <&pp3300_s0>;
};
This diff is collapsed.
......@@ -42,6 +42,47 @@ menu {
};
};
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 101 102 103
104 105 106 107 108 109 110 111
112 113 114 115 116 117 118 119
120 121 122 123 124 125 126 127
128 129 130 131 132 133 134 135
136 137 138 139 140 141 142 143
144 145 146 147 148 149 150 151
152 153 154 155 156 157 158 159
160 161 162 163 164 165 166 167
168 169 170 171 172 173 174 175
176 177 178 179 180 181 182 183
184 185 186 187 188 189 190 191
192 193 194 195 196 197 198 199
200 201 202 203 204 205 206 207
208 209 210 211 212 213 214 215
216 217 218 219 220 221 222 223
224 225 226 227 228 229 230 231
232 233 234 235 236 237 238 239
240 241 242 243 244 245 246 247
248 249 250 251 252 253 254 255>;
default-brightness-level = <200>;
enable-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
pwms = <&pwm0 0 25000 0>;
status = "okay";
};
edp_panel: edp-panel {
compatible ="lg,lp079qx1-sp0v", "simple-panel";
backlight = <&backlight>;
......@@ -95,11 +136,6 @@ sdio_pwrseq: sdio-pwrseq {
};
};
&backlight {
enable-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
status = "okay";
};
&edp {
status = "okay";
......
......@@ -11,43 +11,8 @@
/ {
compatible = "rockchip,rk3399-sapphire", "rockchip,rk3399";
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 101 102 103
104 105 106 107 108 109 110 111
112 113 114 115 116 117 118 119
120 121 122 123 124 125 126 127
128 129 130 131 132 133 134 135
136 137 138 139 140 141 142 143
144 145 146 147 148 149 150 151
152 153 154 155 156 157 158 159
160 161 162 163 164 165 166 167
168 169 170 171 172 173 174 175
176 177 178 179 180 181 182 183
184 185 186 187 188 189 190 191
192 193 194 195 196 197 198 199
200 201 202 203 204 205 206 207
208 209 210 211 212 213 214 215
216 217 218 219 220 221 222 223
224 225 226 227 228 229 230 231
232 233 234 235 236 237 238 239
240 241 242 243 244 245 246 247
248 249 250 251 252 253 254 255>;
default-brightness-level = <200>;
pwms = <&pwm0 0 25000 0>;
chosen {
stdout-path = "serial2:1500000n8";
};
clkin_gmac: external-gmac-clock {
......@@ -66,6 +31,19 @@ dc_12v: dc-12v {
regulator-max-microvolt = <12000000>;
};
/*
* The fan power supply comes from the baseboard.
* For the standalone Sapphire one option is to connect a wire
* from R90030 DNP R0805 pin2 to C90002 10uF C0805 pin1 (vcc_sys).
*/
fan0: gpio-fan {
#cooling-cells = <2>;
compatible = "gpio-fan";
gpio-fan,speed-map = <0 0 3000 1>;
gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
status = "okay";
};
keys: gpio-keys {
compatible = "gpio-keys";
autorepeat;
......@@ -183,6 +161,24 @@ &cpu_b1 {
cpu-supply = <&vdd_cpu_b>;
};
&cpu_thermal {
trips {
cpu_hot: cpu_hot {
hysteresis = <10000>;
temperature = <55000>;
type = "active";
};
};
cooling-maps {
map2 {
cooling-device =
<&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
trip = <&cpu_hot>;
};
};
};
&emmc_phy {
status = "okay";
};
......@@ -472,6 +468,13 @@ pwr_btn: pwr-btn {
};
};
fan {
motor_pwr: motor-pwr {
rockchip,pins =
<RK_GPIO1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
......
......@@ -681,6 +681,8 @@ spi0: spi@ff1c0000 {
clocks = <&cru SCLK_SPI0>, <&cru PCLK_SPI0>;
clock-names = "spiclk", "apb_pclk";
interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH 0>;
dmas = <&dmac_peri 10>, <&dmac_peri 11>;
dma-names = "tx", "rx";
pinctrl-names = "default";
pinctrl-0 = <&spi0_clk &spi0_tx &spi0_rx &spi0_cs0>;
#address-cells = <1>;
......@@ -694,6 +696,8 @@ spi1: spi@ff1d0000 {
clocks = <&cru SCLK_SPI1>, <&cru PCLK_SPI1>;
clock-names = "spiclk", "apb_pclk";
interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH 0>;
dmas = <&dmac_peri 12>, <&dmac_peri 13>;
dma-names = "tx", "rx";
pinctrl-names = "default";
pinctrl-0 = <&spi1_clk &spi1_tx &spi1_rx &spi1_cs0>;
#address-cells = <1>;
......@@ -707,6 +711,8 @@ spi2: spi@ff1e0000 {
clocks = <&cru SCLK_SPI2>, <&cru PCLK_SPI2>;
clock-names = "spiclk", "apb_pclk";
interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH 0>;
dmas = <&dmac_peri 14>, <&dmac_peri 15>;
dma-names = "tx", "rx";
pinctrl-names = "default";
pinctrl-0 = <&spi2_clk &spi2_tx &spi2_rx &spi2_cs0>;
#address-cells = <1>;
......@@ -720,6 +726,8 @@ spi4: spi@ff1f0000 {
clocks = <&cru SCLK_SPI4>, <&cru PCLK_SPI4>;
clock-names = "spiclk", "apb_pclk";
interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH 0>;
dmas = <&dmac_peri 18>, <&dmac_peri 19>;
dma-names = "tx", "rx";
pinctrl-names = "default";
pinctrl-0 = <&spi4_clk &spi4_tx &spi4_rx &spi4_cs0>;
#address-cells = <1>;
......@@ -733,6 +741,8 @@ spi5: spi@ff200000 {
clocks = <&cru SCLK_SPI5>, <&cru PCLK_SPI5>;
clock-names = "spiclk", "apb_pclk";
interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH 0>;
dmas = <&dmac_bus 8>, <&dmac_bus 9>;
dma-names = "tx", "rx";
pinctrl-names = "default";
pinctrl-0 = <&spi5_clk &spi5_tx &spi5_rx &spi5_cs0>;
power-domains = <&power RK3399_PD_SDIOAUDIO>;
......@@ -770,13 +780,18 @@ cooling-maps {
map0 {
trip = <&cpu_alert0>;
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>;
};
map1 {
trip = <&cpu_alert1>;
cooling-device =
<&cpu_l0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu_b0 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>,
<&cpu_b0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu_b1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};
......@@ -804,7 +819,8 @@ cooling-maps {
map0 {
trip = <&gpu_alert0>;
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>;
};
};
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment