Commit a7c5181e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v5.4-rockchip-dtsfixes1' of... 

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

A number of fixes for individual boards like the rockpro64, and Hugsun X99
as well as a fix for the Gru-Kevin display override and fixing the dt-
binding for Theobroma boards to the correct naming that is also actually
used in the wild.

* tag 'v5.4-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Fix override mode for rk3399-kevin panel
  arm64: dts: rockchip: Fix usb-c on Hugsun X99 TV Box
  arm64: dts: rockchip: fix RockPro64 sdmmc settings
  arm64: dts: rockchip: fix RockPro64 sdhci settings
  arm64: dts: rockchip: fix RockPro64 vdd-log regulator settings
  dt-bindings: arm: rockchip: fix Theobroma-System board bindings
  arm64: dts: rockchip: fix Rockpro64 RK808 interrupt line

Link: https://lore.kernel.org/r/1599050.HRXuSXmxRg@phil


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 330a5a46 a9082575

Documentation/devicetree/bindings/arm/rockchip.yaml

+2 −2
Original line number Diff line number Diff line
@@ -496,12 +496,12 @@ properties: 


      - description: Theobroma Systems RK3368-uQ7 with Haikou baseboard

        items:

          - const: tsd,rk3368-uq7-haikou

          - const: tsd,rk3368-lion-haikou

          - const: rockchip,rk3368



      - description: Theobroma Systems RK3399-Q7 with Haikou baseboard

        items:

          - const: tsd,rk3399-q7-haikou

          - const: tsd,rk3399-puma-haikou

          - const: rockchip,rk3399



      - description: Tronsmart Orion R68 Meta

arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
		power-supply = <&pp3300_disp>;



		panel-timing {

			clock-frequency = <266604720>;

			clock-frequency = <266666667>;

			hactive = <2400>;

			hfront-porch = <48>;

			hback-porch = <84>;

arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts

+2 −2
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ 
	status = "okay";



	u2phy0_host: host-port {

		phy-supply = <&vcc5v0_host>;

		phy-supply = <&vcc5v0_typec>;

		status = "okay";

	};
@@ -712,7 +712,7 @@ 


&usbdrd_dwc3_0 {

	status = "okay";

	dr_mode = "otg";

	dr_mode = "host";

};



&usbdrd3_1 {

arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts

+5 −7
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ 
		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <800000>;

		regulator-max-microvolt = <1400000>;

		regulator-max-microvolt = <1700000>;

		vin-supply = <&vcc5v0_sys>;

	};

};
@@ -247,8 +247,8 @@ 
	rk808: pmic@1b {

		compatible = "rockchip,rk808";

		reg = <0x1b>;

		interrupt-parent = <&gpio1>;

		interrupts = <21 IRQ_TYPE_LEVEL_LOW>;

		interrupt-parent = <&gpio3>;

		interrupts = <10 IRQ_TYPE_LEVEL_LOW>;

		#clock-cells = <1>;

		clock-output-names = "xin32k", "rk808-clkout2";

		pinctrl-names = "default";
@@ -574,7 +574,7 @@ 


	pmic {

		pmic_int_l: pmic-int-l {

			rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;

			rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;

		};



		vsel1_gpio: vsel1-gpio {
@@ -624,7 +624,6 @@ 


&sdmmc {

	bus-width = <4>;

	cap-mmc-highspeed;

	cap-sd-highspeed;

	cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;

	disable-wp;
@@ -636,8 +635,7 @@ 


&sdhci {

	bus-width = <8>;

	mmc-hs400-1_8v;

	mmc-hs400-enhanced-strobe;

	mmc-hs200-1_8v;

	non-removable;

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE