Unverified Commit c10519c8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.18-rockchip-dtsfixes1' of... 

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

Regulator/supply fixes for a number of boards, removed too fast
cpu OPPs from rk3576 (not supported in newer vendor TF-A and never
supported in upstream TF-A). As well as some DTS validation fixes
and one pinctrl fix for the odroid-m1.

* tag 'v6.18-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  arm64: dts: rockchip: fix PCIe 3.3V regulator voltage on orangepi-5
  arm64: dts: rockchip: disable HS400 on RK3588 Tiger
  arm64: dts: rockchip: drop reset from rk3576 i2c9 node
  arm64: dts: rockchip: Fix USB power enable pin for BTT CB2 and Pi2
  arm64: dts: rockchip: Fix vccio4-supply on rk3566-pinetab2
  arm64: dts: rockchip: include rk3399-base instead of rk3399 in rk3399-op1
  arm64: dts: rockchip: Fix indentation on rk3399 haikou demo dtso
  arm64: dts: rockchip: Make RK3588 GPU OPP table naming less generic
  arm64: dts: rockchip: Drop 'rockchip,grf' prop from tsadc on rk3328
  arm64: dts: rockchip: Remove non-functioning CPU OPPs from RK3576
  arm64: dts: rockchip: Fix PCIe power enable pin for BigTreeTech CB2 and Pi2
  arm64: dts: rockchip: Set correct pinctrl for I2S1 8ch TX on odroid-m1

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 124c98b1 b5414520

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

+0 −1
Original line number Diff line number Diff line
@@ -598,7 +598,6 @@ tsadc: tsadc@ff250000 { 
		pinctrl-2 = <&otp_pin>;

		resets = <&cru SRST_TSADC>;

		reset-names = "tsadc-apb";

		rockchip,grf = <&grf>;

		rockchip,hw-tshut-temp = <100000>;

		#thermal-sensor-cells = <1>;

		status = "disabled";

arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd

 */



#include "rk3399.dtsi"

#include "rk3399-base.dtsi"



/ {

	cluster0_opp: opp-table-0 {

arch/arm64/boot/dts/rockchip/rk3566-bigtreetech-cb2.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ vcc3v3_pcie: regulator-vcc3v3-pcie { 
		compatible = "regulator-fixed";

		regulator-name = "vcc3v3_pcie";

		enable-active-high;

		gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;

		gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&pcie_drv>;

		regulator-always-on;
@@ -187,7 +187,7 @@ vcc5v0_usb: regulator-vcc5v0-usb { 
	vcc5v0_usb2b: regulator-vcc5v0-usb2b {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;

		gpio = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&vcc5v0_usb2b_en>;

		regulator-name = "vcc5v0_usb2b";
@@ -199,7 +199,7 @@ vcc5v0_usb2b: regulator-vcc5v0-usb2b { 
	vcc5v0_usb2t: regulator-vcc5v0-usb2t {

		compatible = "regulator-fixed";

		enable-active-high;

		gpios = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;

		gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&vcc5v0_usb2t_en>;

		regulator-name = "vcc5v0_usb2t";

arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ &pmu_io_domains { 
	vccio1-supply = <&vccio_acodec>;

	vccio2-supply = <&vcc_1v8>;

	vccio3-supply = <&vccio_sd>;

	vccio4-supply = <&vcc_1v8>;

	vccio4-supply = <&vcca1v8_pmu>;

	vccio5-supply = <&vcc_1v8>;

	vccio6-supply = <&vcc1v8_dvp>;

	vccio7-supply = <&vcc_3v3>;

arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts

+2 −0
Original line number Diff line number Diff line
@@ -482,6 +482,8 @@ &i2s0_8ch { 
};



&i2s1_8ch {

	pinctrl-names = "default";

	pinctrl-0 = <&i2s1m0_sclktx &i2s1m0_lrcktx &i2s1m0_sdi0 &i2s1m0_sdo0>;

	rockchip,trcm-sync-tx-only;

	status = "okay";

};