[PATCH v3 1/6] ARM: dts: Cygnus: Fixed iProc PCIe controller properties
Rob Herring
robh+dt at kernel.org
Wed Dec 8 07:53:35 PST 2021
On Tue, Dec 7, 2021 at 10:04 PM Florian Fainelli <f.fainelli at gmail.com> wrote:
>
> Rename the msi controller unit name to 'msi' to avoid collisions
> with the 'msi-controller' boolean property and add the missing
> 'interrupt-controller' property which is necessary. We also need to
'interrupt-controller'part should be dropped...
> re-arrange the 'ranges' property to show the two cells as being separate
> instead of combined since the DT checker is not able to differentiate
> otherwise.
>
> Signed-off-by: Florian Fainelli <f.fainelli at gmail.com>
> ---
> arch/arm/boot/dts/bcm-cygnus.dtsi | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi
> index 8ecb7861ce10..d6e2b2ba3a19 100644
> --- a/arch/arm/boot/dts/bcm-cygnus.dtsi
> +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi
> @@ -274,8 +274,8 @@ pcie0: pcie at 18012000 {
> #address-cells = <3>;
> #size-cells = <2>;
> device_type = "pci";
> - ranges = <0x81000000 0 0 0x28000000 0 0x00010000
> - 0x82000000 0 0x20000000 0x20000000 0 0x04000000>;
> + ranges = <0x81000000 0 0 0x28000000 0 0x00010000>,
> + <0x82000000 0 0x20000000 0x20000000 0 0x04000000>;
>
> phys = <&pcie0_phy>;
> phy-names = "pcie-phy";
> @@ -283,7 +283,7 @@ pcie0: pcie at 18012000 {
> status = "disabled";
>
> msi-parent = <&msi0>;
> - msi0: msi-controller {
> + msi0: msi {
> compatible = "brcm,iproc-msi";
> msi-controller;
> interrupt-parent = <&gic>;
> @@ -298,6 +298,7 @@ pcie1: pcie at 18013000 {
> compatible = "brcm,iproc-pcie";
> reg = <0x18013000 0x1000>;
>
> + interrupt-controller;
Missed dropping this?
> #interrupt-cells = <1>;
> interrupt-map-mask = <0 0 0 0>;
> interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
> @@ -309,8 +310,8 @@ pcie1: pcie at 18013000 {
> #address-cells = <3>;
> #size-cells = <2>;
> device_type = "pci";
> - ranges = <0x81000000 0 0 0x48000000 0 0x00010000
> - 0x82000000 0 0x40000000 0x40000000 0 0x04000000>;
> + ranges = <0x81000000 0 0 0x48000000 0 0x00010000>,
> + <0x82000000 0 0x40000000 0x40000000 0 0x04000000>;
>
> phys = <&pcie1_phy>;
> phy-names = "pcie-phy";
> @@ -318,7 +319,7 @@ pcie1: pcie at 18013000 {
> status = "disabled";
>
> msi-parent = <&msi1>;
> - msi1: msi-controller {
> + msi1: msi {
> compatible = "brcm,iproc-msi";
> msi-controller;
> interrupt-parent = <&gic>;
> --
> 2.25.1
>
More information about the linux-arm-kernel
mailing list