Skip to contentSkip to conversation

add mx3 cupid bsp

PATCH New Carsten Behling 4 participants 4 messages Feb 17, 2010 – Feb 18, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 add mx3 cupid bsp

---
 arch/arm/mach-mx3/Kconfig                    |    7 +
 arch/arm/mach-mx3/Makefile                   |    1 +
 arch/arm/mach-mx3/cupid.c                    |  186 ++++++++++++++++++++++++++
 arch/arm/plat-mxc/include/mach/board-cupid.h |   27 ++++
 4 files changed, 221 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-mx3/cupid.c
 create mode 100644 arch/arm/plat-mxc/include/mach/board-cupid.h
arch/arm/mach-mx3/Kconfig +7 -0
index 2829441..f2700a0 100644
@@ -112,4 +112,11 @@ config MACH_KZM_ARM11_01
          Include support for KZM-ARM11-01. This includes specific
          configurations for the board and its peripherals.
 
+config MACH_GUF_CUPID
+       bool "Support Garz & Fricke Cupid platform"
+       select ARCH_MX35
+       default n
+       help
+         Include support for Cupid platform. This includes specific
+         configurations for the board and its peripherals.
 endif
arch/arm/mach-mx3/Makefile +1 -0
index 93c7b29..1157230 100644
@@ -20,3 +20,4 @@ obj-$(CONFIG_MACH_PCM043)     += pcm043.o
 obj-$(CONFIG_MACH_ARMADILLO5X0) += armadillo5x0.o
 obj-$(CONFIG_MACH_MX35_3DS)    += mx35pdk.o
 obj-$(CONFIG_MACH_KZM_ARM11_01)        += kzmarm11.o
+obj-$(CONFIG_MACH_GUF_CUPID)   += cupid.o
arch/arm/mach-mx3/cupid.c new file +186 -0

186 lines not on this page · raw message

arch/arm/plat-mxc/include/mach/board-cupid.h new file +27 -0
new file mode 100644
index 0000000..4a3d7a8
@@ -0,0 +1,27 @@
+/*
+ *  Copyright (C) 2009 Carsten Behling, Garz & Fricke GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __ASM_ARCH_MXC_BOARD_CUPID_H__
+#define __ASM_ARCH_MXC_BOARD_CUPID_H__
+
+/* mandatory for CONFIG_LL_DEBUG */
+
+#define MXC_LL_UART_PADDR      UART1_BASE_ADDR
+#define MXC_LL_UART_VADDR      AIPS1_IO_ADDRESS(UART1_BASE_ADDR)
+
+#endif /* __ASM_ARCH_MXC_BOARD_CUPID_H__ */

--
1.6.0.2

#1 lore raw

PATCH 1/1 add mx3 cupid bsp

Hi,

just some minor things below.

arch/arm/mach-mx3/Kconfig config MACH_KZM_ARM11_01 · line 118

Quoted 4 lines · Carsten Behling
arch/arm/mach-mx3/Kconfig +4 -0
+config MACH_GUF_CUPID
+       bool "Support Garz & Fricke Cupid platform"
+       select ARCH_MX35
+       default n

'n' is the default default, no need to specify it.

Quoted 49 lines
arch/arm/mach-mx3/Kconfig +3 -0
+       help
+         Include support for Cupid platform. This includes specific
+         configurations for the board and its peripherals.
 endif
arch/arm/mach-mx3/Makefile +1 -0
index 93c7b29..1157230 100644
@@ -20,3 +20,4 @@ obj-$(CONFIG_MACH_PCM043)     += pcm043.o
 obj-$(CONFIG_MACH_ARMADILLO5X0) += armadillo5x0.o
 obj-$(CONFIG_MACH_MX35_3DS)    += mx35pdk.o
 obj-$(CONFIG_MACH_KZM_ARM11_01)        += kzmarm11.o
+obj-$(CONFIG_MACH_GUF_CUPID)   += cupid.o
arch/arm/mach-mx3/cupid.c new file +30 -0
new file mode 100644
index 0000000..b7e0044
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2009 Garz & Fricke GmbH All Rights Reserved.
+ *
+ * Author: Carsten Behling carsten.behling at garz-fricke.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/physmap.h>
+#include <linux/memory.h>
+#include <linux/gpio.h>
+#include <linux/interrupt.h>
+#include <linux/i2c.h>
+
+#include <asm/mach-types.h>

arch/arm/mach-mx3/cupid.c line 40

