diff mbox

[v3,5/5] ARM: dts: Add device tree support for phycard pca100

Message ID 1372431037-13519-6-git-send-email-mpa@pengutronix.de
State New
Headers show

Commit Message

Markus Pargmann June 28, 2013, 2:50 p.m. UTC
Board files for Phytec phyCARD-S "System on Module" and "Rapid
Development Kit".

Based on patches from:

Steffen Trumtrar <s.trumtrar@pengutronix.de>:
 - Original patch
 - ARM: dts: Set partition offsets for phycard
 - ARM: dts: Use CSPI1 instead of CSPI2 on phycard pca100
 - ARM: imx27-phytec-phycard-S.dts: resize nand partitions

Jan Luebbe <jlu@pengutronix.de>:
 - ARM: dts: Enable bad block table in NAND

Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---

Notes:
    Changes in v3:
     - Fix memory offset
    
    Changes in v2:
     - Remove unnecessary Kconfig nand selection.
     - Style fixes
     - Replace node identifiers with node labels
     - Fix compatibility of cpu node
     - Remove device node for not mainlined dimmer driver
     - Remove nand partition table
     - Remove memory node
     - Splitted board file into "system on module" and "rapid development kit"

 arch/arm/boot/dts/Makefile                       |  2 +
 arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 62 ++++++++++++++++++++
 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts | 72 ++++++++++++++++++++++++
 3 files changed, 136 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
 create mode 100644 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts

Comments

