projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-spi
[platform/kernel/u-boot.git]
/
arch
/
arm
/
dts
/
keystone-k2g.dtsi
diff --git
a/arch/arm/dts/keystone-k2g.dtsi
b/arch/arm/dts/keystone-k2g.dtsi
index
191e3f1
..
bbbb987
100644
(file)
--- a/
arch/arm/dts/keystone-k2g.dtsi
+++ b/
arch/arm/dts/keystone-k2g.dtsi
@@
-9,7
+9,6
@@
*/
#include <dt-bindings/interrupt-controller/arm-gic.h>
*/
#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include "skeleton.dtsi"
/ {
model = "Texas Instruments K2G SoC";
/ {
model = "Texas Instruments K2G SoC";
@@
-17,6
+16,8
@@
#size-cells = <1>;
interrupt-parent = <&gic>;
#size-cells = <1>;
interrupt-parent = <&gic>;
+ chosen { };
+
aliases {
serial0 = &uart0;
spi0 = &spi0;
aliases {
serial0 = &uart0;
spi0 = &spi0;
@@
-29,11
+30,6
@@
i2c2 = &i2c2;
};
i2c2 = &i2c2;
};
- memory {
- device_type = "memory";
- reg = <0x80000000 0x80000000>;
- };
-
cpus {
#address-cells = <1>;
#size-cells = <0>;
cpus {
#address-cells = <1>;
#size-cells = <0>;
@@
-89,15
+85,16
@@
};
qspi: qspi@2940000 {
};
qspi: qspi@2940000 {
- compatible = "c
adence,qspi
";
+ compatible = "c
dns,qspi-nor
";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x02940000 0x1000>,
<0x24000000 0x4000000>;
interrupts = <GIC_SPI 198 IRQ_TYPE_EDGE_RISING>;
num-cs = <4>;
#address-cells = <1>;
#size-cells = <0>;
reg = <0x02940000 0x1000>,
<0x24000000 0x4000000>;
interrupts = <GIC_SPI 198 IRQ_TYPE_EDGE_RISING>;
num-cs = <4>;
- fifo-depth = <256>;
- sram-size = <256>;
+ cdns,fifo-depth = <256>;
+ cdns,fifo-width = <4>;
+ cdns,trigger-address = <0x24000000>;
status = "disabled";
};
status = "disabled";
};