Quoted 10 lines
arch/arm/mach-mx3/cupid.c new file +10 -0
+#include <asm/mach/arch.h>
+#include <asm/mach/time.h>
+#include <asm/mach/map.h>
+
+#include <mach/hardware.h>
+#include <mach/common.h>
+#include <mach/imx-uart.h>
+#if defined CONFIG_I2C_IMX || defined CONFIG_I2C_IMX_MODULE
+#include <mach/i2c.h>
+#endif

No need for the #ifs here - you can and should include this unconditionally.

Quoted 167 lines
arch/arm/mach-mx3/cupid.c new file +146 -0
+#include <mach/iomux-mx35.h>
+#include <mach/ipu.h>
+#include <mach/mx3fb.h>
+#include <mach/mxc_nand.h>
+
+#include "devices.h"
+
+static struct fb_videomode fb_modedb[] = {
+       {
+               /* 800x480 @ 70 Hz */
+               .name           = "CPT CLAA070LC0JCT",
+               .refresh        = 70,
+               .xres           = 800,
+               .yres           = 480,
+               .pixclock       = 7829,
+               .left_margin    = 24,
+               .right_margin   = 47,
+               .upper_margin   = 5,
+               .lower_margin   = 3,
+               .hsync_len      = 24,
+               .vsync_len      = 3,
+               .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_SHARP_MODE |
+                                 FB_SYNC_CLK_INVERT | FB_SYNC_CLK_IDLE_EN,
+               .vmode          = FB_VMODE_NONINTERLACED,
+               .flag           = 0,
+       },
+};
+
+static struct ipu_platform_data mx3_ipu_data = {
+       .irq_base = MXC_IPU_IRQ_START,
+};
+
+static struct mx3fb_platform_data mx3fb_pdata = {
+       .dma_dev        = &mx3_ipu.dev,
+       .name           = "CPT CLAA070LC0JCT",
+       .mode           = fb_modedb,
+       .num_modes      = ARRAY_SIZE(fb_modedb),
+};
+
+static struct imxuart_platform_data uart_pdata = {
+       .flags = IMXUART_HAVE_RTSCTS,
+};
+
+static struct platform_device *devices[] __initdata = {
+       &mxc_fec_device,
+};
+
+static struct pad_desc cupid_pads[] = {
+       /* UART1 */
+       MX35_PAD_CTS1__UART1_CTS,
+       MX35_PAD_RTS1__UART1_RTS,
+       MX35_PAD_TXD1__UART1_TXD_MUX,
+       MX35_PAD_RXD1__UART1_RXD_MUX,
+       /* UART2 */
+       MX35_PAD_CTS2__UART2_CTS,
+       MX35_PAD_RTS2__UART2_RTS,
+       MX35_PAD_TXD2__UART2_TXD_MUX,
+       MX35_PAD_RXD2__UART2_RXD_MUX,
+       /* FEC */
+       MX35_PAD_FEC_TX_CLK__FEC_TX_CLK,
+       MX35_PAD_FEC_RX_CLK__FEC_RX_CLK,
+       MX35_PAD_FEC_RX_DV__FEC_RX_DV,
+       MX35_PAD_FEC_COL__FEC_COL,
+       MX35_PAD_FEC_RDATA0__FEC_RDATA_0,
+       MX35_PAD_FEC_TDATA0__FEC_TDATA_0,
+       MX35_PAD_FEC_TX_EN__FEC_TX_EN,
+       MX35_PAD_FEC_MDC__FEC_MDC,
+       MX35_PAD_FEC_MDIO__FEC_MDIO,
+       MX35_PAD_FEC_TX_ERR__FEC_TX_ERR,
+       MX35_PAD_FEC_RX_ERR__FEC_RX_ERR,
+       MX35_PAD_FEC_CRS__FEC_CRS,
+       MX35_PAD_FEC_RDATA1__FEC_RDATA_1,
+       MX35_PAD_FEC_TDATA1__FEC_TDATA_1,
+       MX35_PAD_FEC_RDATA2__FEC_RDATA_2,
+       MX35_PAD_FEC_TDATA2__FEC_TDATA_2,
+       MX35_PAD_FEC_RDATA3__FEC_RDATA_3,
+       MX35_PAD_FEC_TDATA3__FEC_TDATA_3,
+       /* Display */
+       MX35_PAD_LD0__IPU_DISPB_DAT_0,
+       MX35_PAD_LD1__IPU_DISPB_DAT_1,
+       MX35_PAD_LD2__IPU_DISPB_DAT_2,
+       MX35_PAD_LD3__IPU_DISPB_DAT_3,
+       MX35_PAD_LD4__IPU_DISPB_DAT_4,
+       MX35_PAD_LD5__IPU_DISPB_DAT_5,
+       MX35_PAD_LD6__IPU_DISPB_DAT_6,
+       MX35_PAD_LD7__IPU_DISPB_DAT_7,
+       MX35_PAD_LD8__IPU_DISPB_DAT_8,
+       MX35_PAD_LD9__IPU_DISPB_DAT_9,
+       MX35_PAD_LD10__IPU_DISPB_DAT_10,
+       MX35_PAD_LD11__IPU_DISPB_DAT_11,
+       MX35_PAD_LD12__IPU_DISPB_DAT_12,
+       MX35_PAD_LD13__IPU_DISPB_DAT_13,
+       MX35_PAD_LD14__IPU_DISPB_DAT_14,
+       MX35_PAD_LD15__IPU_DISPB_DAT_15,
+       MX35_PAD_LD16__IPU_DISPB_DAT_16,
+       MX35_PAD_LD17__IPU_DISPB_DAT_17,
+       MX35_PAD_D3_HSYNC__IPU_DISPB_D3_HSYNC,
+       MX35_PAD_D3_FPSHIFT__IPU_DISPB_D3_CLK,
+       MX35_PAD_D3_DRDY__IPU_DISPB_D3_DRDY,
+       MX35_PAD_D3_VSYNC__IPU_DISPB_D3_VSYNC,
+       MX35_PAD_LD18__GPIO3_24,                /* LCD enable */
+       MX35_PAD_CSPI1_SS1__PWM_PWMO,           /* LCD backligtht PWM */
+};
+
+static struct mxc_nand_platform_data nand_pdata = {
+       .width = 1,
+       .hw_ecc = 1,
+       .flash_bbt = 0,
+};
+
+/*
+ * Board specific initialization.
+ */
+static void __init mxc_board_init(void)
+{
+       mxc_iomux_v3_setup_multiple_pads(cupid_pads, ARRAY_SIZE(cupid_pads));
+
+       platform_add_devices(devices, ARRAY_SIZE(devices));
+
+       mxc_register_device(&mxc_uart_device0, &uart_pdata);
+       mxc_register_device(&mxc_nand_device, &nand_pdata);
+
+       mxc_register_device(&mx3_ipu, &mx3_ipu_data);
+       mxc_register_device(&mx3_fb, &mx3fb_pdata);
+}
+
+static void __init cupid_timer_init(void)
+{
+       mx35_clocks_init();
+}
+
+struct sys_timer cupid_timer = {
+       .init   = cupid_timer_init,
+};
+
+MACHINE_START(GUF_CUPID, "Garz & Fricke CUPID")
+       /* Maintainer: Garz & Fricke GmbH */
+       .phys_io        = AIPS1_BASE_ADDR,
+       .io_pg_offst    = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
+       .boot_params    = PHYS_OFFSET + 0x100,
+       .map_io         = mx35_map_io,
+       .init_irq       = mx35_init_irq,
+       .init_machine   = mxc_board_init,
+       .timer          = &cupid_timer,
+MACHINE_END
+
arch/arm/plat-mxc/include/mach/board-cupid.h new file +15 -0
new file mode 100644
index 0000000..4a3d7a8
@@ -0,0 +1,27 @@
+/*
+ *  Copyright (C) 2009 Carsten Behling, Garz & Fricke GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software

arch/arm/plat-mxc/include/mach/board-cupid.h line 25

Quoted 10 lines
arch/arm/plat-mxc/include/mach/board-cupid.h new file +10 -0
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __ASM_ARCH_MXC_BOARD_CUPID_H__
+#define __ASM_ARCH_MXC_BOARD_CUPID_H__
+
+/* mandatory for CONFIG_LL_DEBUG */
+
+#define MXC_LL_UART_PADDR      UART1_BASE_ADDR
+#define MXC_LL_UART_VADDR      AIPS1_IO_ADDRESS(UART1_BASE_ADDR)

