Commit 216800acf1fbf9f498455bf3c92d4513d9a4c681
Exists in
smarc_8mq_lf_v2020.04
and in
9 other branches
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>
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 157 changed files Side-by-side Diff
- MAINTAINERS
- arch/arc/dts/axs10x_mb.dtsi
- arch/arc/dts/hsdk.dts
- arch/arm/dts/am335x-brppt1-spi.dts
- arch/arm/dts/am437x-idk-evm.dts
- arch/arm/dts/am437x-sk-evm.dts
- arch/arm/dts/armada-3720-db.dts
- arch/arm/dts/armada-3720-espressobin.dts
- arch/arm/dts/armada-3720-turris-mox.dts
- arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
- arch/arm/dts/armada-38x-controlcenterdc.dts
- arch/arm/dts/armada-38x-solidrun-microsom.dtsi
- arch/arm/dts/armada-8040-clearfog-gt-8k.dts
- arch/arm/dts/armada-xp-theadorable.dts
- arch/arm/dts/at91-sama5d2_xplained.dts
- arch/arm/dts/at91-sama5d4_xplained.dts
- arch/arm/dts/at91-sama5d4ek.dts
- arch/arm/dts/at91sam9n12ek.dts
- arch/arm/dts/at91sam9x5ek.dtsi
- arch/arm/dts/bk4r1.dts
- arch/arm/dts/da850-evm-u-boot.dtsi
- arch/arm/dts/exynos5250-snow.dts
- arch/arm/dts/exynos5250-spring.dts
- arch/arm/dts/exynos5420-peach-pit.dts
- arch/arm/dts/fsl-ls1012a-2g5rdb.dts
- arch/arm/dts/fsl-ls1012a-frdm.dtsi
- arch/arm/dts/fsl-ls1012a-frwy.dts
- arch/arm/dts/fsl-ls1012a-qds.dtsi
- arch/arm/dts/fsl-ls1012a-rdb.dtsi
- arch/arm/dts/fsl-ls1043a-qds.dtsi
- arch/arm/dts/fsl-ls1043a-rdb.dts
- arch/arm/dts/fsl-ls1046a-qds.dtsi
- arch/arm/dts/fsl-ls1046a-rdb.dts
- arch/arm/dts/fsl-ls1088a-qds.dts
- arch/arm/dts/fsl-ls1088a-rdb.dts
- arch/arm/dts/fsl-ls2080a-qds.dts
- arch/arm/dts/fsl-ls2080a-rdb.dts
- arch/arm/dts/fsl-ls2081a-rdb.dts
- arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
- arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi
- arch/arm/dts/imx6sx-sdb-u-boot.dtsi
- arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
- arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi
- arch/arm/dts/imx6ull-14x14-evk.dts
- arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi
- arch/arm/dts/keystone-k2e-evm.dts
- arch/arm/dts/keystone-k2g-evm.dts
- arch/arm/dts/keystone-k2g-ice.dts
- arch/arm/dts/keystone-k2hk-evm.dts
- arch/arm/dts/keystone-k2l-evm.dts
- arch/arm/dts/kirkwood-atl-sbx81lifkw.dts
- arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts
- arch/arm/dts/kirkwood-dreamplug.dts
- arch/arm/dts/kirkwood-lsxl.dtsi
- arch/arm/dts/kirkwood-netxbig.dtsi
- arch/arm/dts/kirkwood-ns2-common.dtsi
- arch/arm/dts/kirkwood-synology.dtsi
- arch/arm/dts/ls1021a-iot.dtsi
- arch/arm/dts/ls1021a-qds.dtsi
- arch/arm/dts/ls1021a-twr.dtsi
- arch/arm/dts/mt7629-rfb.dts
- arch/arm/dts/omap5-u-boot.dtsi
- arch/arm/dts/r8a77970-eagle-u-boot.dts
- arch/arm/dts/rk3288-veyron.dtsi
- arch/arm/dts/rk3368-lion.dts
- arch/arm/dts/rk3399-gru.dtsi
- arch/arm/dts/rk3399-puma.dtsi
- arch/arm/dts/rv1108-evb.dts
- arch/arm/dts/sama5d27_som1.dtsi
- arch/arm/dts/sama5d3xmb.dtsi
- arch/arm/dts/sama5d3xmb_cmp.dtsi
- arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi
- arch/arm/dts/socfpga_cyclone5_is1.dts
- arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi
- arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi
- arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi
- arch/arm/dts/socfpga_cyclone5_sr1500.dts
- arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi
- arch/arm/dts/stm32f746-disco.dts
- arch/arm/dts/stm32f769-disco.dts
- arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
- arch/arm/dts/stv0991.dts
- arch/arm/dts/zynq-zed.dts
- arch/arm/dts/zynqmp-zc1232-revA.dts
- arch/arm/dts/zynqmp-zc1254-revA.dts
- arch/arm/dts/zynqmp-zc1275-revA.dts
- arch/arm/dts/zynqmp-zc1275-revB.dts
- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts
- arch/arm/dts/zynqmp-zcu102-revA.dts
- arch/arm/dts/zynqmp-zcu104-revA.dts
- arch/arm/dts/zynqmp-zcu104-revC.dts
- arch/arm/dts/zynqmp-zcu106-revA.dts
- arch/arm/dts/zynqmp-zcu111-revA.dts
- arch/mips/dts/ap121.dts
- arch/mips/dts/ap143.dts
- arch/mips/dts/comtrend,ar-5315u.dts
- arch/mips/dts/comtrend,ar-5387un.dts
- arch/mips/dts/gardena-smart-gateway-mt7688.dts
- arch/mips/dts/jr2_pcb110.dts
- arch/mips/dts/jr2_pcb111.dts
- arch/mips/dts/linkit-smart-7688.dts
- arch/mips/dts/luton_pcb090.dts
- arch/mips/dts/luton_pcb091.dts
- arch/mips/dts/mscc,ocelot_pcb.dtsi
- arch/mips/dts/netgear,cg3100d.dts
- arch/mips/dts/sagem,f@st1704.dts
- arch/mips/dts/serval2_pcb112.dts
- arch/mips/dts/serval_pcb105.dts
- arch/mips/dts/serval_pcb106.dts
- arch/mips/dts/servalt_pcb116.dts
- arch/mips/dts/tplink_wdr4300.dts
- arch/nds32/dts/ae3xx.dts
- arch/riscv/dts/ae350_32.dts
- arch/riscv/dts/ae350_64.dts
- arch/sandbox/dts/test.dts
- arch/x86/dts/bayleybay.dts
- arch/x86/dts/baytrail_som-db5800-som-6867.dts
- arch/x86/dts/cherryhill.dts
- arch/x86/dts/chromebook_link.dts
- arch/x86/dts/chromebook_samus.dts
- arch/x86/dts/chromebox_panther.dts
- arch/x86/dts/conga-qeval20-qa3-e3845.dts
- arch/x86/dts/cougarcanyon2.dts
- arch/x86/dts/crownbay.dts
- arch/x86/dts/dfi-bt700.dtsi
- arch/x86/dts/galileo.dts
- arch/x86/dts/minnowmax.dts
- board/sunxi/MAINTAINERS
- cmd/sf.c
- common/spl/spl_spi.c
- configs/da850_am18xxevm_defconfig
- configs/da850evm_defconfig
- configs/mscc_jr2_defconfig
- configs/mscc_luton_defconfig
- configs/mscc_ocelot_defconfig
- configs/mscc_serval_defconfig
- configs/mscc_servalt_defconfig
- doc/device-tree-bindings/pinctrl/atmel,at91-pio4-pinctrl.txt
- doc/device-tree-bindings/spi/spi-atcspi200.txt
- doc/device-tree-bindings/spi/spi-stm32-qspi.txt
- doc/git-mailrc
- drivers/mtd/mtdcore.c
- drivers/mtd/nand/spi/gigadevice.c
- drivers/mtd/spi/Kconfig
- drivers/mtd/spi/sf_probe.c
- drivers/mtd/spi/spi-nor-core.c
- drivers/mtd/spi/spi-nor-ids.c
- drivers/spi/cadence_qspi.c
- drivers/spi/cadence_qspi.h
- drivers/spi/cadence_qspi_apb.c
- drivers/spi/fsl_dspi.c
- drivers/spi/spi-mem.c
- drivers/spi/spi-uclass.c
- include/linux/mtd/mtd.h
- include/spi.h
- lib/fdtdec.c