Unverified Commit 896dcf47 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge tag 'v6.12-rockchip-dtsfixes1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into HEAD

A number of DTS correctnes fixes, to bring down the amount of errors
reported by dtbscheck.

* tag 'v6.12-rockchip-dtsfixes1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (23 commits)
  arm64: dts: rockchip: Correct GPIO polarity on brcm BT nodes
  arm64: dts: rockchip: Drop invalid clock-names from es8388 codec nodes
  ARM: dts: rockchip: Fix the realtek audio codec on rk3036-kylin
  ARM: dts: rockchip: Fix the spi controller on rk3036
  ARM: dts: rockchip: drop grf reference from rk3036 hdmi
  ARM: dts: rockchip: fix rk3036 acodec node
  arm64: dts: rockchip: remove orphaned pinctrl-names from pinephone pro
  arm64: dts: rockchip: remove num-slots property from rk3328-nanopi-r2s-plus
  arm64: dts: rockchip: Fix LED triggers on rk3308-roc-cc
  arm64: dts: rockchip: Remove #cooling-cells from fan on Theobroma lion
  arm64: dts: rockchip: Remove undocumented supports-emmc property
  arm64: dts: rockchip: Fix bluetooth properties on Rock960 boards
  arm64: dts: rockchip: Fix bluetooth properties on rk3566 box demo
  arm64: dts: rockchip: Drop regulator-init-microvolt from two boards
  arm64: dts: rockchip: fix i2c2 pinctrl-names property on anbernic-rg353p/v
  arm64: dts: rockchip: Fix reset-gpios property on brcm BT nodes
  arm64: dts: rockchip: Fix wakeup prop names on PineNote BT node
  arm64: dts: rockchip: Remove hdmi's 2nd interrupt on rk3328
  arm64: dts: rockchip: Designate Turing RK1's system power controller
  arm64: dts: rockchip: Start cooling maps numbering from zero on ROCK 5B
  ...

Link: https://lore.kernel.org/r/2847150.mvXUDI8C0e@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e29c2934 08846522

arch/arm/boot/dts/rockchip/rk3036-kylin.dts

+2 −2
Original line number Diff line number Diff line
@@ -325,8 +325,8 @@ regulator-state-mem { 
&i2c2 {

	status = "okay";



	rt5616: rt5616@1b {

		compatible = "rt5616";

	rt5616: audio-codec@1b {

		compatible = "realtek,rt5616";

		reg = <0x1b>;

		clocks = <&cru SCLK_I2S_OUT>;

		clock-names = "mclk";

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

+7 −7
Original line number Diff line number Diff line
@@ -384,12 +384,13 @@ reboot-mode { 
		};

	};



	acodec: acodec-ana@20030000 {

		compatible = "rk3036-codec";

	acodec: audio-codec@20030000 {

		compatible = "rockchip,rk3036-codec";

		reg = <0x20030000 0x4000>;

		rockchip,grf = <&grf>;

		clock-names = "acodec_pclk";

		clocks = <&cru PCLK_ACODEC>;

		rockchip,grf = <&grf>;

		#sound-dai-cells = <0>;

		status = "disabled";

	};
@@ -399,7 +400,6 @@ hdmi: hdmi@20034000 { 
		interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru  PCLK_HDMI>;

		clock-names = "pclk";

		rockchip,grf = <&grf>;

		pinctrl-names = "default";

		pinctrl-0 = <&hdmi_ctl>;

		#sound-dai-cells = <0>;
@@ -553,11 +553,11 @@ i2c0: i2c@20072000 { 
	};



	spi: spi@20074000 {

		compatible = "rockchip,rockchip-spi";

		compatible = "rockchip,rk3036-spi";

		reg = <0x20074000 0x1000>;

		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru PCLK_SPI>, <&cru SCLK_SPI>;

		clock-names = "apb-pclk","spi_pclk";

		clocks = <&cru SCLK_SPI>, <&cru PCLK_SPI>;

		clock-names = "spiclk", "apb_pclk";

		dmas = <&pdma 8>, <&pdma 9>;

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

		pinctrl-names = "default";

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

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ &emmc { 
	bus-width = <8>;

	cap-mmc-highspeed;

	mmc-hs200-1_8v;

	supports-emmc;

	mmc-pwrseq = <&emmc_pwrseq>;

	non-removable;

	vmmc-supply = <&vcc_3v3>;

arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts

+2 −2
Original line number Diff line number Diff line
@@ -36,14 +36,14 @@ leds { 


		power_led: led-0 {

			label = "firefly:red:power";

			linux,default-trigger = "ir-power-click";

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

			default-state = "on";

			gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;

		};



		user_led: led-1 {

			label = "firefly:blue:user";

			linux,default-trigger = "ir-user-click";

			linux,default-trigger = "rc-feedback";

			default-state = "off";

			gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>;

		};

arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts

+0 −2
Original line number Diff line number Diff line
@@ -24,9 +24,7 @@ &emmc { 
	disable-wp;

	mmc-hs200-1_8v;

	non-removable;

	num-slots = <1>;

	pinctrl-names = "default";

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

	supports-emmc;

	status = "okay";

};