Merge tag 'mmc-2020-6-24' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc

- Fix fsl_esdhc_imx tunning mask
- Disable CMD CRC for normal tuning for fsl_esdhc_imx
- Retry CM1 until emmc ready
- Fix sdhci HISPD handling
- Cache-aligned extcsd reading

diff --git a/cmd/booti.c b/cmd/booti.c
index ae379754943b936821c20612fc1f1c3279abb7ad..af0603b96e54c70b8fb9bc7335e40df956bf5630 100644 (file)
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -141,7 +141,7 @@ static char booti_help_text[] =
        "\tspecifying the size of a RAW initrd.\n"
        "\tCurrently only booting from gz, bz2, lzma and lz4 compression\n"
        "\ttypes are supported. In order to boot from any of these compressed\n"
-       "\timages, user have to set kernel_comp_addr_r and kernel_comp_size enviornment\n"
+       "\timages, user have to set kernel_comp_addr_r and kernel_comp_size environment\n"
        "\tvariables beforehand.\n"
 #if defined(CONFIG_OF_LIBFDT)
        "\tSince booting a Linux kernel requires a flat device-tree, a\n"

diff --git a/doc/board/sifive/fu540.rst b/doc/board/sifive/fu540.rst
index f7c2c9f5bdc06c90f6611a0d292138c25a738a49..739eefa66974db4eda5479ab6f4c43e39e219b3a 100644 (file)
--- a/doc/board/sifive/fu540.rst
+++ b/doc/board/sifive/fu540.rst
@@ -27,7 +27,7 @@ Building
 --------
 
 1. Add the RISC-V toolchain to your PATH.
-2. Setup ARCH & cross compilation enviornment variable:
+2. Setup ARCH & cross compilation environment variable:
 
 .. code-block:: none
 
@@ -217,7 +217,7 @@ Or if you want to use a compressed kernel image file such as Image.gz
    =>setenv kernel_comp_addr_r 0x90000000
    =>setenv kernel_comp_size 0x500000
 
-By this time, correct kernel image is loaded and required enviornment variables
+By this time, correct kernel image is loaded and required environment variables
 are set. You can proceed to load the ramdisk and device tree from the tftp server
 as well.
 

diff --git a/doc/device-tree-bindings/net/phy/atheros.txt b/doc/device-tree-bindings/net/phy/atheros.txt
index 97e97b8c13d4c47040f9f3600b8c980341fd9ee0..a72c6b050d3c567f36722bc253aff04b85b6f176 100644 (file)
--- a/doc/device-tree-bindings/net/phy/atheros.txt
+++ b/doc/device-tree-bindings/net/phy/atheros.txt
@@ -23,7 +23,7 @@ Example:
 
        ethernet-phy@0 {
                reg = <0>;
-               qca-clk-out-frequency = <125000000>;
+               qca,clk-out-frequency = <125000000>;
                qca,keep-pll-enabled;
 
                vddio-supply = <&vddio>;

diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index 0357aba7f1162cd98ade940ce8acbac197cd65a9..fc64d93ab83b7fabe9b9fcad42d7057664ceb2c6 100644 (file)
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -466,6 +466,9 @@ int nvme_identify(struct nvme_dev *dev, unsigned nsid,
 
        c.identify.cns = cpu_to_le32(cns);
 
+       invalidate_dcache_range(dma_addr,
+                               dma_addr + sizeof(struct nvme_id_ctrl));
+
        ret = nvme_submit_admin_cmd(dev, &c, NULL);
        if (!ret)
                invalidate_dcache_range(dma_addr,

diff --git a/include/linux/psci.h b/include/linux/psci.h
index 9433df836b6483fcdaa0a9791ad00cc1d6983f6a..841dbc8da7e266c6d0014334160ffdf00d30033a 100644 (file)
--- a/include/linux/psci.h
+++ b/include/linux/psci.h
@@ -91,8 +91,8 @@
 unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1,
                             unsigned long a2, unsigned long a3);
 #else
-unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1,
-                            unsigned long a2, unsigned long a3)
+static inline unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1,
+                                          unsigned long a2, unsigned long a3)
 {
        return PSCI_RET_DISABLED;
 }

diff --git a/include/zfs_common.h b/include/zfs_common.h
index 027ba91b28740285a8a38962545f4568fec16859..cb83e59e8362652910625eef3af499384ff1a379 100644 (file)
--- a/include/zfs_common.h
+++ b/include/zfs_common.h
@@ -22,6 +22,8 @@
 #ifndef __ZFS_COMMON__
 #define __ZFS_COMMON__
 
+#include <part.h>
+
 #define SECTOR_SIZE                    0x200
 #define SECTOR_BITS                    9