mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-01 02:32:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v5.19-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2022-05-13 11:29:11 +02:00
parent 835c0d9350 53070cfa82
commit eea502e3c5
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/rk3036.dtsi
View File

@@ -556,7 +556,7 @@ spi: spi@20074000 {
status = "disabled";
};
pdma: pdma@20078000 {
pdma: dma-controller@20078000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0x20078000 0x4000>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
@@ -614,7 +614,7 @@ gpio2: gpio@20084000 {
#interrupt-cells = <2>;
};
pcfg_pull_default: pcfg_pull_default {
pcfg_pull_default: pcfg-pull-default {
bias-pull-pin-default;
};

3
arch/arm/boot/dts/rk3188-bqedison2qc.dts
View File

@@ -7,6 +7,7 @@
/dts-v1/;
#include <dt-bindings/i2c/i2c.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include "rk3188.dtsi"
/ {
@@ -485,7 +486,7 @@ brcmf: wifi@1 {
reg = <1>;
compatible = "brcm,bcm4329-fmac";
interrupt-parent = <&gpio3>;
interrupts = <RK_PD2 GPIO_ACTIVE_HIGH>;
interrupts = <RK_PD2 IRQ_TYPE_NONE>;
interrupt-names = "host-wake";
brcm,drive-strength = <5>;
pinctrl-names = "default";

2
arch/arm/boot/dts/rk322x.dtsi
View File

@@ -501,7 +501,7 @@ cru: clock-controller@110e0000 {
<75000000>;
};
pdma: pdma@110f0000 {
pdma: dma-controller@110f0000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0x110f0000 0x4000>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,