These macros are not needed anymore, you can remove them - and with it, the whole file.

You should, however, add your platform to arch/arm/plat-mxc/include/mach/uncompress.h to enable the uncompressing output.

Daniel

#2 lore raw

PATCH 1/1 add mx3 cupid bsp

In reply to Carsten Behling

Hello,

Quoted 15 lines · Carsten Behling
---
 arch/arm/mach-mx3/Kconfig                    |    7 +
 arch/arm/mach-mx3/Makefile                   |    1 +
 arch/arm/mach-mx3/cupid.c                    |  186 ++++++++++++++++++++++++++
 arch/arm/plat-mxc/include/mach/board-cupid.h |   27 ++++
 4 files changed, 221 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-mx3/cupid.c
 create mode 100644 arch/arm/plat-mxc/include/mach/board-cupid.h
arch/arm/mach-mx3/Kconfig +0 -0
index 2829441..f2700a0 100644

arch/arm/mach-mx3/Kconfig config MACH_KZM_ARM11_01 · line 118

Quoted 7 lines
arch/arm/mach-mx3/Kconfig +4 -0
@@ -112,4 +112,11 @@ config MACH_KZM_ARM11_01
          Include support for KZM-ARM11-01. This includes specific
          configurations for the board and its peripherals.
 
+config MACH_GUF_CUPID
+       bool "Support Garz & Fricke Cupid platform"
+       select ARCH_MX35
+       default n

