ARM: dts: Add missing hsi node for omap4

On omap4 we're missing the hsi node with it's related "ti,hwmods"
property that the SoC interconnect code needs.

Note that this will only show up as a bug with "doesn't have
mpu register target base" boot errors when the legacy platform
data is removed.

Let's also update the binding accrodingly while at it.

Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Rob Herring <robh+dt@kernel.org>
Reviewed-by: Sebastian Reichel <sre@kernel.org>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/Documentation/devicetree/bindings/hsi/omap-ssi.txt b/Documentation/devicetree/bindings/hsi/omap-ssi.txt
index b8eca3c..955e335 100644 (file)
--- a/Documentation/devicetree/bindings/hsi/omap-ssi.txt
+++ b/Documentation/devicetree/bindings/hsi/omap-ssi.txt
@@ -1,10 +1,12 @@
 OMAP SSI controller bindings
 
-OMAP Synchronous Serial Interface (SSI) controller implements a legacy
-variant of MIPI's High Speed Synchronous Serial Interface (HSI).
+OMAP3's Synchronous Serial Interface (SSI) controller implements a
+legacy variant of MIPI's High Speed Synchronous Serial Interface (HSI),
+while the controller found inside OMAP4 is supposed to be fully compliant
+with the HSI standard.
 
 Required properties:
-- compatible:          Should include "ti,omap3-ssi".
+- compatible:          Should include "ti,omap3-ssi" or "ti,omap4-hsi"
 - reg-names:           Contains the values "sys" and "gdd" (in this order).
 - reg:                 Contains a matching register specifier for each entry
                        in reg-names.
@@ -27,6 +29,7 @@ Each port is represented as a sub-node of the ti,omap3-ssi device.
 Required Port sub-node properties:
 - compatible:          Should be set to the following value
                        ti,omap3-ssi-port (applicable to OMAP34xx devices)
+                       ti,omap4-hsi-port (applicable to OMAP44xx devices)
 - reg-names:           Contains the values "tx" and "rx" (in this order).
 - reg:                 Contains a matching register specifier for each entry
                        in reg-names.
@@ -38,6 +41,10 @@ Required Port sub-node properties:
                        property. If it's missing the port will not be
                        enabled.
 
+Optional properties:
+- ti,hwmods:           Shall contain TI interconnect module name if needed
+                       by the SoC
+
 Example for Nokia N900:
 
 ssi-controller@48058000 {

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 69d129b..a3c4d35 100644 (file)
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -624,6 +624,40 @@
                        dma-names = "tx", "rx";
                };
 
+               hsi: hsi@4a058000 {
+                       compatible = "ti,omap4-hsi";
+                       reg = <0x4a058000 0x4000>,
+                             <0x4a05c000 0x1000>;
+                       reg-names = "sys", "gdd";
+                       ti,hwmods = "hsi";
+
+                       clocks = <&hsi_fck>;
+                       clock-names = "hsi_fck";
+
+                       interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "gdd_mpu";
+
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0 0x4a058000 0x4000>;
+
+                       hsi_port1: hsi-port@2000 {
+                               compatible = "ti,omap4-hsi-port";
+                               reg = <0x2000 0x800>,
+                                     <0x2800 0x800>;
+                               reg-names = "tx", "rx";
+                               interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
+                       };
+
+                       hsi_port2: hsi-port@3000 {
+                               compatible = "ti,omap4-hsi-port";
+                               reg = <0x3000 0x800>,
+                                     <0x3800 0x800>;
+                               reg-names = "tx", "rx";
+                               interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
+                       };
+               };
+
                mmu_dsp: mmu@4a066000 {
                        compatible = "ti,omap4-iommu";
                        reg = <0x4a066000 0x100>;