Skip to content

L
linux
Commit 4831ddfd authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'keystone-dts' of... 

Merge tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt

Merge "ARM: Keystone DTS updates for 3.16" from Santosh Shilimkar:

Keystone DTS updates for 3.16

- Few of address cell warning fixes.
- Add Lamarr and Edision EVM NOR flash and NAND devices.
- Update dts to make use of dma-ranges and dma-coherent properties.

* tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone-evm: add spi nor flash support
  ARM: dts: k2l-evm: add AEMIF/NAND device entry
  ARM: dts: k2e-evm: add AEMIF/NAND device entry
  ARM: dts: keystone: Update USB node for dma properties
  ARM: dts: keystone: Use dma-ranges property
  ARM: dts: keystone: add cell's information to spi nodes
  ARM: dts: keystone: move i2c0 device node from SoC to board files
  ARM: dts: keystone: add cell's information to i2c nodes
  ARM: dts: keystone: drop address and size cells from GIC node
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 80c2e887 18131ae6
Hide whitespace changes
Inline Side-by-side
Showing with 204 additions and 7 deletions
arch/arm/boot/dts/k2e-evm.dts
View file @ 4831ddfd
...@@ -58,3 +58,84 @@ &usb1_phy { ...@@ -58,3 +58,84 @@ &usb1_phy {
&usb1 { &usb1 {
status = "okay"; status = "okay";
}; };
&i2c0 {
dtt@50 {
compatible = "at,24c1024";
reg = <0x50>;
};
};
&aemif {
cs0 {
#address-cells = <2>;
#size-cells = <1>;
clock-ranges;
ranges;
ti,cs-chipselect = <0>;
/* all timings in nanoseconds */
ti,cs-min-turnaround-ns = <12>;
ti,cs-read-hold-ns = <6>;
ti,cs-read-strobe-ns = <23>;
ti,cs-read-setup-ns = <9>;
ti,cs-write-hold-ns = <8>;
ti,cs-write-strobe-ns = <23>;
ti,cs-write-setup-ns = <8>;
nand@0,0 {
compatible = "ti,keystone-nand","ti,davinci-nand";
#address-cells = <1>;
#size-cells = <1>;
reg = <0 0 0x4000000
1 0 0x0000100>;
ti,davinci-chipselect = <0>;
ti,davinci-mask-ale = <0x2000>;
ti,davinci-mask-cle = <0x4000>;
ti,davinci-mask-chipsel = <0>;
nand-ecc-mode = "hw";
ti,davinci-ecc-bits = <4>;
nand-on-flash-bbt;
partition@0 {
label = "u-boot";
reg = <0x0 0x100000>;
read-only;
};
partition@100000 {
label = "params";
reg = <0x100000 0x80000>;
read-only;
};
partition@180000 {
label = "ubifs";
reg = <0x180000 0x1FE80000>;
};
};
};
};
&spi0 {
nor_flash: n25q128a11@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "Micron,n25q128a11";
spi-max-frequency = <54000000>;
m25p,fast-read;
reg = <0>;
partition@0 {
label = "u-boot-spl";
reg = <0x0 0x80000>;
read-only;
};
partition@1 {
label = "misc";
reg = <0x80000 0xf80000>;
};
};
};
arch/arm/boot/dts/k2hk-evm.dts
View file @ 4831ddfd
...@@ -138,3 +138,32 @@ partition@180000 { ...@@ -138,3 +138,32 @@ partition@180000 {
}; };
}; };
}; };
&i2c0 {
dtt@50 {
compatible = "at,24c1024";
reg = <0x50>;
};
};
&spi0 {
nor_flash: n25q128a11@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "Micron,n25q128a11";
spi-max-frequency = <54000000>;
m25p,fast-read;
reg = <0>;
partition@0 {
label = "u-boot-spl";
reg = <0x0 0x80000>;
read-only;
};
partition@1 {
label = "misc";
reg = <0x80000 0xf80000>;
};
};
};
arch/arm/boot/dts/k2l-evm.dts
View file @ 4831ddfd
...@@ -35,3 +35,84 @@ &usb_phy { ...@@ -35,3 +35,84 @@ &usb_phy {
&usb { &usb {
status = "okay"; status = "okay";
}; };
&i2c0 {
dtt@50 {
compatible = "at,24c1024";
reg = <0x50>;
};
};
&aemif {
cs0 {
#address-cells = <2>;
#size-cells = <1>;
clock-ranges;
ranges;
ti,cs-chipselect = <0>;
/* all timings in nanoseconds */
ti,cs-min-turnaround-ns = <12>;
ti,cs-read-hold-ns = <6>;
ti,cs-read-strobe-ns = <23>;
ti,cs-read-setup-ns = <9>;
ti,cs-write-hold-ns = <8>;
ti,cs-write-strobe-ns = <23>;
ti,cs-write-setup-ns = <8>;
nand@0,0 {
compatible = "ti,keystone-nand","ti,davinci-nand";
#address-cells = <1>;
#size-cells = <1>;
reg = <0 0 0x4000000
1 0 0x0000100>;
ti,davinci-chipselect = <0>;
ti,davinci-mask-ale = <0x2000>;
ti,davinci-mask-cle = <0x4000>;
ti,davinci-mask-chipsel = <0>;
nand-ecc-mode = "hw";
ti,davinci-ecc-bits = <4>;
nand-on-flash-bbt;
partition@0 {
label = "u-boot";
reg = <0x0 0x100000>;
read-only;
};
partition@100000 {
label = "params";
reg = <0x100000 0x80000>;
read-only;
};
partition@180000 {
label = "ubifs";
reg = <0x180000 0x7FE80000>;
};
};
};
};
&spi0 {
nor_flash: n25q128a11@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "Micron,n25q128a11";
spi-max-frequency = <54000000>;
m25p,fast-read;
reg = <0>;
partition@0 {
label = "u-boot-spl";
reg = <0x0 0x80000>;
read-only;
};
partition@1 {
label = "misc";
reg = <0x80000 0xf80000>;
};
};
};
arch/arm/boot/dts/keystone.dtsi
View file @ 4831ddfd
...@@ -28,8 +28,6 @@ memory { ...@@ -28,8 +28,6 @@ memory {
gic: interrupt-controller { gic: interrupt-controller {
compatible = "arm,cortex-a15-gic"; compatible = "arm,cortex-a15-gic";
#interrupt-cells = <3>; #interrupt-cells = <3>;
#size-cells = <0>;
#address-cells = <1>;
interrupt-controller; interrupt-controller;
reg = <0x0 0x02561000 0x0 0x1000>, reg = <0x0 0x02561000 0x0 0x1000>,
<0x0 0x02562000 0x0 0x2000>, <0x0 0x02562000 0x0 0x2000>,
...@@ -66,6 +64,7 @@ soc { ...@@ -66,6 +64,7 @@ soc {
compatible = "ti,keystone","simple-bus"; compatible = "ti,keystone","simple-bus";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
ranges = <0x0 0x0 0x0 0xc0000000>; ranges = <0x0 0x0 0x0 0xc0000000>;
dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;
rstctrl: reset-controller { rstctrl: reset-controller {
compatible = "ti,keystone-reset"; compatible = "ti,keystone-reset";
...@@ -102,11 +101,6 @@ i2c0: i2c@2530000 { ...@@ -102,11 +101,6 @@ i2c0: i2c@2530000 {
interrupts = <GIC_SPI 283 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 283 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
dtt@50 {
compatible = "at,24c1024";
reg = <0x50>;
};
}; };
i2c1: i2c@2530400 { i2c1: i2c@2530400 {
...@@ -115,6 +109,8 @@ i2c1: i2c@2530400 { ...@@ -115,6 +109,8 @@ i2c1: i2c@2530400 {
clock-frequency = <100000>; clock-frequency = <100000>;
clocks = <&clki2c>; clocks = <&clki2c>;
interrupts = <GIC_SPI 286 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 286 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
}; };
i2c2: i2c@2530800 { i2c2: i2c@2530800 {
...@@ -123,6 +119,8 @@ i2c2: i2c@2530800 { ...@@ -123,6 +119,8 @@ i2c2: i2c@2530800 {
clock-frequency = <100000>; clock-frequency = <100000>;
clocks = <&clki2c>; clocks = <&clki2c>;
interrupts = <GIC_SPI 289 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 289 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
}; };
spi0: spi@21000400 { spi0: spi@21000400 {
...@@ -132,6 +130,8 @@ spi0: spi@21000400 { ...@@ -132,6 +130,8 @@ spi0: spi@21000400 {
ti,davinci-spi-intr-line = <0>; ti,davinci-spi-intr-line = <0>;
interrupts = <GIC_SPI 292 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 292 IRQ_TYPE_EDGE_RISING>;
clocks = <&clkspi>; clocks = <&clkspi>;
#address-cells = <1>;
#size-cells = <0>;
}; };
spi1: spi@21000600 { spi1: spi@21000600 {
...@@ -141,6 +141,8 @@ spi1: spi@21000600 { ...@@ -141,6 +141,8 @@ spi1: spi@21000600 {
ti,davinci-spi-intr-line = <0>; ti,davinci-spi-intr-line = <0>;
interrupts = <GIC_SPI 296 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 296 IRQ_TYPE_EDGE_RISING>;
clocks = <&clkspi>; clocks = <&clkspi>;
#address-cells = <1>;
#size-cells = <0>;
}; };
spi2: spi@21000800 { spi2: spi@21000800 {
...@@ -150,6 +152,8 @@ spi2: spi@21000800 { ...@@ -150,6 +152,8 @@ spi2: spi@21000800 {
ti,davinci-spi-intr-line = <0>; ti,davinci-spi-intr-line = <0>;
interrupts = <GIC_SPI 300 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 300 IRQ_TYPE_EDGE_RISING>;
clocks = <&clkspi>; clocks = <&clkspi>;
#address-cells = <1>;
#size-cells = <0>;
}; };
usb_phy: usb_phy@2620738 { usb_phy: usb_phy@2620738 {
...@@ -169,6 +173,8 @@ usb: usb@2680000 { ...@@ -169,6 +173,8 @@ usb: usb@2680000 {
clock-names = "usb"; clock-names = "usb";
interrupts = <GIC_SPI 393 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 393 IRQ_TYPE_EDGE_RISING>;
ranges; ranges;
dma-coherent;
dma-ranges;
status = "disabled"; status = "disabled";
dwc3@2690000 { dwc3@2690000 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7