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

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

Documentation/devicetree/bindings/arm/rockchip.txt

+34 −0
Original line number Diff line number Diff line
@@ -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",

arch/arm64/boot/dts/rockchip/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -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

arch/arm64/boot/dts/rockchip/rk3328-rock64.dts

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ 
&emmc {

	bus-width = <8>;

	cap-mmc-highspeed;

	mmc-hs200-1_8v;

	non-removable;

	pinctrl-names = "default";

	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;

arch/arm64/boot/dts/rockchip/rk3328.dtsi

+4 −1
Original line number Diff line number Diff line
@@ -479,7 +479,10 @@ 
			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>;

				};

			};

arch/arm64/boot/dts/rockchip/rk3368.dtsi

+12 −3
Original line number Diff line number Diff line
@@ -426,12 +426,18 @@ 
				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 @@ 
				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>;

				};

			};

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE