* [PATCH 0/2] Improve fsl-ls1028a-qds device tree overlay build @ 2022-01-29 7:09 Shawn Guo 2022-01-29 7:09 ` [PATCH 1/2] arm64: dts: fsl-ls1028a-qds: Drop overlay syntax hard coding Shawn Guo 2022-01-29 7:09 ` [PATCH 2/2] arm64: dts: freescale: Use overlay target for simplicity Shawn Guo 0 siblings, 2 replies; 11+ messages in thread From: Shawn Guo @ 2022-01-29 7:09 UTC (permalink / raw) To: linux-arm-kernel Cc: devicetree, Rob Herring, Li Yang, Vladimir Oltean, Shawn Guo It makes a couple of improvments on fsl-ls1028a-qds device tree overlay build. Compile tested only. Shawn Guo (2): arm64: dts: fsl-ls1028a-qds: Drop overlay syntax hard coding arm64: dts: freescale: Use overlay target for simplicity arch/arm64/boot/dts/freescale/Makefile | 29 ++-- .../dts/freescale/fsl-ls1028a-qds-13bb.dts | 146 ++++++++---------- .../dts/freescale/fsl-ls1028a-qds-65bb.dts | 138 +++++++---------- .../dts/freescale/fsl-ls1028a-qds-7777.dts | 99 ++++++------ .../dts/freescale/fsl-ls1028a-qds-85bb.dts | 134 +++++++--------- .../dts/freescale/fsl-ls1028a-qds-899b.dts | 86 +++++------ .../dts/freescale/fsl-ls1028a-qds-9999.dts | 97 ++++++------ 7 files changed, 313 insertions(+), 416 deletions(-) -- 2.17.1 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/2] arm64: dts: fsl-ls1028a-qds: Drop overlay syntax hard coding 2022-01-29 7:09 [PATCH 0/2] Improve fsl-ls1028a-qds device tree overlay build Shawn Guo @ 2022-01-29 7:09 ` Shawn Guo 2022-01-31 11:07 ` Vladimir Oltean 2022-01-29 7:09 ` [PATCH 2/2] arm64: dts: freescale: Use overlay target for simplicity Shawn Guo 1 sibling, 1 reply; 11+ messages in thread From: Shawn Guo @ 2022-01-29 7:09 UTC (permalink / raw) To: linux-arm-kernel Cc: devicetree, Rob Herring, Li Yang, Vladimir Oltean, Shawn Guo As suggested by commit 9ae8578b517a ("of: Documentation: change overlay example to use current syntax"), there is no need to have overlay syntax be hard coded in the device tree source file any more. Signed-off-by: Shawn Guo <shawnguo@kernel.org> --- .../dts/freescale/fsl-ls1028a-qds-13bb.dts | 146 ++++++++---------- .../dts/freescale/fsl-ls1028a-qds-65bb.dts | 138 +++++++---------- .../dts/freescale/fsl-ls1028a-qds-7777.dts | 99 ++++++------ .../dts/freescale/fsl-ls1028a-qds-85bb.dts | 134 +++++++--------- .../dts/freescale/fsl-ls1028a-qds-899b.dts | 86 +++++------ .../dts/freescale/fsl-ls1028a-qds-9999.dts | 97 ++++++------ 6 files changed, 299 insertions(+), 401 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-13bb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-13bb.dts index f748a2c12a70..f826392c23fa 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-13bb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-13bb.dts @@ -12,102 +12,80 @@ /dts-v1/; /plugin/; -/ { - fragment@0 { - target = <&mdio_slot1>; - - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - - slot1_sgmii: ethernet-phy@2 { - /* AQR112 */ - reg = <0x2>; - compatible = "ethernet-phy-ieee802.3-c45"; - }; - }; - }; - - fragment@1 { - target = <&enetc_port0>; - - __overlay__ { - phy-handle = <&slot1_sgmii>; - phy-mode = "usxgmii"; - managed = "in-band-status"; - status = "okay"; - }; +&mdio_slot1 { + #address-cells = <1>; + #size-cells = <0>; + + slot1_sgmii: ethernet-phy@2 { + /* AQR112 */ + reg = <0x2>; + compatible = "ethernet-phy-ieee802.3-c45"; }; +}; - fragment@2 { - target = <&mdio_slot2>; - - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - - /* 4 ports on AQR412 */ - slot2_qxgmii0: ethernet-phy@0 { - reg = <0x0>; - compatible = "ethernet-phy-ieee802.3-c45"; - }; - - slot2_qxgmii1: ethernet-phy@1 { - reg = <0x1>; - compatible = "ethernet-phy-ieee802.3-c45"; - }; +&enetc_port0 { + phy-handle = <&slot1_sgmii>; + phy-mode = "usxgmii"; + managed = "in-band-status"; + status = "okay"; +}; - slot2_qxgmii2: ethernet-phy@2 { - reg = <0x2>; - compatible = "ethernet-phy-ieee802.3-c45"; - }; +&mdio_slot2 { + #address-cells = <1>; + #size-cells = <0>; - slot2_qxgmii3: ethernet-phy@3 { - reg = <0x3>; - compatible = "ethernet-phy-ieee802.3-c45"; - }; - }; + /* 4 ports on AQR412 */ + slot2_qxgmii0: ethernet-phy@0 { + reg = <0x0>; + compatible = "ethernet-phy-ieee802.3-c45"; }; - fragment@3 { - target = <&mscc_felix_ports>; + slot2_qxgmii1: ethernet-phy@1 { + reg = <0x1>; + compatible = "ethernet-phy-ieee802.3-c45"; + }; - __overlay__ { - port@0 { - status = "okay"; - phy-handle = <&slot2_qxgmii0>; - phy-mode = "usxgmii"; - managed = "in-band-status"; - }; + slot2_qxgmii2: ethernet-phy@2 { + reg = <0x2>; + compatible = "ethernet-phy-ieee802.3-c45"; + }; - port@1 { - status = "okay"; - phy-handle = <&slot2_qxgmii1>; - phy-mode = "usxgmii"; - managed = "in-band-status"; - }; + slot2_qxgmii3: ethernet-phy@3 { + reg = <0x3>; + compatible = "ethernet-phy-ieee802.3-c45"; + }; +}; - port@2 { - status = "okay"; - phy-handle = <&slot2_qxgmii2>; - phy-mode = "usxgmii"; - managed = "in-band-status"; - }; +&mscc_felix_ports { + port@0 { + status = "okay"; + phy-handle = <&slot2_qxgmii0>; + phy-mode = "usxgmii"; + managed = "in-band-status"; + }; - port@3 { - status = "okay"; - phy-handle = <&slot2_qxgmii3>; - phy-mode = "usxgmii"; - managed = "in-band-status"; - }; - }; + port@1 { + status = "okay"; + phy-handle = <&slot2_qxgmii1>; + phy-mode = "usxgmii"; + managed = "in-band-status"; }; - fragment@4 { - target = <&mscc_felix>; + port@2 { + status = "okay"; + phy-handle = <&slot2_qxgmii2>; + phy-mode = "usxgmii"; + managed = "in-band-status"; + }; - __overlay__ { - status = "okay"; - }; + port@3 { + status = "okay"; + phy-handle = <&slot2_qxgmii3>; + phy-mode = "usxgmii"; + managed = "in-band-status"; }; }; + +&mscc_felix { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts index 8ffb707a1576..bd88438c2ecd 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts @@ -11,98 +11,78 @@ /dts-v1/; /plugin/; -/ { - fragment@0 { - target = <&mdio_slot1>; - - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - - slot1_sgmii: ethernet-phy@2 { - /* AQR112 */ - reg = <0x2>; - compatible = "ethernet-phy-ieee802.3-c45"; - }; - }; - }; +&mdio_slot1 { - fragment@1 { - target = <&enetc_port0>; + #address-cells = <1>; + #size-cells = <0>; - __overlay__ { - phy-handle = <&slot1_sgmii>; - phy-mode = "2500base-x"; - managed = "in-band-status"; - status = "okay"; - }; + slot1_sgmii: ethernet-phy@2 { + /* AQR112 */ + reg = <0x2>; + compatible = "ethernet-phy-ieee802.3-c45"; }; +}; - fragment@2 { - target = <&mdio_slot2>; +&enetc_port0 { + phy-handle = <&slot1_sgmii>; + phy-mode = "2500base-x"; + managed = "in-band-status"; + status = "okay"; +}; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; +&mdio_slot2 { + #address-cells = <1>; + #size-cells = <0>; - /* 4 ports on VSC8514 */ - slot2_qsgmii0: ethernet-phy@8 { - reg = <0x8>; - }; + /* 4 ports on VSC8514 */ + slot2_qsgmii0: ethernet-phy@8 { + reg = <0x8>; + }; - slot2_qsgmii1: ethernet-phy@9 { - reg = <0x9>; - }; + slot2_qsgmii1: ethernet-phy@9 { + reg = <0x9>; + }; - slot2_qsgmii2: ethernet-phy@a { - reg = <0xa>; - }; + slot2_qsgmii2: ethernet-phy@a { + reg = <0xa>; + }; - slot2_qsgmii3: ethernet-phy@b { - reg = <0xb>; - }; - }; + slot2_qsgmii3: ethernet-phy@b { + reg = <0xb>; }; +}; - fragment@3 { - target = <&mscc_felix_ports>; - - __overlay__ { - port@0 { - status = "okay"; - phy-handle = <&slot2_qsgmii0>; - phy-mode = "qsgmii"; - managed = "in-band-status"; - }; - - port@1 { - status = "okay"; - phy-handle = <&slot2_qsgmii1>; - phy-mode = "qsgmii"; - managed = "in-band-status"; - }; - - port@2 { - status = "okay"; - phy-handle = <&slot2_qsgmii2>; - phy-mode = "qsgmii"; - managed = "in-band-status"; - }; - - port@3 { - status = "okay"; - phy-handle = <&slot2_qsgmii3>; - phy-mode = "qsgmii"; - managed = "in-band-status"; - }; - }; +&mscc_felix_ports { + port@0 { + status = "okay"; + phy-handle = <&slot2_qsgmii0>; + phy-mode = "qsgmii"; + managed = "in-band-status"; }; - fragment@4 { - target = <&mscc_felix>; + port@1 { + status = "okay"; + phy-handle = <&slot2_qsgmii1>; + phy-mode = "qsgmii"; + managed = "in-band-status"; + }; + + port@2 { + status = "okay"; + phy-handle = <&slot2_qsgmii2>; + phy-mode = "qsgmii"; + managed = "in-band-status"; + }; - __overlay__ { - status = "okay"; - }; + port@3 { + status = "okay"; + phy-handle = <&slot2_qsgmii3>; + phy-mode = "qsgmii"; + managed = "in-band-status"; }; }; + +&mscc_felix { + + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-7777.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-7777.dts index eb6a1e674f10..1dff68d7484b 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-7777.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-7777.dts @@ -12,71 +12,58 @@ /dts-v1/; /plugin/; -/ { - fragment@0 { - target = <&mdio_slot1>; +&mdio_slot1 { + #address-cells = <1>; + #size-cells = <0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - - /* 4 ports on AQR412 */ - slot1_sxgmii0: ethernet-phy@0 { - reg = <0x0>; - compatible = "ethernet-phy-ieee802.3-c45"; - }; - - slot1_sxgmii1: ethernet-phy@1 { - reg = <0x1>; - compatible = "ethernet-phy-ieee802.3-c45"; - }; - - slot1_sxgmii2: ethernet-phy@2 { - reg = <0x2>; - compatible = "ethernet-phy-ieee802.3-c45"; - }; + /* 4 ports on AQR412 */ + slot1_sxgmii0: ethernet-phy@0 { + reg = <0x0>; + compatible = "ethernet-phy-ieee802.3-c45"; + }; - slot1_sxgmii3: ethernet-phy@3 { - reg = <0x3>; - compatible = "ethernet-phy-ieee802.3-c45"; - }; - }; + slot1_sxgmii1: ethernet-phy@1 { + reg = <0x1>; + compatible = "ethernet-phy-ieee802.3-c45"; }; - fragment@1 { - target = <&mscc_felix_ports>; + slot1_sxgmii2: ethernet-phy@2 { + reg = <0x2>; + compatible = "ethernet-phy-ieee802.3-c45"; + }; - __overlay__ { - port@0 { - status = "okay"; - phy-handle = <&slot1_sxgmii0>; - phy-mode = "2500base-x"; - }; + slot1_sxgmii3: ethernet-phy@3 { + reg = <0x3>; + compatible = "ethernet-phy-ieee802.3-c45"; + }; +}; - port@1 { - status = "okay"; - phy-handle = <&slot1_sxgmii1>; - phy-mode = "2500base-x"; - }; +&mscc_felix_ports { + port@0 { + status = "okay"; + phy-handle = <&slot1_sxgmii0>; + phy-mode = "2500base-x"; + }; - port@2 { - status = "okay"; - phy-handle = <&slot1_sxgmii2>; - phy-mode = "2500base-x"; - }; + port@1 { + status = "okay"; + phy-handle = <&slot1_sxgmii1>; + phy-mode = "2500base-x"; + }; - port@3 { - status = "okay"; - phy-handle = <&slot1_sxgmii3>; - phy-mode = "2500base-x"; - }; - }; + port@2 { + status = "okay"; + phy-handle = <&slot1_sxgmii2>; + phy-mode = "2500base-x"; }; - fragment@2 { - target = <&mscc_felix>; - __overlay__ { - status = "okay"; - }; + port@3 { + status = "okay"; + phy-handle = <&slot1_sxgmii3>; + phy-mode = "2500base-x"; }; }; + +&mscc_felix { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-85bb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-85bb.dts index 8e90c3088ba1..19424d349713 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-85bb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-85bb.dts @@ -11,97 +11,75 @@ /dts-v1/; /plugin/; -/ { - fragment@0 { - target = <&mdio_slot1>; +&mdio_slot1 { + #address-cells = <1>; + #size-cells = <0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - - slot1_sgmii: ethernet-phy@1c { - /* 1st port on VSC8234 */ - reg = <0x1c>; - }; - }; + slot1_sgmii: ethernet-phy@1c { + /* 1st port on VSC8234 */ + reg = <0x1c>; }; +}; - fragment@1 { - target = <&enetc_port0>; - - __overlay__ { - phy-handle = <&slot1_sgmii>; - phy-mode = "sgmii"; - managed = "in-band-status"; - status = "okay"; - }; - }; - - fragment@2 { - target = <&mdio_slot2>; - - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - - /* 4 ports on VSC8514 */ - slot2_qsgmii0: ethernet-phy@8 { - reg = <0x8>; - }; - - slot2_qsgmii1: ethernet-phy@9 { - reg = <0x9>; - }; +&enetc_port0 { + phy-handle = <&slot1_sgmii>; + phy-mode = "sgmii"; + managed = "in-band-status"; + status = "okay"; +}; - slot2_qsgmii2: ethernet-phy@a { - reg = <0xa>; - }; +&mdio_slot2 { + #address-cells = <1>; + #size-cells = <0>; - slot2_qsgmii3: ethernet-phy@b { - reg = <0xb>; - }; - }; + /* 4 ports on VSC8514 */ + slot2_qsgmii0: ethernet-phy@8 { + reg = <0x8>; }; - fragment@3 { - target = <&mscc_felix_ports>; + slot2_qsgmii1: ethernet-phy@9 { + reg = <0x9>; + }; - __overlay__ { - port@0 { - status = "okay"; - phy-handle = <&slot2_qsgmii0>; - phy-mode = "qsgmii"; - managed = "in-band-status"; - }; + slot2_qsgmii2: ethernet-phy@a { + reg = <0xa>; + }; - port@1 { - status = "okay"; - phy-handle = <&slot2_qsgmii1>; - phy-mode = "qsgmii"; - managed = "in-band-status"; - }; + slot2_qsgmii3: ethernet-phy@b { + reg = <0xb>; + }; +}; - port@2 { - status = "okay"; - phy-handle = <&slot2_qsgmii2>; - phy-mode = "qsgmii"; - managed = "in-band-status"; - }; +&mscc_felix_ports { + port@0 { + status = "okay"; + phy-handle = <&slot2_qsgmii0>; + phy-mode = "qsgmii"; + managed = "in-band-status"; + }; - port@3 { - status = "okay"; - phy-handle = <&slot2_qsgmii3>; - phy-mode = "qsgmii"; - managed = "in-band-status"; - }; - }; + port@1 { + status = "okay"; + phy-handle = <&slot2_qsgmii1>; + phy-mode = "qsgmii"; + managed = "in-band-status"; }; - fragment@4 { - target = <&mscc_felix>; + port@2 { + status = "okay"; + phy-handle = <&slot2_qsgmii2>; + phy-mode = "qsgmii"; + managed = "in-band-status"; + }; - __overlay__ { - status = "okay"; - }; + port@3 { + status = "okay"; + phy-handle = <&slot2_qsgmii3>; + phy-mode = "qsgmii"; + managed = "in-band-status"; }; }; + +&mscc_felix { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-899b.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-899b.dts index 5d0a094e6c44..fb85847f778f 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-899b.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-899b.dts @@ -11,65 +11,51 @@ /dts-v1/; /plugin/; -/ { - fragment@0 { - target = <&mdio_slot1>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; +&mdio_slot1 { + #address-cells = <1>; + #size-cells = <0>; - /* VSC8234 */ - slot1_sgmii0: ethernet-phy@1c { - reg = <0x1c>; - }; - - slot1_sgmii1: ethernet-phy@1d { - reg = <0x1d>; - }; + /* VSC8234 */ + slot1_sgmii0: ethernet-phy@1c { + reg = <0x1c>; + }; - slot1_sgmii2: ethernet-phy@1e { - reg = <0x1e>; - }; + slot1_sgmii1: ethernet-phy@1d { + reg = <0x1d>; + }; - slot1_sgmii3: ethernet-phy@1f { - reg = <0x1f>; - }; - }; + slot1_sgmii2: ethernet-phy@1e { + reg = <0x1e>; }; - fragment@1 { - target = <&enetc_port0>; - __overlay__ { - phy-handle = <&slot1_sgmii0>; - phy-mode = "sgmii"; - managed = "in-band-status"; - status = "okay"; - }; + slot1_sgmii3: ethernet-phy@1f { + reg = <0x1f>; }; +}; - fragment@2 { - target = <&mscc_felix_ports>; - __overlay__ { - port@1 { - status = "okay"; - phy-handle = <&slot1_sgmii1>; - phy-mode = "sgmii"; - managed = "in-band-status"; - }; +&enetc_port0 { + phy-handle = <&slot1_sgmii0>; + phy-mode = "sgmii"; + managed = "in-band-status"; + status = "okay"; +}; - port@2 { - status = "okay"; - phy-handle = <&slot1_sgmii2>; - phy-mode = "sgmii"; - managed = "in-band-status"; - }; - }; +&mscc_felix_ports { + port@1 { + status = "okay"; + phy-handle = <&slot1_sgmii1>; + phy-mode = "sgmii"; + managed = "in-band-status"; }; - fragment@3 { - target = <&mscc_felix>; - __overlay__ { - status = "okay"; - }; + port@2 { + status = "okay"; + phy-handle = <&slot1_sgmii2>; + phy-mode = "sgmii"; + managed = "in-band-status"; }; }; + +&mscc_felix { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-9999.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-9999.dts index 1ef743c48e84..63e46fad22bd 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-9999.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-9999.dts @@ -11,69 +11,58 @@ /dts-v1/; /plugin/; -/ { - fragment@0 { - target = <&mdio_slot1>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; +&mdio_slot1 { + #address-cells = <1>; + #size-cells = <0>; - /* VSC8234 */ - slot1_sgmii0: ethernet-phy@1c { - reg = <0x1c>; - }; - - slot1_sgmii1: ethernet-phy@1d { - reg = <0x1d>; - }; + /* VSC8234 */ + slot1_sgmii0: ethernet-phy@1c { + reg = <0x1c>; + }; - slot1_sgmii2: ethernet-phy@1e { - reg = <0x1e>; - }; + slot1_sgmii1: ethernet-phy@1d { + reg = <0x1d>; + }; - slot1_sgmii3: ethernet-phy@1f { - reg = <0x1f>; - }; - }; + slot1_sgmii2: ethernet-phy@1e { + reg = <0x1e>; }; - fragment@1 { - target = <&mscc_felix_ports>; - __overlay__ { - port@0 { - status = "okay"; - phy-handle = <&slot1_sgmii0>; - phy-mode = "sgmii"; - managed = "in-band-status"; - }; + slot1_sgmii3: ethernet-phy@1f { + reg = <0x1f>; + }; +}; - port@1 { - status = "okay"; - phy-handle = <&slot1_sgmii1>; - phy-mode = "sgmii"; - managed = "in-band-status"; - }; +&mscc_felix_ports { + port@0 { + status = "okay"; + phy-handle = <&slot1_sgmii0>; + phy-mode = "sgmii"; + managed = "in-band-status"; + }; - port@2 { - status = "okay"; - phy-handle = <&slot1_sgmii2>; - phy-mode = "sgmii"; - managed = "in-band-status"; - }; + port@1 { + status = "okay"; + phy-handle = <&slot1_sgmii1>; + phy-mode = "sgmii"; + managed = "in-band-status"; + }; - port@3 { - status = "okay"; - phy-handle = <&slot1_sgmii3>; - phy-mode = "sgmii"; - managed = "in-band-status"; - }; - }; + port@2 { + status = "okay"; + phy-handle = <&slot1_sgmii2>; + phy-mode = "sgmii"; + managed = "in-band-status"; }; - fragment@2 { - target = <&mscc_felix>; - __overlay__ { - status = "okay"; - }; + port@3 { + status = "okay"; + phy-handle = <&slot1_sgmii3>; + phy-mode = "sgmii"; + managed = "in-band-status"; }; }; + +&mscc_felix { + status = "okay"; +}; -- 2.17.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] arm64: dts: fsl-ls1028a-qds: Drop overlay syntax hard coding 2022-01-29 7:09 ` [PATCH 1/2] arm64: dts: fsl-ls1028a-qds: Drop overlay syntax hard coding Shawn Guo @ 2022-01-31 11:07 ` Vladimir Oltean 2022-02-11 8:57 ` Shawn Guo 0 siblings, 1 reply; 11+ messages in thread From: Vladimir Oltean @ 2022-01-31 11:07 UTC (permalink / raw) To: Shawn Guo Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Rob Herring, Leo Li Hi Shawn, On Sat, Jan 29, 2022 at 03:09:11PM +0800, Shawn Guo wrote: > As suggested by commit 9ae8578b517a ("of: Documentation: change overlay > example to use current syntax"), there is no need to have overlay syntax > be hard coded in the device tree source file any more. > > Signed-off-by: Shawn Guo <shawnguo@kernel.org> > --- This looks good. Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> Just one minor comment below: > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts > index 8ffb707a1576..bd88438c2ecd 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts > @@ -11,98 +11,78 @@ > /dts-v1/; > /plugin/; > > -/ { > - fragment@0 { > - target = <&mdio_slot1>; > - > - __overlay__ { > - #address-cells = <1>; > - #size-cells = <0>; > - > - slot1_sgmii: ethernet-phy@2 { > - /* AQR112 */ > - reg = <0x2>; > - compatible = "ethernet-phy-ieee802.3-c45"; > - }; > - }; > - }; > +&mdio_slot1 { > Can you please delete this blank line? > - fragment@1 { > - target = <&enetc_port0>; > + #address-cells = <1>; > + #size-cells = <0>; > > - __overlay__ { > - phy-handle = <&slot1_sgmii>; > - phy-mode = "2500base-x"; > - managed = "in-band-status"; > - status = "okay"; > - }; > + slot1_sgmii: ethernet-phy@2 { > + /* AQR112 */ > + reg = <0x2>; > + compatible = "ethernet-phy-ieee802.3-c45"; > }; > +}; ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] arm64: dts: fsl-ls1028a-qds: Drop overlay syntax hard coding 2022-01-31 11:07 ` Vladimir Oltean @ 2022-02-11 8:57 ` Shawn Guo 0 siblings, 0 replies; 11+ messages in thread From: Shawn Guo @ 2022-02-11 8:57 UTC (permalink / raw) To: Vladimir Oltean Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Rob Herring, Leo Li On Mon, Jan 31, 2022 at 11:07:00AM +0000, Vladimir Oltean wrote: > Hi Shawn, > > On Sat, Jan 29, 2022 at 03:09:11PM +0800, Shawn Guo wrote: > > As suggested by commit 9ae8578b517a ("of: Documentation: change overlay > > example to use current syntax"), there is no need to have overlay syntax > > be hard coded in the device tree source file any more. > > > > Signed-off-by: Shawn Guo <shawnguo@kernel.org> > > --- > > This looks good. > > Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> > > Just one minor comment below: > > > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts > > index 8ffb707a1576..bd88438c2ecd 100644 > > --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts > > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts > > @@ -11,98 +11,78 @@ > > /dts-v1/; > > /plugin/; > > > > -/ { > > - fragment@0 { > > - target = <&mdio_slot1>; > > - > > - __overlay__ { > > - #address-cells = <1>; > > - #size-cells = <0>; > > - > > - slot1_sgmii: ethernet-phy@2 { > > - /* AQR112 */ > > - reg = <0x2>; > > - compatible = "ethernet-phy-ieee802.3-c45"; > > - }; > > - }; > > - }; > > +&mdio_slot1 { > > > > Can you please delete this blank line? Fixed. Thanks for spotting it, Vladimir! Shawn > > > - fragment@1 { > > - target = <&enetc_port0>; > > + #address-cells = <1>; > > + #size-cells = <0>; > > > > - __overlay__ { > > - phy-handle = <&slot1_sgmii>; > > - phy-mode = "2500base-x"; > > - managed = "in-band-status"; > > - status = "okay"; > > - }; > > + slot1_sgmii: ethernet-phy@2 { > > + /* AQR112 */ > > + reg = <0x2>; > > + compatible = "ethernet-phy-ieee802.3-c45"; > > }; > > +}; ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/2] arm64: dts: freescale: Use overlay target for simplicity 2022-01-29 7:09 [PATCH 0/2] Improve fsl-ls1028a-qds device tree overlay build Shawn Guo 2022-01-29 7:09 ` [PATCH 1/2] arm64: dts: fsl-ls1028a-qds: Drop overlay syntax hard coding Shawn Guo @ 2022-01-29 7:09 ` Shawn Guo 2022-01-31 11:07 ` Vladimir Oltean 2022-02-09 22:10 ` Tim Harvey 1 sibling, 2 replies; 11+ messages in thread From: Shawn Guo @ 2022-01-29 7:09 UTC (permalink / raw) To: linux-arm-kernel Cc: devicetree, Rob Herring, Li Yang, Vladimir Oltean, Shawn Guo With commit 15d16d6dadf6 ("kbuild: Add generic rule to apply fdtoverlay"), overlay target can be used to simplify the build of DTB overlays. It also performs a cross check to ensure base DT and overlay actually match. Signed-off-by: Shawn Guo <shawnguo@kernel.org> --- arch/arm64/boot/dts/freescale/Makefile | 29 +++++++++++++------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index 6d8f0a532587..c521ac2b00ca 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# required for overlay support -DTC_FLAGS_fsl-ls1028a-qds := -@ -DTC_FLAGS_fsl-ls1028a-qds-13bb := -@ -DTC_FLAGS_fsl-ls1028a-qds-65bb := -@ -DTC_FLAGS_fsl-ls1028a-qds-7777 := -@ -DTC_FLAGS_fsl-ls1028a-qds-85bb := -@ -DTC_FLAGS_fsl-ls1028a-qds-899b := -@ -DTC_FLAGS_fsl-ls1028a-qds-9999 := -@ - dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frdm.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frwy.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-oxalis.dtb @@ -21,12 +12,6 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var2.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var3-ads2.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var4.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds.dtb -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-13bb.dtb -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-65bb.dtb -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-7777.dtb -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-85bb.dtb -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-899b.dtb -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-9999.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-rdb.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-qds.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-rdb.dtb @@ -49,6 +34,20 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-qds.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2162a-qds.dtb +fsl-ls1028a-qds-13bb-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-13bb.dtbo +fsl-ls1028a-qds-65bb-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-65bb.dtbo +fsl-ls1028a-qds-7777-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-7777.dtbo +fsl-ls1028a-qds-85bb-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-85bb.dtbo +fsl-ls1028a-qds-899b-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-899b.dtbo +fsl-ls1028a-qds-9999-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-9999.dtbo + +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-13bb.dtb +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-65bb.dtb +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-7777.dtb +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-85bb.dtb +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-899b.dtb +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-9999.dtb + dtb-$(CONFIG_ARCH_MXC) += imx8mm-beacon-kit.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-ddr4-evk.dtb -- 2.17.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] arm64: dts: freescale: Use overlay target for simplicity 2022-01-29 7:09 ` [PATCH 2/2] arm64: dts: freescale: Use overlay target for simplicity Shawn Guo @ 2022-01-31 11:07 ` Vladimir Oltean 2022-02-09 22:10 ` Tim Harvey 1 sibling, 0 replies; 11+ messages in thread From: Vladimir Oltean @ 2022-01-31 11:07 UTC (permalink / raw) To: Shawn Guo Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Rob Herring, Leo Li On Sat, Jan 29, 2022 at 03:09:12PM +0800, Shawn Guo wrote: > With commit 15d16d6dadf6 ("kbuild: Add generic rule to apply > fdtoverlay"), overlay target can be used to simplify the build of DTB > overlays. It also performs a cross check to ensure base DT and overlay > actually match. > > Signed-off-by: Shawn Guo <shawnguo@kernel.org> > --- Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> > arch/arm64/boot/dts/freescale/Makefile | 29 +++++++++++++------------- > 1 file changed, 14 insertions(+), 15 deletions(-) > > diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile > index 6d8f0a532587..c521ac2b00ca 100644 > --- a/arch/arm64/boot/dts/freescale/Makefile > +++ b/arch/arm64/boot/dts/freescale/Makefile > @@ -1,14 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0 > > -# required for overlay support > -DTC_FLAGS_fsl-ls1028a-qds := -@ > -DTC_FLAGS_fsl-ls1028a-qds-13bb := -@ > -DTC_FLAGS_fsl-ls1028a-qds-65bb := -@ > -DTC_FLAGS_fsl-ls1028a-qds-7777 := -@ > -DTC_FLAGS_fsl-ls1028a-qds-85bb := -@ > -DTC_FLAGS_fsl-ls1028a-qds-899b := -@ > -DTC_FLAGS_fsl-ls1028a-qds-9999 := -@ > - > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frdm.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frwy.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-oxalis.dtb > @@ -21,12 +12,6 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var2.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var3-ads2.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var4.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds.dtb > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-13bb.dtb > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-65bb.dtb > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-7777.dtb > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-85bb.dtb > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-899b.dtb > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-9999.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-rdb.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-qds.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-rdb.dtb > @@ -49,6 +34,20 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-qds.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2162a-qds.dtb > > +fsl-ls1028a-qds-13bb-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-13bb.dtbo > +fsl-ls1028a-qds-65bb-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-65bb.dtbo > +fsl-ls1028a-qds-7777-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-7777.dtbo > +fsl-ls1028a-qds-85bb-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-85bb.dtbo > +fsl-ls1028a-qds-899b-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-899b.dtbo > +fsl-ls1028a-qds-9999-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-9999.dtbo > + > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-13bb.dtb > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-65bb.dtb > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-7777.dtb > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-85bb.dtb > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-899b.dtb > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-9999.dtb > + > dtb-$(CONFIG_ARCH_MXC) += imx8mm-beacon-kit.dtb > dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb > dtb-$(CONFIG_ARCH_MXC) += imx8mm-ddr4-evk.dtb > -- > 2.17.1 > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] arm64: dts: freescale: Use overlay target for simplicity 2022-01-29 7:09 ` [PATCH 2/2] arm64: dts: freescale: Use overlay target for simplicity Shawn Guo 2022-01-31 11:07 ` Vladimir Oltean @ 2022-02-09 22:10 ` Tim Harvey 2022-02-11 9:10 ` Shawn Guo 1 sibling, 1 reply; 11+ messages in thread From: Tim Harvey @ 2022-02-09 22:10 UTC (permalink / raw) To: Shawn Guo, Rob Herring Cc: Masahiro Yamada, Viresh Kumar, Frank Rowand, Device Tree Mailing List On Fri, Jan 28, 2022 at 11:10 PM Shawn Guo <shawnguo@kernel.org> wrote: > > With commit 15d16d6dadf6 ("kbuild: Add generic rule to apply > fdtoverlay"), overlay target can be used to simplify the build of DTB > overlays. It also performs a cross check to ensure base DT and overlay > actually match. > > Signed-off-by: Shawn Guo <shawnguo@kernel.org> > --- > arch/arm64/boot/dts/freescale/Makefile | 29 +++++++++++++------------- > 1 file changed, 14 insertions(+), 15 deletions(-) > > diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile > index 6d8f0a532587..c521ac2b00ca 100644 > --- a/arch/arm64/boot/dts/freescale/Makefile > +++ b/arch/arm64/boot/dts/freescale/Makefile > @@ -1,14 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0 > > -# required for overlay support > -DTC_FLAGS_fsl-ls1028a-qds := -@ > -DTC_FLAGS_fsl-ls1028a-qds-13bb := -@ > -DTC_FLAGS_fsl-ls1028a-qds-65bb := -@ > -DTC_FLAGS_fsl-ls1028a-qds-7777 := -@ > -DTC_FLAGS_fsl-ls1028a-qds-85bb := -@ > -DTC_FLAGS_fsl-ls1028a-qds-899b := -@ > -DTC_FLAGS_fsl-ls1028a-qds-9999 := -@ > - > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frdm.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frwy.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-oxalis.dtb > @@ -21,12 +12,6 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var2.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var3-ads2.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var4.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds.dtb > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-13bb.dtb > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-65bb.dtb > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-7777.dtb > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-85bb.dtb > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-899b.dtb > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-9999.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-rdb.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-qds.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-rdb.dtb > @@ -49,6 +34,20 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-qds.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2162a-qds.dtb > > +fsl-ls1028a-qds-13bb-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-13bb.dtbo > +fsl-ls1028a-qds-65bb-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-65bb.dtbo > +fsl-ls1028a-qds-7777-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-7777.dtbo > +fsl-ls1028a-qds-85bb-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-85bb.dtbo > +fsl-ls1028a-qds-899b-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-899b.dtbo > +fsl-ls1028a-qds-9999-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-9999.dtbo > + > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-13bb.dtb > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-65bb.dtb > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-7777.dtb > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-85bb.dtb > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-899b.dtb > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-9999.dtb > + > dtb-$(CONFIG_ARCH_MXC) += imx8mm-beacon-kit.dtb > dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb > dtb-$(CONFIG_ARCH_MXC) += imx8mm-ddr4-evk.dtb > -- > 2.17.1 Shawn and Rob I tried to adapt my patch 'arm64: dts: imx8mm-venice-gw73xx-0x: add dt overlays for serial modes' [1] and it results in a build failure: $ make dtbs W=1 UPD include/config/kernel.release DTC arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtbo DTOVL arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb Overlay 'scripts/dtc/include-prefixes/dt-bindings/gpio/gpio.h' is incomplete (2048 / 1346656301 bytes read) scripts/Makefile.lib:360: recipe for target 'arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb' failed make[2]: *** [arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb] Error 1 scripts/Makefile.build:550: recipe for target 'arch/arm64/boot/dts/freescale' failed make[1]: *** [arch/arm64/boot/dts/freescale] Error 2 Makefile:1370: recipe for target 'dtbs' failed make: *** [dtbs] Error 2 It seems that it chokes on the include. The dts is: // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright 2022 Gateworks Corporation * * GW73xx RS232 with RTS/CTS hardware flow control: * - GPIO4_0 rs485_en needs to be driven low (in-active) * - UART4_TX becomes RTS * - UART4_RX becomes CTS */ #include <dt-bindings/gpio/gpio.h> #include "imx8mm-pinfunc.h" /dts-v1/; /plugin/; &{/} { compatible = "gw,imx8mm-gw73xx-0x"; }; &gpio4 { rs485_en { gpio-hog; gpios = <0 GPIO_ACTIVE_HIGH>; output-low; line-name = "rs485_en"; }; }; &uart2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>; rts-gpios = <&gpio5 29 GPIO_ACTIVE_LOW>; cts-gpios = <&gpio5 28 GPIO_ACTIVE_LOW>; uart-has-rtscts; status = "okay"; }; &uart4 { status = "disabled"; }; &iomuxc { pinctrl_uart2: uart2grp { fsl,pins = < MX8MM_IOMUXC_UART2_RXD_UART2_DCE_RX 0x140 MX8MM_IOMUXC_UART2_TXD_UART2_DCE_TX 0x140 MX8MM_IOMUXC_UART4_TXD_GPIO5_IO29 0x140 MX8MM_IOMUXC_UART4_RXD_GPIO5_IO28 0x140 >; }; }; Could you explain what is wrong here? It compiled fine before trying to adapt the Makefile to what is described in 15d16d6dadf6 ("kbuild: Add generic rule to applyfdt overlay" Best regards, Tim [1] - https://patchwork.kernel.org/project/linux-arm-kernel/list/?series=607352 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] arm64: dts: freescale: Use overlay target for simplicity 2022-02-09 22:10 ` Tim Harvey @ 2022-02-11 9:10 ` Shawn Guo 2022-02-11 23:23 ` Tim Harvey 0 siblings, 1 reply; 11+ messages in thread From: Shawn Guo @ 2022-02-11 9:10 UTC (permalink / raw) To: Tim Harvey Cc: Rob Herring, Masahiro Yamada, Viresh Kumar, Frank Rowand, Device Tree Mailing List On Wed, Feb 09, 2022 at 02:10:11PM -0800, Tim Harvey wrote: > On Fri, Jan 28, 2022 at 11:10 PM Shawn Guo <shawnguo@kernel.org> wrote: > > > > With commit 15d16d6dadf6 ("kbuild: Add generic rule to apply > > fdtoverlay"), overlay target can be used to simplify the build of DTB > > overlays. It also performs a cross check to ensure base DT and overlay > > actually match. > > > > Signed-off-by: Shawn Guo <shawnguo@kernel.org> > > --- > > arch/arm64/boot/dts/freescale/Makefile | 29 +++++++++++++------------- > > 1 file changed, 14 insertions(+), 15 deletions(-) > > > > diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile > > index 6d8f0a532587..c521ac2b00ca 100644 > > --- a/arch/arm64/boot/dts/freescale/Makefile > > +++ b/arch/arm64/boot/dts/freescale/Makefile > > @@ -1,14 +1,5 @@ > > # SPDX-License-Identifier: GPL-2.0 > > > > -# required for overlay support > > -DTC_FLAGS_fsl-ls1028a-qds := -@ > > -DTC_FLAGS_fsl-ls1028a-qds-13bb := -@ > > -DTC_FLAGS_fsl-ls1028a-qds-65bb := -@ > > -DTC_FLAGS_fsl-ls1028a-qds-7777 := -@ > > -DTC_FLAGS_fsl-ls1028a-qds-85bb := -@ > > -DTC_FLAGS_fsl-ls1028a-qds-899b := -@ > > -DTC_FLAGS_fsl-ls1028a-qds-9999 := -@ > > - > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frdm.dtb > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frwy.dtb > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-oxalis.dtb > > @@ -21,12 +12,6 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var2.dtb > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var3-ads2.dtb > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var4.dtb > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds.dtb > > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-13bb.dtb > > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-65bb.dtb > > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-7777.dtb > > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-85bb.dtb > > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-899b.dtb > > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-9999.dtb > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-rdb.dtb > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-qds.dtb > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-rdb.dtb > > @@ -49,6 +34,20 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-qds.dtb > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2162a-qds.dtb > > > > +fsl-ls1028a-qds-13bb-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-13bb.dtbo > > +fsl-ls1028a-qds-65bb-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-65bb.dtbo > > +fsl-ls1028a-qds-7777-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-7777.dtbo > > +fsl-ls1028a-qds-85bb-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-85bb.dtbo > > +fsl-ls1028a-qds-899b-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-899b.dtbo > > +fsl-ls1028a-qds-9999-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-9999.dtbo > > + > > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-13bb.dtb > > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-65bb.dtb > > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-7777.dtb > > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-85bb.dtb > > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-899b.dtb > > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-9999.dtb > > + > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-beacon-kit.dtb > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-ddr4-evk.dtb > > -- > > 2.17.1 > > Shawn and Rob > > I tried to adapt my patch 'arm64: dts: imx8mm-venice-gw73xx-0x: add dt > overlays for serial modes' [1] and it results in a build failure: > $ make dtbs W=1 > UPD include/config/kernel.release > DTC arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtbo > DTOVL arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb > > Overlay 'scripts/dtc/include-prefixes/dt-bindings/gpio/gpio.h' is > incomplete (2048 / 1346656301 bytes read) > scripts/Makefile.lib:360: recipe for target > 'arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb' > failed > make[2]: *** [arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb] > Error 1 > scripts/Makefile.build:550: recipe for target > 'arch/arm64/boot/dts/freescale' failed > make[1]: *** [arch/arm64/boot/dts/freescale] Error 2 > Makefile:1370: recipe for target 'dtbs' failed > make: *** [dtbs] Error 2 > > It seems that it chokes on the include. The dts is: > // SPDX-License-Identifier: (GPL-2.0+ OR MIT) > /* > * Copyright 2022 Gateworks Corporation > * > * GW73xx RS232 with RTS/CTS hardware flow control: > * - GPIO4_0 rs485_en needs to be driven low (in-active) > * - UART4_TX becomes RTS > * - UART4_RX becomes CTS > */ > > #include <dt-bindings/gpio/gpio.h> > > #include "imx8mm-pinfunc.h" > > /dts-v1/; > /plugin/; > > &{/} { > compatible = "gw,imx8mm-gw73xx-0x"; > }; > > &gpio4 { > rs485_en { > gpio-hog; > gpios = <0 GPIO_ACTIVE_HIGH>; > output-low; > line-name = "rs485_en"; > }; > }; > > &uart2 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_uart2>; > rts-gpios = <&gpio5 29 GPIO_ACTIVE_LOW>; > cts-gpios = <&gpio5 28 GPIO_ACTIVE_LOW>; > uart-has-rtscts; > status = "okay"; > }; > > &uart4 { > status = "disabled"; > }; > > &iomuxc { > pinctrl_uart2: uart2grp { > fsl,pins = < > MX8MM_IOMUXC_UART2_RXD_UART2_DCE_RX 0x140 > MX8MM_IOMUXC_UART2_TXD_UART2_DCE_TX 0x140 > MX8MM_IOMUXC_UART4_TXD_GPIO5_IO29 0x140 > MX8MM_IOMUXC_UART4_RXD_GPIO5_IO28 0x140 > >; > }; > }; > > Could you explain what is wrong here? It compiled fine before trying > to adapt the Makefile to what is described in 15d16d6dadf6 ("kbuild: > Add generic rule to applyfdt overlay" With the following changes on top of your patch, I can build the dtbo without error. ---8<------- diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index 4611f66096a7..d42a9e03f014 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -61,9 +61,6 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-var-som-symphony.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw71xx-0x.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw72xx-0x.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x.dtb -dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs232-rts.dtbo -dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs422.dtbo -dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs485.dtbo dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7901.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7902.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mn-beacon-kit.dtb @@ -97,6 +94,14 @@ dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-eval-v3.dtb dtb-$(CONFIG_ARCH_MXC) += imx8qxp-mek.dtb dtb-$(CONFIG_ARCH_MXC) += imx8ulp-evk.dtb +imx8mm-venice-gw73xx-0x-rs232-rts-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rs232-rts.dtbo +imx8mm-venice-gw73xx-0x-rs422-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rs422.dtbo +imx8mm-venice-gw73xx-0x-rs485-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rs485.dtbo + +dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs232-rts.dtb +dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs422.dtb +dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs485.dtb + dtb-$(CONFIG_ARCH_S32) += s32g274a-evb.dtb dtb-$(CONFIG_ARCH_S32) += s32g274a-rdb2.dtb dtb-$(CONFIG_ARCH_S32) += s32v234-evb.dtb ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] arm64: dts: freescale: Use overlay target for simplicity 2022-02-11 9:10 ` Shawn Guo @ 2022-02-11 23:23 ` Tim Harvey 2022-02-12 4:00 ` Shawn Guo 0 siblings, 1 reply; 11+ messages in thread From: Tim Harvey @ 2022-02-11 23:23 UTC (permalink / raw) To: Shawn Guo Cc: Rob Herring, Masahiro Yamada, Viresh Kumar, Frank Rowand, Device Tree Mailing List On Fri, Feb 11, 2022 at 1:10 AM Shawn Guo <shawnguo@kernel.org> wrote: > > On Wed, Feb 09, 2022 at 02:10:11PM -0800, Tim Harvey wrote: > > On Fri, Jan 28, 2022 at 11:10 PM Shawn Guo <shawnguo@kernel.org> wrote: > > > > > > With commit 15d16d6dadf6 ("kbuild: Add generic rule to apply > > > fdtoverlay"), overlay target can be used to simplify the build of DTB > > > overlays. It also performs a cross check to ensure base DT and overlay > > > actually match. > > > > > > Signed-off-by: Shawn Guo <shawnguo@kernel.org> > > > --- > > > arch/arm64/boot/dts/freescale/Makefile | 29 +++++++++++++------------- > > > 1 file changed, 14 insertions(+), 15 deletions(-) > > > > > > diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile > > > index 6d8f0a532587..c521ac2b00ca 100644 > > > --- a/arch/arm64/boot/dts/freescale/Makefile > > > +++ b/arch/arm64/boot/dts/freescale/Makefile > > > @@ -1,14 +1,5 @@ > > > # SPDX-License-Identifier: GPL-2.0 > > > > > > -# required for overlay support > > > -DTC_FLAGS_fsl-ls1028a-qds := -@ > > > -DTC_FLAGS_fsl-ls1028a-qds-13bb := -@ > > > -DTC_FLAGS_fsl-ls1028a-qds-65bb := -@ > > > -DTC_FLAGS_fsl-ls1028a-qds-7777 := -@ > > > -DTC_FLAGS_fsl-ls1028a-qds-85bb := -@ > > > -DTC_FLAGS_fsl-ls1028a-qds-899b := -@ > > > -DTC_FLAGS_fsl-ls1028a-qds-9999 := -@ > > > - > > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frdm.dtb > > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frwy.dtb > > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-oxalis.dtb > > > @@ -21,12 +12,6 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var2.dtb > > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var3-ads2.dtb > > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var4.dtb > > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds.dtb > > > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-13bb.dtb > > > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-65bb.dtb > > > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-7777.dtb > > > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-85bb.dtb > > > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-899b.dtb > > > -dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-9999.dtb > > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-rdb.dtb > > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-qds.dtb > > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-rdb.dtb > > > @@ -49,6 +34,20 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-qds.dtb > > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb > > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2162a-qds.dtb > > > > > > +fsl-ls1028a-qds-13bb-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-13bb.dtbo > > > +fsl-ls1028a-qds-65bb-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-65bb.dtbo > > > +fsl-ls1028a-qds-7777-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-7777.dtbo > > > +fsl-ls1028a-qds-85bb-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-85bb.dtbo > > > +fsl-ls1028a-qds-899b-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-899b.dtbo > > > +fsl-ls1028a-qds-9999-dtbs := fsl-ls1028a-qds.dtb fsl-ls1028a-qds-9999.dtbo > > > + > > > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-13bb.dtb > > > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-65bb.dtb > > > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-7777.dtb > > > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-85bb.dtb > > > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-899b.dtb > > > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds-9999.dtb > > > + > > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-beacon-kit.dtb > > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb > > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-ddr4-evk.dtb > > > -- > > > 2.17.1 > > > > Shawn and Rob > > > > I tried to adapt my patch 'arm64: dts: imx8mm-venice-gw73xx-0x: add dt > > overlays for serial modes' [1] and it results in a build failure: > > $ make dtbs W=1 > > UPD include/config/kernel.release > > DTC arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtbo > > DTOVL arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb > > > > Overlay 'scripts/dtc/include-prefixes/dt-bindings/gpio/gpio.h' is > > incomplete (2048 / 1346656301 bytes read) > > scripts/Makefile.lib:360: recipe for target > > 'arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb' > > failed > > make[2]: *** [arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb] > > Error 1 > > scripts/Makefile.build:550: recipe for target > > 'arch/arm64/boot/dts/freescale' failed > > make[1]: *** [arch/arm64/boot/dts/freescale] Error 2 > > Makefile:1370: recipe for target 'dtbs' failed > > make: *** [dtbs] Error 2 > > > > It seems that it chokes on the include. The dts is: > > // SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > /* > > * Copyright 2022 Gateworks Corporation > > * > > * GW73xx RS232 with RTS/CTS hardware flow control: > > * - GPIO4_0 rs485_en needs to be driven low (in-active) > > * - UART4_TX becomes RTS > > * - UART4_RX becomes CTS > > */ > > > > #include <dt-bindings/gpio/gpio.h> > > > > #include "imx8mm-pinfunc.h" > > > > /dts-v1/; > > /plugin/; > > > > &{/} { > > compatible = "gw,imx8mm-gw73xx-0x"; > > }; > > > > &gpio4 { > > rs485_en { > > gpio-hog; > > gpios = <0 GPIO_ACTIVE_HIGH>; > > output-low; > > line-name = "rs485_en"; > > }; > > }; > > > > &uart2 { > > pinctrl-names = "default"; > > pinctrl-0 = <&pinctrl_uart2>; > > rts-gpios = <&gpio5 29 GPIO_ACTIVE_LOW>; > > cts-gpios = <&gpio5 28 GPIO_ACTIVE_LOW>; > > uart-has-rtscts; > > status = "okay"; > > }; > > > > &uart4 { > > status = "disabled"; > > }; > > > > &iomuxc { > > pinctrl_uart2: uart2grp { > > fsl,pins = < > > MX8MM_IOMUXC_UART2_RXD_UART2_DCE_RX 0x140 > > MX8MM_IOMUXC_UART2_TXD_UART2_DCE_TX 0x140 > > MX8MM_IOMUXC_UART4_TXD_GPIO5_IO29 0x140 > > MX8MM_IOMUXC_UART4_RXD_GPIO5_IO28 0x140 > > >; > > }; > > }; > > > > Could you explain what is wrong here? It compiled fine before trying > > to adapt the Makefile to what is described in 15d16d6dadf6 ("kbuild: > > Add generic rule to applyfdt overlay" > > > With the following changes on top of your patch, I can build the dtbo > without error. > > ---8<------- > diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile > index 4611f66096a7..d42a9e03f014 100644 > --- a/arch/arm64/boot/dts/freescale/Makefile > +++ b/arch/arm64/boot/dts/freescale/Makefile > @@ -61,9 +61,6 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-var-som-symphony.dtb > dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw71xx-0x.dtb > dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw72xx-0x.dtb > dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x.dtb > -dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs232-rts.dtbo > -dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs422.dtbo > -dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs485.dtbo > dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7901.dtb > dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7902.dtb > dtb-$(CONFIG_ARCH_MXC) += imx8mn-beacon-kit.dtb > @@ -97,6 +94,14 @@ dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-eval-v3.dtb > dtb-$(CONFIG_ARCH_MXC) += imx8qxp-mek.dtb > dtb-$(CONFIG_ARCH_MXC) += imx8ulp-evk.dtb > > +imx8mm-venice-gw73xx-0x-rs232-rts-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rs232-rts.dtbo > +imx8mm-venice-gw73xx-0x-rs422-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rs422.dtbo > +imx8mm-venice-gw73xx-0x-rs485-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rs485.dtbo > + > +dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs232-rts.dtb > +dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs422.dtb > +dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs485.dtb > + > dtb-$(CONFIG_ARCH_S32) += s32g274a-evb.dtb > dtb-$(CONFIG_ARCH_S32) += s32g274a-rdb2.dtb > dtb-$(CONFIG_ARCH_S32) += s32v234-evb.dtb Shawn, On top of what branch and with what commands? I've rebased this on top of your imx/dt64 branch and can not build once I apply this over my patch using 'make dtbs W=1'. Best Regards, Tim ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] arm64: dts: freescale: Use overlay target for simplicity 2022-02-11 23:23 ` Tim Harvey @ 2022-02-12 4:00 ` Shawn Guo 2022-02-14 23:09 ` Tim Harvey 0 siblings, 1 reply; 11+ messages in thread From: Shawn Guo @ 2022-02-12 4:00 UTC (permalink / raw) To: Tim Harvey Cc: Rob Herring, Masahiro Yamada, Viresh Kumar, Frank Rowand, Device Tree Mailing List On Fri, Feb 11, 2022 at 03:23:20PM -0800, Tim Harvey wrote: > > > I tried to adapt my patch 'arm64: dts: imx8mm-venice-gw73xx-0x: add dt > > > overlays for serial modes' [1] and it results in a build failure: > > > $ make dtbs W=1 > > > UPD include/config/kernel.release > > > DTC arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtbo > > > DTOVL arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb > > > > > > Overlay 'scripts/dtc/include-prefixes/dt-bindings/gpio/gpio.h' is > > > incomplete (2048 / 1346656301 bytes read) > > > scripts/Makefile.lib:360: recipe for target > > > 'arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb' > > > failed > > > make[2]: *** [arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb] > > > Error 1 > > > scripts/Makefile.build:550: recipe for target > > > 'arch/arm64/boot/dts/freescale' failed > > > make[1]: *** [arch/arm64/boot/dts/freescale] Error 2 > > > Makefile:1370: recipe for target 'dtbs' failed > > > make: *** [dtbs] Error 2 > > > > > > It seems that it chokes on the include. The dts is: > > > // SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > > /* > > > * Copyright 2022 Gateworks Corporation > > > * > > > * GW73xx RS232 with RTS/CTS hardware flow control: > > > * - GPIO4_0 rs485_en needs to be driven low (in-active) > > > * - UART4_TX becomes RTS > > > * - UART4_RX becomes CTS > > > */ > > > > > > #include <dt-bindings/gpio/gpio.h> > > > > > > #include "imx8mm-pinfunc.h" > > > > > > /dts-v1/; > > > /plugin/; > > > > > > &{/} { > > > compatible = "gw,imx8mm-gw73xx-0x"; > > > }; > > > > > > &gpio4 { > > > rs485_en { > > > gpio-hog; > > > gpios = <0 GPIO_ACTIVE_HIGH>; > > > output-low; > > > line-name = "rs485_en"; > > > }; > > > }; > > > > > > &uart2 { > > > pinctrl-names = "default"; > > > pinctrl-0 = <&pinctrl_uart2>; > > > rts-gpios = <&gpio5 29 GPIO_ACTIVE_LOW>; > > > cts-gpios = <&gpio5 28 GPIO_ACTIVE_LOW>; > > > uart-has-rtscts; > > > status = "okay"; > > > }; > > > > > > &uart4 { > > > status = "disabled"; > > > }; > > > > > > &iomuxc { > > > pinctrl_uart2: uart2grp { > > > fsl,pins = < > > > MX8MM_IOMUXC_UART2_RXD_UART2_DCE_RX 0x140 > > > MX8MM_IOMUXC_UART2_TXD_UART2_DCE_TX 0x140 > > > MX8MM_IOMUXC_UART4_TXD_GPIO5_IO29 0x140 > > > MX8MM_IOMUXC_UART4_RXD_GPIO5_IO28 0x140 > > > >; > > > }; > > > }; > > > > > > Could you explain what is wrong here? It compiled fine before trying > > > to adapt the Makefile to what is described in 15d16d6dadf6 ("kbuild: > > > Add generic rule to applyfdt overlay" > > > > > > With the following changes on top of your patch, I can build the dtbo > > without error. > > > > ---8<------- > > diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile > > index 4611f66096a7..d42a9e03f014 100644 > > --- a/arch/arm64/boot/dts/freescale/Makefile > > +++ b/arch/arm64/boot/dts/freescale/Makefile > > @@ -61,9 +61,6 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-var-som-symphony.dtb > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw71xx-0x.dtb > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw72xx-0x.dtb > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x.dtb > > -dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs232-rts.dtbo > > -dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs422.dtbo > > -dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs485.dtbo > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7901.dtb > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7902.dtb > > dtb-$(CONFIG_ARCH_MXC) += imx8mn-beacon-kit.dtb > > @@ -97,6 +94,14 @@ dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-eval-v3.dtb > > dtb-$(CONFIG_ARCH_MXC) += imx8qxp-mek.dtb > > dtb-$(CONFIG_ARCH_MXC) += imx8ulp-evk.dtb > > > > +imx8mm-venice-gw73xx-0x-rs232-rts-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rs232-rts.dtbo > > +imx8mm-venice-gw73xx-0x-rs422-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rs422.dtbo > > +imx8mm-venice-gw73xx-0x-rs485-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rs485.dtbo > > + > > +dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs232-rts.dtb > > +dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs422.dtb > > +dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs485.dtb > > + > > dtb-$(CONFIG_ARCH_S32) += s32g274a-evb.dtb > > dtb-$(CONFIG_ARCH_S32) += s32g274a-rdb2.dtb > > dtb-$(CONFIG_ARCH_S32) += s32v234-evb.dtb > > Shawn, > > On top of what branch and with what commands? I've rebased this on top > of your imx/dt64 branch and can not build once I apply this over my > patch using 'make dtbs W=1'. Tim, For your reference, I pushed the changes as below. https://git.linaro.org/people/shawn.guo/linux-2.6.git/log/?h=test/gw73xx-dtbo The build command is: $ make W=1 ARCH=arm64 dtbs UPD include/config/kernel.release DTC arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtbo DTC arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs422.dtbo DTC arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs485.dtbo DTOVL arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb DTOVL arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs422.dtb DTOVL arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs485.dtb Maybe you forgot to set up 'ARCH' variable? Shawn ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] arm64: dts: freescale: Use overlay target for simplicity 2022-02-12 4:00 ` Shawn Guo @ 2022-02-14 23:09 ` Tim Harvey 0 siblings, 0 replies; 11+ messages in thread From: Tim Harvey @ 2022-02-14 23:09 UTC (permalink / raw) To: Shawn Guo Cc: Masahiro Yamada, Viresh Kumar, Frank Rowand, Device Tree Mailing List, Rob Herring On Fri, Feb 11, 2022 at 8:01 PM Shawn Guo <shawnguo@kernel.org> wrote: > > On Fri, Feb 11, 2022 at 03:23:20PM -0800, Tim Harvey wrote: > > > > I tried to adapt my patch 'arm64: dts: imx8mm-venice-gw73xx-0x: add dt > > > > overlays for serial modes' [1] and it results in a build failure: > > > > $ make dtbs W=1 > > > > UPD include/config/kernel.release > > > > DTC arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtbo > > > > DTOVL arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb > > > > > > > > Overlay 'scripts/dtc/include-prefixes/dt-bindings/gpio/gpio.h' is > > > > incomplete (2048 / 1346656301 bytes read) > > > > scripts/Makefile.lib:360: recipe for target > > > > 'arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb' > > > > failed > > > > make[2]: *** [arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb] > > > > Error 1 > > > > scripts/Makefile.build:550: recipe for target > > > > 'arch/arm64/boot/dts/freescale' failed > > > > make[1]: *** [arch/arm64/boot/dts/freescale] Error 2 > > > > Makefile:1370: recipe for target 'dtbs' failed > > > > make: *** [dtbs] Error 2 > > > > > > > > It seems that it chokes on the include. The dts is: > > > > // SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > > > /* > > > > * Copyright 2022 Gateworks Corporation > > > > * > > > > * GW73xx RS232 with RTS/CTS hardware flow control: > > > > * - GPIO4_0 rs485_en needs to be driven low (in-active) > > > > * - UART4_TX becomes RTS > > > > * - UART4_RX becomes CTS > > > > */ > > > > > > > > #include <dt-bindings/gpio/gpio.h> > > > > > > > > #include "imx8mm-pinfunc.h" > > > > > > > > /dts-v1/; > > > > /plugin/; > > > > > > > > &{/} { > > > > compatible = "gw,imx8mm-gw73xx-0x"; > > > > }; > > > > > > > > &gpio4 { > > > > rs485_en { > > > > gpio-hog; > > > > gpios = <0 GPIO_ACTIVE_HIGH>; > > > > output-low; > > > > line-name = "rs485_en"; > > > > }; > > > > }; > > > > > > > > &uart2 { > > > > pinctrl-names = "default"; > > > > pinctrl-0 = <&pinctrl_uart2>; > > > > rts-gpios = <&gpio5 29 GPIO_ACTIVE_LOW>; > > > > cts-gpios = <&gpio5 28 GPIO_ACTIVE_LOW>; > > > > uart-has-rtscts; > > > > status = "okay"; > > > > }; > > > > > > > > &uart4 { > > > > status = "disabled"; > > > > }; > > > > > > > > &iomuxc { > > > > pinctrl_uart2: uart2grp { > > > > fsl,pins = < > > > > MX8MM_IOMUXC_UART2_RXD_UART2_DCE_RX 0x140 > > > > MX8MM_IOMUXC_UART2_TXD_UART2_DCE_TX 0x140 > > > > MX8MM_IOMUXC_UART4_TXD_GPIO5_IO29 0x140 > > > > MX8MM_IOMUXC_UART4_RXD_GPIO5_IO28 0x140 > > > > >; > > > > }; > > > > }; > > > > > > > > Could you explain what is wrong here? It compiled fine before trying > > > > to adapt the Makefile to what is described in 15d16d6dadf6 ("kbuild: > > > > Add generic rule to applyfdt overlay" > > > > > > > > > With the following changes on top of your patch, I can build the dtbo > > > without error. > > > > > > ---8<------- > > > diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile > > > index 4611f66096a7..d42a9e03f014 100644 > > > --- a/arch/arm64/boot/dts/freescale/Makefile > > > +++ b/arch/arm64/boot/dts/freescale/Makefile > > > @@ -61,9 +61,6 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-var-som-symphony.dtb > > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw71xx-0x.dtb > > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw72xx-0x.dtb > > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x.dtb > > > -dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs232-rts.dtbo > > > -dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs422.dtbo > > > -dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs485.dtbo > > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7901.dtb > > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7902.dtb > > > dtb-$(CONFIG_ARCH_MXC) += imx8mn-beacon-kit.dtb > > > @@ -97,6 +94,14 @@ dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-eval-v3.dtb > > > dtb-$(CONFIG_ARCH_MXC) += imx8qxp-mek.dtb > > > dtb-$(CONFIG_ARCH_MXC) += imx8ulp-evk.dtb > > > > > > +imx8mm-venice-gw73xx-0x-rs232-rts-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rs232-rts.dtbo > > > +imx8mm-venice-gw73xx-0x-rs422-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rs422.dtbo > > > +imx8mm-venice-gw73xx-0x-rs485-dtbs := imx8mm-venice-gw73xx-0x.dtb imx8mm-venice-gw73xx-0x-rs485.dtbo > > > + > > > +dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs232-rts.dtb > > > +dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs422.dtb > > > +dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw73xx-0x-rs485.dtb > > > + > > > dtb-$(CONFIG_ARCH_S32) += s32g274a-evb.dtb > > > dtb-$(CONFIG_ARCH_S32) += s32g274a-rdb2.dtb > > > dtb-$(CONFIG_ARCH_S32) += s32v234-evb.dtb > > > > Shawn, > > > > On top of what branch and with what commands? I've rebased this on top > > of your imx/dt64 branch and can not build once I apply this over my > > patch using 'make dtbs W=1'. > > Tim, > > For your reference, I pushed the changes as below. > > https://git.linaro.org/people/shawn.guo/linux-2.6.git/log/?h=test/gw73xx-dtbo > > The build command is: > > $ make W=1 ARCH=arm64 dtbs > UPD include/config/kernel.release > DTC arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtbo > DTC arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs422.dtbo > DTC arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs485.dtbo > DTOVL arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtb > DTOVL arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs422.dtb > DTOVL arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs485.dtb > > Maybe you forgot to set up 'ARCH' variable? > Shawn, I saw the same issue with your branch but found a 'make distclean' saved the day. I'll resubmit my patch. Thanks, Tim ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2022-02-14 23:09 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-01-29 7:09 [PATCH 0/2] Improve fsl-ls1028a-qds device tree overlay build Shawn Guo 2022-01-29 7:09 ` [PATCH 1/2] arm64: dts: fsl-ls1028a-qds: Drop overlay syntax hard coding Shawn Guo 2022-01-31 11:07 ` Vladimir Oltean 2022-02-11 8:57 ` Shawn Guo 2022-01-29 7:09 ` [PATCH 2/2] arm64: dts: freescale: Use overlay target for simplicity Shawn Guo 2022-01-31 11:07 ` Vladimir Oltean 2022-02-09 22:10 ` Tim Harvey 2022-02-11 9:10 ` Shawn Guo 2022-02-11 23:23 ` Tim Harvey 2022-02-12 4:00 ` Shawn Guo 2022-02-14 23:09 ` Tim Harvey
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).