tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'v5.19-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt
Naming and flag corrections.
* tag 'v5.19-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: rename pcfg_pull_default node name on rk3036
ARM: dts: rockchip: use generic node name for dma rk3036/rk322x
ARM: dts: rockchip: correct interrupt flags on rk3188 boards
Link: https://lore.kernel.org/r/6919636.31r3eYUQgx@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+5
-4
+2
-2
arch/arm/boot/dts/rk3036.dtsi
+2
-2
arch/arm/boot/dts/rk3036.dtsi
···
556
556
status = "disabled";
557
557
};
558
558
559
-
pdma: pdma@20078000 {
559
+
pdma: dma-controller@20078000 {
560
560
compatible = "arm,pl330", "arm,primecell";
561
561
reg = <0x20078000 0x4000>;
562
562
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
···
614
614
#interrupt-cells = <2>;
615
615
};
616
616
617
-
pcfg_pull_default: pcfg_pull_default {
617
+
pcfg_pull_default: pcfg-pull-default {
618
618
bias-pull-pin-default;
619
619
};
620
620
+2
-1
arch/arm/boot/dts/rk3188-bqedison2qc.dts
+2
-1
arch/arm/boot/dts/rk3188-bqedison2qc.dts
···
7
7
/dts-v1/;
8
8
#include <dt-bindings/i2c/i2c.h>
9
9
#include <dt-bindings/input/input.h>
10
+
#include <dt-bindings/interrupt-controller/irq.h>
10
11
#include "rk3188.dtsi"
11
12
12
13
/ {
···
486
485
reg = <1>;
487
486
compatible = "brcm,bcm4329-fmac";
488
487
interrupt-parent = <&gpio3>;
489
-
interrupts = <RK_PD2 GPIO_ACTIVE_HIGH>;
488
+
interrupts = <RK_PD2 IRQ_TYPE_NONE>;
490
489
interrupt-names = "host-wake";
491
490
brcm,drive-strength = <5>;
492
491
pinctrl-names = "default";