default n is the default, you can skip stating this explicitly.

arch/arm/mach-mx3/cupid.c

Quoted 18 lines
arch/arm/mach-mx3/Kconfig +3 -0
+       help
+         Include support for Cupid platform. This includes specific
+         configurations for the board and its peripherals.
 endif
arch/arm/mach-mx3/Makefile +1 -0
index 93c7b29..1157230 100644
@@ -20,3 +20,4 @@ obj-$(CONFIG_MACH_PCM043)     += pcm043.o
 obj-$(CONFIG_MACH_ARMADILLO5X0) += armadillo5x0.o
 obj-$(CONFIG_MACH_MX35_3DS)    += mx35pdk.o
 obj-$(CONFIG_MACH_KZM_ARM11_01)        += kzmarm11.o
+obj-$(CONFIG_MACH_GUF_CUPID)   += cupid.o
arch/arm/mach-mx3/cupid.c new file +0 -0
new file mode 100644
index 0000000..b7e0044

can you please call that mach-guf_cpuid.c? (There are patches in mxc-master that do the same for the other machs).

arch/arm/mach-mx3/cupid.c line 4

Quoted 5 lines
arch/arm/mach-mx3/cupid.c new file +4 -0
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2009 Garz & Fricke GmbH All Rights Reserved.
+ *
+ * Author: Carsten Behling carsten.behling at garz-fricke.com>

missing '<'

Quoted 4 lines
arch/arm/mach-mx3/cupid.c new file +4 -0
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or

arch/arm/mach-mx3/cupid.c line 18

Quoted 10 lines
arch/arm/mach-mx3/cupid.c new file +10 -0
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

This is an old address of the FSF.

Quoted 12 lines
arch/arm/mach-mx3/cupid.c new file +12 -0
+ */
+
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/physmap.h>
+#include <linux/memory.h>
+#include <linux/gpio.h>
+#include <linux/interrupt.h>
+#include <linux/i2c.h>
+
+#include <asm/mach-types.h>

arch/arm/mach-mx3/cupid.c line 40

Quoted 10 lines
arch/arm/mach-mx3/cupid.c new file +10 -0
+#include <asm/mach/arch.h>
+#include <asm/mach/time.h>
+#include <asm/mach/map.h>
+
+#include <mach/hardware.h>
+#include <mach/common.h>
+#include <mach/imx-uart.h>
+#if defined CONFIG_I2C_IMX || defined CONFIG_I2C_IMX_MODULE
+#include <mach/i2c.h>
+#endif

If including mach/i2c.h even without CONFIG_I2C_IMX doesn't hurt, just include it unconditionally.

arch/arm/plat-mxc/include/mach/board-cupid.h

