Re: [PATCH v6 01/17] dt-bindings: display: rockchip: convert rockchip-lvds.txt to YAML
From: Rob Herring <robh@kernel.org>
Date: 2023-02-06 15:47:14
Also in:
dri-devel, linux-arm-kernel, linux-devicetree, linux-rockchip, linux-samsung-soc, lkml
On Sun, Feb 5, 2023 at 8:12 AM Heiko Stübner [off-list ref] wrote:
Hi, Am Freitag, 3. Februar 2023, 20:02:54 CET schrieb Johan Jonker:quoted
On 2/3/23 19:21, Rob Herring wrote:quoted
On Thu, Dec 22, 2022 at 03:22:14PM +0100, Johan Jonker wrote:quoted
Convert rockchip-lvds.txt to YAML. Changed: Add power-domains property. Requirements between PX30 and RK3288 Signed-off-by: Johan Jonker <redacted> 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/rockchip/rockchip,lvds.yaml delete mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txtquoted
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.yaml See current https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git/log/?h=for-next&qt=grep&q=jonker Not sure what Heiko's plans are. Patch 2 replaces only a description text and some accolades removal, so not "too" important. I urgent then you could merge without conflict: 1, 3-8So 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 applying 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