Re: [PATCH v1 1/5] ARM: imx28: add basic dt support

From: Rob Herring
Date: Tue Mar 13 2012 - 10:35:49 EST

On 03/13/2012 03:47 AM, Dong Aisheng wrote:
> From: Dong Aisheng <dong.aisheng@xxxxxxxxxx>
>
> This patch includes basic dt support which can boot via nfs rootfs.
>
> Signed-off-by: Dong Aisheng <dong.aisheng@xxxxxxxxxx>
> ---
> Documentation/devicetree/bindings/arm/fsl.txt | 4 +
> arch/arm/boot/dts/imx28-evk.dts | 31 +++++++++
> arch/arm/boot/dts/imx28.dtsi | 88 +++++++++++++++++++++++++
> arch/arm/mach-mxs/Kconfig | 9 +++
> arch/arm/mach-mxs/Makefile | 1 +
> arch/arm/mach-mxs/imx28-dt.c | 67 +++++++++++++++++++
> 6 files changed, 200 insertions(+), 0 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt
> index 54bddda..9f21faf 100644
> --- a/Documentation/devicetree/bindings/arm/fsl.txt
> +++ b/Documentation/devicetree/bindings/arm/fsl.txt
> @@ -1,6 +1,10 @@
> Freescale i.MX Platforms Device Tree Bindings
> -----------------------------------------------
>
> +i.MX28 Evaluation Kit
> +Required root node properties:
> + - compatible = "fsl,imx28-evk", "fsl,imx28";
> +
> i.MX51 Babbage Board
> Required root node properties:
> - compatible = "fsl,imx51-babbage", "fsl,imx51";
> diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
> new file mode 100644
> index 0000000..9758dc4
> --- /dev/null
> +++ b/arch/arm/boot/dts/imx28-evk.dts
> @@ -0,0 +1,31 @@
> +/*
> + * Copyright 2012 Freescale Semiconductor, Inc.
> + *
> + * 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/ "imx28.dtsi"
> +
> +/ {
> + model = "Freescale i.MX28 Evaluation Kit";
> + compatible = "fsl,imx28-evk", "fsl,imx28";
> +
> + memory {
> + device_type = "memory";
> + reg = <0x40000000 0x08000000>;
> + };
> +
> + ahb@80080000 {
> + fec@800f0000 {

Use generic names: ethernet@800f0000

> + phy-mode = "rmii";
> + local-mac-address = [00 04 9F 01 7D 5B];
> + status = "okay";
> + };
> + };
> +};
> diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
> new file mode 100644
> index 0000000..acf0dab
> --- /dev/null
> +++ b/arch/arm/boot/dts/imx28.dtsi
> @@ -0,0 +1,88 @@
> +/*
> + * Copyright 2012 Freescale Semiconductor, Inc.
> + *
> + * 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/ "skeleton.dtsi"
> +
> +/ {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + interrupt-parent = <&icoll>;
> +
> + aliases {
> + serial0 = &uart1;
> + };
> +
> + cpus {
> + cpu@0 {
> + compatible = "arm,arm926ejs";
> + };
> + };
> +
> + apb@80000000 {
> + compatible = "simple-bus";
> + #address-cells = <1>;
> + #size-cells = <1>;
> + reg = <0x80000000 0x80000>;
> + ranges;
> +
> + apbh@80000000 {
> + compatible = "simple-bus";
> + #address-cells = <1>;
> + #size-cells = <1>;
> + reg = <0x80000000 0x3c900>;
> + ranges;
> +
> + icoll: interrupt-controller@80000000 {
> + compatible = "fsl,imx28-icoll";
> + interrupt-controller;
> + #interrupt-cells = <1>;
> + reg = <0x80000000 0x2000>;
> + };
> + };
> +
> + apbx@80040000 {
> + compatible = "simple-bus";
> + #address-cells = <1>;
> + #size-cells = <1>;
> + reg = <0x80040000 0x40000>;
> + ranges;
> +
> + uart1: uart@80074000 {

Use generic names: uart1: serial@...

> + compatible = "arm,pl011", "arm,primecell";
> + reg = <0x80074000 0x2000>;

This is really only 0x1000 in length.

> + interrupts = <47>;
> + };
> + };
> + };
> +
> + ahb@80080000 {
> + compatible = "simple-bus";
> + #address-cells = <1>;
> + #size-cells = <1>;
> + reg = <0x80080000 0x80000>;
> + ranges;
> +
> + fec@800f0000 {
> + compatible = "fsl,imx28-fec";
> + reg = <0x800f0000 0x4000>;

This too IIRC.

> + interrupts = <101>;
> + status = "disabled";
> + };
> +
> + fec@800f4000 {
> + compatible = "fsl,imx28-fec";
> + reg = <0x800f4000 0x4000>;
> + interrupts = <102>;
> + status = "disabled";
> + };
> +
> + };
> +};
> diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
> index c57f996..6ab66af 100644
> --- a/arch/arm/mach-mxs/Kconfig
> +++ b/arch/arm/mach-mxs/Kconfig
> @@ -17,6 +17,15 @@ config SOC_IMX28
>
> comment "MXS platforms:"
>
> +config MACH_IMX28_DT

Perhaps this should be more generic like MACH_MXS_DT to eventually
support MX23 as well?

> + bool "Support i.MX28 platforms from device tree"
> + select SOC_IMX28
> + select USE_OF
> + select MACH_MX28EVK

This should not be selected here.

> + help
> + Include support for Freescale i.MX28 based platforms
> + using the device tree for discovery
> +
> config MACH_STMP378X_DEVB
> bool "Support STMP378x_devb Platform"
> select SOC_IMX23
> diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile
> index 908bf9a..25a4122 100644
> --- a/arch/arm/mach-mxs/Makefile
> +++ b/arch/arm/mach-mxs/Makefile
> @@ -7,6 +7,7 @@ obj-$(CONFIG_PM) += pm.o
> obj-$(CONFIG_SOC_IMX23) += clock-mx23.o
> obj-$(CONFIG_SOC_IMX28) += clock-mx28.o
>
> +obj-$(CONFIG_MACH_IMX28_DT) += imx28-dt.o
> obj-$(CONFIG_MACH_STMP378X_DEVB) += mach-stmp378x_devb.o
> obj-$(CONFIG_MACH_MX23EVK) += mach-mx23evk.o
> obj-$(CONFIG_MACH_MX28EVK) += mach-mx28evk.o
> diff --git a/arch/arm/mach-mxs/imx28-dt.c b/arch/arm/mach-mxs/imx28-dt.c
> new file mode 100644
> index 0000000..78d1129
> --- /dev/null
> +++ b/arch/arm/mach-mxs/imx28-dt.c
> @@ -0,0 +1,67 @@
> +/*
> + * Copyright 2011 Freescale Semiconductor, Inc.
> + * Copyright 2011 Linaro Ltd.

It's 2012 now.

> + *
> + * 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 <linux/init.h>
> +#include <linux/irqdomain.h>
> +#include <linux/of_irq.h>
> +#include <linux/of_platform.h>
> +#include <asm/mach/arch.h>
> +#include <asm/mach/time.h>
> +#include <mach/common.h>
> +#include <mach/mx28.h>
> +
> +static const struct of_dev_auxdata imx28_auxdata_lookup[] __initconst = {
> + OF_DEV_AUXDATA("arm,pl011", MX28_DUART_BASE_ADDR, "duart", NULL),
> + OF_DEV_AUXDATA("fsl,imx28-fec", MX28_ENET_MAC0_BASE_ADDR, "imx28-fec.0", NULL),
> + OF_DEV_AUXDATA("fsl,imx28-fec", MX28_ENET_MAC1_BASE_ADDR, "imx28-fec.1", NULL),

Why do you need the old names?

> + { /* sentinel */ }
> +};
> +
> +static void __init imx28_init(void)
> +{
> + of_platform_populate(NULL, of_default_bus_match_table,
> + imx28_auxdata_lookup, NULL);
> +}
> +
> +static const struct of_device_id icoll_of_match[] __initconst = {
> + { .compatible = "fsl,imx28-icoll", },
> + {},
> +};
> +
> +static void __init imx28_dt_init_irq(void)
> +{
> + irq_domain_generate_simple(icoll_of_match, MX28_ICOLL_BASE_ADDR, 0);

Please do "proper" domain support for the interrupt controller and use
of_irq_init.

> + mx28_init_irq();
> +}
> +
> +static void __init imx28_timer_init(void)
> +{
> + mx28_clocks_init();
> +}
> +
> +static struct sys_timer imx28_timer = {
> + .init = imx28_timer_init,
> +};
> +
> +static const char *imx28_dt_compat[] __initdata = {
> + "fsl,imx28-evk",
> + NULL,
> +};
> +
> +DT_MACHINE_START(IMX28, "Freescale i.MX28 (Device Tree)")
> + .map_io = mx28_map_io,
> + .init_irq = imx28_dt_init_irq,
> + .timer = &imx28_timer,
> + .init_machine = imx28_init,
> + .dt_compat = imx28_dt_compat,
> + .restart = mxs_restart,
> +MACHINE_END

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/