Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/boot/dts/k2e-evm.dts

+81 −0
Original line number Diff line number Diff line
@@ -58,3 +58,84 @@ 
&usb1 {

	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

+29 −0
Original line number Diff line number Diff line
@@ -138,3 +138,32 @@ 
		};

	};

};



&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

+81 −0
Original line number Diff line number Diff line
@@ -35,3 +35,84 @@ 
&usb {

	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

+13 −7
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
	gic: interrupt-controller {

		compatible = "arm,cortex-a15-gic";

		#interrupt-cells = <3>;

		#size-cells = <0>;

		#address-cells = <1>;

		interrupt-controller;

		reg = <0x0 0x02561000 0x0 0x1000>,

		      <0x0 0x02562000 0x0 0x2000>,
@@ -66,6 +64,7 @@ 
		compatible = "ti,keystone","simple-bus";

		interrupt-parent = <&gic>;

		ranges = <0x0 0x0 0x0 0xc0000000>;

		dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;



		rstctrl: reset-controller {

			compatible = "ti,keystone-reset";
@@ -102,11 +101,6 @@ 
			interrupts = <GIC_SPI 283 IRQ_TYPE_EDGE_RISING>;

			#address-cells = <1>;

			#size-cells = <0>;



			dtt@50 {

				compatible = "at,24c1024";

				reg = <0x50>;

			};

		};



		i2c1: i2c@2530400 {
@@ -115,6 +109,8 @@ 
			clock-frequency = <100000>;

			clocks = <&clki2c>;

			interrupts = <GIC_SPI 286 IRQ_TYPE_EDGE_RISING>;

			#address-cells = <1>;

			#size-cells = <0>;

		};



		i2c2: i2c@2530800 {
@@ -123,6 +119,8 @@ 
			clock-frequency = <100000>;

			clocks = <&clki2c>;

			interrupts = <GIC_SPI 289 IRQ_TYPE_EDGE_RISING>;

			#address-cells = <1>;

			#size-cells = <0>;

		};



		spi0: spi@21000400 {
@@ -132,6 +130,8 @@ 
			ti,davinci-spi-intr-line = <0>;

			interrupts = <GIC_SPI 292 IRQ_TYPE_EDGE_RISING>;

			clocks = <&clkspi>;

			#address-cells = <1>;

			#size-cells = <0>;

		};



		spi1: spi@21000600 {
@@ -141,6 +141,8 @@ 
			ti,davinci-spi-intr-line = <0>;

			interrupts = <GIC_SPI 296 IRQ_TYPE_EDGE_RISING>;

			clocks = <&clkspi>;

			#address-cells = <1>;

			#size-cells = <0>;

		};



		spi2: spi@21000800 {
@@ -150,6 +152,8 @@ 
			ti,davinci-spi-intr-line = <0>;

			interrupts = <GIC_SPI 300 IRQ_TYPE_EDGE_RISING>;

			clocks = <&clkspi>;

			#address-cells = <1>;

			#size-cells = <0>;

		};



		usb_phy: usb_phy@2620738 {
@@ -169,6 +173,8 @@ 
			clock-names = "usb";

			interrupts = <GIC_SPI 393 IRQ_TYPE_EDGE_RISING>;

			ranges;

			dma-coherent;

			dma-ranges;

			status = "disabled";



			dwc3@2690000 {