March 2019 - U-Boot

[U-Boot] [V5 3/3] sunxi: Use clrsetbits_le32 instead of multiple instruction
by Shyam Saini 25 Mar '19

25 Mar '19

From: Michael Trimarchi <michael(a)amarulasolutions.com> This will improve code readabilty Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> Signed-off-by: Shyam Saini <shyam.saini(a)amarulasolutions.com> --- Changelogs: V1->V2: none V2->V3: Fix use of clrsetbits_le32 and setbits_le32 functions V3->V4: Rebase to original series's patch 2 and 3 v4->V5 Use correct clear bit function --- arch/arm/mach-sunxi/dram_sun8i_a33.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-sunxi/dram_sun8i_a33.c b/arch/arm/mach-sunxi/dram_sun8i_a33.c index 63e18f17d0..c159f55c11 100644 --- a/arch/arm/mach-sunxi/dram_sun8i_a33.c +++ b/arch/arm/mach-sunxi/dram_sun8i_a33.c @@ -145,11 +145,8 @@ static void auto_set_timing_para(struct dram_para *para) reg_val = (tcksrx << 24) | (tcksre << 16) | (tckesr << 8) | (tcke << 0); writel(reg_val, &mctl_ctl->dramtmg5); /* Set two rank timing and exit self-refresh timing */ - reg_val = readl(&mctl_ctl->dramtmg8); - reg_val &= ~(0xff << 8); - reg_val &= ~(0xff << 0); - reg_val |= (0x33 << 8); - reg_val |= (0x10 << 0); + clrbits_le32(&mctl_ctl->dramtmg8, (0xff << 8) | (0xff << 0)); + setbits_le32(&mctl_ctl->dramtmg8, (0x33 << 8) | (0x10 << 0)); writel(reg_val, &mctl_ctl->dramtmg8); /* Set phy interface time */ reg_val = (0x2 << 24) | (t_rdata_en << 16) | (0x1 << 8) -- 2.11.0

1 0

[U-Boot] [PATCH v1 1/3] ppc: t2080qds: add usb node
by Yinbo Zhu 25 Mar '19

25 Mar '19

From: Yinbo Zhu <yinbo.zhu(a)nxp.com> This patch is to add usb node for t2080qds Signed-off-by: Yinbo Zhu <yinbo.zhu(a)nxp.com> --- arch/powerpc/dts/t2080.dtsi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/powerpc/dts/t2080.dtsi b/arch/powerpc/dts/t2080.dtsi index f895dda4d7..666601ed49 100644 --- a/arch/powerpc/dts/t2080.dtsi +++ b/arch/powerpc/dts/t2080.dtsi @@ -68,5 +68,24 @@ bus-width = <4>; voltage-ranges = <1800 1800 3300 3300>; }; + + usb0: usb@210000 { + compatible = "fsl-usb2-mph"; + reg = <0x210000 0x1000>; + #address-cells = <1>; + #size-cells = <0>; + interrupts = <44 0x2 0 0>; + phy_type = "utmi"; + }; + + usb1: usb@211000 { + compatible = "fsl-usb2-dr"; + reg = <0x211000 0x1000>; + #address-cells = <1>; + #size-cells = <0>; + interrupts = <45 0x2 0 0>; + dr_mode = "host"; + phy_type = "utmi"; + }; }; }; -- 2.17.1

1 2

[U-Boot] [PATCH v1 1/5] ppc: t2080qds: add eSDHC node
by Yinbo Zhu 25 Mar '19

25 Mar '19

From: Yinbo Zhu <yinbo.zhu(a)nxp.com> This patch is to add eSDHC node for t2080qds Signed-off-by: Yinbo Zhu <yinbo.zhu(a)nxp.com> --- arch/powerpc/dts/t2080.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/powerpc/dts/t2080.dtsi b/arch/powerpc/dts/t2080.dtsi index db65ea5725..f895dda4d7 100644 --- a/arch/powerpc/dts/t2080.dtsi +++ b/arch/powerpc/dts/t2080.dtsi @@ -58,5 +58,15 @@ device_type = "open-pic"; clock-frequency = <0x0>; }; + + esdhc: esdhc@114000 { + compatible = "fsl,esdhc"; + reg = <0x114000 0x1000>; + interrupts = <48 2 0 0>; + clock-frequency = <0>; + sdhci,auto-cmd12; + bus-width = <4>; + voltage-ranges = <1800 1800 3300 3300>; + }; }; }; -- 2.17.1

1 4

