All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tero Kristo <t-kristo@ti.com>
To: linux-omap@vger.kernel.org, tony@atomide.com, s-anna@ti.com,
	paul@pwsan.com
Cc: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/17] ARM: dts: omap4: add reset data
Date: Thu, 24 Sep 2015 17:26:45 +0300	[thread overview]
Message-ID: <1443104818-993-5-git-send-email-t-kristo@ti.com> (raw)
In-Reply-To: <1443104818-993-1-git-send-email-t-kristo@ti.com>

Copy over the reset data from hwmod database to DT. After this is taken
into use, the data in hwmod database can be removed.

A new node has been also added for ipu to support ipu resets.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
 arch/arm/boot/dts/omap4.dtsi |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index abc4473..d14c485 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -97,11 +97,25 @@
 		dsp {
 			compatible = "ti,omap3-c64";
 			ti,hwmods = "dsp";
+			reset-names = "dsp";
+			resets = <&prm 0x0400 0x10 0 0x14 0>;
 		};
 
 		iva {
 			compatible = "ti,ivahd";
 			ti,hwmods = "iva";
+			reset-names = "seq0", "seq1", "logic";
+			resets = <&prm 0x0f00 0x10 0 0x14 0>,
+				 <&prm 0x0f00 0x10 1 0x14 1>,
+				 <&prm 0x0f00 0x10 2 0x14 2>;
+		};
+
+		ipu {
+			compatible = "ti,omap4-ipu";
+			ti,hwmods = "ipu";
+			reset-names = "cpu0", "cpu1";
+			resets = <&prm 0x0700 0x210 0 0x214 0>,
+				 <&prm 0x0700 0x210 1 0x214 1>;
 		};
 	};
 
@@ -226,6 +240,7 @@
 					compatible = "ti,omap4-prm";
 					reg = <0x6000 0x3000>;
 					interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+					#reset-cells = <5>;
 
 					prm_clocks: clocks {
 						#address-cells = <1>;
@@ -234,6 +249,14 @@
 
 					prm_clockdomains: clockdomains {
 					};
+
+					system_reset: system_reset {
+						compatible = "ti,system-reset";
+						reset-names = "system",
+							      "cold_sw";
+						resets = <&prm 0x1b00 0 0 4 0>,
+							 <&prm 0x1b00 0 1 4 1>;
+					};
 				};
 
 				scrm: scrm@a000 {
@@ -553,6 +576,8 @@
 			interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
 			ti,hwmods = "mmu_dsp";
 			#iommu-cells = <0>;
+			reset-names = "mmu_cache";
+			resets = <&prm 0x400 0x10 1 0x14 1>;
 		};
 
 		mmu_ipu: mmu@55082000 {
@@ -562,6 +587,8 @@
 			ti,hwmods = "mmu_ipu";
 			#iommu-cells = <0>;
 			ti,iommu-bus-err-back;
+			reset-names = "mmu_cache";
+			resets = <&prm 0x700 0x210 2 0x214 2>;
 		};
 
 		wdt2: wdt@4a314000 {
-- 
1.7.9.5

WARNING: multiple messages have this Message-ID (diff)
From: t-kristo@ti.com (Tero Kristo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/17] ARM: dts: omap4: add reset data
Date: Thu, 24 Sep 2015 17:26:45 +0300	[thread overview]
Message-ID: <1443104818-993-5-git-send-email-t-kristo@ti.com> (raw)
In-Reply-To: <1443104818-993-1-git-send-email-t-kristo@ti.com>

Copy over the reset data from hwmod database to DT. After this is taken
into use, the data in hwmod database can be removed.

A new node has been also added for ipu to support ipu resets.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
 arch/arm/boot/dts/omap4.dtsi |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index abc4473..d14c485 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -97,11 +97,25 @@
 		dsp {
 			compatible = "ti,omap3-c64";
 			ti,hwmods = "dsp";
+			reset-names = "dsp";
+			resets = <&prm 0x0400 0x10 0 0x14 0>;
 		};
 
 		iva {
 			compatible = "ti,ivahd";
 			ti,hwmods = "iva";
+			reset-names = "seq0", "seq1", "logic";
+			resets = <&prm 0x0f00 0x10 0 0x14 0>,
+				 <&prm 0x0f00 0x10 1 0x14 1>,
+				 <&prm 0x0f00 0x10 2 0x14 2>;
+		};
+
+		ipu {
+			compatible = "ti,omap4-ipu";
+			ti,hwmods = "ipu";
+			reset-names = "cpu0", "cpu1";
+			resets = <&prm 0x0700 0x210 0 0x214 0>,
+				 <&prm 0x0700 0x210 1 0x214 1>;
 		};
 	};
 
