| Message ID | 79bc2c83929be5536cbf10883519e82cead21dce.1683035888.git.michal.simek@amd.com |
|---|---|
| State | Accepted |
| Commit | 370b0e900fb0f1c74cb1ecf9f92306b6e52039e8 |
| Headers | show |
| Series | arm64: zynqmp: Change zc1275 board name to zcu1275 | expand |
On 02/05/2023 15:58, Michal Simek wrote: > Internal board zc1275 was released also to public which ends up with adding > missing 'u' to board name. Reflect this change by renaming DT files. > > Signed-off-by: Michal Simek <michal.simek@amd.com> > --- > > > For more information about board please take a look at: > https://www.xilinx.com/products/boards-and-kits/zcu1275.html > > --- > Documentation/devicetree/bindings/arm/xilinx.yaml | 6 +++--- > arch/arm64/boot/dts/xilinx/Makefile | 2 +- > .../{zynqmp-zc1275-revA.dts => zynqmp-zcu1275-revA.dts} | 4 ++-- Please keep the bindings separate patch, even though entire set is not bisectable from dtbs_check point of view. Bindings are getting exported. Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/arm/xilinx.yaml b/Documentation/devicetree/bindings/arm/xilinx.yaml index 969cfe6dc434..b3071d10ea65 100644 --- a/Documentation/devicetree/bindings/arm/xilinx.yaml +++ b/Documentation/devicetree/bindings/arm/xilinx.yaml @@ -61,10 +61,10 @@ properties: - const: xlnx,zynqmp-zc1254 - const: xlnx,zynqmp - - description: Xilinx internal board zc1275 + - description: Xilinx evaluation board zcu1275 items: - - const: xlnx,zynqmp-zc1275-revA - - const: xlnx,zynqmp-zc1275 + - const: xlnx,zynqmp-zcu1275-revA + - const: xlnx,zynqmp-zcu1275 - const: xlnx,zynqmp - description: Xilinx 96boards compatible board zcu100 diff --git a/arch/arm64/boot/dts/xilinx/Makefile b/arch/arm64/boot/dts/xilinx/Makefile index 686d50752b00..5e40c0b4fa0a 100644 --- a/arch/arm64/boot/dts/xilinx/Makefile +++ b/arch/arm64/boot/dts/xilinx/Makefile @@ -2,7 +2,6 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += avnet-ultra96-rev1.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zc1232-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zc1254-revA.dtb -dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zc1275-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zc1751-xm015-dc1.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zc1751-xm016-dc2.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zc1751-xm017-dc3.dtb @@ -17,6 +16,7 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu104-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu104-revC.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu106-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu111-revA.dtb +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu1275-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA.dtb diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1275-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu1275-revA.dts similarity index 87% rename from arch/arm64/boot/dts/xilinx/zynqmp-zc1275-revA.dts rename to arch/arm64/boot/dts/xilinx/zynqmp-zcu1275-revA.dts index 676b8550a625..ad641e01ac7b 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1275-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu1275-revA.dts @@ -14,8 +14,8 @@ #include "zynqmp-clk-ccf.dtsi" / { - model = "ZynqMP ZC1275 RevA"; - compatible = "xlnx,zynqmp-zc1275-revA", "xlnx,zynqmp-zc1275", "xlnx,zynqmp"; + model = "ZynqMP ZCU1275 RevA"; + compatible = "xlnx,zynqmp-zcu1275-revA", "xlnx,zynqmp-zcu1275", "xlnx,zynqmp"; aliases { serial0 = &uart0;
Internal board zc1275 was released also to public which ends up with adding missing 'u' to board name. Reflect this change by renaming DT files. Signed-off-by: Michal Simek <michal.simek@amd.com> --- For more information about board please take a look at: https://www.xilinx.com/products/boards-and-kits/zcu1275.html --- Documentation/devicetree/bindings/arm/xilinx.yaml | 6 +++--- arch/arm64/boot/dts/xilinx/Makefile | 2 +- .../{zynqmp-zc1275-revA.dts => zynqmp-zcu1275-revA.dts} | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename arch/arm64/boot/dts/xilinx/{zynqmp-zc1275-revA.dts => zynqmp-zcu1275-revA.dts} (87%)