Quoted 151 lines
arch/arm/mach-mx3/cupid.c new file +146 -0
+#include <mach/iomux-mx35.h>
+#include <mach/ipu.h>
+#include <mach/mx3fb.h>
+#include <mach/mxc_nand.h>
+
+#include "devices.h"
+
+static struct fb_videomode fb_modedb[] = {
+       {
+               /* 800x480 @ 70 Hz */
+               .name           = "CPT CLAA070LC0JCT",
+               .refresh        = 70,
+               .xres           = 800,
+               .yres           = 480,
+               .pixclock       = 7829,
+               .left_margin    = 24,
+               .right_margin   = 47,
+               .upper_margin   = 5,
+               .lower_margin   = 3,
+               .hsync_len      = 24,
+               .vsync_len      = 3,
+               .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_SHARP_MODE |
+                                 FB_SYNC_CLK_INVERT | FB_SYNC_CLK_IDLE_EN,
+               .vmode          = FB_VMODE_NONINTERLACED,
+               .flag           = 0,
+       },
+};
+
+static struct ipu_platform_data mx3_ipu_data = {
+       .irq_base = MXC_IPU_IRQ_START,
+};
+
+static struct mx3fb_platform_data mx3fb_pdata = {
+       .dma_dev        = &mx3_ipu.dev,
+       .name           = "CPT CLAA070LC0JCT",
+       .mode           = fb_modedb,
+       .num_modes      = ARRAY_SIZE(fb_modedb),
+};
+
+static struct imxuart_platform_data uart_pdata = {
+       .flags = IMXUART_HAVE_RTSCTS,
+};
+
+static struct platform_device *devices[] __initdata = {
+       &mxc_fec_device,
+};
+
+static struct pad_desc cupid_pads[] = {
+       /* UART1 */
+       MX35_PAD_CTS1__UART1_CTS,
+       MX35_PAD_RTS1__UART1_RTS,
+       MX35_PAD_TXD1__UART1_TXD_MUX,
+       MX35_PAD_RXD1__UART1_RXD_MUX,
+       /* UART2 */
+       MX35_PAD_CTS2__UART2_CTS,
+       MX35_PAD_RTS2__UART2_RTS,
+       MX35_PAD_TXD2__UART2_TXD_MUX,
+       MX35_PAD_RXD2__UART2_RXD_MUX,
+       /* FEC */
+       MX35_PAD_FEC_TX_CLK__FEC_TX_CLK,
+       MX35_PAD_FEC_RX_CLK__FEC_RX_CLK,
+       MX35_PAD_FEC_RX_DV__FEC_RX_DV,
+       MX35_PAD_FEC_COL__FEC_COL,
+       MX35_PAD_FEC_RDATA0__FEC_RDATA_0,
+       MX35_PAD_FEC_TDATA0__FEC_TDATA_0,
+       MX35_PAD_FEC_TX_EN__FEC_TX_EN,
+       MX35_PAD_FEC_MDC__FEC_MDC,
+       MX35_PAD_FEC_MDIO__FEC_MDIO,
+       MX35_PAD_FEC_TX_ERR__FEC_TX_ERR,
+       MX35_PAD_FEC_RX_ERR__FEC_RX_ERR,
+       MX35_PAD_FEC_CRS__FEC_CRS,
+       MX35_PAD_FEC_RDATA1__FEC_RDATA_1,
+       MX35_PAD_FEC_TDATA1__FEC_TDATA_1,
+       MX35_PAD_FEC_RDATA2__FEC_RDATA_2,
+       MX35_PAD_FEC_TDATA2__FEC_TDATA_2,
+       MX35_PAD_FEC_RDATA3__FEC_RDATA_3,
+       MX35_PAD_FEC_TDATA3__FEC_TDATA_3,
+       /* Display */
+       MX35_PAD_LD0__IPU_DISPB_DAT_0,
+       MX35_PAD_LD1__IPU_DISPB_DAT_1,
+       MX35_PAD_LD2__IPU_DISPB_DAT_2,
+       MX35_PAD_LD3__IPU_DISPB_DAT_3,
+       MX35_PAD_LD4__IPU_DISPB_DAT_4,
+       MX35_PAD_LD5__IPU_DISPB_DAT_5,
+       MX35_PAD_LD6__IPU_DISPB_DAT_6,
+       MX35_PAD_LD7__IPU_DISPB_DAT_7,
+       MX35_PAD_LD8__IPU_DISPB_DAT_8,
+       MX35_PAD_LD9__IPU_DISPB_DAT_9,
+       MX35_PAD_LD10__IPU_DISPB_DAT_10,
+       MX35_PAD_LD11__IPU_DISPB_DAT_11,
+       MX35_PAD_LD12__IPU_DISPB_DAT_12,
+       MX35_PAD_LD13__IPU_DISPB_DAT_13,
+       MX35_PAD_LD14__IPU_DISPB_DAT_14,
+       MX35_PAD_LD15__IPU_DISPB_DAT_15,
+       MX35_PAD_LD16__IPU_DISPB_DAT_16,
+       MX35_PAD_LD17__IPU_DISPB_DAT_17,
+       MX35_PAD_D3_HSYNC__IPU_DISPB_D3_HSYNC,
+       MX35_PAD_D3_FPSHIFT__IPU_DISPB_D3_CLK,
+       MX35_PAD_D3_DRDY__IPU_DISPB_D3_DRDY,
+       MX35_PAD_D3_VSYNC__IPU_DISPB_D3_VSYNC,
+       MX35_PAD_LD18__GPIO3_24,                /* LCD enable */
+       MX35_PAD_CSPI1_SS1__PWM_PWMO,           /* LCD backligtht PWM */
+};
+
+static struct mxc_nand_platform_data nand_pdata = {
+       .width = 1,
+       .hw_ecc = 1,
+       .flash_bbt = 0,
+};
+
+/*
+ * Board specific initialization.
+ */
+static void __init mxc_board_init(void)
+{
+       mxc_iomux_v3_setup_multiple_pads(cupid_pads, ARRAY_SIZE(cupid_pads));
+
+       platform_add_devices(devices, ARRAY_SIZE(devices));
+
+       mxc_register_device(&mxc_uart_device0, &uart_pdata);
+       mxc_register_device(&mxc_nand_device, &nand_pdata);
+
+       mxc_register_device(&mx3_ipu, &mx3_ipu_data);
+       mxc_register_device(&mx3_fb, &mx3fb_pdata);
+}
+
+static void __init cupid_timer_init(void)
+{
+       mx35_clocks_init();
+}
+
+struct sys_timer cupid_timer = {
+       .init   = cupid_timer_init,
+};
+
+MACHINE_START(GUF_CUPID, "Garz & Fricke CUPID")
+       /* Maintainer: Garz & Fricke GmbH */
+       .phys_io        = AIPS1_BASE_ADDR,
+       .io_pg_offst    = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
+       .boot_params    = PHYS_OFFSET + 0x100,
+       .map_io         = mx35_map_io,
+       .init_irq       = mx35_init_irq,
+       .init_machine   = mxc_board_init,
+       .timer          = &cupid_timer,
+MACHINE_END
+
arch/arm/plat-mxc/include/mach/board-cupid.h new file +0 -0
new file mode 100644
index 0000000..4a3d7a8

