Skip to content

Commit 706450b

Browse files
arndbarndb
committed
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: Arnd Bergmann <arnd@arndb.de>
2 parents ff5a199 + 562105c commit 706450b

34 files changed

Lines changed: 46 additions & 64 deletions

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@
3535
&i2c1 {
3636
status = "okay";
3737

38-
hym8563: hym8563@51 {
38+
hym8563: rtc@51 {
3939
compatible = "haoyu,hym8563";
4040
reg = <0x51>;
4141
#clock-cells = <0>;
42-
clock-frequency = <32768>;
4342
clock-output-names = "xin32k";
4443
};
4544
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
keyup-threshold-microvolt = <2500000>;
3333
poll-interval = <100>;
3434

35-
recovery {
35+
button-recovery {
3636
label = "recovery";
3737
linux,code = <KEY_VENDOR>;
3838
press-threshold-microvolt = <0>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
#sound-dai-cells = <0>;
7272
};
7373

74-
ir_recv: gpio-ir-receiver {
74+
ir_recv: ir-receiver {
7575
compatible = "gpio-ir-receiver";
7676
gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
7777
pinctrl-names = "default";

‎arch/arm/boot/dts/rk3188.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@
379379
rockchip,pins = <2 RK_PD3 1 &pcfg_pull_none>;
380380
};
381381

382-
lcdc1_rgb24: ldcd1-rgb24 {
382+
lcdc1_rgb24: lcdc1-rgb24 {
383383
rockchip,pins = <2 RK_PA0 1 &pcfg_pull_none>,
384384
<2 RK_PA1 1 &pcfg_pull_none>,
385385
<2 RK_PA2 1 &pcfg_pull_none>,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
vin-supply = <&vcc_sys>;
5555
};
5656

57-
hym8563@51 {
57+
rtc@51 {
5858
compatible = "haoyu,hym8563";
5959
reg = <0x51>;
6060

‎arch/arm/boot/dts/rk3288-evb.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@
2828
press-threshold-microvolt = <300000>;
2929
};
3030

31-
menu {
31+
button-menu {
3232
label = "Menu";
3333
linux,code = <KEY_MENU>;
3434
press-threshold-microvolt = <640000>;
3535
};
3636

37-
esc {
37+
button-esc {
3838
label = "Esc";
3939
linux,code = <KEY_ESC>;
4040
press-threshold-microvolt = <1000000>;
4141
};
4242

43-
home {
43+
button-home {
4444
label = "Home";
4545
linux,code = <KEY_HOME>;
4646
press-threshold-microvolt = <1300000>;

‎arch/arm/boot/dts/rk3288-firefly.dtsi‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,10 @@
233233
vin-supply = <&vcc_sys>;
234234
};
235235

236-
hym8563: hym8563@51 {
236+
hym8563: rtc@51 {
237237
compatible = "haoyu,hym8563";
238238
reg = <0x51>;
239239
#clock-cells = <0>;
240-
clock-frequency = <32768>;
241240
clock-output-names = "xin32k";
242241
interrupt-parent = <&gpio7>;
243242
interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;

‎arch/arm/boot/dts/rk3288-miqi.dts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,10 @@
162162
vin-supply = <&vcc_sys>;
163163
};
164164

165-
hym8563: hym8563@51 {
165+
hym8563: rtc@51 {
166166
compatible = "haoyu,hym8563";
167167
reg = <0x51>;
168168
#clock-cells = <0>;
169-
clock-frequency = <32768>;
170169
clock-output-names = "xin32k";
171170
};
172171

‎arch/arm/boot/dts/rk3288-rock2-square.dts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,10 @@
165165
};
166166

167167
&i2c0 {
168-
hym8563: hym8563@51 {
168+
hym8563: rtc@51 {
169169
compatible = "haoyu,hym8563";
170170
reg = <0x51>;
171171
#clock-cells = <0>;
172-
clock-frequency = <32768>;
173172
clock-output-names = "xin32k";
174173
interrupt-parent = <&gpio0>;
175174
interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;

‎arch/arm/boot/dts/rk3288-vmarc-som.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@
241241
interrupt-parent = <&gpio5>;
242242
interrupts = <RK_PC3 IRQ_TYPE_LEVEL_LOW>;
243243
#clock-cells = <0>;
244-
clock-frequency = <32768>;
245244
clock-output-names = "hym8563";
246245
pinctrl-names = "default";
247246
pinctrl-0 = <&hym8563_int>;

0 commit comments

Comments
 (0)