This pull request contains Broadcom ARM-based SoCs Device Tree fixes for

5.15, please pull the following:
 
 - Stefan fixes the VEC (video encoder) bus address for 2711, fixes the
   MDIO bus controller #address-cells/#size-cells inversion and the SDIO
   regulator voltage ranges
 
 - Nicolas fixes DTC warnings for the PCIe host bridge and its child
   USB device
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmFmAAgACgkQh9CWnEQH
 BwR2FhAAr4S1yCqKUrTXV0yM1M2teZgtNZE/19fWkeKd++9o/RrG+dYdoos/wPTm
 M45jrsQt5spt20Qw1UBet+cROL1DfG34eoCX5jC7HzdN5YEZ0HYV8tgWDI0woVQo
 5jfD5ELbxLeQvAHXGluPYZpT//DKP67JS66HmNO4E3NEEB1JJXBw3nyCn+JQlRa/
 MUBJGkfuu5cYJkgRQLCtfXM/rY7SrbHWvrPGTDrEPzKtlKNvNna5126qgEYBqckg
 chicQR/CXi7c3tN+qBKFyMQGK2sdkAeOROnpHMXehevp+SVRnuk1IKemGAZF3EFb
 C0fTM/rS8AgzjQpAgmhQkuBRjCNcnvJOKWOQTgete8JaBwqhfPzBq2ZJJW1eFKFp
 A9vtynHPrOWDn507lrTS7MV9lgr6K99OG76uiS9gMArJ+jgFm4XUP9kT36o+hpPx
 3/YUr1rXWx8V9oT4pjVHYTiNICmlnpwZCldkP6sMpo2UWIUS1amKK70ly4wBTn5A
 hTuvkmM09V5aQomZK8yZljaLedaGfek4k5Lxw6wkPwM+NblYr4puACcGKgnPwUIw
 iFU9v10NfSMHPJgEWMHZvFOGCN+GM+DI0gZA9VyOslmOuNdj/+A9jmkjJZ8YcBw5
 bdqo1glj/BZI7+kE17FAMz+mBZpzsDFVHLHiD8bOteVh3/tzsHA=
 =EOTX
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmFnLAsACgkQmmx57+YA
 GNnnPw/9GC0xjSAGyNShAg7t68zibHmth0sfeih96WjzrDAIYgrBm0RBgcV2bn83
 +I4jgpSpVIMHs1hSFMYIpm1UP65XQrS5kdKrWHt4NgnMTmYJByv8Ydthh0fTZenW
 /zFe6aQqBLNOpfYPcFHeS090WuUkteniAU8Ba7DbdZVldRsgGZMTpCpQApkwQ/0c
 YY+TY1j6kTW+JCTx/Z1CkTVcjNgEtKc7zTfpk9XbmU5FQkixL0Ife4580JV5PJvW
 u7QraAeZW96stGKWOEb5UK+nKjUQyc79fBj5uo9B4A2CmEhc+Ur90GQ1BTepVgPB
 mvfj97Ipuz57h5/fVTrnUJjfNcpy0aFbxzVny29LB0ZKk3UHtnH1ps4o5fGVVW41
 zZuu9BVAKiFNi99Foqv+UzLAUP5u4yrq/53X0qeJQeu+5j+R9WAQNkWTrOvzu72t
 x1xBBqXKHAvFIp+/4oPNyLNcUHJx8jjOJawOsX7h2vkoA3A1b2wPMA0WuuCJSArg
 jKhu7Eo8tAbDuszyIpB/hNm7OLQuJPTZN/YR5JCFzu5LVYFiRe8XW33+Ct/Y792Y
 PifWxhpzUlGTdJE+xCDgjT9M96UaGHbXrd6j2FIImAj+JP/PW9x9v+mb0DCk/QCI
 b6nDzRfpNb5J3zTyTsWTrl5FY7JVEVHeWF1YhmImnUXeiVt3tqM=
 =SPDH
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-5.15/devicetree' of https://github.com/Broadcom/stblinux into arm/fixes

This pull request contains Broadcom ARM-based SoCs Device Tree fixes for
5.15, please pull the following:

