Commit 745d0c93 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.4-rockchip-dts32-1' of... 

Merge tag 'v5.4-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

A lot more love for Veyron devices with cleanups in the display and wifi
areas and also a 100ms speedup as a delay isn't needed anymore.
New boards are Tiger and Fievel from the Veyron family and the Mecer Xtreme
Mini S6, which I think is the first consumer-grade rk3229-based device in
the kernel.

* tag 'v5.4-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: add device tree for Mecer Xtreme Mini S6
  Revert "ARM: dts: rockchip: add startup delay to rk3288-veyron panel-regulators"
  ARM: dts: rockchip: Add pin names for rk3288-veyron fievel
  ARM: dts: rockchip: A few fixes for veyron-{fievel,tiger}
  ARM: dts: rockchip: Cleanup style around assignment operator
  ARM: dts: rockchip: add veyron-tiger board
  ARM: dts: rockchip: add veyron-fievel board
  dt-bindings: ARM: dts: rockchip: Add bindings for rk3288-veyron-{fievel,tiger}
  ARM: dts: rockchip: consolidate veyron panel and backlight settings
  ARM: dts: rockchip: move rk3288-veryon display settings into a separate file
  ARM: dts: rockchip: Limit WiFi TX power on rk3288-veyron-jerry
  ARM: dts: rockchip: Specify rk3288-veyron-minnie's display timings
  ARM: dts: rockchip: Specify rk3288-veyron-chromebook's display timings

Link: https://lore.kernel.org/r/1611583.rKl1eQBRh8@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5ba78aff dd7c66ac

Documentation/devicetree/bindings/arm/rockchip.yaml

+35 −0
Original line number Diff line number Diff line
@@ -128,6 +128,21 @@ properties: 
          - const: google,veyron

          - const: rockchip,rk3288



      - description: Google Fievel (AOPEN Chromebox Mini)

        items:

          - const: google,veyron-fievel-rev8

          - const: google,veyron-fievel-rev7

          - const: google,veyron-fievel-rev6

          - const: google,veyron-fievel-rev5

          - const: google,veyron-fievel-rev4

          - const: google,veyron-fievel-rev3

          - const: google,veyron-fievel-rev2

          - const: google,veyron-fievel-rev1

          - const: google,veyron-fievel-rev0

          - const: google,veyron-fievel

          - const: google,veyron

          - const: rockchip,rk3288



      - description: Google Gru (dev-board)

        items:

          - const: google,gru-rev15
@@ -311,6 +326,21 @@ properties: 
          - const: google,veyron

          - const: rockchip,rk3288



      - description: Google Tiger (AOpen Chromebase Mini)

        items:

          - const: google,veyron-tiger-rev8

          - const: google,veyron-tiger-rev7

          - const: google,veyron-tiger-rev6

          - const: google,veyron-tiger-rev5

          - const: google,veyron-tiger-rev4

          - const: google,veyron-tiger-rev3

          - const: google,veyron-tiger-rev2

          - const: google,veyron-tiger-rev1

          - const: google,veyron-tiger-rev0

          - const: google,veyron-tiger

          - const: google,veyron

          - const: rockchip,rk3288



      - description: Haoyu MarsBoard RK3066

        items:

          - const: haoyu,marsboard-rk3066
@@ -329,6 +359,11 @@ properties: 
              - khadas,edge-v

          - const: rockchip,rk3399



      - description: Mecer Xtreme Mini S6

        items:

          - const: mecer,xms6

          - const: rockchip,rk3229



      - description: mqmaker MiQi

        items:

          - const: mqmaker,miqi

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -549,6 +549,8 @@ patternProperties: 
    description: mCube

  "^meas,.*":

    description: Measurement Specialties

  "^mecer,.*":

    description: Mustek Limited

  "^mediatek,.*":

    description: MediaTek Inc.

  "^megachips,.*":

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -905,6 +905,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ 
	rk3188-radxarock.dtb \

	rk3228-evb.dtb \

	rk3229-evb.dtb \

	rk3229-xms6.dtb \

	rk3288-evb-act8846.dtb \

	rk3288-evb-rk808.dtb \

	rk3288-fennec.dtb \
