diff mbox

[08/17] ARM: dts: Add missing hsi node for omap4

Message ID 20170830202519.GI6008@atomide.com (mailing list archive)
State New, archived
Headers show

Commit Message

Tony Lindgren Aug. 30, 2017, 8:25 p.m. UTC
* Sebastian Reichel <sre@kernel.org> [170830 12:38]:
> On Wed, Aug 30, 2017 at 08:19:44AM -0700, Tony Lindgren wrote:
> Maybe change the leading text:
> 
> 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.

OK

> >  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 +27,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-ssi-port (applicable to OMAP44xx devices)
>                      ^^^
> 
> this should be hsi.

Oops fixed.

> otherwise:
> 
> Reviewed-by: Sebastian Reichel <sre@kernel.org>

Thanks, updated patch below.

Regards,

Tony

8< --------------------
From tony Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Wed, 30 Aug 2017 08:07:51 -0700
Subject: [PATCH] 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>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 Documentation/devicetree/bindings/hsi/omap-ssi.txt | 13 +++++++--
 arch/arm/boot/dts/omap4.dtsi                       | 34 ++++++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

Comments

Sebastian Reichel Oct. 1, 2017, 3:25 p.m. UTC | #1
Hi,

On Wed, Aug 30, 2017 at 01:25:20PM -0700, Tony Lindgren wrote:
> Thanks, updated patch below.

Thanks, I applied the DT binding part to the HSI subsystem:

https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git/commit/?h=for-next&id=8635d6b3afe68cdde2f646c2a3bbd8149c031e8c

-- Sebastian

> 8< --------------------
> From tony Mon Sep 17 00:00:00 2001
> From: Tony Lindgren <tony@atomide.com>
> Date: Wed, 30 Aug 2017 08:07:51 -0700
> Subject: [PATCH] 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>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
>  Documentation/devicetree/bindings/hsi/omap-ssi.txt | 13 +++++++--
>  arch/arm/boot/dts/omap4.dtsi                       | 34 ++++++++++++++++++++++
>  2 files changed, 44 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/hsi/omap-ssi.txt b/Documentation/devicetree/bindings/hsi/omap-ssi.txt
> --- 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
> --- a/arch/arm/boot/dts/omap4.dtsi
> +++ b/arch/arm/boot/dts/omap4.dtsi
> @@ -632,6 +632,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>;
> -- 
> 2.14.1
Tony Lindgren Oct. 1, 2017, 4:47 p.m. UTC | #2
* Sebastian Reichel <sre@kernel.org> [171001 08:26]:
> Hi,
> 
> On Wed, Aug 30, 2017 at 01:25:20PM -0700, Tony Lindgren wrote:
> > Thanks, updated patch below.
> 
> Thanks, I applied the DT binding part to the HSI subsystem:
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git/commit/?h=for-next&id=8635d6b3afe68cdde2f646c2a3bbd8149c031e8c

OK thanks.

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/hsi/omap-ssi.txt b/Documentation/devicetree/bindings/hsi/omap-ssi.txt
--- 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
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -632,6 +632,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>;