[U-Boot] [PATCH v4] board/fsl/lx2160a: Fix MC firmware loading during SD boot
by Pankaj Bansal 25 Mar '19

25 Mar '19

during SD boot, following error comes: MMC read: dev # 0, block # 20480, count 2048 ... 2048 blocks read: OK MMC read: dev # 0, block # 28672, count 2048 ... 2048 blocks read: OK fsl-mc: ERR: Bad firmware image (bad FIT header) Hit any key to stop autoboot: 0 it's occurring because mc 10.14.3 file size is 1064880, which means 0x820 SD blocks which is more than 0x800 blocks (1MB). This results in DPC loading address 0x80100000 overlapping with MC loading address 0x80000000. so, update the MC/dpl/dpc addresses as per their addresses in SD card. Assuming that SD card block size is 512 bytes and 0x0 block in SD card would get loaded at 0x80000000 (DDR base address), this gives following addresses for various binaries: Binary | SD block | DDR offset ------------------------------ MC | 0x5000 | 0x80a00000 DPL | 0x6800 | 0x80d00000 DPC | 0x7000 | 0x80e00000 Signed-off-by: Pankaj Bansal <pankaj.bansal(a)nxp.com> --- Notes: V4: - Modify the commit message to remove any reference to Flexspi flash V3: - modify the commit message. - remove issue/cause/fix from message. V2: - reduce the mc firmware size blocks from 0x1800 to 0x1200, to save on boot time - Fix the commit message to indicate that the patch is for LX2160A boards only and for SD boot only include/configs/lx2160a_common.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index 637619cb55..4fc429d7b6 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -200,14 +200,14 @@ unsigned long get_board_ddr_clk(void); "fsl_mc start mc 0x20a00000 0x20e00000\0" #define SD_MC_INIT_CMD \ - "mmc read 0x80000000 0x5000 0x800;" \ - "mmc read 0x80100000 0x7000 0x800;" \ + "mmc read 0x80a00000 0x5000 0x1200;" \ + "mmc read 0x80e00000 0x7000 0x800;" \ "env exists secureboot && " \ "mmc read 0x80700000 0x3800 0x10 && " \ "mmc read 0x80740000 0x3A00 0x10 && " \ "esbc_validate 0x80700000 && " \ "esbc_validate 0x80740000 ;" \ - "fsl_mc start mc 0x80000000 0x80100000\0" + "fsl_mc start mc 0x80a00000 0x80e00000\0" #define EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ @@ -272,11 +272,11 @@ unsigned long get_board_ddr_clk(void); #define SD_BOOTCOMMAND \ "env exists mcinitcmd && mmcinfo; " \ - "mmc read 0x80001000 0x6800 0x800; " \ + "mmc read 0x80d00000 0x6800 0x800; " \ "env exists mcinitcmd && env exists secureboot " \ " && mmc read 0x80780000 0x3C00 0x10 " \ "&& esbc_validate 0x80780000;env exists mcinitcmd " \ - "&& fsl_mc lazyapply dpl 0x80001000;" \ + "&& fsl_mc lazyapply dpl 0x80d00000;" \ "run distro_bootcmd;run sd_bootcmd;" \ "env exists secureboot && esbc_halt;" -- 2.17.1

1 0

[U-Boot] [PATCH v2] board/fsl/lx2160a: Fix MC firmware loading during SD boot
by Pankaj Bansal 25 Mar '19

25 Mar '19

