Re: [PATCH 3/4] ARM: mxs: dt: Add the Crystalfontz CFA-10055 device tree
Dear Maxime Ripard, Some nitpicking below. On Thu, 13 Jun 2013 15:43:44 +0200, Maxime Ripard wrote: > -static void __init cfa10049_init(void) > -{ > - update_fec_mac_prop(OUI_CRYSTALFONTZ); > -} > - > -static void __init cfa10037_init(void) > +static void __init crystalfontz_init(void) > { > update_fec_mac_prop(OUI_CRYSTALFONTZ); > } > @@ -368,10 +363,10 @@ static void __init mxs_machine_init(void) > imx28_evk_init(); > else if (of_machine_is_compatible("bluegiga,apx4devkit")) > apx4devkit_init(); > - else if (of_machine_is_compatible("crystalfontz,cfa10037")) > - cfa10037_init(); > - else if (of_machine_is_compatible("crystalfontz,cfa10049")) > - cfa10049_init(); > + else if (of_machine_is_compatible("crystalfontz,cfa10037") || > + of_machine_is_compatible("crystalfontz,cfa10049") || > + of_machine_is_compatible("crystalfontz,cfa10055")) > + crystalfontz_init(); Maybe this could be something like: else if (of_machine_is_compatible("crystalfontz,cfa10036")) crystalfontz_init(); with crystalfontz_init() something like: if (mac0 has status = "okay") update_fec_mac_prop(OUI_CRYSTALFONTZ); This way, for all Crystalfontz boards that have an Ethernet interface, it would call update_fec_mac_prop() without having to update mach-mxs.c every time. (Of course, this is based on the assumption that all Crystalfontz .dts files have "crystalfontz,cfa10036" in their compatible string list) Best regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 3/4] ARM: mxs: dt: Add the Crystalfontz CFA-10055 device tree
Dear Maxime Ripard, Some nitpicking below. On Thu, 13 Jun 2013 15:43:44 +0200, Maxime Ripard wrote: -static void __init cfa10049_init(void) -{ - update_fec_mac_prop(OUI_CRYSTALFONTZ); -} - -static void __init cfa10037_init(void) +static void __init crystalfontz_init(void) { update_fec_mac_prop(OUI_CRYSTALFONTZ); } @@ -368,10 +363,10 @@ static void __init mxs_machine_init(void) imx28_evk_init(); else if (of_machine_is_compatible(bluegiga,apx4devkit)) apx4devkit_init(); - else if (of_machine_is_compatible(crystalfontz,cfa10037)) - cfa10037_init(); - else if (of_machine_is_compatible(crystalfontz,cfa10049)) - cfa10049_init(); + else if (of_machine_is_compatible(crystalfontz,cfa10037) || + of_machine_is_compatible(crystalfontz,cfa10049) || + of_machine_is_compatible(crystalfontz,cfa10055)) + crystalfontz_init(); Maybe this could be something like: else if (of_machine_is_compatible(crystalfontz,cfa10036)) crystalfontz_init(); with crystalfontz_init() something like: if (mac0 has status = okay) update_fec_mac_prop(OUI_CRYSTALFONTZ); This way, for all Crystalfontz boards that have an Ethernet interface, it would call update_fec_mac_prop() without having to update mach-mxs.c every time. (Of course, this is based on the assumption that all Crystalfontz .dts files have crystalfontz,cfa10036 in their compatible string list) Best regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3/4] ARM: mxs: dt: Add the Crystalfontz CFA-10055 device tree
From: Brian Lilly The CFA-10055 is yet another breakout board for the CFA-10036, and is basically a CFA-10037, with the screen and LCD controller found on the CFA-10049. Signed-off-by: Brian Lilly Signed-off-by: Maxime Ripard --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx28-cfa10055.dts | 179 +++ arch/arm/mach-mxs/mach-mxs.c | 15 +-- 3 files changed, 185 insertions(+), 10 deletions(-) create mode 100644 arch/arm/boot/dts/imx28-cfa10055.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index b9f7121..e26c504 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -130,6 +130,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ imx28-cfa10036.dtb \ imx28-cfa10037.dtb \ imx28-cfa10049.dtb \ + imx28-cfa10055.dtb \ imx28-evk.dtb \ imx28-m28evk.dtb \ imx28-sps1.dtb \ diff --git a/arch/arm/boot/dts/imx28-cfa10055.dts b/arch/arm/boot/dts/imx28-cfa10055.dts new file mode 100644 index 000..1581112 --- /dev/null +++ b/arch/arm/boot/dts/imx28-cfa10055.dts @@ -0,0 +1,179 @@ +/* + * Copyright 2013 Crystalfontz America, Inc. + * Free Electrons + * + * 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 + */ + +/* + * The CFA-10055 is an expansion board for the CFA-10036 module and + * CFA-10037, thus we need to include the CFA-10037 DTS. + */ +/include/ "imx28-cfa10037.dts" + +/ { + model = "Crystalfontz CFA-10055 Board"; + compatible = "crystalfontz,cfa10055", "crystalfontz,cfa10037", "crystalfontz,cfa10036", "fsl,imx28"; + + apb@8000 { + apbh@8000 { + pinctrl@80018000 { + pinctrl-names = "default", "default"; + pinctrl-1 = <_pins_cfa10055 + _pins_cfa10055_pullup>; + + hog_pins_cfa10055: hog-10055@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x3053 /* MX28_PAD_AUART1_TX__GPIO_3_5 */ + >; + fsl,drive-strength = <0>; + fsl,voltage = <1>; + fsl,pull-up = <0>; + }; + + hog_pins_cfa10055_pullup: hog-10055-pullup@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */ + >; + fsl,drive-strength = <0>; + fsl,voltage = <1>; + fsl,pull-up = <1>; + }; + + spi2_pins_cfa10055: spi2-cfa10055@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x2103 /* MX28_PAD_SSP2_SCK__GPIO_2_16 */ + 0x2113 /* MX28_PAD_SSP2_CMD__GPIO_2_17 */ + 0x2123 /* MX28_PAD_SSP2_D0__GPIO_2_18 */ + >; + fsl,drive-strength = <1>; + fsl,voltage = <1>; + fsl,pull-up = <1>; + }; + + lcdif_18bit_pins_cfa10055: lcdif-18bit@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x1000 /* MX28_PAD_LCD_D00__LCD_D0 */ + 0x1010 /* MX28_PAD_LCD_D01__LCD_D1 */ + 0x1020 /* MX28_PAD_LCD_D02__LCD_D2 */ + 0x1030 /* MX28_PAD_LCD_D03__LCD_D3 */ + 0x1040 /* MX28_PAD_LCD_D04__LCD_D4 */ + 0x1050 /* MX28_PAD_LCD_D05__LCD_D5 */ + 0x1060 /* MX28_PAD_LCD_D06__LCD_D6 */ + 0x1070 /* MX28_PAD_LCD_D07__LCD_D7 */ + 0x1080 /* MX28_PAD_LCD_D08__LCD_D8 */ + 0x1090 /*
[PATCH 3/4] ARM: mxs: dt: Add the Crystalfontz CFA-10055 device tree
From: Brian Lilly br...@crystalfontz.com The CFA-10055 is yet another breakout board for the CFA-10036, and is basically a CFA-10037, with the screen and LCD controller found on the CFA-10049. Signed-off-by: Brian Lilly br...@crystalfontz.com Signed-off-by: Maxime Ripard maxime.rip...@free-electrons.com --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx28-cfa10055.dts | 179 +++ arch/arm/mach-mxs/mach-mxs.c | 15 +-- 3 files changed, 185 insertions(+), 10 deletions(-) create mode 100644 arch/arm/boot/dts/imx28-cfa10055.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index b9f7121..e26c504 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -130,6 +130,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ imx28-cfa10036.dtb \ imx28-cfa10037.dtb \ imx28-cfa10049.dtb \ + imx28-cfa10055.dtb \ imx28-evk.dtb \ imx28-m28evk.dtb \ imx28-sps1.dtb \ diff --git a/arch/arm/boot/dts/imx28-cfa10055.dts b/arch/arm/boot/dts/imx28-cfa10055.dts new file mode 100644 index 000..1581112 --- /dev/null +++ b/arch/arm/boot/dts/imx28-cfa10055.dts @@ -0,0 +1,179 @@ +/* + * Copyright 2013 Crystalfontz America, Inc. + * Free Electrons + * + * 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 + */ + +/* + * The CFA-10055 is an expansion board for the CFA-10036 module and + * CFA-10037, thus we need to include the CFA-10037 DTS. + */ +/include/ imx28-cfa10037.dts + +/ { + model = Crystalfontz CFA-10055 Board; + compatible = crystalfontz,cfa10055, crystalfontz,cfa10037, crystalfontz,cfa10036, fsl,imx28; + + apb@8000 { + apbh@8000 { + pinctrl@80018000 { + pinctrl-names = default, default; + pinctrl-1 = hog_pins_cfa10055 + hog_pins_cfa10055_pullup; + + hog_pins_cfa10055: hog-10055@0 { + reg = 0; + fsl,pinmux-ids = + 0x3053 /* MX28_PAD_AUART1_TX__GPIO_3_5 */ + ; + fsl,drive-strength = 0; + fsl,voltage = 1; + fsl,pull-up = 0; + }; + + hog_pins_cfa10055_pullup: hog-10055-pullup@0 { + reg = 0; + fsl,pinmux-ids = + 0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */ + ; + fsl,drive-strength = 0; + fsl,voltage = 1; + fsl,pull-up = 1; + }; + + spi2_pins_cfa10055: spi2-cfa10055@0 { + reg = 0; + fsl,pinmux-ids = + 0x2103 /* MX28_PAD_SSP2_SCK__GPIO_2_16 */ + 0x2113 /* MX28_PAD_SSP2_CMD__GPIO_2_17 */ + 0x2123 /* MX28_PAD_SSP2_D0__GPIO_2_18 */ + ; + fsl,drive-strength = 1; + fsl,voltage = 1; + fsl,pull-up = 1; + }; + + lcdif_18bit_pins_cfa10055: lcdif-18bit@0 { + reg = 0; + fsl,pinmux-ids = + 0x1000 /* MX28_PAD_LCD_D00__LCD_D0 */ + 0x1010 /* MX28_PAD_LCD_D01__LCD_D1 */ + 0x1020 /* MX28_PAD_LCD_D02__LCD_D2 */ + 0x1030 /* MX28_PAD_LCD_D03__LCD_D3 */ + 0x1040 /* MX28_PAD_LCD_D04__LCD_D4 */ + 0x1050 /* MX28_PAD_LCD_D05__LCD_D5 */ + 0x1060 /* MX28_PAD_LCD_D06__LCD_D6 */ + 0x1070 /* MX28_PAD_LCD_D07__LCD_D7 */ + 0x1080 /* MX28_PAD_LCD_D08__LCD_D8 */ +