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

Merge tag 'v5.17-rockchip-dts64-1' of... 

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

Improvements on a number of boards:
- helios64: hdd-power, pcie, 2.5GbE nic
- spi for rk356x and on the Quartz-A board
- headphone, bluetooth support on Rock Pi4
And some misc soc improvements:
- missing dsi compatible on px30
- pwm pinctrl name on rk356x

* tag 'v5.17-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Fix Bluetooth on ROCK Pi 4 boards
  arm64: dts: rockchip: Add missing secondary compatible for PX30 DSI
  arm64: dts: rockchip: Add spi1 pins on Quartz64 A
  arm64: dts: rockchip: Add spi nodes on rk356x
  arm64: dts: rockchip: Change pwm pinctrl-name to "default" on rk356x
  arm64: dts: rockchip: Enable HDD power on helios64
  arm64: dts: rockchip: add variables for pcie completion to helios64
  arm64: dts: rockchip: define usb hub and 2.5GbE nic on helios64
  arm64: dts: rockchip: add interrupt and headphone-detection for Rock Pi4's audio codec

Link: https://lore.kernel.org/r/3637342.7akbv5NDAT@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7f0ef89c f471b1b2

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

+1 −1
Original line number Diff line number Diff line
@@ -1072,7 +1072,7 @@ vpu_mmu: iommu@ff442800 { 
	};



	dsi: dsi@ff450000 {

		compatible = "rockchip,px30-mipi-dsi";

		compatible = "rockchip,px30-mipi-dsi", "snps,dw-mipi-dsi";

		reg = <0x0 0xff450000 0x0 0x10000>;

		interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru PCLK_MIPI_DSI>;

arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts

+87 −0
Original line number Diff line number Diff line
@@ -89,6 +89,30 @@ led-1 { 
		};

	};



	hdd_a_power: hdd-a-power {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;

		pinctrl-0 = <&hdd_a_power_en>;

		pinctrl-names = "default";

		regulator-always-on;

		regulator-boot-on;

		regulator-name = "hdd_a_power";

		startup-delay-us = <2000000>;

	};



	hdd_b_power: hdd-b-power {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;

		pinctrl-0 = <&hdd_b_power_en>;

		pinctrl-names = "default";

		regulator-always-on;

		regulator-boot-on;

		regulator-name = "hdd_b_power";

		startup-delay-us = <2000000>;

	};



	pcie_power: pcie-power {

		compatible = "regulator-fixed";

		enable-active-high;
@@ -101,6 +125,18 @@ pcie_power: pcie-power { 
		vin-supply = <&vcc5v0_perdev>;

	};



	usblan_power: usblan-power {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&usb_lan_en>;

		regulator-name = "usblan_power";

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc5v0_usb>;

	};



	vcc1v8_sys_s0: vcc1v8-sys-s0 {

		compatible = "regulator-fixed";

		regulator-name = "vcc1v8_sys_s0";
@@ -389,7 +425,10 @@ &pcie_phy { 
};



&pcie0 {

	ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;

	max-link-speed = <2>;

	num-lanes = <2>;

	pinctrl-names = "default";

	status = "okay";



	vpcie12v-supply = <&vcc12v_dcin>;
@@ -429,9 +468,21 @@ pmic_int_l: pmic-int-l { 
	};



	power {

		hdd_a_power_en: hdd-a-power-en {

			rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		hdd_b_power_en: hdd-b-power-en {

			rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		vcc5v0_usb_en: vcc5v0-usb-en {

			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		usb_lan_en: usb-lan-en {

			rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	vcc3v0-sd {
@@ -530,5 +581,41 @@ &usbdrd3_1 { 
	usb@fe900000 {

		dr_mode = "host";

		status = "okay";

		#address-cells = <1>;

		#size-cells = <0>;



		hub@1 {

			compatible = "usb2109,0815";

			reg = <1>;

			#address-cells = <1>;

			#size-cells = <0>;



			port@1 {

				reg = <1>;

				#trigger-source-cells = <0>;

			};



			port@2 {

				reg = <2>;

				#trigger-source-cells = <0>;

			};



			port@3 {

				reg = <3>;

				#trigger-source-cells = <0>;

			};



			device@4 {

				compatible = "usbbda,8156";

				reg = <4>;

				#address-cells = <2>;

				#size-cells = <0>;



				interface@0 {	/* interface 0 of configuration 1 */

					compatible = "usbbda,8156.config1.0";

					reg = <0 1>;

				};

			};

		};

	};

};

arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi

+11 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ sdio_pwrseq: sdio-pwrseq { 
		reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;

	};



	sound {

	sound: sound {

		compatible = "audio-graph-card";

		label = "Analog";

		dais = <&i2s0_p0>;
@@ -543,6 +543,16 @@ bt_wake_l: bt-wake-l { 
		};

	};



	es8316 {

		hp_detect: hp-detect {

			rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		hp_int: hp-int {

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

		};

	};



	pcie {

		pcie_pwr_en: pcie-pwr-en {

			rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;

arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts

+11 −0
Original line number Diff line number Diff line
@@ -12,3 +12,14 @@ / { 
	model = "Radxa ROCK Pi 4A+";

	compatible = "radxa,rockpi4a-plus", "radxa,rockpi4", "rockchip,rk3399";

};



&es8316 {

	pinctrl-0 = <&hp_detect &hp_int>;

	pinctrl-names = "default";

	interrupt-parent = <&gpio1>;

	interrupts = <RK_PA1 IRQ_TYPE_LEVEL_HIGH>;

};



&sound {

	hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;

};

arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts

+16 −2
Original line number Diff line number Diff line
@@ -17,6 +17,13 @@ aliases { 
	};

};



&es8316 {

	pinctrl-0 = <&hp_detect &hp_int>;

	pinctrl-names = "default";

	interrupt-parent = <&gpio1>;

	interrupts = <RK_PA1 IRQ_TYPE_LEVEL_HIGH>;

};



&sdio0 {

	status = "okay";
@@ -31,17 +38,24 @@ brcmf: wifi@1 { 
	};

};



&sound {

	hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;

};



&uart0 {

	status = "okay";



	bluetooth {

		compatible = "brcm,bcm43438-bt";

		compatible = "brcm,bcm4345c5";

		clocks = <&rk808 1>;

		clock-names = "ext_clock";

		clock-names = "lpo";

		device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;

		host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;

		shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;

		max-speed = <1500000>;

		pinctrl-names = "default";

		pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;

		vbat-supply = <&vcc3v3_sys>;

		vddio-supply = <&vcc_1v8>;

	};

};