github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 20:46:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Naming and flag corrections.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmJ8RDoQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgQzCB/4mVQKMxQBrzK3yn6x2lwS18cCcAIykGRYs
 BjR7/Jk/Z/2MOoxuXMecVaR7zTznYmJfHMegubyjFWxMN3/mu+XXEV+DT8jIEt73
 0fArsc2o0Xv6TMPUp8ohkALaWNoyXpX/ccQi72CbQ2yKyygsqhpd0WEEdPVDEW6L
 Q0uM3J1Fus+ReqFYIyPHXXPAo9bhLQkxpR3nBzLAo6yfTua/zOW4YqUi6kWVPuFT
 CZRb0Hn7BdLvUktKG0hWK5GUZHzCy9h26KbXzBnbM1nWJuud4jKpQNo3lxBY5fDU
 ruXZLLgW4k/fK7+ovhEu5DY5mD+OAcGgKMvyTkmYhdEwPTwFO9ml
 =cei9
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmJ+JOcACgkQmmx57+YA
 GNkOpxAAlSqeE9GZzCjujvlDV5SV3zq2L1zyprBppgiepKNy1fS0Tj0FGh0+PhzY
 QAlXItwN1iAwzSW29a+DFAh9n1BSVtbKgRzh/m/irMXePLAi9MapCFRftbaLc5ML
 Ytg38zp2apyL0pvUn69F1+5oaWGXhkynRecFDoPEjDTvi10bLdRUMztO/5ioizWx
 YG+vfjNPO1DduI5SmoPhhIm6/lYG305K8AI/x3vZ3vvCCKaZEWXaI2dDZ9JAqXRc
 UTgojJhCgZDAz8ZxiwDaAtUB2ATaN1VtKtoVTPBysFKl8kEiBpc/zYn6MX0zy7gc
 nzRmnNNvMjUJJgWIn695Y5NWp9+4MSTR/7XDcJOTdmHRglDlP8Q+/kDMMuJPyG/x
 2NHD1Du+zXnl7KEY9ibsF09H/wYTXGWoYUoatGT4Eg9Q5I7wLT5CkSTdqnSMNk80
 72oj4aAuTqn5WOi3iMttt306L6y/KBm7AQNnDk1mC1NBqLvNspwKW7VK865Dmpc1
 NTnLq536eOQorQA7ApqeBiwaZcvlU/R+d7yom+KY3+fllAt/CiZ4k/+XLXc3RJaf
 B7rygH3db4bVXQ2tgy90t/puFLLAX8cJPW4fOxYMXvkP/BnHvKWrCep4FHuZpKks
 yRuCDYtOi3NjXxbCGN5uXM5hC/eDZyfl1GJUvoB1SMF0EQAXO84=
 =ZRPe
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2022-05-13 11:29:11 +02:00
commit eea502e3c5
3 changed files with 5 additions and 4 deletions
Show Stats 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>,