MIME-Version: 1.0
References: <67771143-fd83-383d-41b2-68e8707134e8@gmail.com>
 <20230203182119.GA615242-robh@kernel.org> <87f5097d-1cd0-e09f-e759-8592a9165ea6@gmail.com>
 <5647788.DvuYhMxLoT@diego>
In-Reply-To: <5647788.DvuYhMxLoT@diego>
From:   Rob Herring <robh@kernel.org>
Date:   Mon, 6 Feb 2023 09:46:19 -0600
Message-ID: <CAL_JsqJJcRx0XAJmsS6Q-AmNGDd+bWPVgW1yLBq6o2kmxiEFAg@mail.gmail.com>
Subject: Re: [PATCH v6 01/17] dt-bindings: display: rockchip: convert
 rockchip-lvds.txt to YAML
To:     =?UTF-8?Q?Heiko_St=C3=BCbner?= <heiko@sntech.de>
Cc:     Johan Jonker <jbx6244@gmail.com>, hjc@rock-chips.com,
        krzysztof.kozlowski+dt@linaro.org, gregkh@linuxfoundation.org,
        airlied@gmail.com, daniel@ffwll.ch, andrzej.hajda@intel.com,
        neil.armstrong@linaro.org, robert.foss@linaro.org,
        Laurent.pinchart@ideasonboard.com, jonas@kwiboo.se,
        jernej.skrabec@gmail.com, philippe.cornu@foss.st.com,
        dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-rockchip@lists.infradead.org, linux-usb@vger.kernel.org,
        linus.walleij@linaro.org, inki.dae@samsung.com,
        sw0312.kim@samsung.com, kyungmin.park@samsung.com,
        alim.akhtar@samsung.com, linux-samsung-soc@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Sun, Feb 5, 2023 at 8:12 AM Heiko St=C3=BCbner <heiko@sntech.de> wrote:
>
> Hi,
>
> Am Freitag, 3. Februar 2023, 20:02:54 CET schrieb Johan Jonker:
> >
> > On 2/3/23 19:21, Rob Herring wrote:
> > > On Thu, Dec 22, 2022 at 03:22:14PM +0100, Johan Jonker wrote:
> > >> Convert rockchip-lvds.txt to YAML.
> > >>
> > >> Changed:
> > >>   Add power-domains property.
> > >>   Requirements between PX30 and RK3288
> > >>
> > >> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> > >> Reviewed-by: Rob Herring <robh@kernel.org>
> > >> ---
> > >>
> > >> Changed V3:
> > >>   Filename matching compatible style
> > >>   Drop "Regulator phandle for "
> > >>   Specify properties and requirements per SoC
> > >>   Sort order and restyle
> > >>
> > >> Changed V2:
> > >>   Fix title
> > >> ---
> > >>  .../display/rockchip/rockchip,lvds.yaml       | 170 +++++++++++++++=
+++
> > >>  .../display/rockchip/rockchip-lvds.txt        |  92 ----------
> > >>  2 files changed, 170 insertions(+), 92 deletions(-)
> > >>  create mode 100644 Documentation/devicetree/bindings/display/rockch=
ip/rockchip,lvds.yaml
> > >>  delete mode 100644 Documentation/devicetree/bindings/display/rockch=
ip/rockchip-lvds.txt
> > >
> >
> > > What's the plan for these patches? Don't see them in linux-next still=
.
> > > Do you want me to take patches 1-8?
> >
> > Hi,
> >
> > The display patches normally go through the DRM git.
> > Patch 2 must merge with grf.yaml.
> > Heiko has merged now 3 PHY related patches to grf.yaml first.
> >
> > [PATCH v6 02/17] dt-bindings: soc: rockchip: grf: add rockchip,lvds.yam=
l
> >
> > See current
> > https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.gi=
t/log/?h=3Dfor-next&qt=3Dgrep&q=3Djonker
> >
> > Not sure what Heiko's plans are.
> > Patch 2 replaces  only a description text and some accolades removal, s=
o not "too" important.
> >
> > I urgent then you could merge without conflict:
> > 1, 3-8
>
> So I've applied patches 1-7 to the drm-tree now.

That would have been good a month ago. Now these won't land til 6.4.
:( For that reason, if it is after the drm-misc cutoff, I prefer to
take DT bindings via my tree.

> For the GRF-patch, I've dropped the quotes changes, as they are somewhat
> unrelated to the lvds inclusion and so prevented any conflicts when apply=
ing
> the rest to the DRM tree.

Only 1 hunk needed to be dropped to avoid the conflict (which also
dropped quotes). If all the quote changes were dropped, please send
another patch for that.

> @Rob, if you could pick the fusb302 patch (number8), that would be great

Will do.

Rob