Alexander Shiyan July 2, 2013, 4:27 p.m. UTC | #1
> Board files for Phytec phyCARD-S "System on Module" and "Rapid
> Development Kit".
> 
> Based on patches from:
> 
> Steffen Trumtrar <s.trumtrar@pengutronix.de>:
>  - Original patch
>  - ARM: dts: Set partition offsets for phycard
>  - ARM: dts: Use CSPI1 instead of CSPI2 on phycard pca100
>  - ARM: imx27-phytec-phycard-S.dts: resize nand partitions
...
> diff --git a/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts
...
> +&i2c1 {
> +	status = "okay";
> +
> +	ioexpander@41 {
> +		compatible = "nxp,pca9536";
> +		reg = <0x41>;
> +	};
> +
> +	rtc@51 {
> +		compatible = "nxp,pcf8563";
> +		reg = <0x51>;
> +	};
> +};
> +
> +&i2c2 {
> +	status = "okay";
> +
> +	lm75@4a {
> +		compatible = "national,lm75";
> +		reg = <0x4a>;
> +	};
> +
> +	rtc@51 {
> +		compatible = "nxp,pcf8563";
> +		reg = <0x51>;
> +	};

Really two identical RTC on I2C1 & I2C2 or it is typo?

---
Shawn Guo July 6, 2013, 3:15 a.m. UTC | #2
On Fri, Jul 05, 2013 at 03:45:09PM +0200, Markus Pargmann wrote:
> Fixup of commit 7874d595b78e431f0f661d2fe47625649308a52e

The commit ID is not stable.  I just dropped it and applied the patch.

Shawn

> "ARM: dts: Add device tree support for phycard pca100".
> 
> Remove wrong I2C RTC node.
> 
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> ---
> 
> Thanks, Alexander, you are right. I2C2 has no RTC.
> 
> Regards,
> 
> Markus
> 
>  arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts
> index ec52b6d..01ee807 100644
> --- a/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts
> +++ b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts
> @@ -55,11 +55,6 @@
>  		reg = <0x4a>;
>  	};
>  
> -	rtc@51 {
> -		compatible = "nxp,pcf8563";
> -		reg = <0x51>;
> -	};
> -
>  	at24@52 {
>  		compatible = "at,24c32";
>  		pagesize = <32>;
> -- 
> 1.8.2.1
>
Alexander Shiyan July 6, 2013, 8:51 a.m. UTC | #3
> Fixup of commit 7874d595b78e431f0f661d2fe47625649308a52e
> "ARM: dts: Add device tree support for phycard pca100".
> 
> Remove wrong I2C RTC node.
> 
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> ---
> 
> Thanks, Alexander, you are right. I2C2 has no RTC.
...

There are a couple of comments on this file.

I think that the OWIRE should be moved to the RDK.

ioexpander must contain "gpio-controller" at least, and for use it further,
it is necessary to define the label for this node.

Thanks.

---
Markus Pargmann July 7, 2013, 10:22 a.m. UTC | #4
On Sat, Jul 06, 2013 at 12:51:58PM +0400, Alexander Shiyan wrote:
> > Fixup of commit 7874d595b78e431f0f661d2fe47625649308a52e
> > "ARM: dts: Add device tree support for phycard pca100".
> > 
> > Remove wrong I2C RTC node.
> > 
> > Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> > ---
> > 
> > Thanks, Alexander, you are right. I2C2 has no RTC.
> ...
> 
> There are a couple of comments on this file.
> 
> I think that the OWIRE should be moved to the RDK.

I moved OWIRE and i2c1 to RDK. Both are not used on the SOM.

> ioexpander must contain "gpio-controller" at least, and for use it further,
> it is necessary to define the label for this node.

I checked all I2C devices in the board schematics. There is actually no
ioexpander. I don't know why it was added. I will send some I2C patches
later.

Regards,

Markus
Alexander Shiyan July 7, 2013, 10:31 a.m. UTC | #5
> On Sat, Jul 06, 2013 at 12:51:58PM +0400, Alexander Shiyan wrote:
> > > Fixup of commit 7874d595b78e431f0f661d2fe47625649308a52e
> > > "ARM: dts: Add device tree support for phycard pca100".
> > > 
> > > Remove wrong I2C RTC node.
> > > 
> > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> > > ---
> > > 
> > > Thanks, Alexander, you are right. I2C2 has no RTC.
> > ...
> > 
> > There are a couple of comments on this file.
> > 
> > I think that the OWIRE should be moved to the RDK.
> 
> I moved OWIRE and i2c1 to RDK. Both are not used on the SOM.
> 
> > ioexpander must contain "gpio-controller" at least, and for use it further,
> > it is necessary to define the label for this node.
> 
> I checked all I2C devices in the board schematics. There is actually no
> ioexpander. I don't know why it was added. I will send some I2C patches
> later.

Perhaps the chip is mounted on the camera module.
A similar IC is exist on PCM-970 camera addon device.
If so, the device should also be moved to RDK.

---
Markus Pargmann July 7, 2013, 10:44 a.m. UTC | #6
On Sun, Jul 07, 2013 at 02:31:41PM +0400, Alexander Shiyan wrote:
> > On Sat, Jul 06, 2013 at 12:51:58PM +0400, Alexander Shiyan wrote:
> > > > Fixup of commit 7874d595b78e431f0f661d2fe47625649308a52e
> > > > "ARM: dts: Add device tree support for phycard pca100".
> > > > 
> > > > Remove wrong I2C RTC node.
> > > > 
> > > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> > > > ---
> > > > 
> > > > Thanks, Alexander, you are right. I2C2 has no RTC.
> > > ...
> > > 
> > > There are a couple of comments on this file.
> > > 
> > > I think that the OWIRE should be moved to the RDK.
> > 
> > I moved OWIRE and i2c1 to RDK. Both are not used on the SOM.
> > 
> > > ioexpander must contain "gpio-controller" at least, and for use it further,
> > > it is necessary to define the label for this node.
> > 
> > I checked all I2C devices in the board schematics. There is actually no
> > ioexpander. I don't know why it was added. I will send some I2C patches
> > later.
> 
> Perhaps the chip is mounted on the camera module.
> A similar IC is exist on PCM-970 camera addon device.
> If so, the device should also be moved to RDK.

Yes that's possible. But in that case I think the ioexpander should be
removed from both dts files because the Phytec phyCARD-S RDK does not
include a camera module.

Regards,

Markus
diff mbox

Patch

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b3a8661..707c192 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -105,6 +105,8 @@  dtb-$(CONFIG_ARCH_MXC) += \
 	imx27-pdk.dtb \
 	imx27-phytec-phycore-som.dtb \
 	imx27-phytec-phycore-rdk.dtb \
+	imx27-phytec-phycard-s-som.dtb \
+	imx27-phytec-phycard-s-rdk.dtb \
 	imx31-bug.dtb \
 	imx51-apf51.dtb \
 	imx51-apf51dev.dtb \
diff --git a/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
new file mode 100644
index 0000000..bf11429
--- /dev/null
+++ b/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
@@ -0,0 +1,62 @@ 
+/*
+ * Copyright 2012 Markus Pargmann, Pengutronix
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include "imx27-phytec-phycard-s-som.dts"
+
+/ {
+	model = "Phytec pca100 rapid development kit";
+	compatible = "phytec,imx27-pca100-rdk", "phytec,imx27-pca100", "fsl,imx27";
+
+	display: display {
+		model = "Primeview-PD050VL1";
+		native-mode = <&timing0>;
+		bits-per-pixel = <16>;  /* non-standard but required */
+		fsl,pcr = <0xf0c88080>;	/* non-standard but required */
+		display-timings {
+			timing0: 640x480 {
+				hactive = <640>;
+				vactive = <480>;
+				hback-porch = <112>;
+				hfront-porch = <36>;
+				hsync-len = <32>;
+				vback-porch = <33>;
+				vfront-porch = <33>;
+				vsync-len = <2>;
+				clock-frequency = <25000000>;
+			};
+		};
+	};
+};
+
+&imxfb {
+	display = <&display>;
+	status = "okay";
+};
+
+&sdhci2 {
+	cd-gpios = <&gpio3 29 0>;
+	status = "okay";
+};
+
+&uart1 {
+	fsl,uart-has-rtscts;
+	status = "okay";
+};
+
+&uart2 {
+	fsl,uart-has-rtscts;
+	status = "okay";
+};
+
+&uart3 {
+	fsl,uart-has-rtscts;
+	status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts
new file mode 100644
index 0000000..ec52b6d
--- /dev/null
+++ b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts
@@ -0,0 +1,72 @@ 
+/*
+ * Copyright 2012 Sascha Hauer, Uwe Kleine-König, Steffen Trumtrar
+ * and Markus Pargmann, Pengutronix
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx27.dtsi"
+
+/ {
+	model = "Phytec pca100";
+	compatible = "phytec,imx27-pca100", "fsl,imx27";
+
+	memory {
+		reg = <0xa0000000 0x08000000>; /* 128MB */
+	};
+};
+
+&cspi1 {
+	fsl,spi-num-chipselects = <2>;
+	cs-gpios = <&gpio4 28 0>,
+		<&gpio4 27 0>;
+	status = "okay";
+};
+
+&fec {
+	status = "okay";
+};
+
+&i2c1 {
+	status = "okay";
+
+	ioexpander@41 {
+		compatible = "nxp,pca9536";
+		reg = <0x41>;
+	};
+
+	rtc@51 {
+		compatible = "nxp,pcf8563";
+		reg = <0x51>;
+	};
+};
+
+&i2c2 {
+	status = "okay";
+
+	lm75@4a {
+		compatible = "national,lm75";
+		reg = <0x4a>;
+	};
+
+	rtc@51 {
+		compatible = "nxp,pcf8563";
+		reg = <0x51>;
+	};
+
+	at24@52 {
+		compatible = "at,24c32";
+		pagesize = <32>;
+		reg = <0x52>;
+	};
+};
+
+&owire {
+	status = "okay";
+};