Unverified Commit eea502e3 authored May 13, 2022 by Arnd Bergmann

Merge tag 'v5.19-rockchip-dts32-1' of...

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>

parents 835c0d93 53070cfa

arch/arm/boot/dts/rk3036.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -556,7 +556,7 @@
		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 @@
		#interrupt-cells = <2>;
		};

		pcfg_pull_default: pcfg_pull_default {
		pcfg_pull_default: pcfg-pull-default {
		bias-pull-pin-default;
		};

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -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 @@
		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";

arch/arm/boot/dts/rk322x.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -501,7 +501,7 @@
		<75000000>;
		};

		pdma: pdma@110f0000 {
		pdma: dma-controller@110f0000 {
		compatible = "arm,pl330", "arm,primecell";
		reg = <0x110f0000 0x4000>;
		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,