Message ID | 1383813908-26571-1-git-send-email-shc_work@mail.ru (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, Nov 07, 2013 at 12:45:04PM +0400, Alexander Shiyan wrote: > usbphy0 is not a part of AIPS1, so move this node under usbotg. > Additionally this patch removes useless "status" property. > > Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Applied all except #4. I would add those pingroups only when there are in-tree users of it. Shawn > --- > arch/arm/boot/dts/imx51.dtsi | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi > index 463dfe8..1075a7d 100644 > --- a/arch/arm/boot/dts/imx51.dtsi > +++ b/arch/arm/boot/dts/imx51.dtsi > @@ -189,13 +189,6 @@ > }; > }; > > - usbphy0: usbphy@0 { > - compatible = "usb-nop-xceiv"; > - clocks = <&clks 75>; > - clock-names = "main_clk"; > - status = "okay"; > - }; > - > usbotg: usb@73f80000 { > compatible = "fsl,imx51-usb", "fsl,imx27-usb"; > reg = <0x73f80000 0x0200>; > @@ -204,6 +197,12 @@ > fsl,usbmisc = <&usbmisc 0>; > fsl,usbphy = <&usbphy0>; > status = "disabled"; > + > + usbphy0: usbphy@0 { > + compatible = "usb-nop-xceiv"; > + clocks = <&clks 75>; > + clock-names = "main_clk"; > + }; > }; > > usbh1: usb@73f80200 { > -- > 1.8.1.5 >
> On Thu, Nov 07, 2013 at 12:45:04PM +0400, Alexander Shiyan wrote: > > usbphy0 is not a part of AIPS1, so move this node under usbotg. > > Additionally this patch removes useless "status" property. > > > > Signed-off-by: Alexander Shiyan <shc_work@mail.ru> > > Applied all except #4. I would add those pingroups only when there are > in-tree users of it. Please revert this one part too [1/5]. This change is incorrect. I will make other solution later. Thanks. ---
On Mon, Nov 11, 2013 at 12:15:06PM +0400, Alexander Shiyan wrote: > > On Thu, Nov 07, 2013 at 12:45:04PM +0400, Alexander Shiyan wrote: > > > usbphy0 is not a part of AIPS1, so move this node under usbotg. > > > Additionally this patch removes useless "status" property. > > > > > > Signed-off-by: Alexander Shiyan <shc_work@mail.ru> > > > > Applied all except #4. I would add those pingroups only when there are > > in-tree users of it. > > Please revert this one part too [1/5]. This change is incorrect. I will make > other solution later. > Thanks. Okay. Dropped the patch 'ARM: dts: i.MX51: Move usbphy0 node from AIPS1'. Shawn
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index 463dfe8..1075a7d 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi @@ -189,13 +189,6 @@ }; }; - usbphy0: usbphy@0 { - compatible = "usb-nop-xceiv"; - clocks = <&clks 75>; - clock-names = "main_clk"; - status = "okay"; - }; - usbotg: usb@73f80000 { compatible = "fsl,imx51-usb", "fsl,imx27-usb"; reg = <0x73f80000 0x0200>; @@ -204,6 +197,12 @@ fsl,usbmisc = <&usbmisc 0>; fsl,usbphy = <&usbphy0>; status = "disabled"; + + usbphy0: usbphy@0 { + compatible = "usb-nop-xceiv"; + clocks = <&clks 75>; + clock-names = "main_clk"; + }; }; usbh1: usb@73f80200 {
usbphy0 is not a part of AIPS1, so move this node under usbotg. Additionally this patch removes useless "status" property. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> --- arch/arm/boot/dts/imx51.dtsi | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)