po 14. 10. 2019 v 16:12 odesÃlatel Michal Simek
<michal.si...@xilinx.com> napsal:
>
> From: Naga Sureshkumar Relli <naga.sureshkumar.re...@xilinx.com>
>
> This patch updates the nand device tree node properties as per
> updated driver.
>
> Signed-off-by: Naga Sureshkumar Relli <nagas...@xilinx.com>
> Signed-off-by: Michal Simek <michal.si...@xilinx.com>
> ---
>
> arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 104 +++++++++++++----------
> arch/arm/dts/zynqmp.dtsi | 4 +-
> 2 files changed, 59 insertions(+), 49 deletions(-)
>
> diff --git a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
> b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
> index 1cc469d93fb5..1cc8aaa87976 100644
> --- a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
> +++ b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
> @@ -119,56 +119,66 @@
> &nand0 {
> status = "okay";
> arasan,has-mdma;
> - num-cs = <2>;
>
> - partition@0 { /* for testing purpose */
> - label = "nand-fsbl-uboot";
> - reg = <0x0 0x0 0x400000>;
> - };
> - partition@1 { /* for testing purpose */
> - label = "nand-linux";
> - reg = <0x0 0x400000 0x1400000>;
> - };
> - partition@2 { /* for testing purpose */
> - label = "nand-device-tree";
> - reg = <0x0 0x1800000 0x400000>;
> - };
> - partition@3 { /* for testing purpose */
> - label = "nand-rootfs";
> - reg = <0x0 0x1C00000 0x1400000>;
> - };
> - partition@4 { /* for testing purpose */
> - label = "nand-bitstream";
> - reg = <0x0 0x3000000 0x400000>;
> - };
> - partition@5 { /* for testing purpose */
> - label = "nand-misc";
> - reg = <0x0 0x3400000 0xFCC00000>;
> - };
> + nand@0 {
> + reg = <0x0>;
> + #address-cells = <0x2>;
> + #size-cells = <0x1>;
>
> - partition@6 { /* for testing purpose */
> - label = "nand1-fsbl-uboot";
> - reg = <0x1 0x0 0x400000>;
> - };
> - partition@7 { /* for testing purpose */
> - label = "nand1-linux";
> - reg = <0x1 0x400000 0x1400000>;
> - };
> - partition@8 { /* for testing purpose */
> - label = "nand1-device-tree";
> - reg = <0x1 0x1800000 0x400000>;
> - };
> - partition@9 { /* for testing purpose */
> - label = "nand1-rootfs";
> - reg = <0x1 0x1C00000 0x1400000>;
> - };
> - partition@10 { /* for testing purpose */
> - label = "nand1-bitstream";
> - reg = <0x1 0x3000000 0x400000>;
> + partition@0 { /* for testing purpose */
> + label = "nand-fsbl-uboot";
> + reg = <0x0 0x0 0x400000>;
> + };
> + partition@1 { /* for testing purpose */
> + label = "nand-linux";
> + reg = <0x0 0x400000 0x1400000>;
> + };
> + partition@2 { /* for testing purpose */
> + label = "nand-device-tree";
> + reg = <0x0 0x1800000 0x400000>;
> + };
> + partition@3 { /* for testing purpose */
> + label = "nand-rootfs";
> + reg = <0x0 0x1c00000 0x1400000>;
> + };
> + partition@4 { /* for testing purpose */
> + label = "nand-bitstream";
> + reg = <0x0 0x3000000 0x400000>;
> + };
> + partition@5 { /* for testing purpose */
> + label = "nand-misc";
> + reg = <0x0 0x3400000 0xfcc00000>;
> + };
> };
> - partition@11 { /* for testing purpose */
> - label = "nand1-misc";
> - reg = <0x1 0x3400000 0xFCC00000>;
> + nand@1 {
> + reg = <0x1>;
> + #address-cells = <0x2>;
> + #size-cells = <0x1>;
> +
> + partition@0 { /* for testing purpose */
> + label = "nand1-fsbl-uboot";
> + reg = <0x0 0x0 0x400000>;
> + };
> + partition@1 { /* for testing purpose */
> + label = "nand1-linux";
> + reg = <0x0 0x400000 0x1400000>;
> + };
> + partition@2 { /* for testing purpose */
> + label = "nand1-device-tree";
> + reg = <0x0 0x1800000 0x400000>;
> + };
> + partition@3 { /* for testing purpose */
> + label = "nand1-rootfs";
> + reg = <0x0 0x1c00000 0x1400000>;
> + };
> + partition@4 { /* for testing purpose */
> + label = "nand1-bitstream";
> + reg = <0x0 0x3000000 0x400000>;
> + };
> + partition@5 { /* for testing purpose */
> + label = "nand1-misc";
> + reg = <0x0 0x3400000 0xfcc00000>;
> + };
> };
> };
>
> diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
> index 06e88ee1b4d2..337922f8a966 100644
> --- a/arch/arm/dts/zynqmp.dtsi
> +++ b/arch/arm/dts/zynqmp.dtsi
> @@ -532,8 +532,8 @@
> clock-names = "clk_sys", "clk_flash";
> interrupt-parent = <&gic>;
> interrupts = <0 14 4>;
> - #address-cells = <2>;
> - #size-cells = <1>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> #stream-id-cells = <1>;
> iommus = <&smmu 0x872>;
> };
> --
> 2.17.1
>
Applied.
M
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