- Stefan fixes the VEC (video encoder) bus address for 2711, fixes the
  MDIO bus controller #address-cells/#size-cells inversion and the SDIO
  regulator voltage ranges

- Nicolas fixes DTC warnings for the PCIe host bridge and its child
  USB device

* tag 'arm-soc/for-5.15/devicetree' of https://github.com/Broadcom/stblinux:
  ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address
  ARM: dts: bcm2711-rpi-4-b: Fix pcie0's unit address formatting
  ARM: dts: bcm2711-rpi-4-b: fix sd_io_1v8_reg regulator states
  ARM: dts: bcm2711: fix MDIO #address- and #size-cells
  ARM: dts: bcm283x: Fix VEC address for BCM2711

Link: https://lore.kernel.org/r/20211012213841.1872021-1-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-10-13 20:57:12 +02:00
Родитель 209ee634bc bc22b6208f
Коммит 0470512952
4 изменённых файлов: 24 добавлений и 15 удалений

Просмотреть файл

@ -40,8 +40,8 @@
regulator-always-on; regulator-always-on;
regulator-settling-time-us = <5000>; regulator-settling-time-us = <5000>;
gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>; gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>;
states = <1800000 0x1 states = <1800000 0x1>,
3300000 0x0>; <3300000 0x0>;
status = "okay"; status = "okay";
}; };
@ -217,15 +217,16 @@
}; };
&pcie0 { &pcie0 {
pci@1,0 { pci@0,0 {
device_type = "pci";
#address-cells = <3>; #address-cells = <3>;
#size-cells = <2>; #size-cells = <2>;
ranges; ranges;
reg = <0 0 0 0 0>; reg = <0 0 0 0 0>;
usb@1,0 { usb@0,0 {
reg = <0x10000 0 0 0 0>; reg = <0 0 0 0 0>;
resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>; resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
}; };
}; };

Просмотреть файл

@ -300,6 +300,14 @@
status = "disabled"; status = "disabled";
}; };
vec: vec@7ec13000 {
compatible = "brcm,bcm2711-vec";
reg = <0x7ec13000 0x1000>;
clocks = <&clocks BCM2835_CLOCK_VEC>;
interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
dvp: clock@7ef00000 { dvp: clock@7ef00000 {
compatible = "brcm,brcm2711-dvp"; compatible = "brcm,brcm2711-dvp";
reg = <0x7ef00000 0x10>; reg = <0x7ef00000 0x10>;
@ -532,8 +540,8 @@
compatible = "brcm,genet-mdio-v5"; compatible = "brcm,genet-mdio-v5";
reg = <0xe14 0x8>; reg = <0xe14 0x8>;
reg-names = "mdio"; reg-names = "mdio";
#address-cells = <0x0>; #address-cells = <0x1>;
#size-cells = <0x1>; #size-cells = <0x0>;
}; };
}; };
}; };

Просмотреть файл

@ -106,6 +106,14 @@
status = "okay"; status = "okay";
}; };
vec: vec@7e806000 {
compatible = "brcm,bcm2835-vec";
reg = <0x7e806000 0x1000>;
clocks = <&clocks BCM2835_CLOCK_VEC>;
interrupts = <2 27>;
status = "disabled";
};
pixelvalve@7e807000 { pixelvalve@7e807000 {
compatible = "brcm,bcm2835-pixelvalve2"; compatible = "brcm,bcm2835-pixelvalve2";
reg = <0x7e807000 0x100>; reg = <0x7e807000 0x100>;

Просмотреть файл

@ -464,14 +464,6 @@
status = "disabled"; status = "disabled";
}; };
vec: vec@7e806000 {
compatible = "brcm,bcm2835-vec";
reg = <0x7e806000 0x1000>;
clocks = <&clocks BCM2835_CLOCK_VEC>;
interrupts = <2 27>;
status = "disabled";
};
usb: usb@7e980000 { usb: usb@7e980000 {
compatible = "brcm,bcm2835-usb"; compatible = "brcm,bcm2835-usb";
reg = <0x7e980000 0x10000>; reg = <0x7e980000 0x10000>;