@@ -919,6 +920,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ 
	rk3288-tinker.dtb \

	rk3288-tinker-s.dtb \

	rk3288-veyron-brain.dtb \

	rk3288-veyron-fievel.dtb \

	rk3288-veyron-jaq.dtb \

	rk3288-veyron-jerry.dtb \

	rk3288-veyron-mickey.dtb \
@@ -926,6 +928,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ 
	rk3288-veyron-minnie.dtb \

	rk3288-veyron-pinky.dtb \

	rk3288-veyron-speedy.dtb \

	rk3288-veyron-tiger.dtb \

	rk3288-vyasa.dtb

dtb-$(CONFIG_ARCH_S3C24XX) += \

	s3c2416-smdk2416.dtb

arch/arm/boot/dts/rk3229-xms6.dts

0 → 100644
+283 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)



/dts-v1/;



#include <dt-bindings/input/input.h>

#include "rk3229.dtsi"



/ {

	model = "Mecer Xtreme Mini S6";

	compatible = "mecer,xms6", "rockchip,rk3229";



	memory@60000000 {

		device_type = "memory";

		reg = <0x60000000 0x40000000>;

	};



	dc_12v: dc-12v-regulator {

		compatible = "regulator-fixed";

		regulator-name = "dc_12v";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

	};



	ext_gmac: ext_gmac {

		compatible = "fixed-clock";

		clock-frequency = <125000000>;

		clock-output-names = "ext_gmac";

		#clock-cells = <0>;

	};



	power-led {

		compatible = "gpio-leds";



		blue {

			gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;

			default-state = "on";

		};

	};



	vcc_host: vcc-host-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio3 RK_PC4 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&host_vbus_drv>;

		regulator-name = "vcc_host";

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc_sys>;

	};



	vcc_phy: vcc-phy-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		regulator-name = "vcc_phy";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vccio_1v8>;

	};



	vcc_sys: vcc-sys-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vcc_sys";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&dc_12v>;

	};



	vccio_1v8: vccio-1v8-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vccio_1v8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

		vin-supply = <&vcc_sys>;

	};



	vccio_3v3: vccio-3v3-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vccio_3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		vin-supply = <&vcc_sys>;

	};



	vdd_arm: vdd-arm-regulator {

		compatible = "pwm-regulator";

		pwms = <&pwm1 0 25000 1>;

		pwm-supply = <&vcc_sys>;

		regulator-name = "vdd_arm";

		regulator-min-microvolt = <950000>;

		regulator-max-microvolt = <1400000>;

		regulator-always-on;

		regulator-boot-on;

	};



	vdd_log: vdd-log-regulator {

		compatible = "pwm-regulator";

		pwms = <&pwm2 0 25000 1>;

		pwm-supply = <&vcc_sys>;

		regulator-name = "vdd_log";

		regulator-min-microvolt = <1000000>;

		regulator-max-microvolt = <1300000>;

		regulator-always-on;

		regulator-boot-on;

	};

};



&cpu0 {

	cpu-supply = <&vdd_arm>;

};



&cpu1 {

	cpu-supply = <&vdd_arm>;

};



&cpu2 {

	cpu-supply = <&vdd_arm>;

};



&cpu3 {

	cpu-supply = <&vdd_arm>;

};



&emmc {

	cap-mmc-highspeed;

	disable-wp;

	non-removable;

	status = "okay";

};



&gmac {

	assigned-clocks = <&cru SCLK_MAC_SRC>;

	assigned-clock-rates = <50000000>;

	clock_in_out = "output";

	phy-handle = <&phy>;

	phy-mode = "rmii";

	phy-supply = <&vcc_phy>;

	status = "okay";



	mdio {

		compatible = "snps,dwmac-mdio";

		#address-cells = <1>;

		#size-cells = <0>;



		phy: phy@0 {

			compatible = "ethernet-phy-id1234.d400",

			             "ethernet-phy-ieee802.3-c22";

			reg = <0>;

			clocks = <&cru SCLK_MAC_PHY>;

			phy-is-integrated;

			resets = <&cru SRST_MACPHY>;

		};

	};

};



