Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
arch
/
arm
/
boot
/
dts
/
keystone.dtsi
diff --git
a/kernel/arch/arm/boot/dts/keystone.dtsi
b/kernel/arch/arm/boot/dts/keystone.dtsi
index
c06542b
..
3f27282
100644
(file)
--- a/
kernel/arch/arm/boot/dts/keystone.dtsi
+++ b/
kernel/arch/arm/boot/dts/keystone.dtsi
@@
-12,6
+12,7
@@
#include "skeleton.dtsi"
/ {
#include "skeleton.dtsi"
/ {
+ compatible = "ti,keystone";
model = "Texas Instruments Keystone 2 SoC";
#address-cells = <2>;
#size-cells = <2>;
model = "Texas Instruments Keystone 2 SoC";
#address-cells = <2>;
#size-cells = <2>;
@@
-136,7
+137,7
@@
};
spi0: spi@21000400 {
};
spi0: spi@21000400 {
- compatible = "ti,dm6441-spi";
+ compatible = "ti,
keystone-spi", "ti,
dm6441-spi";
reg = <0x21000400 0x200>;
num-cs = <4>;
ti,davinci-spi-intr-line = <0>;
reg = <0x21000400 0x200>;
num-cs = <4>;
ti,davinci-spi-intr-line = <0>;
@@
-147,7
+148,7
@@
};
spi1: spi@21000600 {
};
spi1: spi@21000600 {
- compatible = "ti,dm6441-spi";
+ compatible = "ti,
keystone-spi", "ti,
dm6441-spi";
reg = <0x21000600 0x200>;
num-cs = <4>;
ti,davinci-spi-intr-line = <0>;
reg = <0x21000600 0x200>;
num-cs = <4>;
ti,davinci-spi-intr-line = <0>;
@@
-158,7
+159,7
@@
};
spi2: spi@21000800 {
};
spi2: spi@21000800 {
- compatible = "ti,dm6441-spi";
+ compatible = "ti,
keystone-spi", "ti,
dm6441-spi";
reg = <0x21000800 0x200>;
num-cs = <4>;
ti,davinci-spi-intr-line = <0>;
reg = <0x21000800 0x200>;
num-cs = <4>;
ti,davinci-spi-intr-line = <0>;
@@
-267,17
+268,6
@@
1 0 0x21000A00 0x00000100>;
};
1 0 0x21000A00 0x00000100>;
};
- mdio: mdio@02090300 {
- compatible = "ti,keystone_mdio", "ti,davinci_mdio";
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0x02090300 0x100>;
- status = "disabled";
- clocks = <&clkpa>;
- clock-names = "fck";
- bus_freq = <2500000>;
- };
-
kirq0: keystone_irq@26202a0 {
compatible = "ti,keystone-irq";
interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
kirq0: keystone_irq@26202a0 {
compatible = "ti,keystone-irq";
interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
@@
-286,7
+276,7
@@
ti,syscon-dev = <&devctrl 0x2a0>;
};
ti,syscon-dev = <&devctrl 0x2a0>;
};
- pcie@21800000 {
+ pcie
0: pcie
@21800000 {
compatible = "ti,keystone-pcie", "snps,dw-pcie";
clocks = <&clkpcie>;
clock-names = "pcie";
compatible = "ti,keystone-pcie", "snps,dw-pcie";
clocks = <&clkpcie>;
clock-names = "pcie";
@@
-296,6
+286,7
@@
ranges = <0x81000000 0 0 0x23250000 0 0x4000
0x82000000 0 0x50000000 0x50000000 0 0x10000000>;
ranges = <0x81000000 0 0 0x23250000 0 0x4000
0x82000000 0 0x50000000 0x50000000 0 0x10000000>;
+ status = "disabled";
device_type = "pci";
num-lanes = <2>;
device_type = "pci";
num-lanes = <2>;