Merge branch 'master' of git://git.denx.de/u-boot-spi

Conflicts:
	arch/arm/dts/armada-385-amc.dts
	arch/arm/dts/armada-xp-theadorable.dts
	arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/dts/armada-xp-theadorable.dts
index bcb4bfd,b0f6c2b..5b18d62
--- 1/arch/arm/dts/armada-xp-theadorable.dts
--- 2/arch/arm/dts/armada-xp-theadorable.dts
+++ b/arch/arm/dts/armada-xp-theadorable.dts
@@@ -154,41 -188,6 +154,41 @@@
        };
  };
  
-               compatible = "n25q128a13", "jedec,spi-nor", "spi-flash";
 +&spi0 {
 +      status = "okay";
 +      u-boot,dm-pre-reloc;
 +
 +      spi-flash@0 {
 +              u-boot,dm-pre-reloc;
 +              #address-cells = <1>;
 +              #size-cells = <1>;
++              compatible = "n25q128a13", "jedec,spi-nor";
 +              reg = <0>; /* Chip select 0 */
 +              spi-max-frequency = <27777777>;
 +      };
 +
 +      fpga@1 {
 +              #address-cells = <1>;
 +              #size-cells = <1>;
 +              compatible = "spi-generic-device";
 +              reg = <1>; /* Chip select 1 */
 +              spi-max-frequency = <27777777>;
 +      };
 +};
 +
 +&spi1 {
 +      status = "okay";
 +
 +      fpga@0 {
 +              #address-cells = <1>;
 +              #size-cells = <1>;
 +              compatible = "spi-generic-device";
 +              reg = <0>; /* Chip select 0 */
 +              spi-max-frequency = <27777777>;
 +      };
 +};
 +
 +
  &pciec {
        status = "okay";
  

diff --cc arch/arm/dts/da850-evm-u-boot.dtsi
index ab9368b,360e79e..1683f34
--- 1/arch/arm/dts/da850-evm-u-boot.dtsi
--- 2/arch/arm/dts/da850-evm-u-boot.dtsi
+++ b/arch/arm/dts/da850-evm-u-boot.dtsi
@@@ -6,24 -6,6 +6,24 @@@
   * Copyright (C) Adam Ford
   */
  
 +/ {
 +      soc@1c00000 {
 +              u-boot,dm-spl;
 +      };
 +};
 +
  &flash {
-       compatible = "m25p64", "spi-flash";
+       compatible = "m25p64", "jedec,spi-nor";
  };
 +
 +&mmc0 {
 +      u-boot,dm-spl;
 +};
 +
 +&serial2 {
 +      u-boot,dm-spl;
 +};
 +
 +&spi1 {
 +      u-boot,dm-spl;
 +};

diff --cc arch/arm/dts/keystone-k2g-evm.dts
Simple merge

diff --cc arch/arm/dts/keystone-k2g-ice.dts
Simple merge

diff --cc arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
index 6a18d03,409f983..8b92b1f
--- 1/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
--- 2/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
@@@ -16,14 -14,22 +16,14 @@@
  };
  
  &flash0 {
-       compatible = "spi-flash";
+       compatible = "jedec,spi-nor";
 +      u-boot,dm-spl;
  };
  
  &flash1 {
-       compatible = "spi-flash";
+       compatible = "jedec,spi-nor";
  };
  
 -&v3v3 {
 -      regulator-always-on;
 -};
 -
 -&usbotg_hs {
 -      g-tx-fifo-size = <576>;
 -};
 -
 -/* SPL part **************************************/
  &qspi {
        u-boot,dm-spl;
  };

diff --cc arch/mips/dts/ap143.dts
Simple merge

diff --cc arch/mips/dts/gardena-smart-gateway-mt7688.dts
Simple merge

diff --cc arch/mips/dts/jr2_pcb110.dts
Simple merge

diff --cc arch/mips/dts/jr2_pcb111.dts
Simple merge

diff --cc arch/mips/dts/serval2_pcb112.dts
Simple merge

diff --cc arch/mips/dts/servalt_pcb116.dts
Simple merge

diff --cc arch/sandbox/dts/test.dts
Simple merge

diff --cc board/sunxi/MAINTAINERS
Simple merge

diff --cc configs/da850evm_defconfig
index 4083dcb,41dae05..4b09ba1
--- 1/configs/da850evm_defconfig
--- 2/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@@@ -42,15 -39,10 +42,11 @@@ CONFIG_CMD_DIAG=
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="da850-evm"
 -CONFIG_SPL_OF_PLATDATA=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
- CONFIG_USE_ENV_SPI_MAX_HZ=y
- CONFIG_ENV_SPI_MAX_HZ=0
- CONFIG_USE_ENV_SPI_MODE=y
- CONFIG_ENV_SPI_MODE=0
  CONFIG_DM=y
  CONFIG_SPL_DM=y
 +CONFIG_SPL_DM_SEQ_ALIAS=y
 +CONFIG_SPL_OF_TRANSLATE=y
  CONFIG_DM_GPIO=y
  CONFIG_DA8XX_GPIO=y
  CONFIG_DM_I2C=y

diff --cc configs/mscc_jr2_defconfig
Simple merge

diff --cc configs/mscc_servalt_defconfig
Simple merge

diff --cc doc/git-mailrc
index ec6d8bf,9cf1807..f989792
--- 1/doc/git-mailrc
--- 2/doc/git-mailrc
+++ b/doc/git-mailrc
@@@ -24,8 -24,9 +24,8 @@@ alias dinh           Dinh Nguyen <dingu
  alias hs             Heiko Schocher <hs@denx.de>
  alias iwamatsu       Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
  alias jaehoon        Jaehoon Chung <jh80.chung@samsung.com>
- alias jagan          Jagan Teki <jagan@openedev.com>
+ alias jagan          Jagan Teki <jagan@amarulasolutions.com>
  alias jhersh         Joe Hershberger <joe.hershberger@ni.com>
 -alias luka           Luka Perkov <luka.perkov@sartura.hr>
  alias lukma          Lukasz Majewski <lukma@denx.de>
  alias macpaul        Macpaul Lin <macpaul@andestech.com>
  alias marex          Marek Vasut <marex@denx.de>

diff --cc lib/fdtdec.c
Simple merge