board-guf_cupid.h please

Quoted 8 lines
arch/arm/plat-mxc/include/mach/board-cupid.h new file +7 -0
@@ -0,0 +1,27 @@
+/*
+ *  Copyright (C) 2009 Carsten Behling, Garz & Fricke GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.

arch/arm/plat-mxc/include/mach/board-cupid.h line 17

Quoted 10 lines
arch/arm/plat-mxc/include/mach/board-cupid.h new file +10 -0
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */

ditto, old address

arch/arm/plat-mxc/include/mach/board-cupid.h line 20

Quoted 3 lines
arch/arm/plat-mxc/include/mach/board-cupid.h new file +3 -0
+
+#ifndef __ASM_ARCH_MXC_BOARD_CUPID_H__
+#define __ASM_ARCH_MXC_BOARD_CUPID_H__

__MACH_BOARD_GUF_CUPID_H__ please

arch/arm/plat-mxc/include/mach/board-cupid.h line 27

Quoted 6 lines
arch/arm/plat-mxc/include/mach/board-cupid.h new file +6 -0
+/* mandatory for CONFIG_LL_DEBUG */
+
+#define MXC_LL_UART_PADDR      UART1_BASE_ADDR
+#define MXC_LL_UART_VADDR      AIPS1_IO_ADDRESS(UART1_BASE_ADDR)
+
+#endif /* __ASM_ARCH_MXC_BOARD_CUPID_H__ */

Can you please base you patch on top of mxc-master? You shouldn't use UART1_BASE_ADDR or AIPS1_IO_ADDRESS any more.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#3 lore raw

PATCH 1/1 add mx3 cupid bsp

In reply to Carsten Behling

arch/arm/mach-mx3/Kconfig config MACH_KZM_ARM11_01 · line 118

Quoted 4 lines · Carsten Behling
arch/arm/mach-mx3/Kconfig +4 -0
+config MACH_GUF_CUPID
+       bool "Support Garz & Fricke Cupid platform"
+       select ARCH_MX35
+       default n

default n is the default already; there's no need to explicitly state it.

arch/arm/mach-mx3/cupid.c line 40

Quoted 3 lines
arch/arm/mach-mx3/cupid.c new file +3 -0
+#if defined CONFIG_I2C_IMX || defined CONFIG_I2C_IMX_MODULE
+#include <mach/i2c.h>
+#endif

Don't ifdef include files.