during SD boot, following error comes: MMC read: dev # 0, block # 20480, count 2048 ... 2048 blocks read: OK MMC read: dev # 0, block # 28672, count 2048 ... 2048 blocks read: OK fsl-mc: ERR: Bad firmware image (bad FIT header) Hit any key to stop autoboot: 0 it's occurring because mc 10.14.3 file size is 1064880, which means 0x820 SD blocks which is more than 0x800 blocks (1MB). This results in DPC loading address 0x80100000 overlapping with MC loading address 0x80000000. so, update the MC/dpl/dpc addresses as per their addresses in SD card. Assuming that SD card block size is 512 bytes and 0x0 block in SD card would get loaded at 0x80000000 (DDR base address), this gives following addresses for various binaries: Binary | SD block | DDR offset ------------------------------ MC | 0x5000 | 0x80a00000 DPL | 0x6800 | 0x80d00000 DPC | 0x7000 | 0x80e00000 Signed-off-by: Pankaj Bansal <pankaj.bansal(a)nxp.com> --- Notes: V2: - Modify the commit message to remove any reference to Flexspi flash include/configs/lx2160a_common.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index 637619cb55..4fc429d7b6 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -200,14 +200,14 @@ unsigned long get_board_ddr_clk(void); "fsl_mc start mc 0x20a00000 0x20e00000\0" #define SD_MC_INIT_CMD \ - "mmc read 0x80000000 0x5000 0x800;" \ - "mmc read 0x80100000 0x7000 0x800;" \ + "mmc read 0x80a00000 0x5000 0x1200;" \ + "mmc read 0x80e00000 0x7000 0x800;" \ "env exists secureboot && " \ "mmc read 0x80700000 0x3800 0x10 && " \ "mmc read 0x80740000 0x3A00 0x10 && " \ "esbc_validate 0x80700000 && " \ "esbc_validate 0x80740000 ;" \ - "fsl_mc start mc 0x80000000 0x80100000\0" + "fsl_mc start mc 0x80a00000 0x80e00000\0" #define EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ @@ -272,11 +272,11 @@ unsigned long get_board_ddr_clk(void); #define SD_BOOTCOMMAND \ "env exists mcinitcmd && mmcinfo; " \ - "mmc read 0x80001000 0x6800 0x800; " \ + "mmc read 0x80d00000 0x6800 0x800; " \ "env exists mcinitcmd && env exists secureboot " \ " && mmc read 0x80780000 0x3C00 0x10 " \ "&& esbc_validate 0x80780000;env exists mcinitcmd " \ - "&& fsl_mc lazyapply dpl 0x80001000;" \ + "&& fsl_mc lazyapply dpl 0x80d00000;" \ "run distro_bootcmd;run sd_bootcmd;" \ "env exists secureboot && esbc_halt;" -- 2.17.1

1 0

[U-Boot] [PATCH v2] armv8: fsl-layerscape: update copyright info
by Pankaj Bansal 25 Mar '19

25 Mar '19

Update copyright info for the issues reported after running check-legal test Signed-off-by: Pankaj Bansal <pankaj.bansal(a)nxp.com> --- Notes: V2: - Removed past tense from commit description and body arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 +- board/freescale/ls1088a/eth_ls1088aqds.c | 2 +- board/freescale/ls1088a/eth_ls1088ardb.c | 2 +- board/freescale/ls2080aqds/eth.c | 1 + board/freescale/ls2080ardb/eth_ls2080rdb.c | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 978d46b32f..3567db8959 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017 NXP + * Copyright 2017-2019 NXP * Copyright 2014-2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c index f16b78cf03..9df5cb9cb0 100644 --- a/board/freescale/ls1088a/eth_ls1088aqds.c +++ b/board/freescale/ls1088a/eth_ls1088aqds.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017 NXP + * Copyright 2017-2019 NXP */ #include <common.h> diff --git a/board/freescale/ls1088a/eth_ls1088ardb.c b/board/freescale/ls1088a/eth_ls1088ardb.c index a2b52a879b..0af8054971 100644 --- a/board/freescale/ls1088a/eth_ls1088ardb.c +++ b/board/freescale/ls1088a/eth_ls1088ardb.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017 NXP + * Copyright 2017-2019 NXP */ #include <common.h> diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c index f706fd4cb6..62e5919cdb 100644 --- a/board/freescale/ls2080aqds/eth.c +++ b/board/freescale/ls2080aqds/eth.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor, Inc. + * Copyright 2018-2019 NXP */ #include <common.h> diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/freescale/ls2080ardb/eth_ls2080rdb.c index 62c7a7a315..ba71d712a5 100644 --- a/board/freescale/ls2080ardb/eth_ls2080rdb.c +++ b/board/freescale/ls2080ardb/eth_ls2080rdb.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor, Inc. + * Copyright 2018-2019 NXP * */ -- 2.17.1

1 0

[U-Boot] [PATCH] driver: net: updated copyright info
by Pankaj Bansal 25 Mar '19

25 Mar '19