&gpu {

	mali-supply = <&vdd_log>;

	status = "okay";

};



&hdmi {

	status = "okay";

};



&hdmi_phy {

	status = "okay";

};



&iep_mmu {

	status = "okay";

};



&io_domains {

	status = "okay";



	vccio1-supply = <&vccio_3v3>;

	vccio2-supply = <&vccio_1v8>;

	vccio4-supply = <&vccio_3v3>;

};



&pinctrl {

	usb {

		host_vbus_drv: host-vbus-drv {

			rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};



&pwm1 {

	status = "okay";

};



&pwm2 {

	status = "okay";

};



&sdmmc {

	cap-mmc-highspeed;

	disable-wp;

	status = "okay";

};



&tsadc {

	rockchip,hw-tshut-mode = <0>;

	status = "okay";

};



&u2phy0 {

	status = "okay";



	u2phy0_host: host-port {

		phy-supply = <&vcc_host>;

		status = "okay";

	};



	u2phy0_otg: otg-port {

		phy-supply = <&vcc_host>;

		status = "okay";

	};

};



&u2phy1 {

	status = "okay";



	u2phy1_host: host-port {

		phy-supply = <&vcc_host>;

		status = "okay";

	};



	u2phy1_otg: otg-port {

		phy-supply = <&vcc_host>;

		status = "okay";

	};

};



&uart2 {

	pinctrl-0 = <&uart21_xfer>;

	status = "okay";

};



&usb_host0_ehci {

	status = "okay";

};



&usb_host0_ohci {

	status = "okay";

};



&usb_host1_ehci {

	status = "okay";

};



&usb_host1_ohci {

	status = "okay";

};



&usb_host2_ehci {

	status = "okay";

};



&usb_host2_ohci {

	status = "okay";

};



&usb_otg {

	status = "okay";

};



&vop {

	status = "okay";

};



&vop_mmu {

	status = "okay";

};

arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi

+1 −100
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <dt-bindings/input/input.h>

#include "rk3288-veyron.dtsi"

#include "rk3288-veyron-analog-audio.dtsi"

#include "rk3288-veyron-edp.dtsi"

#include "rk3288-veyron-sdmmc.dtsi"



/ {
@@ -18,50 +19,6 @@ 
		i2c20 = &i2c_tunnel;

	};



	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 = <128>;

		enable-gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&bl_en>;

		pwms = <&pwm0 0 1000000 0>;

		post-pwm-on-delay-ms = <10>;

		pwm-off-delay-ms = <10>;

	};



	gpio-charger {

		compatible = "gpio-charger";

		charger-type = "mains";
@@ -85,21 +42,6 @@ 
		};

	};



	panel: panel {

		compatible ="innolux,n116bge", "simple-panel";

		status = "okay";

		power-supply = <&vcc33_lcd>;

		backlight = <&backlight>;



		ports {

			panel_in: port {

				panel_in_edp: endpoint {

					remote-endpoint = <&edp_out_panel>;

				};

			};

		};

	};



	/* A non-regulated voltage from power supply or battery */

	vccsys: vccsys {

		compatible = "regulator-fixed";
@@ -141,33 +83,6 @@ 
	};

};



&edp {

	status = "okay";



	pinctrl-names = "default";

	pinctrl-0 = <&edp_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>;

			};

		};

	};

};



&edp_phy {

	status = "okay";

};



&pwm0 {

	status = "okay";

};



&rk808 {

	vcc11-supply = <&vcc_5v>;
@@ -220,14 +135,6 @@ 
	};

};



&vopl {

	status = "okay";

};



&vopl_mmu {

	status = "okay";

};



&pinctrl {

	pinctrl-0 = <

		/* Common for sleep and wake, but no owners */
@@ -250,12 +157,6 @@ 
		&bt_dev_wake_sleep

	>;



	backlight {

		bl_en: bl-en {

			rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	buttons {

		ap_lid_int_l: ap-lid-int-l {

			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE