From: Tom Rini Date: Sun, 14 Apr 2019 04:03:06 +0000 (-0400) Subject: Merge branch 'master' of git://git.denx.de/u-boot-spi X-Git-Tag: v2025.01-rc5-pxa1908~3035 X-Git-Url: http://git.dujemihanovic.xyz/img/%7B%7B%20.RelPermalink%20%7D%7D?a=commitdiff_plain;h=216800acf1fbf9f498455bf3c92d4513d9a4c681;p=u-boot.git 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 --- 216800acf1fbf9f498455bf3c92d4513d9a4c681 diff --cc arch/arm/dts/armada-xp-theadorable.dts index bcb4bfdd5c,b0f6c2bafe..5b18d62c3c --- a/arch/arm/dts/armada-xp-theadorable.dts +++ b/arch/arm/dts/armada-xp-theadorable.dts @@@ -154,41 -188,6 +154,41 @@@ }; }; +&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", "spi-flash"; ++ 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 ab9368b9d3,360e79e68d..1683f3472e --- a/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/stm32mp157c-ev1-u-boot.dtsi index 6a18d032ae,409f983fb2..8b92b1fa2e --- a/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 configs/da850evm_defconfig index 4083dcbae6,41dae05fb9..4b09ba10a6 --- a/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 doc/git-mailrc index ec6d8bf8f4,9cf180779c..f989792e8d --- a/doc/git-mailrc +++ b/doc/git-mailrc @@@ -24,8 -24,9 +24,8 @@@ alias dinh Dinh Nguyen alias iwamatsu Nobuhiro Iwamatsu alias jaehoon Jaehoon Chung - alias jagan Jagan Teki + alias jagan Jagan Teki alias jhersh Joe Hershberger -alias luka Luka Perkov alias lukma Lukasz Majewski alias macpaul Macpaul Lin alias marex Marek Vasut