Commit cbd1d63c authored by Arnd Bergmann's avatar Arnd Bergmann

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
...@@ -47,18 +47,26 @@ &usb_phy { ...@@ -47,18 +47,26 @@ &usb_phy {
status = "okay"; status = "okay";
}; };
&usb { &keystone_usb0 {
status = "okay"; status = "okay";
}; };
&usb0 {
dr_mode = "host";
};
&usb1_phy { &usb1_phy {
status = "okay"; status = "okay";
}; };
&usb1 { &keystone_usb1 {
status = "okay"; status = "okay";
}; };
&usb1 {
dr_mode = "peripheral";
};
&i2c0 { &i2c0 {
dtt@50 { dtt@50 {
compatible = "at,24c1024"; compatible = "at,24c1024";
......
...@@ -61,7 +61,7 @@ usb1_phy: usb_phy@2620750 { ...@@ -61,7 +61,7 @@ usb1_phy: usb_phy@2620750 {
status = "disabled"; status = "disabled";
}; };
usb1: usb@25000000 { keystone_usb1: usb@25000000 {
compatible = "ti,keystone-dwc3"; compatible = "ti,keystone-dwc3";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -74,7 +74,7 @@ usb1: usb@25000000 { ...@@ -74,7 +74,7 @@ usb1: usb@25000000 {
dma-ranges; dma-ranges;
status = "disabled"; status = "disabled";
dwc3@25010000 { usb1: dwc3@25010000 {
compatible = "synopsys,dwc3"; compatible = "synopsys,dwc3";
reg = <0x25010000 0x70000>; reg = <0x25010000 0x70000>;
interrupts = <GIC_SPI 414 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 414 IRQ_TYPE_EDGE_RISING>;
......
...@@ -83,6 +83,11 @@ k2g_pinctrl: pinmux@02621000 { ...@@ -83,6 +83,11 @@ k2g_pinctrl: pinmux@02621000 {
pinctrl-single,function-mask = <0x001b0007>; pinctrl-single,function-mask = <0x001b0007>;
}; };
devctrl: device-state-control@02620000 {
compatible = "ti,keystone-devctrl", "syscon";
reg = <0x02620000 0x1000>;
};
uart0: serial@02530c00 { uart0: serial@02530c00 {
compatible = "ns16550a"; compatible = "ns16550a";
current-speed = <115200>; current-speed = <115200>;
...@@ -93,5 +98,32 @@ uart0: serial@02530c00 { ...@@ -93,5 +98,32 @@ uart0: serial@02530c00 {
clock-frequency = <200000000>; clock-frequency = <200000000>;
status = "disabled"; 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>;
};
}; };
}; };
...@@ -83,10 +83,14 @@ &usb_phy { ...@@ -83,10 +83,14 @@ &usb_phy {
status = "okay"; status = "okay";
}; };
&usb { &keystone_usb0 {
status = "okay"; status = "okay";
}; };
&usb0 {
dr_mode = "host";
};
&aemif { &aemif {
cs0 { cs0 {
#address-cells = <2>; #address-cells = <2>;
......
...@@ -32,10 +32,14 @@ &usb_phy { ...@@ -32,10 +32,14 @@ &usb_phy {
status = "okay"; status = "okay";
}; };
&usb { &keystone_usb0 {
status = "okay"; status = "okay";
}; };
&usb0 {
dr_mode = "host";
};
&i2c0 { &i2c0 {
dtt@50 { dtt@50 {
compatible = "at,24c1024"; compatible = "at,24c1024";
......
...@@ -188,7 +188,7 @@ usb_phy: usb_phy@2620738 { ...@@ -188,7 +188,7 @@ usb_phy: usb_phy@2620738 {
status = "disabled"; status = "disabled";
}; };
usb: usb@2680000 { keystone_usb0: usb@2680000 {
compatible = "ti,keystone-dwc3"; compatible = "ti,keystone-dwc3";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -201,7 +201,7 @@ usb: usb@2680000 { ...@@ -201,7 +201,7 @@ usb: usb@2680000 {
dma-ranges; dma-ranges;
status = "disabled"; status = "disabled";
dwc3@2690000 { usb0: dwc3@2690000 {
compatible = "synopsys,dwc3"; compatible = "synopsys,dwc3";
reg = <0x2690000 0x70000>; reg = <0x2690000 0x70000>;
interrupts = <GIC_SPI 393 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 393 IRQ_TYPE_EDGE_RISING>;
......
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