February 2021 - U-Boot

[PATCH v2 00/12] x86: Minor improvements mostly for image loading
by Simon Glass 01 Feb '21

01 Feb '21

This series provides a few improvements for loading of images. It also provides a way to show more detailed model information as well as an of-platdata fix noticed recently. Changes in v2: - Add comment to .lds file - Add more notes to the commit - Fix two missing asterisks in comments Simon Glass (12): x86: acpi_gpe: Update driver name to match devicetree x86: spl: Add a function to find the text base x86: apl: Enhance debugging in the SPL loader x86: Make sure the SPL image ends on a suitable boundary x86: spl: Make moving BSS conditional x86: Update Chromium OS GNVS names x86: zimage: Allow dumping the image from outside the module x86: zimage: Improve command-line debug handling x86: spl: Clear BSS unconditionally x86: tpl: Show next stage being booted sysinfo: Allow showing model info from sysinfo x86: coral: Show memory config and SKU ID on startup arch/x86/cpu/acpi_gpe.c | 6 +- arch/x86/cpu/apollolake/spl.c | 12 +- arch/x86/cpu/u-boot-spl.lds | 12 ++ arch/x86/dts/chromebook_coral.dts | 11 ++ arch/x86/include/asm/intel_gnvs.h | 34 ++++- arch/x86/include/asm/zimage.h | 10 ++ arch/x86/lib/spl.c | 2 +- arch/x86/lib/tpl.c | 7 +- arch/x86/lib/zimage.c | 33 +++-- board/google/chromebook_coral/coral.c | 139 +++++++++++++++++- board/google/chromebook_coral/variant_gpio.h | 6 - common/board_info.c | 37 ++++- common/spl/spl.c | 6 + .../sysinfo/google,coral.txt | 37 +++++ include/spl.h | 10 ++ include/sysinfo.h | 4 + 16 files changed, 318 insertions(+), 48 deletions(-) create mode 100644 doc/device-tree-bindings/sysinfo/google,coral.txt -- 2.30.0.280.ga3ce27912f-goog

2 14

[PATCH] acpi: Tidy up documentation for struct acpi_gpio
by Simon Glass 01 Feb '21

01 Feb '21