Updated copyright info for the issues reported after running check-legal test. Signed-off-by: Pankaj Bansal <pankaj.bansal(a)nxp.com> diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index cc59b21f9f..dc4dd4398a 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -1,8 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. - * Copyright 2017 NXP - * Copyright 2017-2018 NXP + * Copyright 2017-2019 NXP */ #include <common.h> #include <errno.h> diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c index 73b7ba29df..fc732c7be9 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.c +++ b/drivers/net/ldpaa_eth/ldpaa_eth.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014-2016 Freescale Semiconductor, Inc. - * Copyright 2017 NXP + * Copyright 2017-2019 NXP */ #include <common.h> diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.h b/drivers/net/ldpaa_eth/ldpaa_eth.h index 3f9154b5bb..dd559bb78d 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.h +++ b/drivers/net/ldpaa_eth/ldpaa_eth.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2014-2016 Freescale Semiconductor, Inc. - * Copyright 2017 NXP + * Copyright 2017-2019 NXP */ #ifndef __LDPAA_ETH_H diff --git a/drivers/net/ldpaa_eth/ldpaa_wriop.c b/drivers/net/ldpaa_eth/ldpaa_wriop.c index 06a284ad68..a5a19c6b1a 100644 --- a/drivers/net/ldpaa_eth/ldpaa_wriop.c +++ b/drivers/net/ldpaa_eth/ldpaa_wriop.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Freescale Semiconductor + * Copyright 2018-2019 NXP */ #include <common.h> diff --git a/drivers/net/ldpaa_eth/lx2160a.c b/drivers/net/ldpaa_eth/lx2160a.c index 1fbeb0d14b..8a71bf40a3 100644 --- a/drivers/net/ldpaa_eth/lx2160a.c +++ b/drivers/net/ldpaa_eth/lx2160a.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2018 NXP + * Copyright 2018-2019 NXP */ #include <common.h> #include <phy.h> diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 0c8b29dae4..7bf8e9ef05 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -3,6 +3,8 @@ * Generic PHY Management code * * Copyright 2011 Freescale Semiconductor, Inc. + * Copyright 2018-2019 NXP + * * author Andy Fleming * * Based loosely off of Linux's PHY Lib diff --git a/include/fsl-mc/ldpaa_wriop.h b/include/fsl-mc/ldpaa_wriop.h index b55c39cbb2..3f32c39ec9 100644 --- a/include/fsl-mc/ldpaa_wriop.h +++ b/include/fsl-mc/ldpaa_wriop.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2015 Freescale Semiconductor + * Copyright 2018-2019 NXP */ #ifndef __LDPAA_WRIOP_H diff --git a/include/phy.h b/include/phy.h index f23ca63f3b..74d2e693eb 100644 --- a/include/phy.h +++ b/include/phy.h @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2011 Freescale Semiconductor, Inc. + * Copyright 2018-2019 NXP + * * Andy Fleming <afleming(a)gmail.com> * * This file pretty much stolen from Linux's mii.h/ethtool.h/phy.h -- 2.17.1

1 0

[U-Boot] [PATCH] armv8: fsl-layerscape: updated copyright info
by Pankaj Bansal 25 Mar '19

25 Mar '19

Updated copyright info for the issues reported after running check-legal test Signed-off-by: Pankaj Bansal <pankaj.bansal(a)nxp.com> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 978d46b32f..3567db8959 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017 NXP + * Copyright 2017-2019 NXP * Copyright 2014-2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c index f16b78cf03..9df5cb9cb0 100644 --- a/board/freescale/ls1088a/eth_ls1088aqds.c +++ b/board/freescale/ls1088a/eth_ls1088aqds.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017 NXP + * Copyright 2017-2019 NXP */ #include <common.h> diff --git a/board/freescale/ls1088a/eth_ls1088ardb.c b/board/freescale/ls1088a/eth_ls1088ardb.c index a2b52a879b..0af8054971 100644 --- a/board/freescale/ls1088a/eth_ls1088ardb.c +++ b/board/freescale/ls1088a/eth_ls1088ardb.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017 NXP + * Copyright 2017-2019 NXP */ #include <common.h> diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c index f706fd4cb6..62e5919cdb 100644 --- a/board/freescale/ls2080aqds/eth.c +++ b/board/freescale/ls2080aqds/eth.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor, Inc. + * Copyright 2018-2019 NXP */ #include <common.h> diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/freescale/ls2080ardb/eth_ls2080rdb.c index 62c7a7a315..ba71d712a5 100644 --- a/board/freescale/ls2080ardb/eth_ls2080rdb.c +++ b/board/freescale/ls2080ardb/eth_ls2080rdb.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor, Inc. + * Copyright 2018-2019 NXP * */ -- 2.17.1

1 0

[U-Boot] Issues with BeagleBone Black Wireless booting off eMMC
by Peter Robinson 25 Mar '19

25 Mar '19

