Unverified Commit 706450b5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Fixes to make the automated binding tools happier (node-names,
undocumented + unneeded properties) and fixes for non-working
devices on some boards.

* tag 'v6.1-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Fix Pine64 Quartz4-B PMIC interrupt
  ARM: dts: rockchip: rk3188: fix lcdc1-rgb24 node name
  arm64: dts: rockchip: fix ir-receiver node names
  ARM: dts: rockchip: fix ir-receiver node names
  arm64: dts: rockchip: fix adc-keys sub node names
  ARM: dts: rockchip: fix adc-keys sub node names
  arm: dts: rockchip: remove clock-frequency from rtc
  arm: dts: rockchip: fix node name for hym8563 rtc
  arm64: dts: rockchip: remove clock-frequency from rtc
  arm64: dts: rockchip: fix node name for hym8563 rtc
  arm64: dts: rockchip: lower rk3399-puma-haikou SD controller clock frequency
  arm64: dts: rockchip: keep I2S1 disabled for GPIO function on ROCK Pi 4 series
  arm64: dts: rockchip: fix quartz64-a bluetooth configuration
  arm64: dts: rockchip: add enable-strobe-pulldown to emmc phy on nanopi4
  arm64: dts: rockchip: remove i2c5 from rk3566-roc-pc
  arm64: dts: rockchip: Fix i2c3 pinctrl on rk3566-roc-pc
  arm64: dts: rockchip: Fix gmac failure of rgmii-id from rk3566-roc-pc
  arm64: dts: rockchip: Drop RK3399-Scarlet's repeated ec_ap_int_l definition

Link: https://lore.kernel.org/r/6274427.GXAFRqVoOG@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ff5a1990 562105c1

arch/arm/boot/dts/rk3036-evb.dts

+1 −2
Original line number Diff line number Diff line
@@ -35,11 +35,10 @@ phy0: ethernet-phy@0 { 
&i2c1 {

	status = "okay";



	hym8563: hym8563@51 {

	hym8563: rtc@51 {

		compatible = "haoyu,hym8563";

		reg = <0x51>;

		#clock-cells = <0>;

		clock-frequency = <32768>;

		clock-output-names = "xin32k";

	};

};

arch/arm/boot/dts/rk3066a-mk808.dts

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ adc-keys { 
		keyup-threshold-microvolt = <2500000>;

		poll-interval = <100>;



		recovery {

		button-recovery {

			label = "recovery";

			linux,code = <KEY_VENDOR>;

			press-threshold-microvolt = <0>;

arch/arm/boot/dts/rk3188-radxarock.dts

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ spdif_out: spdif-out { 
		#sound-dai-cells = <0>;

	};



	ir_recv: gpio-ir-receiver {

	ir_recv: ir-receiver {

		compatible = "gpio-ir-receiver";

		gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

arch/arm/boot/dts/rk3188.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ lcdc1_vsync: lcdc1-vsync { 
				rockchip,pins = <2 RK_PD3 1 &pcfg_pull_none>;

			};



			lcdc1_rgb24: ldcd1-rgb24 {

			lcdc1_rgb24: lcdc1-rgb24 {

				rockchip,pins = <2 RK_PA0 1 &pcfg_pull_none>,

						<2 RK_PA1 1 &pcfg_pull_none>,

						<2 RK_PA2 1 &pcfg_pull_none>,

arch/arm/boot/dts/rk3288-evb-act8846.dts

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ vdd_gpu: syr828@41 { 
		vin-supply = <&vcc_sys>;

	};



	hym8563@51 {

	rtc@51 {

		compatible = "haoyu,hym8563";

		reg = <0x51>;