| Message ID | 1350492832-7044-1-git-send-email-julien.boibessot@free.fr |
|---|---|
| State | New |
| Headers | show |
On Wed, Oct 17, 2012 at 06:53:52PM +0200, julien.boibessot@free.fr wrote: > From: Julien Boibessot <julien.boibessot@armadeus.com> > > The APF28 is a small SOM built around an i.MX28 processor with 128MBytes DDR2, > 256MBytes NAND Flash and an Ethernet PHY. > > Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com> > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> > --- > Changes since v1 (as advised by Shawn Guo): > * add imx28-apf28.dtb to arch/arm/boot/dts/Makefile > * fix partitions declaration for gpmi-nand in imx28-apf28.dts > > arch/arm/boot/dts/Makefile | 3 +- > arch/arm/boot/dts/imx28-apf28.dts | 85 +++++++++++++++++++++++++++++++++++++ > arch/arm/mach-mxs/mach-mxs.c | 7 +++ > 3 files changed, 94 insertions(+), 1 deletions(-) > create mode 100644 arch/arm/boot/dts/imx28-apf28.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index c1ce813..5baf5a0 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -59,7 +59,8 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ > imx28-cfa10049.dtb \ > imx28-evk.dtb \ > imx28-m28evk.dtb \ > - imx28-tx28.dtb > + imx28-tx28.dtb \ > + imx28-apf28.dtb Please maintain the alphabet order on the list. Shawn > dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ > omap3-beagle-xm.dtb \ > omap3-evm.dtb \ > diff --git a/arch/arm/boot/dts/imx28-apf28.dts b/arch/arm/boot/dts/imx28-apf28.dts > new file mode 100644 > index 0000000..7eb0758 > --- /dev/null > +++ b/arch/arm/boot/dts/imx28-apf28.dts > @@ -0,0 +1,85 @@ > +/* > + * Copyright 2012 Armadeus Systems - <support@armadeus.com> > + * > + * 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 = "Armadeus Systems APF28 module"; > + compatible = "armadeus,imx28-apf28", "fsl,imx28"; > + > + memory { > + reg = <0x40000000 0x08000000>; > + }; > + > + apb@80000000 { > + apbh@80000000 { > + gpmi-nand@8000c000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>; > + status = "okay"; > + > + partition@0 { > + label = "u-boot"; > + reg = <0x0 0x300000>; > + }; > + > + partition@300000 { > + label = "env"; > + reg = <0x300000 0x80000>; > + }; > + > + partition@380000 { > + label = "env2"; > + reg = <0x380000 0x80000>; > + }; > + > + partition@400000 { > + label = "dtb"; > + reg = <0x400000 0x80000>; > + }; > + > + partition@480000 { > + label = "splash"; > + reg = <0x480000 0x80000>; > + }; > + > + partition@500000 { > + label = "kernel"; > + reg = <0x500000 0x800000>; > + }; > + > + partition@d00000 { > + label = "rootfs"; > + reg = <0xd00000 0xf300000>; > + }; > + }; > + }; > + > + apbx@80040000 { > + duart: serial@80074000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&duart_pins_a>; > + status = "okay"; > + }; > + }; > + }; > + > + ahb@80080000 { > + mac0: ethernet@800f0000 { > + phy-mode = "rmii"; > + pinctrl-names = "default"; > + pinctrl-0 = <&mac0_pins_a>; > + phy-reset-gpios = <&gpio4 13 0>; > + status = "okay"; > + }; > + }; > +}; > diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c > index b8c452a..9cfb25c 100644 > --- a/arch/arm/mach-mxs/mach-mxs.c > +++ b/arch/arm/mach-mxs/mach-mxs.c > @@ -367,6 +367,11 @@ static void __init cfa10049_init(void) > update_fec_mac_prop(OUI_CRYSTALFONTZ); > } > > +static void __init apf28_init(void) > +{ > + enable_clk_enet_out(); > +} > + > static void __init mxs_machine_init(void) > { > if (of_machine_is_compatible("fsl,imx28-evk")) > @@ -379,6 +384,8 @@ static void __init mxs_machine_init(void) > apx4devkit_init(); > else if (of_machine_is_compatible("crystalfontz,cfa10049")) > cfa10049_init(); > + else if (of_machine_is_compatible("armadeus,imx28-apf28")) > + apf28_init(); > > of_platform_populate(NULL, of_default_bus_match_table, > mxs_auxdata_lookup, NULL); > -- > 1.7.5.4 >
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index c1ce813..5baf5a0 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -59,7 +59,8 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ imx28-cfa10049.dtb \ imx28-evk.dtb \ imx28-m28evk.dtb \ - imx28-tx28.dtb + imx28-tx28.dtb \ + imx28-apf28.dtb dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ omap3-beagle-xm.dtb \ omap3-evm.dtb \ diff --git a/arch/arm/boot/dts/imx28-apf28.dts b/arch/arm/boot/dts/imx28-apf28.dts new file mode 100644 index 0000000..7eb0758 --- /dev/null +++ b/arch/arm/boot/dts/imx28-apf28.dts @@ -0,0 +1,85 @@ +/* + * Copyright 2012 Armadeus Systems - <support@armadeus.com> + * + * 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 = "Armadeus Systems APF28 module"; + compatible = "armadeus,imx28-apf28", "fsl,imx28"; + + memory { + reg = <0x40000000 0x08000000>; + }; + + apb@80000000 { + apbh@80000000 { + gpmi-nand@8000c000 { + pinctrl-names = "default"; + pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>; + status = "okay"; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x300000>; + }; + + partition@300000 { + label = "env"; + reg = <0x300000 0x80000>; + }; + + partition@380000 { + label = "env2"; + reg = <0x380000 0x80000>; + }; + + partition@400000 { + label = "dtb"; + reg = <0x400000 0x80000>; + }; + + partition@480000 { + label = "splash"; + reg = <0x480000 0x80000>; + }; + + partition@500000 { + label = "kernel"; + reg = <0x500000 0x800000>; + }; + + partition@d00000 { + label = "rootfs"; + reg = <0xd00000 0xf300000>; + }; + }; + }; + + apbx@80040000 { + duart: serial@80074000 { + pinctrl-names = "default"; + pinctrl-0 = <&duart_pins_a>; + status = "okay"; + }; + }; + }; + + ahb@80080000 { + mac0: ethernet@800f0000 { + phy-mode = "rmii"; + pinctrl-names = "default"; + pinctrl-0 = <&mac0_pins_a>; + phy-reset-gpios = <&gpio4 13 0>; + status = "okay"; + }; + }; +}; diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index b8c452a..9cfb25c 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c @@ -367,6 +367,11 @@ static void __init cfa10049_init(void) update_fec_mac_prop(OUI_CRYSTALFONTZ); } +static void __init apf28_init(void) +{ + enable_clk_enet_out(); +} + static void __init mxs_machine_init(void) { if (of_machine_is_compatible("fsl,imx28-evk")) @@ -379,6 +384,8 @@ static void __init mxs_machine_init(void) apx4devkit_init(); else if (of_machine_is_compatible("crystalfontz,cfa10049")) cfa10049_init(); + else if (of_machine_is_compatible("armadeus,imx28-apf28")) + apf28_init(); of_platform_populate(NULL, of_default_bus_match_table, mxs_auxdata_lookup, NULL);