Hi All, It seems there's a regression in 2019.04 when booting the BBone Black Wireless off the onboard eMMC. It works fine if I boot off the SD card. It complains about not being about to see a partition, and manual poking it will see the partitions and load from them, this previously booted fine with 2019.01. Looking through various logs I can't see where/why this changed. Peter U-Boot SPL 2019.04-rc4 (Mar 20 2019 - 15:03:10 +0000) Trying to boot from MMC2 Loading Environment from FAT... Card did not respond to voltage select! U-Boot 2019.04-rc4 (Mar 20 2019 - 15:03:10 +0000) CPU : AM335X-GP rev 2.1 Model: TI AM335x BeagleBone Black DRAM: 512 MiB NAND: 0 MiB MMC: OMAP SD/MMC: 0, OMAP SD/MMC: 1 Loading Environment from FAT... MMC: no card present <ethaddr> not set. Validating first E-fuse MAC Net: Could not get PHY for ethernet@4a100000: addr 0 eth0: ethernet@4a100000 Warning: usb_ether MAC addresses don't match: Address in ROM is de:ad:be:ef:00:01 Address in environment is 50:65:83:da:68:eb , eth1: usb_ether Hit any key to stop autoboot: 0 MMC: no card present MMC: no card present MMC: no card present MMC: no card present MMC: no card present MMC: no card present switch to partitions #0, OK mmc1(part 0) is current device SD/MMC found on device 1 ** No partition table - mmc 1 ** ** No partition table - mmc 1 ** ## Error: "bootcmd_nand0" not defined starting USB... USB0: Port not available. using musb-hdrc, OUT ep1out IN ep1in STATUS ep2in MAC de:ad:be:ef:00:01 <snip attempts at network boot off usb> The remote end did not respond in time.=> => mmc list OMAP SD/MMC: 0 OMAP SD/MMC: 1 (eMMC) => mmc dev 1 switch to partitions #0, OK mmc1(part 0) is current device => mmc part Partition Map for MMC device 1 -- Partition Type: DOS Part Start Sector Num Sectors UUID Type 1 2048 202753 ff24dd7d-01 ef Boot 2 204801 1355775 ff24dd7d-02 83 Boot 4 1560576 5910528 ff24dd7d-04 83 =>

1 0

[U-Boot] [PATCH v3] arm: dts: Stratix10: Add QSPI node
by Ley Foon Tan 25 Mar '19

25 Mar '19

Add QSPI device tree to Stratix 10. Sync from Linux Stratix 10 dts. Tested on Stratix 10 SoC devkit. SOCFPGA_STRATIX10 # sf probe 0:0 SF: Detected mt25qu02g with page size 256 Bytes, erase size 64 KiB, total 256 MiB Signed-off-by: Ley Foon Tan <ley.foon.tan(a)intel.com> --- v2->v3: - Change flash compatible to "jedec,spi-nor" - Change spi-max-frequency to 100MHz --- arch/arm/dts/socfpga_stratix10.dtsi | 15 +++++++++++++++ arch/arm/dts/socfpga_stratix10_socdk.dts | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/arch/arm/dts/socfpga_stratix10.dtsi b/arch/arm/dts/socfpga_stratix10.dtsi index ee93725d64..9998bb1ba3 100644 --- a/arch/arm/dts/socfpga_stratix10.dtsi +++ b/arch/arm/dts/socfpga_stratix10.dtsi @@ -391,5 +391,20 @@ resets = <&rst WATCHDOG3_RESET>; status = "disabled"; }; + + qspi: spi@ff8d2000 { + compatible = "cdns,qspi-nor"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xff8d2000 0x100>, + <0xff900000 0x100000>; + interrupts = <0 3 4>; + cdns,fifo-depth = <128>; + cdns,fifo-width = <4>; + cdns,trigger-address = <0x00000000>; + bus-num = <0>; + status = "disabled"; + u-boot,dm-pre-reloc; + }; }; }; diff --git a/arch/arm/dts/socfpga_stratix10_socdk.dts b/arch/arm/dts/socfpga_stratix10_socdk.dts index c59b77d829..9d7d11ee13 100644 --- a/arch/arm/dts/socfpga_stratix10_socdk.dts +++ b/arch/arm/dts/socfpga_stratix10_socdk.dts @@ -10,6 +10,7 @@ aliases { serial0 = &uart0; + spi0 = &qspi; }; chosen { @@ -87,6 +88,26 @@ smplsel = <0>; }; +&qspi { + status = "okay"; + + flash@0 { + u-boot,dm-pre-reloc; + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + reg = <0>; /* chip select */ + spi-max-frequency = <100000000>; + + page-size = <256>; + block-size = <16>; /* 2^16, 64KB */ + cdns,tshsl-ns = <50>; + cdns,tsd2d-ns = <50>; + cdns,tchsh-ns = <4>; + cdns,tslch-ns = <4>; + }; +}; + &uart0 { status = "okay"; }; -- 2.19.0

1 0