* [PATCH 1/6] ARM: dts: i.MX27: Move IIM node under AIPI2 bus
@ 2013-07-02 16:02 Alexander Shiyan
2013-07-02 16:02 ` [PATCH 2/6] ARM: dts: i.MX27: Add WEIM node Alexander Shiyan
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Alexander Shiyan @ 2013-07-02 16:02 UTC (permalink / raw)
To: linux-arm-kernel
This patch moves IIM node under AIPI2 bus, since this is proper
location for this module.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx27.dtsi | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index a587294..516473c 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -375,13 +375,6 @@
clocks = <&clks 41>, <&clks 61>;
clock-names = "ipg", "per";
};
-
- iim: iim at 10028000 {
- compatible = "fsl,imx27-iim";
- reg = <0x10028000 0x1000>;
- interrupts = <62>;
- clocks = <&clks 38>;
- };
};
aipi at 10020000 { /* AIPI2 */
@@ -423,6 +416,13 @@
#clock-cells = <1>;
};
+ iim: iim at 10028000 {
+ compatible = "fsl,imx27-iim";
+ reg = <0x10028000 0x1000>;
+ interrupts = <62>;
+ clocks = <&clks 38>;
+ };
+
fec: ethernet at 1002b000 {
compatible = "fsl,imx27-fec";
reg = <0x1002b000 0x4000>;
--
1.8.1.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/6] ARM: dts: i.MX27: Add WEIM node
2013-07-02 16:02 [PATCH 1/6] ARM: dts: i.MX27: Move IIM node under AIPI2 bus Alexander Shiyan
@ 2013-07-02 16:02 ` Alexander Shiyan
2013-07-02 16:02 ` [PATCH 3/6] ARM: dts: imx27-phytec-phycore-som: " Alexander Shiyan
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Alexander Shiyan @ 2013-07-02 16:02 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds the missing (Wireless External Interface Module) WEIM
devicetree node for i.MX27 CPUs.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx27.dtsi | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 516473c..056e33b 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -443,6 +443,23 @@
status = "disabled";
};
+ weim: weim at d8002000 {
+ #address-cells = <2>;
+ #size-cells = <1>;
+ compatible = "fsl,imx27-weim";
+ reg = <0xd8002000 0x1000>;
+ clocks = <&clks 0>;
+ ranges = <
+ 0 0 0xc0000000 0x08000000
+ 1 0 0xc8000000 0x08000000
+ 2 0 0xd0000000 0x02000000
+ 3 0 0xd2000000 0x02000000
+ 4 0 0xd4000000 0x02000000
+ 5 0 0xd6000000 0x02000000
+ >;
+ status = "disabled";
+ };
+
iram: iram at ffff4c00 {
compatible = "mmio-sram";
reg = <0xffff4c00 0xb400>;
--
1.8.1.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/6] ARM: dts: imx27-phytec-phycore-som: Add WEIM node
2013-07-02 16:02 [PATCH 1/6] ARM: dts: i.MX27: Move IIM node under AIPI2 bus Alexander Shiyan
2013-07-02 16:02 ` [PATCH 2/6] ARM: dts: i.MX27: Add WEIM node Alexander Shiyan
@ 2013-07-02 16:02 ` Alexander Shiyan
2013-07-02 16:02 ` [PATCH 4/6] ARM: dts: imx27-phytec-phycore-som: Add SRAM node Alexander Shiyan
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Alexander Shiyan @ 2013-07-02 16:02 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds WEIM node for Phytec PCM-038 module.
Migrate existing on-module NOR-flash as children of WEIM CS0.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx27-phytec-phycore-som.dts | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dts b/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
index 76edf59..92765ee 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
@@ -52,15 +52,6 @@
};
};
};
-
- nor_flash at c0000000 {
- compatible = "cfi-flash";
- bank-width = <2>;
- reg = <0xc0000000 0x02000000>;
- linux,mtd-name = "physmap-flash.0";
- #address-cells = <1>;
- #size-cells = <1>;
- };
};
&cspi1 {
@@ -177,3 +168,17 @@
nand-ecc-mode = "hw";
status = "okay";
};
+
+&weim {
+ status = "okay";
+
+ nor: nor at c0000000 {
+ compatible = "cfi-flash";
+ reg = <0 0x00000000 0x02000000>;
+ bank-width = <2>;
+ linux,mtd-name = "physmap-flash.0";
+ fsl,weim-cs-timing = <0x22c2cf00 0x75000d01 0x00000900>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ };
+};
--
1.8.1.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/6] ARM: dts: imx27-phytec-phycore-som: Add SRAM node
2013-07-02 16:02 [PATCH 1/6] ARM: dts: i.MX27: Move IIM node under AIPI2 bus Alexander Shiyan
2013-07-02 16:02 ` [PATCH 2/6] ARM: dts: i.MX27: Add WEIM node Alexander Shiyan
2013-07-02 16:02 ` [PATCH 3/6] ARM: dts: imx27-phytec-phycore-som: " Alexander Shiyan
@ 2013-07-02 16:02 ` Alexander Shiyan
2013-07-02 16:02 ` [PATCH 5/6] ARM: dts: imx27-phytec-phycore-rdk: Add CAN node Alexander Shiyan
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Alexander Shiyan @ 2013-07-02 16:02 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds SRAM node for Phytec PCM-038 module.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx27-phytec-phycore-som.dts | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dts b/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
index 92765ee..bd7df2e 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
@@ -181,4 +181,14 @@
#address-cells = <1>;
#size-cells = <1>;
};
+
+ sram: sram at c8000000 {
+ compatible = "mtd-ram";
+ reg = <1 0x00000000 0x00800000>;
+ bank-width = <2>;
+ linux,mtd-name = "mtd-ram.0";
+ fsl,weim-cs-timing = <0x0000d843 0x22252521 0x22220a00>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ };
};
--
1.8.1.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/6] ARM: dts: imx27-phytec-phycore-rdk: Add CAN node
2013-07-02 16:02 [PATCH 1/6] ARM: dts: i.MX27: Move IIM node under AIPI2 bus Alexander Shiyan
` (2 preceding siblings ...)
2013-07-02 16:02 ` [PATCH 4/6] ARM: dts: imx27-phytec-phycore-som: Add SRAM node Alexander Shiyan
@ 2013-07-02 16:02 ` Alexander Shiyan
2013-07-02 16:02 ` [PATCH 6/6] ARM: dts: imx27-phytec-phycore-som: Using labels for reusing UART, I2C and FEC Alexander Shiyan
2013-07-04 6:56 ` [PATCH 1/6] ARM: dts: i.MX27: Move IIM node under AIPI2 bus Shawn Guo
5 siblings, 0 replies; 7+ messages in thread
From: Alexander Shiyan @ 2013-07-02 16:02 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds CAN (NXP SJA1000) node for Phytec PCM-970 RDK.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
index e7ed978..0fc6551 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
@@ -35,3 +35,16 @@
fsl,uart-has-rtscts;
status = "okay";
};
+
+&weim {
+ can at d4000000 {
+ compatible = "nxp,sja1000";
+ reg = <4 0x00000000 0x00000100>;
+ interrupt-parent = <&gpio5>;
+ interrupts = <19 0x2>;
+ nxp,external-clock-frequency = <16000000>;
+ nxp,tx-output-config = <0x16>;
+ nxp,no-comparator-bypass;
+ fsl,weim-cs-timing = <0x0000dcf6 0x444a0301 0x44443302>;
+ };
+};
--
1.8.1.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 6/6] ARM: dts: imx27-phytec-phycore-som: Using labels for reusing UART, I2C and FEC
2013-07-02 16:02 [PATCH 1/6] ARM: dts: i.MX27: Move IIM node under AIPI2 bus Alexander Shiyan
` (3 preceding siblings ...)
2013-07-02 16:02 ` [PATCH 5/6] ARM: dts: imx27-phytec-phycore-rdk: Add CAN node Alexander Shiyan
@ 2013-07-02 16:02 ` Alexander Shiyan
2013-07-04 6:56 ` [PATCH 1/6] ARM: dts: i.MX27: Move IIM node under AIPI2 bus Shawn Guo
5 siblings, 0 replies; 7+ messages in thread
From: Alexander Shiyan @ 2013-07-02 16:02 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx27-phytec-phycore-som.dts | 63 ++++++++++++--------------
1 file changed, 30 insertions(+), 33 deletions(-)
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dts b/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
index bd7df2e..22d0d27 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
@@ -19,39 +19,6 @@
memory {
reg = <0xa0000000 0x08000000>;
};
-
- soc {
- aipi at 10000000 { /* aipi1 */
- serial at 1000a000 {
- status = "okay";
- };
-
- i2c at 1001d000 {
- clock-frequency = <400000>;
- status = "okay";
- at24 at 52 {
- compatible = "at,24c32";
- pagesize = <32>;
- reg = <0x52>;
- };
- pcf8563 at 51 {
- compatible = "nxp,pcf8563";
- reg = <0x51>;
- };
- lm75 at 4a {
- compatible = "national,lm75";
- reg = <0x4a>;
- };
- };
- };
-
- aipi at 10020000 { /* aipi2 */
- ethernet at 1002b000 {
- phy-reset-gpios = <&gpio3 30 0>;
- status = "okay";
- };
- };
- };
};
&cspi1 {
@@ -163,12 +130,42 @@
};
};
+&fec {
+ phy-reset-gpios = <&gpio3 30 0>;
+ status = "okay";
+};
+
+&i2c2 {
+ clock-frequency = <400000>;
+ status = "okay";
+
+ at24 at 52 {
+ compatible = "at,24c32";
+ pagesize = <32>;
+ reg = <0x52>;
+ };
+
+ pcf8563 at 51 {
+ compatible = "nxp,pcf8563";
+ reg = <0x51>;
+ };
+
+ lm75 at 4a {
+ compatible = "national,lm75";
+ reg = <0x4a>;
+ };
+};
+
&nfc {
nand-bus-width = <8>;
nand-ecc-mode = "hw";
status = "okay";
};
+&uart1 {
+ status = "okay";
+};
+
&weim {
status = "okay";
--
1.8.1.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 1/6] ARM: dts: i.MX27: Move IIM node under AIPI2 bus
2013-07-02 16:02 [PATCH 1/6] ARM: dts: i.MX27: Move IIM node under AIPI2 bus Alexander Shiyan
` (4 preceding siblings ...)
2013-07-02 16:02 ` [PATCH 6/6] ARM: dts: imx27-phytec-phycore-som: Using labels for reusing UART, I2C and FEC Alexander Shiyan
@ 2013-07-04 6:56 ` Shawn Guo
5 siblings, 0 replies; 7+ messages in thread
From: Shawn Guo @ 2013-07-04 6:56 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 02, 2013 at 08:02:24PM +0400, Alexander Shiyan wrote:
> This patch moves IIM node under AIPI2 bus, since this is proper
> location for this module.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
All applied, thanks.
Shawn
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-07-04 6:56 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-02 16:02 [PATCH 1/6] ARM: dts: i.MX27: Move IIM node under AIPI2 bus Alexander Shiyan
2013-07-02 16:02 ` [PATCH 2/6] ARM: dts: i.MX27: Add WEIM node Alexander Shiyan
2013-07-02 16:02 ` [PATCH 3/6] ARM: dts: imx27-phytec-phycore-som: " Alexander Shiyan
2013-07-02 16:02 ` [PATCH 4/6] ARM: dts: imx27-phytec-phycore-som: Add SRAM node Alexander Shiyan
2013-07-02 16:02 ` [PATCH 5/6] ARM: dts: imx27-phytec-phycore-rdk: Add CAN node Alexander Shiyan
2013-07-02 16:02 ` [PATCH 6/6] ARM: dts: imx27-phytec-phycore-som: Using labels for reusing UART, I2C and FEC Alexander Shiyan
2013-07-04 6:56 ` [PATCH 1/6] ARM: dts: i.MX27: Move IIM node under AIPI2 bus Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).