Unverified Commit 07917ee0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Apart from the regular dts fixes for wrong addresses, missing
or wrong properties, this reverts the previous move away from
cd-gpios to the mmc-controller's internal card-detect.
With this change applied, it was reported that boards could not
detect card anymore, so this go reverted of course.

* tag 'v6.10-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Add sound-dai-cells for RK3368
  arm64: dts: rockchip: Fix the i2c address of es8316 on Cool Pi 4B
  arm64: dts: rockchip: fix PMIC interrupt pin on ROCK Pi E
  arm64: dts: rockchip: make poweroff(8) work on Radxa ROCK 5A
  Revert "arm64: dts: rockchip: remove redundant cd-gpios from rk3588 sdmmc nodes"
  ARM: dts: rockchip: rk3066a: add #sound-dai-cells to hdmi node
  arm64: dts: rockchip: Fix the value of `dlg,jack-det-rate` mismatch on rk3399-gru
  arm64: dts: rockchip: set correct pwm0 pinctrl on rk3588-tiger
  arm64: dts: rockchip: Rename LED related pinctrl nodes on rk3308-rock-pi-s
  arm64: dts: rockchip: Fix SD NAND and eMMC init on rk3308-rock-pi-s
  arm64: dts: rockchip: Fix rk3308 codec@ff560000 reset-names
  arm64: dts: rockchip: Fix the DCDC_REG2 minimum voltage on Quartz64 Model B

Link: https://lore.kernel.org/r/10237789.nnTZe4vzsl@diego


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 56d62dc2 8d7ec44a

arch/arm/boot/dts/rockchip/rk3066a.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ hdmi: hdmi@10116000 { 
		pinctrl-0 = <&hdmii2c_xfer>, <&hdmi_hpd>;

		power-domains = <&power RK3066_PD_VIO>;

		rockchip,grf = <&grf>;

		#sound-dai-cells = <0>;

		status = "disabled";



		ports {

arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts

+13 −5
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
 */



/dts-v1/;



#include <dt-bindings/leds/common.h>

#include "rk3308.dtsi"



/ {
@@ -24,17 +26,21 @@ chosen { 
	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&green_led_gio>, <&heartbeat_led_gpio>;

		pinctrl-0 = <&green_led>, <&heartbeat_led>;



		green-led {

			color = <LED_COLOR_ID_GREEN>;

			default-state = "on";

			function = LED_FUNCTION_POWER;

			gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;

			label = "rockpis:green:power";

			linux,default-trigger = "default-on";

		};



		blue-led {

			color = <LED_COLOR_ID_BLUE>;

			default-state = "on";

			function = LED_FUNCTION_HEARTBEAT;

			gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;

			label = "rockpis:blue:user";

			linux,default-trigger = "heartbeat";
@@ -126,10 +132,12 @@ &cpu0 { 
};



&emmc {

	bus-width = <4>;

	cap-mmc-highspeed;

	mmc-hs200-1_8v;

	cap-sd-highspeed;

	no-sdio;

	non-removable;

	pinctrl-names = "default";

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

	vmmc-supply = <&vcc_io>;

	status = "okay";

};
@@ -214,11 +222,11 @@ &pinctrl { 
	pinctrl-0 = <&rtc_32k>;



	leds {

		green_led_gio: green-led-gpio {

		green_led: green-led {

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

		};



		heartbeat_led_gpio: heartbeat-led-gpio {

		heartbeat_led: heartbeat-led {

			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ codec: codec@ff560000 { 
		clocks = <&cru SCLK_I2S2_8CH_TX_OUT>,

			 <&cru SCLK_I2S2_8CH_RX_OUT>,

			 <&cru PCLK_ACODEC>;

		reset-names = "codec-reset";

		reset-names = "codec";

		resets = <&cru SRST_ACODEC_P>;

		#sound-dai-cells = <0>;

		status = "disabled";

arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts

+2 −2
Original line number Diff line number Diff line
@@ -241,8 +241,8 @@ &i2c1 { 
	rk805: pmic@18 {

		compatible = "rockchip,rk805";

		reg = <0x18>;

		interrupt-parent = <&gpio2>;

		interrupts = <6 IRQ_TYPE_LEVEL_LOW>;

		interrupt-parent = <&gpio0>;

		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;

		#clock-cells = <1>;

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

		gpio-controller;

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

+3 −0
Original line number Diff line number Diff line
@@ -793,6 +793,7 @@ spdif: spdif@ff880000 { 
		dma-names = "tx";

		pinctrl-names = "default";

		pinctrl-0 = <&spdif_tx>;

		#sound-dai-cells = <0>;

		status = "disabled";

	};
@@ -804,6 +805,7 @@ i2s_2ch: i2s-2ch@ff890000 { 
		clocks = <&cru SCLK_I2S_2CH>, <&cru HCLK_I2S_2CH>;

		dmas = <&dmac_bus 6>, <&dmac_bus 7>;

		dma-names = "tx", "rx";

		#sound-dai-cells = <0>;

		status = "disabled";

	};
@@ -817,6 +819,7 @@ i2s_8ch: i2s-8ch@ff898000 { 
		dma-names = "tx", "rx";

		pinctrl-names = "default";

		pinctrl-0 = <&i2s_8ch_bus>;

		#sound-dai-cells = <0>;

		status = "disabled";

	};