From: t-kristo@ti.com (Tero Kristo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv4 27/35] ARM: dts: am33xx: merge control module features under scrm node
Date: Wed, 18 Mar 2015 16:44:12 +0200 [thread overview]
Message-ID: <1426689860-17537-28-git-send-email-t-kristo@ti.com> (raw)
In-Reply-To: <1426689860-17537-1-git-send-email-t-kristo@ti.com>
This patch moves all the control module related features under scrm
node. scm_conf area is changed to use syscon, and also the clocks
are moved under scm_conf area.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
arch/arm/boot/dts/am33xx.dtsi | 48 ++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index acd3705..b30e238 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -83,20 +83,6 @@
};
};
- am33xx_control_module: control_module at 4a002000 {
- compatible = "syscon";
- reg = <0x44e10000 0x7fc>;
- };
-
- am33xx_pinmux: pinmux at 44e10800 {
- compatible = "pinctrl-single";
- reg = <0x44e10800 0x0238>;
- #address-cells = <1>;
- #size-cells = <0>;
- pinctrl-single,register-width = <32>;
- pinctrl-single,function-mask = <0x7f>;
- };
-
/*
* XXX: Use a flat representation of the AM33XX interconnect.
* The real AM33XX interconnect network is quite complex. Since
@@ -125,21 +111,35 @@
};
scrm: scrm at 44e10000 {
- compatible = "ti,am3-scrm";
+ compatible = "ti,am3-scrm", "simple-bus";
reg = <0x44e10000 0x2000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0 0x44e10000 0x2000>;
- scrm_clocks: clocks {
+ am33xx_pinmux: pinmux at 800 {
+ compatible = "pinctrl-single";
+ reg = <0x800 0x238>;
#address-cells = <1>;
#size-cells = <0>;
+ pinctrl-single,register-width = <32>;
+ pinctrl-single,function-mask = <0x7f>;
};
- scrm_clockdomains: clockdomains {
+ scm_conf: scm_conf at 0 {
+ compatible = "syscon";
+ reg = <0x0 0x7fc>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ scrm_clocks: clocks {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
};
- };
- cm: syscon at 44e10000 {
- compatible = "ti,am33xx-controlmodule", "syscon";
- reg = <0x44e10000 0x800>;
+ scrm_clockdomains: clockdomains {
+ };
};
intc: interrupt-controller at 48200000 {
@@ -350,7 +350,7 @@
reg = <0x481cc000 0x2000>;
clocks = <&dcan0_fck>;
clock-names = "fck";
- syscon-raminit = <&am33xx_control_module 0x644 0>;
+ syscon-raminit = <&scm_conf 0x644 0>;
interrupts = <52>;
status = "disabled";
};
@@ -361,7 +361,7 @@
reg = <0x481d0000 0x2000>;
clocks = <&dcan1_fck>;
clock-names = "fck";
- syscon-raminit = <&am33xx_control_module 0x644 1>;
+ syscon-raminit = <&scm_conf 0x644 1>;
interrupts = <55>;
status = "disabled";
};
@@ -720,7 +720,7 @@
*/
interrupts = <40 41 42 43>;
ranges;
- syscon = <&cm>;
+ syscon = <&scm_conf>;
status = "disabled";
davinci_mdio: mdio at 4a101000 {
--
1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Tero Kristo <t-kristo@ti.com>
To: linux-omap@vger.kernel.org, tony@atomide.com, paul@pwsan.com
Cc: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv4 27/35] ARM: dts: am33xx: merge control module features under scrm node
Date: Wed, 18 Mar 2015 16:44:12 +0200 [thread overview]
Message-ID: <1426689860-17537-28-git-send-email-t-kristo@ti.com> (raw)
In-Reply-To: <1426689860-17537-1-git-send-email-t-kristo@ti.com>
This patch moves all the control module related features under scrm
node. scm_conf area is changed to use syscon, and also the clocks
are moved under scm_conf area.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
arch/arm/boot/dts/am33xx.dtsi | 48 ++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index acd3705..b30e238 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -83,20 +83,6 @@
};
};
- am33xx_control_module: control_module@4a002000 {
- compatible = "syscon";
- reg = <0x44e10000 0x7fc>;
- };
-
- am33xx_pinmux: pinmux@44e10800 {
- compatible = "pinctrl-single";
- reg = <0x44e10800 0x0238>;
- #address-cells = <1>;
- #size-cells = <0>;
- pinctrl-single,register-width = <32>;
- pinctrl-single,function-mask = <0x7f>;
- };
-
/*
* XXX: Use a flat representation of the AM33XX interconnect.
* The real AM33XX interconnect network is quite complex. Since
@@ -125,21 +111,35 @@
};
scrm: scrm@44e10000 {
- compatible = "ti,am3-scrm";
+ compatible = "ti,am3-scrm", "simple-bus";
reg = <0x44e10000 0x2000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0 0x44e10000 0x2000>;
- scrm_clocks: clocks {
+ am33xx_pinmux: pinmux@800 {
+ compatible = "pinctrl-single";
+ reg = <0x800 0x238>;
#address-cells = <1>;
#size-cells = <0>;
+ pinctrl-single,register-width = <32>;
+ pinctrl-single,function-mask = <0x7f>;
};
- scrm_clockdomains: clockdomains {
+ scm_conf: scm_conf@0 {
+ compatible = "syscon";
+ reg = <0x0 0x7fc>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ scrm_clocks: clocks {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
};
- };
- cm: syscon@44e10000 {
- compatible = "ti,am33xx-controlmodule", "syscon";
- reg = <0x44e10000 0x800>;
+ scrm_clockdomains: clockdomains {
+ };
};
intc: interrupt-controller@48200000 {
@@ -350,7 +350,7 @@
reg = <0x481cc000 0x2000>;
clocks = <&dcan0_fck>;
clock-names = "fck";
- syscon-raminit = <&am33xx_control_module 0x644 0>;
+ syscon-raminit = <&scm_conf 0x644 0>;
interrupts = <52>;
status = "disabled";
};
@@ -361,7 +361,7 @@
reg = <0x481d0000 0x2000>;
clocks = <&dcan1_fck>;
clock-names = "fck";
- syscon-raminit = <&am33xx_control_module 0x644 1>;
+ syscon-raminit = <&scm_conf 0x644 1>;
interrupts = <55>;
status = "disabled";
};
@@ -720,7 +720,7 @@
*/
interrupts = <40 41 42 43>;
ranges;
- syscon = <&cm>;
+ syscon = <&scm_conf>;
status = "disabled";
davinci_mdio: mdio@4a101000 {
--
1.7.9.5
next prev parent reply other threads:[~2015-03-18 14:44 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-18 14:43 [PATCHv4 00/35] ARM: OMAP2+: PRCM / SCM cleanups against 4.0-rc1 Tero Kristo
2015-03-18 14:43 ` Tero Kristo
2015-03-18 14:43 ` [PATCHv4 01/35] ARM: OMAP2+: PRCM: rename of_prcm_init to omap_prcm_init Tero Kristo
2015-03-18 14:43 ` Tero Kristo
2015-03-18 14:43 ` [PATCHv4 02/35] ARM: OMAP3: PRM: invert the wkst_mask for the prm_clear_mod_irqs Tero Kristo
2015-03-18 14:43 ` Tero Kristo
2015-03-18 14:43 ` [PATCHv4 03/35] ARM: OMAP2+: PRM: add generic API for clear_mod_irqs Tero Kristo
2015-03-18 14:43 ` Tero Kristo
2015-03-18 14:43 ` [PATCHv4 04/35] ARM: OMAP3+: PRM: add common APIs for prm_vp_check/clear_txdone Tero Kristo
2015-03-18 14:43 ` Tero Kristo
2015-03-18 14:43 ` [PATCHv4 05/35] ARM: OMAP4+: PRM: move omap_prm_base_init under OMAP4 PRM driver Tero Kristo
2015-03-18 14:43 ` Tero Kristo
2015-03-18 14:43 ` [PATCHv4 06/35] ARM: OMAP4+: CM: move omap_cm_base_init under OMAP4 CM driver Tero Kristo
2015-03-18 14:43 ` Tero Kristo
2015-03-18 14:43 ` [PATCHv4 07/35] ARM: OMAP4: PRM: move omap4xxx_prm_init earlier in init order Tero Kristo
2015-03-18 14:43 ` Tero Kristo
2015-03-18 14:43 ` [PATCHv4 08/35] clk: ti: fix ti_clk_get_reg_addr error handling Tero Kristo
2015-03-18 14:43 ` Tero Kristo
2015-03-18 14:43 ` [PATCHv4 09/35] Documentation: DT: document PRCM compatible strings for dm81x SoCs Tero Kristo
2015-03-18 14:43 ` Tero Kristo
2015-03-18 14:43 ` [PATCHv4 10/35] ARM: OMAP2+: PRCM: add support for static clock memmap indices Tero Kristo
2015-03-18 14:43 ` Tero Kristo
2015-03-18 14:43 ` [PATCHv4 11/35] ARM: OMAP2+: clock: move clock provider infrastructure to clock driver Tero Kristo
2015-03-18 14:43 ` Tero Kristo
2015-03-18 14:43 ` [PATCHv4 12/35] ARM: OMAP2+: PRCM: split PRCM module init to their own driver files Tero Kristo
2015-03-18 14:43 ` Tero Kristo
2015-03-18 14:43 ` [PATCHv4 13/35] ARM: OMAP2+: CM: determine CM base address from device tree Tero Kristo
2015-03-18 14:43 ` Tero Kristo
2015-03-18 14:43 ` [PATCHv4 14/35] ARM: OMAP2+: PRM: determine PRM " Tero Kristo
2015-03-18 14:43 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 15/35] ARM: OMAP2+: control: determine control module base address from DT Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 16/35] ARM: OMAP2+: PRM: move SoC specific init calls within a generic API Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 17/35] ARM: OMAP4+: PRM: determine prm_device_inst based on DT compatibility Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 18/35] ARM: OMAP2+: CM: move SoC specific init calls within a generic API Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 19/35] ARM: OMAP4+: PRM: setup prm_features from the PRM init time flags Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 20/35] ARM: OMAP4+: PRM: get rid of cpu_is_omap44xx calls from interrupt init Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 21/35] ARM: OMAP2+: clock: add low-level support for regmap Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 22/35] ARM: OMAP2+: control: remove API for getting control module base address Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 23/35] ARM: OMAP2+: id: cache omap_type value Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 18:24 ` Sergei Shtylyov
2015-03-18 18:24 ` Sergei Shtylyov
2015-03-19 7:23 ` Tero Kristo
2015-03-19 7:23 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 24/35] ARM: OMAP2+: control: add syscon support for register accesses Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 25/35] ARM: dts: omap24xx: merge control module features under scrm node Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 26/35] ARM: dts: omap3: " Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` Tero Kristo [this message]
2015-03-18 14:44 ` [PATCHv4 27/35] ARM: dts: am33xx: " Tero Kristo
2015-03-18 14:44 ` [PATCHv4 28/35] ARM: dts: am43xx-epos-evm: fix pinmux node layout Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 29/35] ARM: dts: am4372: merge control module features under scrm node Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 30/35] ARM: dts: omap4: add system control module node Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 21:30 ` Tony Lindgren
2015-03-18 21:30 ` Tony Lindgren
2015-03-19 20:25 ` Tony Lindgren
2015-03-19 20:25 ` Tony Lindgren
2015-03-20 6:40 ` Tero Kristo
2015-03-20 6:40 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 31/35] ARM: OMAP4: display: convert display to use syscon for dsi muxing Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 32/35] ARM: OMAP4+: control: remove support for legacy pad read/write Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 33/35] ARM: dts: omap5: add system control module node Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 34/35] ARM: dts: dra7: " Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 14:44 ` [PATCHv4 35/35] ARM: OMAP4+: control: add support for initializing control module via DT Tero Kristo
2015-03-18 14:44 ` Tero Kristo
2015-03-18 22:07 ` [PATCHv4 00/35] ARM: OMAP2+: PRCM / SCM cleanups against 4.0-rc1 Tony Lindgren
2015-03-18 22:07 ` Tony Lindgren
2015-03-19 7:48 ` Tero Kristo
2015-03-19 7:48 ` Tero Kristo
2015-03-19 16:10 ` Tony Lindgren
2015-03-19 16:10 ` Tony Lindgren
2015-03-19 0:00 ` Sakari Ailus
2015-03-19 0:00 ` Sakari Ailus
2015-03-19 8:05 ` Tero Kristo
2015-03-19 8:05 ` 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=1426689860-17537-28-git-send-email-t-kristo@ti.com \
--to=t-kristo@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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.