smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Tom Rini
2019-04-14 00:03:06 -04:00
parent cf5eebeb18 59aea29a31
commit 216800acf1
157 changed files with 282 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/device-tree-bindings/pinctrl/atmel,at91-pio4-pinctrl.txt
View File

@@ -42,7 +42,7 @@ Example:
status = "okay";
spi_flash@0 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <50000000>;
};

2
doc/device-tree-bindings/spi/spi-atcspi200.txt
View File

@@ -28,7 +28,7 @@ Example:
clocks = <&spiclk>;
interrupts = <3 4>;
flash@0 {
compatible = "spi-flash";
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <0>;
spi-cpol;

2
doc/device-tree-bindings/spi/spi-stm32-qspi.txt
View File

@@ -29,7 +29,7 @@ Example:
qflash0: n25q128a {
#address-cells = <1>;
#size-cells = <1>;
compatible = "micron,n25q128a13", "spi-flash";
compatible = "micron,n25q128a13", "jedec,spi-nor";
spi-max-frequency = <108000000>;
spi-tx-bus-width = <4>;
spi-rx-bus-width = <4>;