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

Commit cbd1d63c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'keystone_dts_for_4.9' of... 

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

Merge "ARM: dts: Keystone DTS for 4.9" from Santosh Shilimkar

Add K2G nodes for GPIO, IRQ and Message Manager

* tag 'keystone_dts_for_4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone-k2g: Add Message Manager node
  ARM: dts: keystone-k2g: Add DSP GPIO controller node
  ARM: dts: keystone-k2g: Add keystone IRQ controller node
  ARM: dts: keystone-k2g: Add device state controller node
  ARM: dts: keystone: specify usb mode explicitly
parents 30d430d9 11b897a2

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

+10 −2
Original line number Diff line number Diff line
@@ -47,18 +47,26 @@ 
	status = "okay";

};



&usb {

&keystone_usb0 {

	status = "okay";

};



&usb0 {

	dr_mode = "host";

};



&usb1_phy {

	status = "okay";

};



&usb1 {

&keystone_usb1 {

	status = "okay";

};



&usb1 {

	dr_mode = "peripheral";

};



&i2c0 {

	dtt@50 {

		compatible = "at,24c1024";

arch/arm/boot/dts/keystone-k2e.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
			status = "disabled";

		};



		usb1: usb@25000000 {

		keystone_usb1: usb@25000000 {

			compatible = "ti,keystone-dwc3";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -74,7 +74,7 @@ 
			dma-ranges;

			status = "disabled";



			dwc3@25010000 {

			usb1: dwc3@25010000 {

				compatible = "synopsys,dwc3";

				reg = <0x25010000 0x70000>;

				interrupts = <GIC_SPI 414 IRQ_TYPE_EDGE_RISING>;

arch/arm/boot/dts/keystone-k2g.dtsi

+32 −0
Original line number Diff line number Diff line
@@ -83,6 +83,11 @@ 
			pinctrl-single,function-mask = <0x001b0007>;

		};



		devctrl: device-state-control@02620000 {

			compatible = "ti,keystone-devctrl", "syscon";

			reg = <0x02620000 0x1000>;

		};



		uart0: serial@02530c00 {

			compatible = "ns16550a";

			current-speed = <115200>;
@@ -93,5 +98,32 @@ 
			clock-frequency = <200000000>;

			status = "disabled";

		};



		kirq0: keystone_irq@026202a0 {

			compatible = "ti,keystone-irq";

			interrupts = <GIC_SPI 1 IRQ_TYPE_EDGE_RISING>;

			interrupt-controller;

			#interrupt-cells = <1>;

			ti,syscon-dev = <&devctrl 0x2a0>;

		};



		dspgpio0: keystone_dsp_gpio@02620240 {

			compatible = "ti,keystone-dsp-gpio";

			gpio-controller;

			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x240>;

		};



		msgmgr: msgmgr@02a00000 {

			compatible = "ti,k2g-message-manager";

			#mbox-cells = <2>;

			reg-names = "queue_proxy_region",

				    "queue_state_debug_region";

			reg = <0x02a00000 0x400000>, <0x028c3400 0x400>;

			interrupt-names = "rx_005",

					  "rx_057";

			interrupts = <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>;

		};

	};

};

arch/arm/boot/dts/keystone-k2hk-evm.dts

+5 −1
Original line number Diff line number Diff line
@@ -83,10 +83,14 @@ 
	status = "okay";

};



&usb {

&keystone_usb0 {

	status = "okay";

};



&usb0 {

	dr_mode = "host";

};



&aemif {

	cs0 {

		#address-cells = <2>;

arch/arm/boot/dts/keystone-k2l-evm.dts

+5 −1
Original line number Diff line number Diff line
@@ -32,10 +32,14 @@ 
	status = "okay";

};



&usb {

&keystone_usb0 {

	status = "okay";

};



&usb0 {

	dr_mode = "host";

};



&i2c0 {

	dtt@50 {

		compatible = "at,24c1024";