@@ -226,6 +240,7 @@
 					compatible = "ti,omap4-prm";
 					reg = <0x6000 0x3000>;
 					interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+					#reset-cells = <5>;
 
 					prm_clocks: clocks {
 						#address-cells = <1>;
@@ -234,6 +249,14 @@
 
 					prm_clockdomains: clockdomains {
 					};
+
+					system_reset: system_reset {
+						compatible = "ti,system-reset";
+						reset-names = "system",
+							      "cold_sw";
+						resets = <&prm 0x1b00 0 0 4 0>,
+							 <&prm 0x1b00 0 1 4 1>;
+					};
 				};
 
 				scrm: scrm at a000 {
@@ -553,6 +576,8 @@
 			interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
 			ti,hwmods = "mmu_dsp";
 			#iommu-cells = <0>;
+			reset-names = "mmu_cache";
+			resets = <&prm 0x400 0x10 1 0x14 1>;
 		};
 
 		mmu_ipu: mmu at 55082000 {
@@ -562,6 +587,8 @@
 			ti,hwmods = "mmu_ipu";
 			#iommu-cells = <0>;
 			ti,iommu-bus-err-back;
+			reset-names = "mmu_cache";
+			resets = <&prm 0x700 0x210 2 0x214 2>;
 		};
 
 		wdt2: wdt at 4a314000 {
-- 
1.7.9.5

  parent reply	other threads:[~2015-09-24 14:26 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-24 14:26 [PATCH 00/17] ARM: OMAP2+: reset controller support Tero Kristo
2015-09-24 14:26 ` Tero Kristo
2015-09-24 14:26 ` [PATCH 01/17] ARM: OMAP2+: PRM: add support for reset controller Tero Kristo
2015-09-24 14:26   ` Tero Kristo
2015-10-06 12:06   ` Tony Lindgren
2015-10-06 12:06     ` Tony Lindgren
2015-11-30 17:09     ` Tony Lindgren
2015-11-30 17:09       ` Tony Lindgren
2015-09-24 14:26 ` [PATCH 02/17] ARM: OMAP2+: hwmod: parse also soc hierarchy for hwmod compatible nodes Tero Kristo
2015-09-24 14:26   ` Tero Kristo
2015-09-24 14:26 ` [PATCH 03/17] ARM: dts: omap3: add reset data Tero Kristo
2015-09-24 14:26   ` Tero Kristo
2015-09-24 14:26 ` Tero Kristo [this message]
2015-09-24 14:26   ` [PATCH 04/17] ARM: dts: omap4: " Tero Kristo
2015-09-24 14:26 ` [PATCH 05/17] ARM: dts: omap5: " Tero Kristo
2015-09-24 14:26   ` Tero Kristo
2015-09-24 14:26 ` [PATCH 06/17] ARM: dts: dra7: " Tero Kristo
2015-09-24 14:26   ` Tero Kristo
2015-09-24 14:26 ` [PATCH 07/17] ARM: dts: am4372: " Tero Kristo
2015-09-24 14:26   ` Tero Kristo
2015-09-25 12:57   ` Lokesh Vutla
2015-09-25 12:57     ` Lokesh Vutla
2015-09-28  8:11     ` Tero Kristo
2015-09-28  8:11       ` Tero Kristo
2015-09-24 14:26 ` [PATCH 08/17] ARM: dts: am33xx: " Tero Kristo
2015-09-24 14:26   ` Tero Kristo
2015-09-24 14:26 ` [PATCH 09/17] ARM: dts: OMAP24xx: " Tero Kristo
2015-09-24 14:26   ` Tero Kristo
2015-09-24 14:26 ` [PATCH 10/17] ARM: OMAP2+: hwmod: parse reset information from DT Tero Kristo
2015-09-24 14:26   ` Tero Kristo
2015-09-24 14:26 ` [PATCH 11/17] ARM: OMAP2+: use system reset info from device tree data Tero Kristo
2015-09-24 14:26   ` Tero Kristo
2015-09-24 14:26 ` [PATCH 12/17] ARM: OMAP4: hwmod_data: remove reset data Tero Kristo
2015-09-24 14:26   ` Tero Kristo
2015-09-24 14:26 ` [PATCH 13/17] ARM: OMAP5: " Tero Kristo
2015-09-24 14:26   ` Tero Kristo
2015-09-24 14:26 ` [PATCH 14/17] ARM: OMAP2: hwmod: AMx3xx: remove redundant reset info Tero Kristo
2015-09-24 14:26   ` Tero Kristo
2015-09-24 14:26 ` [PATCH 15/17] ARM: OMAP24xx: hwmod: remove reset data from hwmod database Tero Kristo
2015-09-24 14:26   ` Tero Kristo
2015-09-24 14:26 ` [PATCH 16/17] ARM: OMAP2+: hwmod: remove obsolete support for some hardreset logic Tero Kristo
2015-09-24 14:26   ` Tero Kristo
2015-09-24 14:26 ` [PATCH 17/17] ARM: OMAP2+: PRM: remove redundant system reset code Tero Kristo
2015-09-24 14:26   ` Tero Kristo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1443104818-993-5-git-send-email-t-kristo@ti.com \
    --to=t-kristo@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=paul@pwsan.com \
    --cc=s-anna@ti.com \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.