| Message ID | 20220228135700.1089526-2-pgwipeout@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | enable usb support on rk356x | expand |
Good Morning, Would it be possible to pull this patch individually, to fix the current error reported by Rob? Thanks, Peter On Mon, Feb 28, 2022 at 8:57 AM Peter Geis <pgwipeout@gmail.com> wrote: > > The rockchip,rk3568-pipe-grf and rockchip,rk3568-pipe-phy-grf > compatibles were incorrectly assigned to the syscon, simple-mfd > enumeration, vice only the syscon enumeration. > This leads a dtbs_check failure. > > Move these to the syscon enumeration. > > Fixes: b3df807e1fb0 ("dt-bindings: soc: grf: add naneng combo phy register compatible") > > Signed-off-by: Peter Geis <pgwipeout@gmail.com> > --- > Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml > index 072318fcd57b..5079e9d24af6 100644 > --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml > +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml > @@ -15,6 +15,8 @@ properties: > - items: > - enum: > - rockchip,rk3288-sgrf > + - rockchip,rk3568-pipe-grf > + - rockchip,rk3568-pipe-phy-grf > - rockchip,rk3568-usb2phy-grf > - rockchip,rv1108-usbgrf > - const: syscon > @@ -39,8 +41,6 @@ properties: > - rockchip,rk3399-grf > - rockchip,rk3399-pmugrf > - rockchip,rk3568-grf > - - rockchip,rk3568-pipe-grf > - - rockchip,rk3568-pipe-phy-grf > - rockchip,rk3568-pmugrf > - rockchip,rv1108-grf > - rockchip,rv1108-pmugrf > -- > 2.25.1 >
On 01-03-22, 09:52, Peter Geis wrote: > Good Morning, > > Would it be possible to pull this patch individually, to fix the > current error reported by Rob? This does not apply for me on phy-next. What was this based on..? > > Thanks, > Peter > > On Mon, Feb 28, 2022 at 8:57 AM Peter Geis <pgwipeout@gmail.com> wrote: > > > > The rockchip,rk3568-pipe-grf and rockchip,rk3568-pipe-phy-grf > > compatibles were incorrectly assigned to the syscon, simple-mfd > > enumeration, vice only the syscon enumeration. > > This leads a dtbs_check failure. > > > > Move these to the syscon enumeration. > > > > Fixes: b3df807e1fb0 ("dt-bindings: soc: grf: add naneng combo phy register compatible") > > > > Signed-off-by: Peter Geis <pgwipeout@gmail.com> > > --- > > Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml > > index 072318fcd57b..5079e9d24af6 100644 > > --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml > > +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml > > @@ -15,6 +15,8 @@ properties: > > - items: > > - enum: > > - rockchip,rk3288-sgrf > > + - rockchip,rk3568-pipe-grf > > + - rockchip,rk3568-pipe-phy-grf > > - rockchip,rk3568-usb2phy-grf > > - rockchip,rv1108-usbgrf > > - const: syscon > > @@ -39,8 +41,6 @@ properties: > > - rockchip,rk3399-grf > > - rockchip,rk3399-pmugrf > > - rockchip,rk3568-grf > > - - rockchip,rk3568-pipe-grf > > - - rockchip,rk3568-pipe-phy-grf > > - rockchip,rk3568-pmugrf > > - rockchip,rv1108-grf > > - rockchip,rv1108-pmugrf > > -- > > 2.25.1 > >
On Wed, Mar 2, 2022 at 3:16 AM Vinod Koul <vkoul@kernel.org> wrote: > > On 01-03-22, 09:52, Peter Geis wrote: > > Good Morning, > > > > Would it be possible to pull this patch individually, to fix the > > current error reported by Rob? > > This does not apply for me on phy-next. What was this based on..? This is based on linux-next, which the applicable patch was accepted on 24 Feb. The original patch was correct, but it seems a merge error happened and these two lines were moved into an incorrect location. This patch corrects that, but I see on the original patch chain you are discussing reverting and reapplying to fix it. > > > > > Thanks, > > Peter > > > > On Mon, Feb 28, 2022 at 8:57 AM Peter Geis <pgwipeout@gmail.com> wrote: > > > > > > The rockchip,rk3568-pipe-grf and rockchip,rk3568-pipe-phy-grf > > > compatibles were incorrectly assigned to the syscon, simple-mfd > > > enumeration, vice only the syscon enumeration. > > > This leads a dtbs_check failure. > > > > > > Move these to the syscon enumeration. > > > > > > Fixes: b3df807e1fb0 ("dt-bindings: soc: grf: add naneng combo phy register compatible") > > > > > > Signed-off-by: Peter Geis <pgwipeout@gmail.com> > > > --- > > > Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml > > > index 072318fcd57b..5079e9d24af6 100644 > > > --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml > > > +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml > > > @@ -15,6 +15,8 @@ properties: > > > - items: > > > - enum: > > > - rockchip,rk3288-sgrf > > > + - rockchip,rk3568-pipe-grf > > > + - rockchip,rk3568-pipe-phy-grf > > > - rockchip,rk3568-usb2phy-grf > > > - rockchip,rv1108-usbgrf > > > - const: syscon > > > @@ -39,8 +41,6 @@ properties: > > > - rockchip,rk3399-grf > > > - rockchip,rk3399-pmugrf > > > - rockchip,rk3568-grf > > > - - rockchip,rk3568-pipe-grf > > > - - rockchip,rk3568-pipe-phy-grf > > > - rockchip,rk3568-pmugrf > > > - rockchip,rv1108-grf > > > - rockchip,rv1108-pmugrf > > > -- > > > 2.25.1 > > > > > -- > ~Vinod
On 02-03-22, 07:18, Peter Geis wrote: > On Wed, Mar 2, 2022 at 3:16 AM Vinod Koul <vkoul@kernel.org> wrote: > > > > On 01-03-22, 09:52, Peter Geis wrote: > > > Good Morning, > > > > > > Would it be possible to pull this patch individually, to fix the > > > current error reported by Rob? > > > > This does not apply for me on phy-next. What was this based on..? > > This is based on linux-next, which the applicable patch was accepted on 24 Feb. > The original patch was correct, but it seems a merge error happened > and these two lines were moved into an incorrect location. > This patch corrects that, but I see on the original patch chain you > are discussing reverting and reapplying to fix it. Ok let me revert than so that it is easy for everyone to fix up Thanks
diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml index 072318fcd57b..5079e9d24af6 100644 --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml @@ -15,6 +15,8 @@ properties: - items: - enum: - rockchip,rk3288-sgrf + - rockchip,rk3568-pipe-grf + - rockchip,rk3568-pipe-phy-grf - rockchip,rk3568-usb2phy-grf - rockchip,rv1108-usbgrf - const: syscon @@ -39,8 +41,6 @@ properties: - rockchip,rk3399-grf - rockchip,rk3399-pmugrf - rockchip,rk3568-grf - - rockchip,rk3568-pipe-grf - - rockchip,rk3568-pipe-phy-grf - rockchip,rk3568-pmugrf - rockchip,rv1108-grf - rockchip,rv1108-pmugrf
The rockchip,rk3568-pipe-grf and rockchip,rk3568-pipe-phy-grf compatibles were incorrectly assigned to the syscon, simple-mfd enumeration, vice only the syscon enumeration. This leads a dtbs_check failure. Move these to the syscon enumeration. Fixes: b3df807e1fb0 ("dt-bindings: soc: grf: add naneng combo phy register compatible") Signed-off-by: Peter Geis <pgwipeout@gmail.com> --- Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)