Patchwork [v3] ARM: dts: Add basic support for imx6q-sabresd

login
register
mail settings
Submitter Fabio Estevam
Date April 21, 2012, 5:07 p.m.
Message ID <1335028028-3214-1-git-send-email-festevam@gmail.com>
Download mbox | patch
Permalink /patch/154222/
State New
Headers show

Comments

Fabio Estevam - April 21, 2012, 5:07 p.m.
Add basic support for imx6q-sabresd.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v2:
- Add SDHC2 and SDHC3 support

Changes since v1:

- Added entry into Documentation
- Added entry in arch/arm/mach-imx/Makefile.boot
- Fixed ethernet
- Dropped SDHC for now
 Documentation/devicetree/bindings/arm/fsl.txt |    4 ++
 arch/arm/boot/dts/imx6q-sabresd.dts           |   54 +++++++++++++++++++++++++
 arch/arm/mach-imx/Makefile.boot               |    3 +-
 arch/arm/mach-imx/mach-imx6q.c                |    1 +
 4 files changed, 61 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx6q-sabresd.dts
Shawn Guo - April 23, 2012, 1:16 a.m.
On Sat, Apr 21, 2012 at 02:07:08PM -0300, Fabio Estevam wrote:
> Add basic support for imx6q-sabresd.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes since v2:
> - Add SDHC2 and SDHC3 support
> 
> Changes since v1:
> 
> - Added entry into Documentation
> - Added entry in arch/arm/mach-imx/Makefile.boot
> - Fixed ethernet
> - Dropped SDHC for now
>  Documentation/devicetree/bindings/arm/fsl.txt |    4 ++
>  arch/arm/boot/dts/imx6q-sabresd.dts           |   54 +++++++++++++++++++++++++
>  arch/arm/mach-imx/Makefile.boot               |    3 +-
>  arch/arm/mach-imx/mach-imx6q.c                |    1 +
>  4 files changed, 61 insertions(+), 1 deletions(-)
>  create mode 100644 arch/arm/boot/dts/imx6q-sabresd.dts
> 
> diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt
> index fecb580..0fc2da7 100644
> --- a/Documentation/devicetree/bindings/arm/fsl.txt
> +++ b/Documentation/devicetree/bindings/arm/fsl.txt
> @@ -33,6 +33,10 @@ i.MX6 Quad SABRE Lite Board
>  Required root node properties:
>      - compatible = "fsl,imx6q-sabrelite", "fsl,imx6q";
>  
> +i.MX6 Quad SABRE Smart Device Board
> +Required root node properties:
> +    - compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
> +
>  Generic i.MX boards
>  -------------------
>  
> diff --git a/arch/arm/boot/dts/imx6q-sabresd.dts b/arch/arm/boot/dts/imx6q-sabresd.dts
> new file mode 100644
> index 0000000..93d1e17
> --- /dev/null
> +++ b/arch/arm/boot/dts/imx6q-sabresd.dts
> @@ -0,0 +1,54 @@
> +/*
> + * Copyright 2012 Freescale Semiconductor, Inc.
> + * Copyright 2011 Linaro Ltd.
> + *
> + * 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/ "imx6q.dtsi"
> +
> +/ {
> +	model = "Freescale i.MX6Q SABRE Smart Device Board";
> +	compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
> +
> +	memory {
> +		reg = <0x10000000 0x40000000>;
> +	};
> +
> +	soc {
> +
> +		aips-bus@02000000 { /* AIPS1 */
> +			spba-bus@02000000 {
> +				uart1: uart@02020000 {

I have it rebased on imx/dt branch, where node name has been renamed
to serial.

> +				status = "okay";

It misses one tab indent.

> +				};
> +			};
> +		};
> +
> +		aips-bus@02100000 { /* AIPS2 */
> +			enet@02188000 {
> +				phy-mode = "rgmii";
> +				status = "okay";
> +			};
> +
> +			usdhc@02194000 { /* uSDHC2 */
> +				cd-gpios = <&gpio2 2 0>;
> +				wp-gpios = <&gpio2 3 0>;
> +				status = "okay";
> +			};
> +
> +			usdhc@02198000 { /* uSDHC3 */
> +				cd-gpios = <&gpio2 0 0>;
> +				wp-gpios = <&gpio2 1 0>;
> +				status = "okay";
> +			};
> +

Unnecessary new line.

I fixed all above and applied the patch, thanks.

Regards,
Shawn

> +		};
> +	};
> +};
> diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot
> index 3851d8a..05541cf 100644
> --- a/arch/arm/mach-imx/Makefile.boot
> +++ b/arch/arm/mach-imx/Makefile.boot
> @@ -42,4 +42,5 @@ dtb-$(CONFIG_MACH_IMX51_DT) += imx51-babbage.dtb
>  dtb-$(CONFIG_MACH_IMX53_DT) += imx53-ard.dtb imx53-evk.dtb \
>  			       imx53-qsb.dtb imx53-smd.dtb
>  dtb-$(CONFIG_SOC_IMX6Q)	+= imx6q-arm2.dtb \
> -			   imx6q-sabrelite.dtb
> +			   imx6q-sabrelite.dtb \
> +			   imx6q-sabresd.dtb \
> diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
> index da6c1d9..512c18d 100644
> --- a/arch/arm/mach-imx/mach-imx6q.c
> +++ b/arch/arm/mach-imx/mach-imx6q.c
> @@ -132,6 +132,7 @@ static struct sys_timer imx6q_timer = {
>  static const char *imx6q_dt_compat[] __initdata = {
>  	"fsl,imx6q-arm2",
>  	"fsl,imx6q-sabrelite",
> +	"fsl,imx6q-sabresd",
>  	"fsl,imx6q",
>  	NULL,
>  };
> -- 
> 1.7.1
>

Patch

diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt
index fecb580..0fc2da7 100644
--- a/Documentation/devicetree/bindings/arm/fsl.txt
+++ b/Documentation/devicetree/bindings/arm/fsl.txt
@@ -33,6 +33,10 @@  i.MX6 Quad SABRE Lite Board
 Required root node properties:
     - compatible = "fsl,imx6q-sabrelite", "fsl,imx6q";
 
+i.MX6 Quad SABRE Smart Device Board
+Required root node properties:
+    - compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
+
 Generic i.MX boards
 -------------------
 
diff --git a/arch/arm/boot/dts/imx6q-sabresd.dts b/arch/arm/boot/dts/imx6q-sabresd.dts
new file mode 100644
index 0000000..93d1e17
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-sabresd.dts
@@ -0,0 +1,54 @@ 
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ *
+ * 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/ "imx6q.dtsi"
+
+/ {
+	model = "Freescale i.MX6Q SABRE Smart Device Board";
+	compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
+
+	memory {
+		reg = <0x10000000 0x40000000>;
+	};
+
+	soc {
+
+		aips-bus@02000000 { /* AIPS1 */
+			spba-bus@02000000 {
+				uart1: uart@02020000 {
+				status = "okay";
+				};
+			};
+		};
+
+		aips-bus@02100000 { /* AIPS2 */
+			enet@02188000 {
+				phy-mode = "rgmii";
+				status = "okay";
+			};
+
+			usdhc@02194000 { /* uSDHC2 */
+				cd-gpios = <&gpio2 2 0>;
+				wp-gpios = <&gpio2 3 0>;
+				status = "okay";
+			};
+
+			usdhc@02198000 { /* uSDHC3 */
+				cd-gpios = <&gpio2 0 0>;
+				wp-gpios = <&gpio2 1 0>;
+				status = "okay";
+			};
+
+		};
+	};
+};
diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot
index 3851d8a..05541cf 100644
--- a/arch/arm/mach-imx/Makefile.boot
+++ b/arch/arm/mach-imx/Makefile.boot
@@ -42,4 +42,5 @@  dtb-$(CONFIG_MACH_IMX51_DT) += imx51-babbage.dtb
 dtb-$(CONFIG_MACH_IMX53_DT) += imx53-ard.dtb imx53-evk.dtb \
 			       imx53-qsb.dtb imx53-smd.dtb
 dtb-$(CONFIG_SOC_IMX6Q)	+= imx6q-arm2.dtb \
-			   imx6q-sabrelite.dtb
+			   imx6q-sabrelite.dtb \
+			   imx6q-sabresd.dtb \
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index da6c1d9..512c18d 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -132,6 +132,7 @@  static struct sys_timer imx6q_timer = {
 static const char *imx6q_dt_compat[] __initdata = {
 	"fsl,imx6q-arm2",
 	"fsl,imx6q-sabrelite",
+	"fsl,imx6q-sabresd",
 	"fsl,imx6q",
 	NULL,
 };