arm/dt: Add basic device tree support for mx53 loco board

Message ID 1301387820-18299-1-git-send-email-jason.hui@linaro.org
State New
Headers show

Commit Message

Jason Hui March 29, 2011, 8:37 a.m.
---
grant, uboot patches has been send to u-boot maillist
Test OK on mx53 loco board

Signed-off-by: Jason Liu <jason.hui@linaro.org>
---
 arch/arm/boot/dts/mx53-loco.dts     |   30 ++++++++++++++++++++++++++++++
 arch/arm/mach-mx5/Kconfig           |    1 +
 arch/arm/mach-mx5/board-mx53_loco.c |    5 +++++
 3 files changed, 36 insertions(+), 0 deletions(-)

Comments

Jason Liu March 29, 2011, 10:34 a.m. | #1
Hi, Grant,
The two patches for mx51/mx53 DT support have the same issue, which 
is the S-O-B will be missed when you git am. Let me know if you want me
re-send the two patches or you would take care when you am it? Thanks,

Best Regards,
Jason Liu


>-----Original Message-----
>From: linaro-dev-bounces@lists.linaro.org [mailto:linaro-dev-
>bounces@lists.linaro.org] On Behalf Of Jason Liu
>Sent: Tuesday, March 29, 2011 4:37 PM
>To: devicetree-discuss@lists.ozlabs.org
>Cc: grant.likely@linaro.org; linaro-dev@lists.linaro.org; patches@linaro.org
>Subject: [PATCH] arm/dt: Add basic device tree support for mx53 loco board
>
>---
>grant, uboot patches has been send to u-boot maillist Test OK on mx53 loco
>board
>
>Signed-off-by: Jason Liu <jason.hui@linaro.org>
>---
> arch/arm/boot/dts/mx53-loco.dts     |   30
>++++++++++++++++++++++++++++++
> arch/arm/mach-mx5/Kconfig           |    1 +
> arch/arm/mach-mx5/board-mx53_loco.c |    5 +++++
> 3 files changed, 36 insertions(+), 0 deletions(-)
>
>diff --git a/arch/arm/boot/dts/mx53-loco.dts b/arch/arm/boot/dts/mx53-
>loco.dts new file mode 100644 index 0000000..7347456
>--- /dev/null
>+++ b/arch/arm/boot/dts/mx53-loco.dts
>@@ -0,0 +1,30 @@
>+/*
>+ * 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/;
>+
>+/ {
>+	model = "Freescale i.MX53 LOCO";
>+	compatible = "fsl,mx53-loco";
>+	#address-cells = <1>;
>+	#size-cells = <1>;
>+
>+	aliases {
>+	};
>+
>+	memory {
>+		device_type = "memory";
>+		reg = <0x70000000 0x40000000>;
>+	};
>+
>+	chosen {
>+	};
>+};
>diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig index
>aae51ee..a61e01e 100644
>--- a/arch/arm/mach-mx5/Kconfig
>+++ b/arch/arm/mach-mx5/Kconfig
>@@ -167,6 +167,7 @@ config MACH_MX53_SMD  config MACH_MX53_LOCO
> 	bool "Support MX53 LOCO platforms"
> 	select SOC_IMX53
>+	select MX5_DT_COMMON
> 	select IMX_HAVE_PLATFORM_IMX2_WDT
> 	select IMX_HAVE_PLATFORM_IMX_I2C
> 	select IMX_HAVE_PLATFORM_IMX_UART
>diff --git a/arch/arm/mach-mx5/board-mx53_loco.c b/arch/arm/mach-
>mx5/board-mx53_loco.c
>index 0a18f8d..6ffc591 100644
>--- a/arch/arm/mach-mx5/board-mx53_loco.c
>+++ b/arch/arm/mach-mx5/board-mx53_loco.c
>@@ -226,10 +226,15 @@ static struct sys_timer mx53_loco_timer = {
> 	.init	= mx53_loco_timer_init,
> };
>
>+static const char *mx53_loco_dt_match[] __initdata = {
>+	"fsl,mx53-loco",
>+	NULL
>+};
> MACHINE_START(MX53_LOCO, "Freescale MX53 LOCO Board")
> 	.map_io = mx53_map_io,
> 	.init_early = imx53_init_early,
> 	.init_irq = mx53_init_irq,
> 	.timer = &mx53_loco_timer,
> 	.init_machine = mx53_loco_board_init,
>+	.dt_compat = mx53_loco_dt_match,
> MACHINE_END
>--
>1.7.1
>
>
>_______________________________________________
>linaro-dev mailing list
>linaro-dev@lists.linaro.org
>http://lists.linaro.org/mailman/listinfo/linaro-dev
Grant Likely March 31, 2011, 3:52 a.m. | #2
On Tue, Mar 29, 2011 at 10:34:12AM +0000, Liu Hui-R64343 wrote:
> Hi, Grant,
> The two patches for mx51/mx53 DT support have the same issue, which 
> is the S-O-B will be missed when you git am. Let me know if you want me
> re-send the two patches or you would take care when you am it? Thanks,

I fixed it up.  Don't worry about it.

g.
Shawn Guo March 31, 2011, 4:36 p.m. | #3
Hi Grant,

On Wed, Mar 30, 2011 at 09:52:15PM -0600, Grant Likely wrote:
> On Tue, Mar 29, 2011 at 10:34:12AM +0000, Liu Hui-R64343 wrote:
> > Hi, Grant,
> > The two patches for mx51/mx53 DT support have the same issue, which 
> > is the S-O-B will be missed when you git am. Let me know if you want me
> > re-send the two patches or you would take care when you am it? Thanks,
> 
> I fixed it up.  Don't worry about it.
> 
I'm little confused by the Kconfig changes in this patch.  I saw your
comments on SMDKV310 patch as below.  But this patch was accepted with
MX5_DT_COMMON selected, which in turn selects USE_OF and
PROC_DEVICETREE.

--- quota begins ---
> diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
> index a021b52..78f5924 100644
> --- a/arch/arm/mach-exynos4/Kconfig
> +++ b/arch/arm/mach-exynos4/Kconfig
> @@ -123,6 +123,7 @@ config MACH_SMDKV310
>  	select EXYNOS4_SETUP_I2C1
>  	select EXYNOS4_SETUP_KEYPAD
>  	select EXYNOS4_SETUP_SDHCI
> +	select USE_OF

I would drop this bit (I dropped it from my branch when I applied the
patch).  Device tree support remains an optional feature.  Instead it
can be enabled by default in the defconfig (or however the config is
managed for the kernel package)
--- quota ends ---

BTW, are you silently renaming the original devicetree/test branch
to devicetree/test-2.6.38 and using new devicetree/test for Nicolas
to pull Linaro bits?  If that is the case, what branch
devicetree/arm-linaro-2.6.38-rebuilt will be for?
Grant Likely March 31, 2011, 4:50 p.m. | #4
On Fri, Apr 01, 2011 at 12:36:16AM +0800, Shawn Guo wrote:
> Hi Grant,
> 
> On Wed, Mar 30, 2011 at 09:52:15PM -0600, Grant Likely wrote:
> > On Tue, Mar 29, 2011 at 10:34:12AM +0000, Liu Hui-R64343 wrote:
> > > Hi, Grant,
> > > The two patches for mx51/mx53 DT support have the same issue, which 
> > > is the S-O-B will be missed when you git am. Let me know if you want me
> > > re-send the two patches or you would take care when you am it? Thanks,
> > 
> > I fixed it up.  Don't worry about it.
> > 
> I'm little confused by the Kconfig changes in this patch.  I saw your
> comments on SMDKV310 patch as below.  But this patch was accepted with
> MX5_DT_COMMON selected, which in turn selects USE_OF and
> PROC_DEVICETREE.

I picked up a bunch of these patches even though there were little
things that should probably be fixed up.  I'll get it all resolved
before I ask Nicolas to pull.

> 
> --- quota begins ---
> > diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
> > index a021b52..78f5924 100644
> > --- a/arch/arm/mach-exynos4/Kconfig
> > +++ b/arch/arm/mach-exynos4/Kconfig
> > @@ -123,6 +123,7 @@ config MACH_SMDKV310
> >  	select EXYNOS4_SETUP_I2C1
> >  	select EXYNOS4_SETUP_KEYPAD
> >  	select EXYNOS4_SETUP_SDHCI
> > +	select USE_OF
> 
> I would drop this bit (I dropped it from my branch when I applied the
> patch).  Device tree support remains an optional feature.  Instead it
> can be enabled by default in the defconfig (or however the config is
> managed for the kernel package)
> --- quota ends ---
> 
> BTW, are you silently renaming the original devicetree/test branch
> to devicetree/test-2.6.38 and using new devicetree/test for Nicolas
> to pull Linaro bits?  If that is the case, what branch
> devicetree/arm-linaro-2.6.38-rebuilt will be for?

devicetree/test is /always/ an unstable branch that I try to keep as
close to Linus' tree as possible.  I usually rebase for every -rc
release.  devicetree/arm is based on devicetree/test, but it is
published in a way that means it can always be merged.

Also, which devicetree/test is pretty much "anything goes", I'm a lot
more careful about which patches I actually publish to devicetree/arm.

devicetree/arm-linaro-2.6.38 is the tree that I used previously for
asking Nicolas to pull.  I created
devicetree/arm-linaro-2.6.38-rebuilt solely for the purpose of
Nicolas' new rebuilt branch, but now I hear that he isn't going to use
that tree, so I'll push the latest changes into the
devicetree/arm-linaro-2.6.38 branch too.

You should be using devicetree/arm for anything targeted at upstream,
and devicetree/arm-linaro-2.6.38 for anything targeted at the 11.05
release.

g.
Grant Likely March 31, 2011, 4:57 p.m. | #5
On Thu, Mar 31, 2011 at 10:50 AM, Grant Likely
<grant.likely@secretlab.ca> wrote:
> On Fri, Apr 01, 2011 at 12:36:16AM +0800, Shawn Guo wrote:
>> Hi Grant,
>>
>> On Wed, Mar 30, 2011 at 09:52:15PM -0600, Grant Likely wrote:
>> > On Tue, Mar 29, 2011 at 10:34:12AM +0000, Liu Hui-R64343 wrote:
>> > > Hi, Grant,
>> > > The two patches for mx51/mx53 DT support have the same issue, which
>> > > is the S-O-B will be missed when you git am. Let me know if you want me
>> > > re-send the two patches or you would take care when you am it? Thanks,
>> >
>> > I fixed it up.  Don't worry about it.
>> >
>> I'm little confused by the Kconfig changes in this patch.  I saw your
>> comments on SMDKV310 patch as below.  But this patch was accepted with
>> MX5_DT_COMMON selected, which in turn selects USE_OF and
>> PROC_DEVICETREE.
>
> I picked up a bunch of these patches even though there were little
> things that should probably be fixed up.  I'll get it all resolved
> before I ask Nicolas to pull.
>
>>
>> --- quota begins ---
>> > diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
>> > index a021b52..78f5924 100644
>> > --- a/arch/arm/mach-exynos4/Kconfig
>> > +++ b/arch/arm/mach-exynos4/Kconfig
>> > @@ -123,6 +123,7 @@ config MACH_SMDKV310
>> >     select EXYNOS4_SETUP_I2C1
>> >     select EXYNOS4_SETUP_KEYPAD
>> >     select EXYNOS4_SETUP_SDHCI
>> > +   select USE_OF
>>
>> I would drop this bit (I dropped it from my branch when I applied the
>> patch).  Device tree support remains an optional feature.  Instead it
>> can be enabled by default in the defconfig (or however the config is
>> managed for the kernel package)
>> --- quota ends ---
>>
>> BTW, are you silently renaming the original devicetree/test branch
>> to devicetree/test-2.6.38 and using new devicetree/test for Nicolas
>> to pull Linaro bits?  If that is the case, what branch
>> devicetree/arm-linaro-2.6.38-rebuilt will be for?
>
> devicetree/test is /always/ an unstable branch that I try to keep as
> close to Linus' tree as possible.  I usually rebase for every -rc
> release.  devicetree/arm is based on devicetree/test, but it is
> published in a way that means it can always be merged.
>
> Also, which devicetree/test is pretty much "anything goes", I'm a lot
> more careful about which patches I actually publish to devicetree/arm.
>
> devicetree/arm-linaro-2.6.38 is the tree that I used previously for
> asking Nicolas to pull.  I created
> devicetree/arm-linaro-2.6.38-rebuilt solely for the purpose of
> Nicolas' new rebuilt branch, but now I hear that he isn't going to use
> that tree, so I'll push the latest changes into the
> devicetree/arm-linaro-2.6.38 branch too.

Actually, it looks like linaro-2.6.38 master and rebuilt are merged
now, so I'll go back to using devicetree/arm-linaro-2.6.38 for stuff I
push to Nicolas.

g.

Patch

diff --git a/arch/arm/boot/dts/mx53-loco.dts b/arch/arm/boot/dts/mx53-loco.dts
new file mode 100644
index 0000000..7347456
--- /dev/null
+++ b/arch/arm/boot/dts/mx53-loco.dts
@@ -0,0 +1,30 @@ 
+/*
+ * 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/;
+
+/ {
+	model = "Freescale i.MX53 LOCO";
+	compatible = "fsl,mx53-loco";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	aliases {
+	};
+
+	memory {
+		device_type = "memory";
+		reg = <0x70000000 0x40000000>;
+	};
+
+	chosen {
+	};
+};
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
index aae51ee..a61e01e 100644
--- a/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
@@ -167,6 +167,7 @@  config MACH_MX53_SMD
 config MACH_MX53_LOCO
 	bool "Support MX53 LOCO platforms"
 	select SOC_IMX53
+	select MX5_DT_COMMON
 	select IMX_HAVE_PLATFORM_IMX2_WDT
 	select IMX_HAVE_PLATFORM_IMX_I2C
 	select IMX_HAVE_PLATFORM_IMX_UART
diff --git a/arch/arm/mach-mx5/board-mx53_loco.c b/arch/arm/mach-mx5/board-mx53_loco.c
index 0a18f8d..6ffc591 100644
--- a/arch/arm/mach-mx5/board-mx53_loco.c
+++ b/arch/arm/mach-mx5/board-mx53_loco.c
@@ -226,10 +226,15 @@  static struct sys_timer mx53_loco_timer = {
 	.init	= mx53_loco_timer_init,
 };
 
+static const char *mx53_loco_dt_match[] __initdata = {
+	"fsl,mx53-loco",
+	NULL
+};
 MACHINE_START(MX53_LOCO, "Freescale MX53 LOCO Board")
 	.map_io = mx53_map_io,
 	.init_early = imx53_init_early,
 	.init_irq = mx53_init_irq,
 	.timer = &mx53_loco_timer,
 	.init_machine = mx53_loco_board_init,
+	.dt_compat = mx53_loco_dt_match,
 MACHINE_END