Some comments were provided after this patch was applied. Address them. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- include/acpi/acpi_device.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/acpi/acpi_device.h b/include/acpi/acpi_device.h index ed4acd912a1..2c8846250b6 100644 --- a/include/acpi/acpi_device.h +++ b/include/acpi/acpi_device.h @@ -171,10 +171,11 @@ enum acpi_gpio_polarity { * @io_restrict: I/O restriction setting * @polarity: GPIO polarity * - * Note that GpioIo doesn't have any means of Active Low / High setting, so a - * _DSD must be provided to mitigate this. + * Note that GpioIo() doesn't have any means of Active Low / High setting, so a + * _DSD must be provided to mitigate this. This parameter does not make sense + * for GpioInt() since it has its own means to define it. * - * GpioIo doesn't properly communicate the initial state of the output pin, + * GpioIo() doesn't properly communicate the initial state of the output pin, * thus Linux assumes the simple rule: * * Pull Bias Polarity Requested... @@ -184,7 +185,7 @@ enum acpi_gpio_polarity { * assuming non-active (Polarity = !Pull Bias) * * Down Low as low, assuming active - * Down High as high, assuming non-active + * Down High as low, assuming non-active * Up Low as high, assuming non-active * Up High as high, assuming active * -- 2.30.0.280.ga3ce27912f-goog

2 2

[PATCH 0/3] arm: dts: k3: Sync TI's K3 related dts nodes
by Lokesh Vutla 01 Feb '21

01 Feb '21

Sync are TI's K3 related v5.11-rc6 Linux kernel dts into U-Boot. This series depends on the following two patch series: https://patchwork.ozlabs.org/project/uboot/list/?series=226539 https://patchwork.ozlabs.org/project/uboot/list/?series=227056 Lokesh Vutla (3): arm: dts: k3-am65: Sync Linux v5.11-rc6 dts into U-Boot arm: dts: k3-j721e: Sync Linux v5.11-rc6 dts into U-Boot arm: dts: k3-j7200: Sync Linux v5.11-rc6 dts into U-Boot arch/arm/dts/k3-am65-main.dtsi | 832 ++++++++-- arch/arm/dts/k3-am65-mcu.dtsi | 221 ++- arch/arm/dts/k3-am65-wakeup.dtsi | 48 +- arch/arm/dts/k3-am65.dtsi | 10 +- arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 63 +- arch/arm/dts/k3-am654-base-board.dts | 465 +++++- arch/arm/dts/k3-am654-industrial-thermal.dtsi | 45 + arch/arm/dts/k3-am654-r5-base-board.dts | 38 +- arch/arm/dts/k3-am654.dtsi | 10 +- .../k3-j7200-common-proc-board-u-boot.dtsi | 16 +- arch/arm/dts/k3-j7200-common-proc-board.dts | 122 +- arch/arm/dts/k3-j7200-main.dtsi | 296 +++- arch/arm/dts/k3-j7200-mcu-wakeup.dtsi | 230 +-- arch/arm/dts/k3-j7200-som-p0.dtsi | 107 +- arch/arm/dts/k3-j7200.dtsi | 27 +- .../k3-j721e-common-proc-board-u-boot.dtsi | 70 +- arch/arm/dts/k3-j721e-common-proc-board.dts | 661 +++++++- arch/arm/dts/k3-j721e-main.dtsi | 1476 +++++++++++++++-- arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 234 ++- .../k3-j721e-r5-common-proc-board-u-boot.dtsi | 9 + .../arm/dts/k3-j721e-r5-common-proc-board.dts | 2 - arch/arm/dts/k3-j721e-som-p0.dtsi | 272 ++- arch/arm/dts/k3-j721e.dtsi | 29 +- include/dt-bindings/mux/ti-serdes.h | 93 ++ 24 files changed, 4383 insertions(+), 993 deletions(-) create mode 100644 arch/arm/dts/k3-am654-industrial-thermal.dtsi create mode 100644 include/dt-bindings/mux/ti-serdes.h -- 2.30.0

1 3

[PATCH] sunxi: spl: Fix H616 clock initialization
by Jernej Skrabec 01 Feb '21

01 Feb '21

It turns out that there is a magic bit in PRCM region which seemingly makes PLLs work if it's enabled. Sadly, there is no documentation what it does exactly, so we'll just mimick BSP boot0 behaviour and enable it before any clock is set up. Fixes: b18bd53d6cde ("sunxi: introduce support for H616 clocks") Signed-off-by: Jernej Skrabec <jernej.skrabec(a)siol.net> --- arch/arm/mach-sunxi/clock_sun50i_h6.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/mach-sunxi/clock_sun50i_h6.c b/arch/arm/mach-sunxi/clock_sun50i_h6.c index 06d84eb158d7..68c8e7f2afbe 100644 --- a/arch/arm/mach-sunxi/clock_sun50i_h6.c +++ b/arch/arm/mach-sunxi/clock_sun50i_h6.c @@ -9,6 +9,12 @@ void clock_init_safe(void) { struct sunxi_ccm_reg *const ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; + +#ifdef CONFIG_MACH_SUN50I_H616 + /* this seems to enable PLLs */ + setbits_le32(SUNXI_PRCM_BASE + 0x250, 0x10); +#endif + clock_set_pll1(408000000); writel(CCM_PLL6_DEFAULT, &ccm->pll6_cfg); -- 2.30.0

3 2

[PATCH] remoteproc: k3_r5: Sync to upstreamed kernel DT property names
by Suman Anna 01 Feb '21

01 Feb '21

The K3 R5F remoteproc driver in U-Boot was upstreamed prior to the equivalent remoteproc driver in the Linux kernel. Some of the DT properties used in U-Boot got upstreamed using different names in Linux kernel. The modified property names include the R5F cluster mode configuration property "lockstep-mode"; and three different individual R5F core config properties - "atcm-enable", "btcm-enable" and "loczrama". The property names were updated as follows: lockstep-mode => ti,cluster-mode atcm-enable => ti,atcm-enable btcm-enable => ti,btcm-enable loczrama => ti,loczrama Update the K3 R5F remoteproc driver, the corresponding binding, and all the existing usage in AM65x, J721E and J7200 dts files all at once to use the new properties and to not break any bisectability. Signed-off-by: Suman Anna <s-anna(a)ti.com> --- Hi Lokesh, As agreed offline, this patch syncs the U-Boot K3 R5F driver and all the related pieces in a single patch to the equivalent property names in the latest upstream Linux kernel. Note that the kernel bindings in general define a few more properties which have no presence so far in U-Boot. So, only the common properties are synched. No changes are required to the K3 DSP remoteproc driver. Tested on AM65x, J721E and J7200 using appropriate SYSFW. Patch is on top of latest U-Boot master commit e262b2973e22. regards Suman arch/arm/dts/k3-am65-mcu.dtsi | 14 +++++----- arch/arm/dts/k3-j7200-main.dtsi | 14 +++++----- arch/arm/dts/k3-j7200-mcu-wakeup.dtsi | 14 +++++----- arch/arm/dts/k3-j721e-main.dtsi | 28 +++++++++---------- arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 14 +++++----- .../remoteproc/ti,k3-r5f-rproc.txt | 26 ++++++++--------- drivers/remoteproc/ti_k3_r5f_rproc.c | 8 +++--- 7 files changed, 59 insertions(+), 59 deletions(-) diff --git a/arch/arm/dts/k3-am65-mcu.dtsi b/arch/arm/dts/k3-am65-mcu.dtsi index 0b07e188b59f..84c8f34e24a2 100644 --- a/arch/arm/dts/k3-am65-mcu.dtsi +++ b/arch/arm/dts/k3-am65-mcu.dtsi @@ -43,7 +43,7 @@ mcu_r5fss0: r5fss@41000000 { compatible = "ti,am654-r5fss"; - lockstep-mode = <0>; + ti,cluster-mode = <0>; #address-cells = <1>; #size-cells = <1>; ranges = <0x41000000 0x00 0x41000000 0x20000>, @@ -59,9 +59,9 @@ ti,sci-dev-id = <159>; ti,sci-proc-ids = <0x01 0xFF>; resets = <&k3_reset 159 1>; - atcm-enable = <1>; - btcm-enable = <1>; - loczrama = <1>; + ti,atcm-enable = <1>; + ti,btcm-enable = <1>; + ti,loczrama = <1>; }; mcu_r5fss0_core1: r5f@41400000 { @@ -73,9 +73,9 @@ ti,sci-dev-id = <245>; ti,sci-proc-ids = <0x02 0xFF>; resets = <&k3_reset 245 1>; - atcm-enable = <1>; - btcm-enable = <1>; - loczrama = <1>; + ti,atcm-enable = <1>; + ti,btcm-enable = <1>; + ti,loczrama = <1>; }; }; diff --git a/arch/arm/dts/k3-j7200-main.dtsi b/arch/arm/dts/k3-j7200-main.dtsi index c25f03cf23d9..ed9f1a7b8259 100644 --- a/arch/arm/dts/k3-j7200-main.dtsi +++ b/arch/arm/dts/k3-j7200-main.dtsi @@ -343,7 +343,7 @@ main_r5fss0: r5fss@5c00000 { compatible = "ti,j7200-r5fss"; - lockstep-mode = <0>; + ti,cluster-mode = <0>; #address-cells = <1>; #size-cells = <1>; ranges = <0x5c00000 0x00 0x5c00000 0x20000>, @@ -360,9 +360,9 @@ ti,sci-proc-ids = <0x06 0xFF>; resets = <&k3_reset 245 1>; firmware-name = "j7200-main-r5f0_0-fw"; - atcm-enable = <1>; - btcm-enable = <1>; - loczrama = <1>; + ti,atcm-enable = <1>; + ti,btcm-enable = <1>; + ti,loczrama = <1>; }; main_r5fss0_core1: r5f@5d00000 { @@ -375,9 +375,9 @@ ti,sci-proc-ids = <0x07 0xFF>; resets = <&k3_reset 246 1>; firmware-name = "j7200-main-r5f0_1-fw"; - atcm-enable = <1>; - btcm-enable = <1>; - loczrama = <1>; + ti,atcm-enable = <1>; + ti,btcm-enable = <1>; + ti,loczrama = <1>; }; }; }; diff --git a/arch/arm/dts/k3-j7200-mcu-wakeup.dtsi b/arch/arm/dts/k3-j7200-mcu-wakeup.dtsi index 75c0c8597dc9..1faffe62fe80 100644 --- a/arch/arm/dts/k3-j7200-mcu-wakeup.dtsi +++ b/arch/arm/dts/k3-j7200-mcu-wakeup.dtsi @@ -272,7 +272,7 @@ mcu_r5fss0: r5fss@41000000 { compatible = "ti,j7200-r5fss"; - lockstep-mode = <1>; + ti,cluster-mode = <1>; #address-cells = <1>; #size-cells = <1>; ranges = <0x41000000 0x00 0x41000000 0x20000>, @@ -289,9 +289,9 @@ ti,sci-proc-ids = <0x01 0xff>; resets = <&k3_reset 250 1>; firmware-name = "j7200-mcu-r5f0_0-fw"; - atcm-enable = <1>; - btcm-enable = <1>; - loczrama = <1>; + ti,atcm-enable = <1>; + ti,btcm-enable = <1>; + ti,loczrama = <1>; }; mcu_r5fss0_core1: r5f@41400000 { @@ -304,9 +304,9 @@ ti,sci-proc-ids = <0x02 0xff>; resets = <&k3_reset 251 1>; firmware-name = "j7200-mcu-r5f0_1-fw"; - atcm-enable = <1>; - btcm-enable = <1>; - loczrama = <1>; + ti,atcm-enable = <1>; + ti,btcm-enable = <1>; + ti,loczrama = <1>; }; }; }; diff --git a/arch/arm/dts/k3-j721e-main.dtsi b/arch/arm/dts/k3-j721e-main.dtsi index 33db74a267a6..f179837313df 100644 --- a/arch/arm/dts/k3-j721e-main.dtsi +++ b/arch/arm/dts/k3-j721e-main.dtsi @@ -264,7 +264,7 @@ main_r5fss0: r5fss@5c00000 { compatible = "ti,j721e-r5fss"; - lockstep-mode = <0>; + ti,cluster-mode = <0>; #address-cells = <1>; #size-cells = <1>; ranges = <0x5c00000 0x00 0x5c00000 0x20000>, @@ -280,9 +280,9 @@ ti,sci-dev-id = <245>; ti,sci-proc-ids = <0x06 0xFF>; resets = <&k3_reset 245 1>; - atcm-enable = <1>; - btcm-enable = <1>; - loczrama = <1>; + ti,atcm-enable = <1>; + ti,btcm-enable = <1>; + ti,loczrama = <1>; }; main_r5fss0_core1: r5f@5d00000 { @@ -294,15 +294,15 @@ ti,sci-dev-id = <246>; ti,sci-proc-ids = <0x07 0xFF>; resets = <&k3_reset 246 1>; - atcm-enable = <1>; - btcm-enable = <1>; - loczrama = <1>; + ti,atcm-enable = <1>; + ti,btcm-enable = <1>; + ti,loczrama = <1>; }; }; main_r5fss1: r5fss@5e00000 { compatible = "ti,j721e-r5fss"; - lockstep-mode = <0>; + ti,cluster-mode = <0>; #address-cells = <1>; #size-cells = <1>; ranges = <0x5e00000 0x00 0x5e00000 0x20000>, @@ -318,9 +318,9 @@ ti,sci-dev-id = <247>; ti,sci-proc-ids = <0x08 0xFF>; resets = <&k3_reset 247 1>; - atcm-enable = <1>; - btcm-enable = <1>; - loczrama = <1>; + ti,atcm-enable = <1>; + ti,btcm-enable = <1>; + ti,loczrama = <1>; }; main_r5fss1_core1: r5f@5f00000 { @@ -332,9 +332,9 @@ ti,sci-dev-id = <248>; ti,sci-proc-ids = <0x09 0xFF>; resets = <&k3_reset 248 1>; - atcm-enable = <1>; - btcm-enable = <1>; - loczrama = <1>; + ti,atcm-enable = <1>; + ti,btcm-enable = <1>; + ti,loczrama = <1>; }; }; diff --git a/arch/arm/dts/k3-j721e-mcu-wakeup.dtsi b/arch/arm/dts/k3-j721e-mcu-wakeup.dtsi index 60695f5eb91d..1dcc09a75510 100644 --- a/arch/arm/dts/k3-j721e-mcu-wakeup.dtsi +++ b/arch/arm/dts/k3-j721e-mcu-wakeup.dtsi @@ -97,7 +97,7 @@ mcu_r5fss0: r5fss@41000000 { compatible = "ti,j721e-r5fss"; - lockstep-mode = <1>; + ti,cluster-mode = <1>; #address-cells = <1>; #size-cells = <1>; ranges = <0x41000000 0x00 0x41000000 0x20000>, @@ -113,9 +113,9 @@ ti,sci-dev-id = <250>; ti,sci-proc-ids = <0x01 0xFF>; resets = <&k3_reset 250 1>; - atcm-enable = <1>; - btcm-enable = <1>; - loczrama = <1>; + ti,atcm-enable = <1>; + ti,btcm-enable = <1>; + ti,loczrama = <1>; }; mcu_r5fss0_core1: r5f@41400000 { @@ -127,9 +127,9 @@ ti,sci-dev-id = <251>; ti,sci-proc-ids = <0x02 0xFF>; resets = <&k3_reset 251 1>; - atcm-enable = <1>; - btcm-enable = <1>; - loczrama = <1>; + ti,atcm-enable = <1>; + ti,btcm-enable = <1>; + ti,loczrama = <1>; }; }; diff --git a/doc/device-tree-bindings/remoteproc/ti,k3-r5f-rproc.txt b/doc/device-tree-bindings/remoteproc/ti,k3-r5f-rproc.txt index 5708c230175c..25ee495fe63c 100644 --- a/doc/device-tree-bindings/remoteproc/ti,k3-r5f-rproc.txt +++ b/doc/device-tree-bindings/remoteproc/ti,k3-r5f-rproc.txt @@ -38,7 +38,7 @@ The following are the mandatory properties: Optional properties: -------------------- -- lockstep-mode: Configuration Mode for the Dual R5F cores within the R5F +- ti,cluster-mode: Configuration Mode for the Dual R5F cores within the R5F cluster. Should be either a value of 1 (LockStep mode) or 0 (Split mode), default is LockStep mode if omitted. @@ -88,15 +88,15 @@ Optional properties: -------------------- The following properties are optional properties for each of the R5F cores: -- atcm-enable: R5F core configuration mode dictating if ATCM should be +- ti,atcm-enable: R5F core configuration mode dictating if ATCM should be enabled. Should be either a value of 1 (enabled) or 0 (disabled), default is disabled if omitted. R5F view - of ATCM dictated by loczrama property. -- btcm-enable: R5F core configuration mode dictating if BTCM should be + of ATCM dictated by ti,loczrama property. +- ti,btcm-enable: R5F core configuration mode dictating if BTCM should be enabled. Should be either a value of 1 (enabled) or 0 (disabled), default is enabled if omitted. R5F view - of BTCM dictated by loczrama property. -- loczrama: R5F core configuration mode dictating which TCM should + of BTCM dictated by ti,loczrama property. +- ti,loczrama: R5F core configuration mode dictating which TCM should appear at address 0 (from core's view). Should be either a value of 1 (ATCM at 0x0) or 0 (BTCM at 0x0), default value is 1 if omitted. @@ -129,7 +129,7 @@ Example: mcu_r5fss0: r5fss@41000000 { compatible = "ti,am654-r5fss"; power-domains = <&k3_pds 129>; - lockstep-mode = <1>; + ti,cluster-mode = <1>; #address-cells = <1>; #size-cells = <1>; ranges = <0x41000000 0x00 0x41000000 0x20000>, @@ -144,9 +144,9 @@ Example: ti,sci-dev-id = <159>; ti,sci-proc-ids = <0x01 0xFF>; resets = <&k3_reset 159 1>; - atcm-enable = <1>; - btcm-enable = <1>; - loczrama = <1>; + ti,atcm-enable = <1>; + ti,btcm-enable = <1>; + ti,loczrama = <1>; }; mcu_r5f1: r5f@41400000 { @@ -158,9 +158,9 @@ Example: ti,sci-dev-id = <245>; ti,sci-proc-ids = <0x02 0xFF>; resets = <&k3_reset 245 1>; - atcm-enable = <1>; - btcm-enable = <1>; - loczrama = <1>; + ti,atcm-enable = <1>; + ti,btcm-enable = <1>; + ti,loczrama = <1>; }; }; }; diff --git a/drivers/remoteproc/ti_k3_r5f_rproc.c b/drivers/remoteproc/ti_k3_r5f_rproc.c index 10bc4e99f0c8..3c569a3b7b6b 100644 --- a/drivers/remoteproc/ti_k3_r5f_rproc.c +++ b/drivers/remoteproc/ti_k3_r5f_rproc.c @@ -678,9 +678,9 @@ static int k3_r5f_of_to_priv(struct k3_r5f_core *core) dev_dbg(core->dev, "%s\n", __func__); - core->atcm_enable = dev_read_u32_default(core->dev, "atcm-enable", 0); - core->btcm_enable = dev_read_u32_default(core->dev, "btcm-enable", 1); - core->loczrama = dev_read_u32_default(core->dev, "loczrama", 1); + core->atcm_enable = dev_read_u32_default(core->dev, "ti,atcm-enable", 0); + core->btcm_enable = dev_read_u32_default(core->dev, "ti,btcm-enable", 1); + core->loczrama = dev_read_u32_default(core->dev, "ti,loczrama", 1); ret = ti_sci_proc_of_to_priv(core->dev, &core->tsp); if (ret) @@ -875,7 +875,7 @@ static int k3_r5f_cluster_probe(struct udevice *dev) dev_dbg(dev, "%s\n", __func__); - cluster->mode = dev_read_u32_default(dev, "lockstep-mode", + cluster->mode = dev_read_u32_default(dev, "ti,cluster-mode", CLUSTER_MODE_LOCKSTEP); if (device_get_child_count(dev) != 2) { -- 2.29.2

2 1

[PATCH] configs: am335x_evm: enable CONFIG_SPL_ALLOC_BD
by Dario Binacchi 01 Feb '21

01 Feb '21

With commit 38d6b7ebdaee ("spl: Drop bd_info in the data section") you need to enable this option to boot from mmc. Signed-off-by: Dario Binacchi <dariobin(a)libero.it> --- configs/am335x_evm_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index eb5a299bbc..c4d3bd0c44 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -13,6 +13,7 @@ CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run f CONFIG_LOGLEVEL=3 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_ARCH_MISC_INIT=y +CONFIG_SPL_ALLOC_BD=y CONFIG_SPL_FIT_IMAGE_TINY=y CONFIG_SPL_ETH_SUPPORT=y # CONFIG_SPL_FS_EXT4 is not set -- 2.17.1

2 1

[PATCH v2] mmc: mmc_spi: Print verbose debug output when crc16 check fails
by Bin Meng 01 Feb '21

01 Feb '21

Add some verbose debug output when crc16 check fails. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> Reviewed-by: Jaehoon Chung <jh80.chung(a)samsung.com> --- Changes in v2: - do the crc_ok assignment at the the same line where it's defined drivers/mmc/mmc_spi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c index 46800bbed2..b1edb6ad7c 100644 --- a/drivers/mmc/mmc_spi.c +++ b/drivers/mmc/mmc_spi.c @@ -181,8 +181,10 @@ static int mmc_spi_readdata(struct udevice *dev, if (ret) return ret; #ifdef CONFIG_MMC_SPI_CRC_ON - if (be16_to_cpu(crc16_ccitt(0, buf, bsize)) != crc) { - debug("%s: data crc error\n", __func__); + u16 crc_ok = be16_to_cpu(crc16_ccitt(0, buf, bsize)); + if (crc_ok != crc) { + debug("%s: data crc error, expect %04x get %04x\n", + __func__, crc_ok, crc); r1 = R1_SPI_COM_CRC; break; } -- 2.25.1

2 3

arm64: rk3399: Add support NanoPi R4s
by alex tian 01 Feb '21

01 Feb '21

>From c9563fe439e07e760d29a42e737b8265d5772150 Mon Sep 17 00:00:00 2001 From: Xiaobo Tian <peterwillcn(a)gmail.com> Date: Fri, 29 Jan 2021 22:30:22 +0800 Subject: [PATCH] arm64: rk3399: Add support NanoPi R4s NanoPi R4s [1] is SBC base on Rockchip RK3399 hexa-core processor with dual-Core Cortex-A72 and Mali-T864 GPU with 4GiB(LPDDR4) of RAM, SD card support, including 2 gigabit ethernet(RTL8211E 1Gbps - RTL8111H 1Gbps) and 2 USB 3.0 port. port.It also has two GPIO headers which allows further peripherals to be used. The devicetree file is taken of the rk3399 nanopi4 Linux kernel [2]. [1] https://wiki.friendlyarm.com/wiki/index.php/NanoPi_R4S [2] https://github.com/torvalds/linux/blob/master/arch/arm64/boot/dts/rockchip/… Cc: Tom Rini <trini(a)konsulko.com> Cc: Kever Yang <kever.yang(a)rock-chips.com> Reviewed-by: Kever Yang <kever.yang(a)rock-chips.com> Signed-off-by: Xiaobo Tian <peterwillcn(a)gmail.com> --- arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 7 ++ arch/arm/dts/rk3399-nanopi-r4s.dts | 129 +++++++++++++++++++++ configs/nanopi-r4s-rk3399_defconfig | 62 ++++++++++ 4 files changed, 199 insertions(+) create mode 100644 arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-nanopi-r4s.dts create mode 100644 configs/nanopi-r4s-rk3399_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 858b79ac97..528dfe069e 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -92,6 +92,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \ rk3288-evb.dtb \ rk3288-firefly.dtb \ rk3288-miqi.dtb \ + rk3399-nanopi-r4s.dtb \ rk3288-phycore-rdk.dtb \ rk3288-popmetal.dtb \ rk3288-rock2-square.dtb \ diff --git a/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi new file mode 100644 index 0000000000..df193f0e64 --- /dev/null +++ b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2020 Xiaobo <peterwillcn(a)gmail.com> + */ + +#include "rk3399-nanopi4-u-boot.dtsi" +#include "rk3399-sdram-lpddr4-100.dtsi" diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts new file mode 100644 index 0000000000..36d55fed39 --- /dev/null +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts @@ -0,0 +1,129 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2020 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyarm.com) + * + * Copyright (C) 2020 Xiaobo <peterwillcn(a)gmail.com> + */ + +/dts-v1/; +#include "rk3399-nanopi4.dtsi" + +/ { + model = "FriendlyElec NanoPi R4S"; + compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399"; + + cpuinfo { + compatible = "rockchip,cpuinfo"; + nvmem-cells = <&cpu_id>; + nvmem-cell-names = "id"; + }; + + aliases { + ethernet1 = &r8169; + }; + + vdd_5v: vdd-5v { + compatible = "regulator-fixed"; + regulator-name = "vdd_5v"; + regulator-always-on; + regulator-boot-on; + }; + + fan: pwm-fan { + compatible = "pwm-fan"; + cooling-levels = <0 12 18 255>; + #cooling-cells = <2>; + fan-supply = <&vdd_5v>; + pwms = <&pwm1 0 50000 0>; + }; +}; + +&cpu_thermal { + trips { + cpu_warm: cpu_warm { + temperature = <55000>; + hysteresis = <2000>; + type = "active"; + }; + + cpu_hot: cpu_hot { + temperature = <65000>; + hysteresis = <2000>; + type = "active"; + }; + }; + + cooling-maps { + map2 { + trip = <&cpu_warm>; + cooling-device = <&fan THERMAL_NO_LIMIT 1>; + }; + + map3 { + trip = <&cpu_hot>; + cooling-device = <&fan 2 THERMAL_NO_LIMIT>; + }; + }; +}; + +&emmc_phy { + status = "disabled"; +}; + +&fusb0 { + status = "disabled"; +}; + +&leds { + lan_led: led-1 { + gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; + label = "nanopi-r4s:green:lan"; + }; + + wan_led: led-2 { + gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; + label = "nanopi-r4s:green:wan"; + }; +}; + +&leds_gpio { + rockchip,pins = + <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, + <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, + <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; +}; + +&pcie0 { + max-link-speed = <1>; + num-lanes = <1>; + vpcie3v3-supply = <&vcc3v3_sys>; +}; + +&sdhci { + status = "disabled"; +}; + +&sdio0 { + status = "disabled"; +}; + +&sdmmc { + host-index-min = <1>; +}; + +&u2phy0_host { + phy-supply = <&vdd_5v>; +}; + +&u2phy1_host { + status = "disabled"; +}; + +&usbdrd_dwc3_0 { + dr_mode = "host"; +}; + +&vcc3v3_sys { + vin-supply = <&vcc5v0_sys>; +}; diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig new file mode 100644 index 0000000000..0a3c28b012 --- /dev/null +++ b/configs/nanopi-r4s-rk3399_defconfig @@ -0,0 +1,62 @@ +CONFIG_ARM=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_ROCKCHIP_RK3399=y +CONFIG_TARGET_EVB_RK3399=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_DEBUG_UART_BASE=0xFF1A0000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_DEBUG_UART=y +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-r4s.dtb" +CONFIG_DISPLAY_BOARDINFO_LATE=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +CONFIG_SPL_STACK_R=y +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 +CONFIG_TPL=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_TIME=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-r4s" +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_DM_ETH=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_GMAC_ROCKCHIP=y +CONFIG_PMIC_RK8XX=y +CONFIG_REGULATOR_PWM=y +CONFIG_REGULATOR_RK8XX=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_RAM_RK3399_LPDDR4=y +CONFIG_BAUDRATE=1500000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_SYSRESET=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_KEYBOARD=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_ASIX88179=y +CONFIG_USB_ETHER_MCS7830=y +CONFIG_USB_ETHER_RTL8152=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_DM_VIDEO=y +CONFIG_DISPLAY=y +CONFIG_VIDEO_ROCKCHIP=y +CONFIG_DISPLAY_ROCKCHIP_HDMI=y +CONFIG_SPL_TINY_MEMSET=y +CONFIG_ERRNO_STR=y -- 2.30.0

3 2

[PULL] u-boot-usb/master
by Marek Vasut 01 Feb '21

01 Feb '21

The following changes since commit 472a716b8fdfd88a27cb675e4ea8e12cb4f79fc3: configs: Resync with savedefconfig (2021-01-29 13:56:04 -0500) are available in the Git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to 723fd5668ff2c8dd19e808778b5670d0fa6bdc4b: usb: gaget: ci: set ep's desc when enable ep (2021-01-31 14:08:56 +0100) ---------------------------------------------------------------- Andy Shevchenko (3): f_rockusb: Use NULL instead of 0 for pointers f_rockusb: Avoid use-after-free in the global pointer variable f_fastboot: Avoid use-after-free in the global pointer variable Eugeniu Rosca (5): cmd: bcb: Extract '__bcb_load' from 'do_bcb_load' for internal needs cmd: bcb: Extract '__bcb_set' from 'do_bcb_set' for internal needs cmd: bcb: Extract '__bcb_store' from 'do_bcb_store' for internal needs cmd: bcb: Expose 'bcb_write_reboot_reason' to external callers cmd: bcb: Add support for processing const string literals in bcb_set() Guillermo Rodriguez (1): dfu: Fix handling of UBI partitions in MTD backend Jaehoon Chung (1): dfu: add 'SKIP' entity Jun Li (2): usb: gadget: set correct usb_configuration for os_desc_config usb: gadget: update os_desc_config when add config Li Jun (13): usb: gadget: don't change ep name for dwc3 while ep autoconfig usb: gadget: OS String support usb: gadget: move utf8_to_utf16le to header file usb: gadget: OS Feature Descriptors support usb: gadget: add WCID support for mfgtool usb: gadget: fastboot: add ext properties for WCID usb: gadget: add super speed support usb: fastboot: add super speed support usb: gadget: dnl: set dnl to be super speed usb: composite: force gadget to be USB2 for HS only function usb: udc: ci: update speed handling usb: gadget: fastboot: use correct max packet size usb: gaget: ci: set ep's desc when enable ep Marek Szyprowski (5): cmd: usb_mass_storage: show device interface name dfu: mmc: use the default MMC device if entity specifies it as -1 dfu: add 'SCRIPT' entity dfu: add support for the dfu_alt_info reintialization from the flashed script thor: add support for the dfu_alt_info reintialization from the flashed script Pali Rohár (1): usb: gadget: Do not export usbd_device_* arrays Peng Fan (1): usb: gadget: add Kconfig for OS descriptors Seung-Woo Kim (1): gadget: f_thor: fix wrong file size cast Ye Li (1): usb: gadget: Add ep_config call back to usb_gadget_ops cmd/bcb.c | 88 ++++++++++++++++++----- cmd/dfu.c | 13 +++- cmd/thordown.c | 19 +++-- cmd/usb_mass_storage.c | 4 +- common/dfu.c | 3 + doc/README.dfu | 30 +++++++- drivers/dfu/dfu.c | 7 +- drivers/dfu/dfu_mmc.c | 39 ++++++++-- drivers/dfu/dfu_mtd.c | 4 +- drivers/usb/gadget/Kconfig | 9 +++ drivers/usb/gadget/ci_udc.c | 5 +- drivers/usb/gadget/composite.c | 392 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- drivers/usb/gadget/core.c | 45 ++---------- drivers/usb/gadget/ep0.c | 46 ++++++++++++ drivers/usb/gadget/epautoconf.c | 6 ++ drivers/usb/gadget/f_fastboot.c | 85 ++++++++++++++++++++-- drivers/usb/gadget/f_rockusb.c | 7 +- drivers/usb/gadget/f_thor.c | 11 +-- drivers/usb/gadget/g_dnl.c | 1 + drivers/usb/gadget/u_os_desc.h | 123 ++++++++++++++++++++++++++++++++ drivers/usb/gadget/usbstring.c | 74 +------------------ include/bcb.h | 21 ++++++ include/dfu.h | 4 ++ include/linux/usb/composite.h | 71 +++++++++++++++++++ include/linux/usb/gadget.h | 9 +++ include/linux/utf.h | 75 ++++++++++++++++++++ include/thor.h | 2 + include/usbdevice.h | 15 ---- 28 files changed, 1001 insertions(+), 207 deletions(-) create mode 100644 drivers/usb/gadget/u_os_desc.h create mode 100644 include/bcb.h create mode 100644 include/linux/utf.h

2 1

[PULL] u-boot-sh/master
by Marek Vasut 01 Feb '21

01 Feb '21

The following changes since commit 472a716b8fdfd88a27cb675e4ea8e12cb4f79fc3: configs: Resync with savedefconfig (2021-01-29 13:56:04 -0500) are available in the Git repository at: git://git.denx.de/u-boot-sh.git master for you to fetch changes up to 8a73bef338d48095dfb8e805b643d7dd1f6b6d9b: mmc: tmio: sdhi: Configure internal DMA bus width (2021-01-31 14:08:45 +0100) ---------------------------------------------------------------- Biju Das (1): arm: dts: rmobile: r8a774a1: Synchronize DTs with Linux 5.10 Marek Vasut (1): mmc: tmio: sdhi: Configure internal DMA bus width arch/arm/dts/hihope-common.dtsi | 377 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/hihope-rev4.dtsi | 124 +++++++++++++++++++++++++++++ arch/arm/dts/hihope-rzg2-ex.dtsi | 92 +++++++++++++++++++++ arch/arm/dts/r8a774a1-hihope-rzg2m-ex.dts | 21 +++++ arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts | 27 +++++++ arch/arm/dts/r8a774a1-hihope-rzg2m.dts | 37 +++++++++ arch/arm/dts/r8a774a1-u-boot.dtsi | 55 +++++++++++++ drivers/mmc/renesas-sdhi.c | 3 + drivers/mmc/tmio-common.c | 3 + drivers/mmc/tmio-common.h | 2 + 10 files changed, 741 insertions(+) create mode 100644 arch/arm/dts/hihope-common.dtsi create mode 100644 arch/arm/dts/hihope-rev4.dtsi create mode 100644 arch/arm/dts/hihope-rzg2-ex.dtsi create mode 100644 arch/arm/dts/r8a774a1-hihope-rzg2m-ex.dts create mode 100644 arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts create mode 100644 arch/arm/dts/r8a774a1-hihope-rzg2m.dts create mode 100644 arch/arm/dts/r8a774a1-u-boot.dtsi

2 1