From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Subject: Re: [PATCH 06/15] ARM: dts: r8a779x: fix PCI bus dtc warnings Date: Fri, 24 Mar 2017 08:06:14 +0100 Message-ID: <20170324070614.GJ1319@verge.net.au> References: <20170322020313.24338-1-robh@kernel.org> <20170322020313.24338-6-robh@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20170322020313.24338-6-robh@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Rob Herring Cc: devicetree@vger.kernel.org, Magnus Damm , linux-renesas-soc@vger.kernel.org, arm@kernel.org, Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org On Tue, Mar 21, 2017 at 09:03:04PM -0500, Rob Herring wrote: > dtc recently added PCI bus checks. Fix these warnings. > > Signed-off-by: Rob Herring > Cc: Simon Horman > Cc: Magnus Damm > Cc: linux-renesas-soc@vger.kernel.org > --- > Sub-arch maintainers, please apply to your trees unless arm-soc wants > to take the whole lot. I would prefer to take these through my tree to reduce the chances of conflicts emerging later. Geert, are you happy with this patch and its changelog as-is? > > arch/arm/boot/dts/r8a7790.dtsi | 16 ++++++---------- > arch/arm/boot/dts/r8a7791.dtsi | 16 ++++++---------- > arch/arm/boot/dts/r8a7794.dtsi | 16 ++++++---------- > 3 files changed, 18 insertions(+), 30 deletions(-) > > diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi > index 6d10450de6d7..c16a37e9fb5d 100644 > --- a/arch/arm/boot/dts/r8a7790.dtsi > +++ b/arch/arm/boot/dts/r8a7790.dtsi > @@ -1598,16 +1598,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; > > - usb@0,1 { > + usb@1,0 { > reg = <0x800 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > > - usb@0,2 { > + usb@2,0 { > reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > @@ -1654,16 +1652,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; > > - usb@0,1 { > - reg = <0x800 0 0 0 0>; > - device_type = "pci"; > + usb@1,0 { > + reg = <0x20800 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > > - usb@0,2 { > - reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > + usb@2,0 { > + reg = <0x21000 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi > index 9f9e48511836..a1d8686eaea5 100644 > --- a/arch/arm/boot/dts/r8a7791.dtsi > +++ b/arch/arm/boot/dts/r8a7791.dtsi > @@ -1596,16 +1596,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; > > - usb@0,1 { > + usb@1,0 { > reg = <0x800 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > > - usb@0,2 { > + usb@2,0 { > reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > @@ -1631,16 +1629,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; > > - usb@0,1 { > - reg = <0x800 0 0 0 0>; > - device_type = "pci"; > + usb@1,0 { > + reg = <0x10800 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > > - usb@0,2 { > - reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > + usb@2,0 { > + reg = <0x11000 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi > index 319c1069b7ee..c07495185cc4 100644 > --- a/arch/arm/boot/dts/r8a7794.dtsi > +++ b/arch/arm/boot/dts/r8a7794.dtsi > @@ -817,16 +817,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; > > - usb@0,1 { > + usb@1,0 { > reg = <0x800 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > > - usb@0,2 { > + usb@2,0 { > reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > @@ -852,16 +850,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; > > - usb@0,1 { > - reg = <0x800 0 0 0 0>; > - device_type = "pci"; > + usb@1,0 { > + reg = <0x10800 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > > - usb@0,2 { > - reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > + usb@2,0 { > + reg = <0x11000 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > -- > 2.10.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from kirsty.vergenet.net ([202.4.237.240]:60083 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751406AbdCXHGU (ORCPT ); Fri, 24 Mar 2017 03:06:20 -0400 Date: Fri, 24 Mar 2017 08:06:14 +0100 From: Simon Horman To: Rob Herring Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, arm@kernel.org, Magnus Damm , linux-renesas-soc@vger.kernel.org, Geert Uytterhoeven Subject: Re: [PATCH 06/15] ARM: dts: r8a779x: fix PCI bus dtc warnings Message-ID: <20170324070614.GJ1319@verge.net.au> References: <20170322020313.24338-1-robh@kernel.org> <20170322020313.24338-6-robh@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170322020313.24338-6-robh@kernel.org> Sender: linux-renesas-soc-owner@vger.kernel.org List-ID: On Tue, Mar 21, 2017 at 09:03:04PM -0500, Rob Herring wrote: > dtc recently added PCI bus checks. Fix these warnings. > > Signed-off-by: Rob Herring > Cc: Simon Horman > Cc: Magnus Damm > Cc: linux-renesas-soc@vger.kernel.org > --- > Sub-arch maintainers, please apply to your trees unless arm-soc wants > to take the whole lot. I would prefer to take these through my tree to reduce the chances of conflicts emerging later. Geert, are you happy with this patch and its changelog as-is? > > arch/arm/boot/dts/r8a7790.dtsi | 16 ++++++---------- > arch/arm/boot/dts/r8a7791.dtsi | 16 ++++++---------- > arch/arm/boot/dts/r8a7794.dtsi | 16 ++++++---------- > 3 files changed, 18 insertions(+), 30 deletions(-) > > diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi > index 6d10450de6d7..c16a37e9fb5d 100644 > --- a/arch/arm/boot/dts/r8a7790.dtsi > +++ b/arch/arm/boot/dts/r8a7790.dtsi > @@ -1598,16 +1598,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; > > - usb@0,1 { > + usb@1,0 { > reg = <0x800 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > > - usb@0,2 { > + usb@2,0 { > reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > @@ -1654,16 +1652,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; > > - usb@0,1 { > - reg = <0x800 0 0 0 0>; > - device_type = "pci"; > + usb@1,0 { > + reg = <0x20800 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > > - usb@0,2 { > - reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > + usb@2,0 { > + reg = <0x21000 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi > index 9f9e48511836..a1d8686eaea5 100644 > --- a/arch/arm/boot/dts/r8a7791.dtsi > +++ b/arch/arm/boot/dts/r8a7791.dtsi > @@ -1596,16 +1596,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; > > - usb@0,1 { > + usb@1,0 { > reg = <0x800 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > > - usb@0,2 { > + usb@2,0 { > reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > @@ -1631,16 +1629,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; > > - usb@0,1 { > - reg = <0x800 0 0 0 0>; > - device_type = "pci"; > + usb@1,0 { > + reg = <0x10800 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > > - usb@0,2 { > - reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > + usb@2,0 { > + reg = <0x11000 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi > index 319c1069b7ee..c07495185cc4 100644 > --- a/arch/arm/boot/dts/r8a7794.dtsi > +++ b/arch/arm/boot/dts/r8a7794.dtsi > @@ -817,16 +817,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; > > - usb@0,1 { > + usb@1,0 { > reg = <0x800 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > > - usb@0,2 { > + usb@2,0 { > reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > @@ -852,16 +850,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; > > - usb@0,1 { > - reg = <0x800 0 0 0 0>; > - device_type = "pci"; > + usb@1,0 { > + reg = <0x10800 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > > - usb@0,2 { > - reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > + usb@2,0 { > + reg = <0x11000 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > -- > 2.10.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: horms@verge.net.au (Simon Horman) Date: Fri, 24 Mar 2017 08:06:14 +0100 Subject: [PATCH 06/15] ARM: dts: r8a779x: fix PCI bus dtc warnings In-Reply-To: <20170322020313.24338-6-robh@kernel.org> References: <20170322020313.24338-1-robh@kernel.org> <20170322020313.24338-6-robh@kernel.org> Message-ID: <20170324070614.GJ1319@verge.net.au> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Mar 21, 2017 at 09:03:04PM -0500, Rob Herring wrote: > dtc recently added PCI bus checks. Fix these warnings. > > Signed-off-by: Rob Herring > Cc: Simon Horman > Cc: Magnus Damm > Cc: linux-renesas-soc at vger.kernel.org > --- > Sub-arch maintainers, please apply to your trees unless arm-soc wants > to take the whole lot. I would prefer to take these through my tree to reduce the chances of conflicts emerging later. Geert, are you happy with this patch and its changelog as-is? > > arch/arm/boot/dts/r8a7790.dtsi | 16 ++++++---------- > arch/arm/boot/dts/r8a7791.dtsi | 16 ++++++---------- > arch/arm/boot/dts/r8a7794.dtsi | 16 ++++++---------- > 3 files changed, 18 insertions(+), 30 deletions(-) > > diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi > index 6d10450de6d7..c16a37e9fb5d 100644 > --- a/arch/arm/boot/dts/r8a7790.dtsi > +++ b/arch/arm/boot/dts/r8a7790.dtsi > @@ -1598,16 +1598,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; > > - usb at 0,1 { > + usb at 1,0 { > reg = <0x800 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > > - usb at 0,2 { > + usb at 2,0 { > reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > @@ -1654,16 +1652,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; > > - usb at 0,1 { > - reg = <0x800 0 0 0 0>; > - device_type = "pci"; > + usb at 1,0 { > + reg = <0x20800 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > > - usb at 0,2 { > - reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > + usb at 2,0 { > + reg = <0x21000 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi > index 9f9e48511836..a1d8686eaea5 100644 > --- a/arch/arm/boot/dts/r8a7791.dtsi > +++ b/arch/arm/boot/dts/r8a7791.dtsi > @@ -1596,16 +1596,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; > > - usb at 0,1 { > + usb at 1,0 { > reg = <0x800 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > > - usb at 0,2 { > + usb at 2,0 { > reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > @@ -1631,16 +1629,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; > > - usb at 0,1 { > - reg = <0x800 0 0 0 0>; > - device_type = "pci"; > + usb at 1,0 { > + reg = <0x10800 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > > - usb at 0,2 { > - reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > + usb at 2,0 { > + reg = <0x11000 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi > index 319c1069b7ee..c07495185cc4 100644 > --- a/arch/arm/boot/dts/r8a7794.dtsi > +++ b/arch/arm/boot/dts/r8a7794.dtsi > @@ -817,16 +817,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; > > - usb at 0,1 { > + usb at 1,0 { > reg = <0x800 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > > - usb at 0,2 { > + usb at 2,0 { > reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > phys = <&usb0 0>; > phy-names = "usb"; > }; > @@ -852,16 +850,14 @@ > 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH > 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; > > - usb at 0,1 { > - reg = <0x800 0 0 0 0>; > - device_type = "pci"; > + usb at 1,0 { > + reg = <0x10800 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > > - usb at 0,2 { > - reg = <0x1000 0 0 0 0>; > - device_type = "pci"; > + usb at 2,0 { > + reg = <0x11000 0 0 0 0>; > phys = <&usb2 0>; > phy-names = "usb"; > }; > -- > 2.10.1 >