* [PATCH 0/3] Introduce Zoom3 board
@ 2009-10-23 19:23 Vikram Pandita
2009-10-23 19:23 ` [PATCH 1/3] omap: zoom: reuse zoom2 board file for zoom3 Vikram Pandita
0 siblings, 1 reply; 13+ messages in thread
From: Vikram Pandita @ 2009-10-23 19:23 UTC (permalink / raw)
To: linux-omap; +Cc: Vikram Pandita
Zoom3 is the next versoin of Zoom2 board.
There has been a silicon update from zoom2 to zoom3.
Zoom2 has OMAP34xx
Zoom3 has OMAP3630
Zoom3 = OMAP3630 SOM board + same zoom2 main board + same debugboard
We want to reuse the zoom2 files as much for zoom3, as at board level,
there is no change at all.
Vikram Pandita (3):
omap: zoom: reuse zoom2 board file for zoom3
omap: zoom2: update makefile for boardfile name change
omap: zoom3: add zoom3 board support
arch/arm/mach-omap2/Kconfig | 4 +
arch/arm/mach-omap2/Makefile | 5 +-
arch/arm/mach-omap2/board-zoom2-zoom3.c | 296 +++++++++++++++++++++++++++++++
arch/arm/mach-omap2/board-zoom2.c | 292 ------------------------------
4 files changed, 304 insertions(+), 293 deletions(-)
create mode 100644 arch/arm/mach-omap2/board-zoom2-zoom3.c
delete mode 100644 arch/arm/mach-omap2/board-zoom2.c
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/3] omap: zoom: reuse zoom2 board file for zoom3
2009-10-23 19:23 [PATCH 0/3] Introduce Zoom3 board Vikram Pandita
@ 2009-10-23 19:23 ` Vikram Pandita
2009-10-23 19:23 ` [PATCH 2/3] omap: zoom2: update makefile for boardfile name change Vikram Pandita
2009-10-23 23:01 ` [PATCH 1/3] omap: zoom: reuse zoom2 board file for zoom3 Felipe Balbi
0 siblings, 2 replies; 13+ messages in thread
From: Vikram Pandita @ 2009-10-23 19:23 UTC (permalink / raw)
To: linux-omap; +Cc: Vikram Pandita
Move:
arch/arm/mach-omap2/board-zoom2.c -> arch/arm/mach-omap2/board-zoom2-zoom3.c
Zoom2 has an omap3430 SOM board attached to a (main board + debug board)
Zoom3 has an omap3630 SOM board attached to same (main board + debug board)
The main board/peripherals/debug board remain exactly the same.
Only change is the omap silicon.
Hence reuse the board file for Zoom2 and Zoom3 boards.
This patch renames the board-zoom2 to board-zoom2-zoom3 to
reflect this reuse to avoid any confusion
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
---
arch/arm/mach-omap2/board-zoom2-zoom3.c | 292 +++++++++++++++++++++++++++++++
arch/arm/mach-omap2/board-zoom2.c | 292 -------------------------------
2 files changed, 292 insertions(+), 292 deletions(-)
create mode 100644 arch/arm/mach-omap2/board-zoom2-zoom3.c
delete mode 100644 arch/arm/mach-omap2/board-zoom2.c
diff --git a/arch/arm/mach-omap2/board-zoom2-zoom3.c b/arch/arm/mach-omap2/board-zoom2-zoom3.c
new file mode 100644
index 0000000..4ad9b94
--- /dev/null
+++ b/arch/arm/mach-omap2/board-zoom2-zoom3.c
@@ -0,0 +1,292 @@
+/*
+ * Copyright (C) 2009 Texas Instruments Inc.
+ * Mikkel Christensen <mlc@ti.com>
+ *
+ * Modified from mach-omap2/board-ldp.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/input.h>
+#include <linux/input/matrix_keypad.h>
+#include <linux/gpio.h>
+#include <linux/i2c/twl4030.h>
+#include <linux/regulator/machine.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+
+#include <plat/common.h>
+#include <plat/usb.h>
+
+#include "mmc-twl4030.h"
+#include "sdram-micron-mt46h32m32lf-6.h"
+
+/* Zoom2 has Qwerty keyboard*/
+static int board_keymap[] = {
+ KEY(0, 0, KEY_E),
+ KEY(1, 0, KEY_R),
+ KEY(2, 0, KEY_T),
+ KEY(3, 0, KEY_HOME),
+ KEY(6, 0, KEY_I),
+ KEY(7, 0, KEY_LEFTSHIFT),
+ KEY(0, 1, KEY_D),
+ KEY(1, 1, KEY_F),
+ KEY(2, 1, KEY_G),
+ KEY(3, 1, KEY_SEND),
+ KEY(6, 1, KEY_K),
+ KEY(7, 1, KEY_ENTER),
+ KEY(0, 2, KEY_X),
+ KEY(1, 2, KEY_C),
+ KEY(2, 2, KEY_V),
+ KEY(3, 2, KEY_END),
+ KEY(6, 2, KEY_DOT),
+ KEY(7, 2, KEY_CAPSLOCK),
+ KEY(0, 3, KEY_Z),
+ KEY(1, 3, KEY_KPPLUS),
+ KEY(2, 3, KEY_B),
+ KEY(3, 3, KEY_F1),
+ KEY(6, 3, KEY_O),
+ KEY(7, 3, KEY_SPACE),
+ KEY(0, 4, KEY_W),
+ KEY(1, 4, KEY_Y),
+ KEY(2, 4, KEY_U),
+ KEY(3, 4, KEY_F2),
+ KEY(4, 4, KEY_VOLUMEUP),
+ KEY(6, 4, KEY_L),
+ KEY(7, 4, KEY_LEFT),
+ KEY(0, 5, KEY_S),
+ KEY(1, 5, KEY_H),
+ KEY(2, 5, KEY_J),
+ KEY(3, 5, KEY_F3),
+ KEY(5, 5, KEY_VOLUMEDOWN),
+ KEY(6, 5, KEY_M),
+ KEY(4, 5, KEY_ENTER),
+ KEY(7, 5, KEY_RIGHT),
+ KEY(0, 6, KEY_Q),
+ KEY(1, 6, KEY_A),
+ KEY(2, 6, KEY_N),
+ KEY(3, 6, KEY_BACKSPACE),
+ KEY(6, 6, KEY_P),
+ KEY(7, 6, KEY_UP),
+ KEY(6, 7, KEY_SELECT),
+ KEY(7, 7, KEY_DOWN),
+ KEY(0, 7, KEY_PROG1), /*MACRO 1 <User defined> */
+ KEY(1, 7, KEY_PROG2), /*MACRO 2 <User defined> */
+ KEY(2, 7, KEY_PROG3), /*MACRO 3 <User defined> */
+ KEY(3, 7, KEY_PROG4), /*MACRO 4 <User defined> */
+ 0
+};
+
+static struct matrix_keymap_data board_map_data = {
+ .keymap = board_keymap,
+ .keymap_size = ARRAY_SIZE(board_keymap),
+};
+
+static struct twl4030_keypad_data zoom2_kp_twl4030_data = {
+ .keymap_data = &board_map_data,
+ .rows = 8,
+ .cols = 8,
+ .rep = 1,
+};
+
+static struct omap_board_config_kernel zoom2_config[] __initdata = {
+};
+
+static struct regulator_consumer_supply zoom2_vmmc1_supply = {
+ .supply = "vmmc",
+};
+
+static struct regulator_consumer_supply zoom2_vsim_supply = {
+ .supply = "vmmc_aux",
+};
+
+static struct regulator_consumer_supply zoom2_vmmc2_supply = {
+ .supply = "vmmc",
+};
+
+/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
+static struct regulator_init_data zoom2_vmmc1 = {
+ .constraints = {
+ .min_uV = 1850000,
+ .max_uV = 3150000,
+ .valid_modes_mask = REGULATOR_MODE_NORMAL
+ | REGULATOR_MODE_STANDBY,
+ .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE
+ | REGULATOR_CHANGE_MODE
+ | REGULATOR_CHANGE_STATUS,
+ },
+ .num_consumer_supplies = 1,
+ .consumer_supplies = &zoom2_vmmc1_supply,
+};
+
+/* VMMC2 for MMC2 card */
+static struct regulator_init_data zoom2_vmmc2 = {
+ .constraints = {
+ .min_uV = 1850000,
+ .max_uV = 1850000,
+ .apply_uV = true,
+ .valid_modes_mask = REGULATOR_MODE_NORMAL
+ | REGULATOR_MODE_STANDBY,
+ .valid_ops_mask = REGULATOR_CHANGE_MODE
+ | REGULATOR_CHANGE_STATUS,
+ },
+ .num_consumer_supplies = 1,
+ .consumer_supplies = &zoom2_vmmc2_supply,
+};
+
+/* VSIM for OMAP VDD_MMC1A (i/o for DAT4..DAT7) */
+static struct regulator_init_data zoom2_vsim = {
+ .constraints = {
+ .min_uV = 1800000,
+ .max_uV = 3000000,
+ .valid_modes_mask = REGULATOR_MODE_NORMAL
+ | REGULATOR_MODE_STANDBY,
+ .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE
+ | REGULATOR_CHANGE_MODE
+ | REGULATOR_CHANGE_STATUS,
+ },
+ .num_consumer_supplies = 1,
+ .consumer_supplies = &zoom2_vsim_supply,
+};
+
+static struct twl4030_hsmmc_info mmc[] __initdata = {
+ {
+ .mmc = 1,
+ .wires = 4,
+ .gpio_wp = -EINVAL,
+ },
+ {
+ .mmc = 2,
+ .wires = 4,
+ .gpio_wp = -EINVAL,
+ },
+ {} /* Terminator */
+};
+
+static int zoom2_twl_gpio_setup(struct device *dev,
+ unsigned gpio, unsigned ngpio)
+{
+ /* gpio + 0 is "mmc0_cd" (input/IRQ),
+ * gpio + 1 is "mmc1_cd" (input/IRQ)
+ */
+ mmc[0].gpio_cd = gpio + 0;
+ mmc[1].gpio_cd = gpio + 1;
+ twl4030_mmc_init(mmc);
+
+ /* link regulators to MMC adapters ... we "know" the
+ * regulators will be set up only *after* we return.
+ */
+ zoom2_vmmc1_supply.dev = mmc[0].dev;
+ zoom2_vsim_supply.dev = mmc[0].dev;
+ zoom2_vmmc2_supply.dev = mmc[1].dev;
+
+ return 0;
+}
+
+
+static int zoom2_batt_table[] = {
+/* 0 C*/
+30800, 29500, 28300, 27100,
+26000, 24900, 23900, 22900, 22000, 21100, 20300, 19400, 18700, 17900,
+17200, 16500, 15900, 15300, 14700, 14100, 13600, 13100, 12600, 12100,
+11600, 11200, 10800, 10400, 10000, 9630, 9280, 8950, 8620, 8310,
+8020, 7730, 7460, 7200, 6950, 6710, 6470, 6250, 6040, 5830,
+5640, 5450, 5260, 5090, 4920, 4760, 4600, 4450, 4310, 4170,
+4040, 3910, 3790, 3670, 3550
+};
+
+static struct twl4030_bci_platform_data zoom2_bci_data = {
+ .battery_tmp_tbl = zoom2_batt_table,
+ .tblsize = ARRAY_SIZE(zoom2_batt_table),
+};
+
+static struct twl4030_usb_data zoom2_usb_data = {
+ .usb_mode = T2_USB_MODE_ULPI,
+};
+
+static void __init omap_zoom2_init_irq(void)
+{
+ omap_board_config = zoom2_config;
+ omap_board_config_size = ARRAY_SIZE(zoom2_config);
+ omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
+ mt46h32m32lf6_sdrc_params);
+ omap_init_irq();
+ omap_gpio_init();
+}
+
+static struct twl4030_gpio_platform_data zoom2_gpio_data = {
+ .gpio_base = OMAP_MAX_GPIO_LINES,
+ .irq_base = TWL4030_GPIO_IRQ_BASE,
+ .irq_end = TWL4030_GPIO_IRQ_END,
+ .setup = zoom2_twl_gpio_setup,
+};
+
+static struct twl4030_madc_platform_data zoom2_madc_data = {
+ .irq_line = 1,
+};
+
+static struct twl4030_platform_data zoom2_twldata = {
+ .irq_base = TWL4030_IRQ_BASE,
+ .irq_end = TWL4030_IRQ_END,
+
+ /* platform_data for children goes here */
+ .bci = &zoom2_bci_data,
+ .madc = &zoom2_madc_data,
+ .usb = &zoom2_usb_data,
+ .gpio = &zoom2_gpio_data,
+ .keypad = &zoom2_kp_twl4030_data,
+ .vmmc1 = &zoom2_vmmc1,
+ .vmmc2 = &zoom2_vmmc2,
+ .vsim = &zoom2_vsim,
+
+};
+
+static struct i2c_board_info __initdata zoom2_i2c_boardinfo[] = {
+ {
+ I2C_BOARD_INFO("twl4030", 0x48),
+ .flags = I2C_CLIENT_WAKE,
+ .irq = INT_34XX_SYS_NIRQ,
+ .platform_data = &zoom2_twldata,
+ },
+};
+
+static int __init omap_i2c_init(void)
+{
+ omap_register_i2c_bus(1, 2600, zoom2_i2c_boardinfo,
+ ARRAY_SIZE(zoom2_i2c_boardinfo));
+ omap_register_i2c_bus(2, 400, NULL, 0);
+ omap_register_i2c_bus(3, 400, NULL, 0);
+ return 0;
+}
+
+extern int __init omap_zoom2_debugboard_init(void);
+
+static void __init omap_zoom2_init(void)
+{
+ omap_i2c_init();
+ omap_serial_init();
+ omap_zoom2_debugboard_init();
+ usb_musb_init();
+}
+
+static void __init omap_zoom2_map_io(void)
+{
+ omap2_set_globals_343x();
+ omap2_map_common_io();
+}
+
+MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
+ .phys_io = 0x48000000,
+ .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
+ .boot_params = 0x80000100,
+ .map_io = omap_zoom2_map_io,
+ .init_irq = omap_zoom2_init_irq,
+ .init_machine = omap_zoom2_init,
+ .timer = &omap_timer,
+MACHINE_END
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c
deleted file mode 100644
index 4ad9b94..0000000
--- a/arch/arm/mach-omap2/board-zoom2.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright (C) 2009 Texas Instruments Inc.
- * Mikkel Christensen <mlc@ti.com>
- *
- * Modified from mach-omap2/board-ldp.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/input.h>
-#include <linux/input/matrix_keypad.h>
-#include <linux/gpio.h>
-#include <linux/i2c/twl4030.h>
-#include <linux/regulator/machine.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#include <plat/common.h>
-#include <plat/usb.h>
-
-#include "mmc-twl4030.h"
-#include "sdram-micron-mt46h32m32lf-6.h"
-
-/* Zoom2 has Qwerty keyboard*/
-static int board_keymap[] = {
- KEY(0, 0, KEY_E),
- KEY(1, 0, KEY_R),
- KEY(2, 0, KEY_T),
- KEY(3, 0, KEY_HOME),
- KEY(6, 0, KEY_I),
- KEY(7, 0, KEY_LEFTSHIFT),
- KEY(0, 1, KEY_D),
- KEY(1, 1, KEY_F),
- KEY(2, 1, KEY_G),
- KEY(3, 1, KEY_SEND),
- KEY(6, 1, KEY_K),
- KEY(7, 1, KEY_ENTER),
- KEY(0, 2, KEY_X),
- KEY(1, 2, KEY_C),
- KEY(2, 2, KEY_V),
- KEY(3, 2, KEY_END),
- KEY(6, 2, KEY_DOT),
- KEY(7, 2, KEY_CAPSLOCK),
- KEY(0, 3, KEY_Z),
- KEY(1, 3, KEY_KPPLUS),
- KEY(2, 3, KEY_B),
- KEY(3, 3, KEY_F1),
- KEY(6, 3, KEY_O),
- KEY(7, 3, KEY_SPACE),
- KEY(0, 4, KEY_W),
- KEY(1, 4, KEY_Y),
- KEY(2, 4, KEY_U),
- KEY(3, 4, KEY_F2),
- KEY(4, 4, KEY_VOLUMEUP),
- KEY(6, 4, KEY_L),
- KEY(7, 4, KEY_LEFT),
- KEY(0, 5, KEY_S),
- KEY(1, 5, KEY_H),
- KEY(2, 5, KEY_J),
- KEY(3, 5, KEY_F3),
- KEY(5, 5, KEY_VOLUMEDOWN),
- KEY(6, 5, KEY_M),
- KEY(4, 5, KEY_ENTER),
- KEY(7, 5, KEY_RIGHT),
- KEY(0, 6, KEY_Q),
- KEY(1, 6, KEY_A),
- KEY(2, 6, KEY_N),
- KEY(3, 6, KEY_BACKSPACE),
- KEY(6, 6, KEY_P),
- KEY(7, 6, KEY_UP),
- KEY(6, 7, KEY_SELECT),
- KEY(7, 7, KEY_DOWN),
- KEY(0, 7, KEY_PROG1), /*MACRO 1 <User defined> */
- KEY(1, 7, KEY_PROG2), /*MACRO 2 <User defined> */
- KEY(2, 7, KEY_PROG3), /*MACRO 3 <User defined> */
- KEY(3, 7, KEY_PROG4), /*MACRO 4 <User defined> */
- 0
-};
-
-static struct matrix_keymap_data board_map_data = {
- .keymap = board_keymap,
- .keymap_size = ARRAY_SIZE(board_keymap),
-};
-
-static struct twl4030_keypad_data zoom2_kp_twl4030_data = {
- .keymap_data = &board_map_data,
- .rows = 8,
- .cols = 8,
- .rep = 1,
-};
-
-static struct omap_board_config_kernel zoom2_config[] __initdata = {
-};
-
-static struct regulator_consumer_supply zoom2_vmmc1_supply = {
- .supply = "vmmc",
-};
-
-static struct regulator_consumer_supply zoom2_vsim_supply = {
- .supply = "vmmc_aux",
-};
-
-static struct regulator_consumer_supply zoom2_vmmc2_supply = {
- .supply = "vmmc",
-};
-
-/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
-static struct regulator_init_data zoom2_vmmc1 = {
- .constraints = {
- .min_uV = 1850000,
- .max_uV = 3150000,
- .valid_modes_mask = REGULATOR_MODE_NORMAL
- | REGULATOR_MODE_STANDBY,
- .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE
- | REGULATOR_CHANGE_MODE
- | REGULATOR_CHANGE_STATUS,
- },
- .num_consumer_supplies = 1,
- .consumer_supplies = &zoom2_vmmc1_supply,
-};
-
-/* VMMC2 for MMC2 card */
-static struct regulator_init_data zoom2_vmmc2 = {
- .constraints = {
- .min_uV = 1850000,
- .max_uV = 1850000,
- .apply_uV = true,
- .valid_modes_mask = REGULATOR_MODE_NORMAL
- | REGULATOR_MODE_STANDBY,
- .valid_ops_mask = REGULATOR_CHANGE_MODE
- | REGULATOR_CHANGE_STATUS,
- },
- .num_consumer_supplies = 1,
- .consumer_supplies = &zoom2_vmmc2_supply,
-};
-
-/* VSIM for OMAP VDD_MMC1A (i/o for DAT4..DAT7) */
-static struct regulator_init_data zoom2_vsim = {
- .constraints = {
- .min_uV = 1800000,
- .max_uV = 3000000,
- .valid_modes_mask = REGULATOR_MODE_NORMAL
- | REGULATOR_MODE_STANDBY,
- .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE
- | REGULATOR_CHANGE_MODE
- | REGULATOR_CHANGE_STATUS,
- },
- .num_consumer_supplies = 1,
- .consumer_supplies = &zoom2_vsim_supply,
-};
-
-static struct twl4030_hsmmc_info mmc[] __initdata = {
- {
- .mmc = 1,
- .wires = 4,
- .gpio_wp = -EINVAL,
- },
- {
- .mmc = 2,
- .wires = 4,
- .gpio_wp = -EINVAL,
- },
- {} /* Terminator */
-};
-
-static int zoom2_twl_gpio_setup(struct device *dev,
- unsigned gpio, unsigned ngpio)
-{
- /* gpio + 0 is "mmc0_cd" (input/IRQ),
- * gpio + 1 is "mmc1_cd" (input/IRQ)
- */
- mmc[0].gpio_cd = gpio + 0;
- mmc[1].gpio_cd = gpio + 1;
- twl4030_mmc_init(mmc);
-
- /* link regulators to MMC adapters ... we "know" the
- * regulators will be set up only *after* we return.
- */
- zoom2_vmmc1_supply.dev = mmc[0].dev;
- zoom2_vsim_supply.dev = mmc[0].dev;
- zoom2_vmmc2_supply.dev = mmc[1].dev;
-
- return 0;
-}
-
-
-static int zoom2_batt_table[] = {
-/* 0 C*/
-30800, 29500, 28300, 27100,
-26000, 24900, 23900, 22900, 22000, 21100, 20300, 19400, 18700, 17900,
-17200, 16500, 15900, 15300, 14700, 14100, 13600, 13100, 12600, 12100,
-11600, 11200, 10800, 10400, 10000, 9630, 9280, 8950, 8620, 8310,
-8020, 7730, 7460, 7200, 6950, 6710, 6470, 6250, 6040, 5830,
-5640, 5450, 5260, 5090, 4920, 4760, 4600, 4450, 4310, 4170,
-4040, 3910, 3790, 3670, 3550
-};
-
-static struct twl4030_bci_platform_data zoom2_bci_data = {
- .battery_tmp_tbl = zoom2_batt_table,
- .tblsize = ARRAY_SIZE(zoom2_batt_table),
-};
-
-static struct twl4030_usb_data zoom2_usb_data = {
- .usb_mode = T2_USB_MODE_ULPI,
-};
-
-static void __init omap_zoom2_init_irq(void)
-{
- omap_board_config = zoom2_config;
- omap_board_config_size = ARRAY_SIZE(zoom2_config);
- omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
- mt46h32m32lf6_sdrc_params);
- omap_init_irq();
- omap_gpio_init();
-}
-
-static struct twl4030_gpio_platform_data zoom2_gpio_data = {
- .gpio_base = OMAP_MAX_GPIO_LINES,
- .irq_base = TWL4030_GPIO_IRQ_BASE,
- .irq_end = TWL4030_GPIO_IRQ_END,
- .setup = zoom2_twl_gpio_setup,
-};
-
-static struct twl4030_madc_platform_data zoom2_madc_data = {
- .irq_line = 1,
-};
-
-static struct twl4030_platform_data zoom2_twldata = {
- .irq_base = TWL4030_IRQ_BASE,
- .irq_end = TWL4030_IRQ_END,
-
- /* platform_data for children goes here */
- .bci = &zoom2_bci_data,
- .madc = &zoom2_madc_data,
- .usb = &zoom2_usb_data,
- .gpio = &zoom2_gpio_data,
- .keypad = &zoom2_kp_twl4030_data,
- .vmmc1 = &zoom2_vmmc1,
- .vmmc2 = &zoom2_vmmc2,
- .vsim = &zoom2_vsim,
-
-};
-
-static struct i2c_board_info __initdata zoom2_i2c_boardinfo[] = {
- {
- I2C_BOARD_INFO("twl4030", 0x48),
- .flags = I2C_CLIENT_WAKE,
- .irq = INT_34XX_SYS_NIRQ,
- .platform_data = &zoom2_twldata,
- },
-};
-
-static int __init omap_i2c_init(void)
-{
- omap_register_i2c_bus(1, 2600, zoom2_i2c_boardinfo,
- ARRAY_SIZE(zoom2_i2c_boardinfo));
- omap_register_i2c_bus(2, 400, NULL, 0);
- omap_register_i2c_bus(3, 400, NULL, 0);
- return 0;
-}
-
-extern int __init omap_zoom2_debugboard_init(void);
-
-static void __init omap_zoom2_init(void)
-{
- omap_i2c_init();
- omap_serial_init();
- omap_zoom2_debugboard_init();
- usb_musb_init();
-}
-
-static void __init omap_zoom2_map_io(void)
-{
- omap2_set_globals_343x();
- omap2_map_common_io();
-}
-
-MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
- .phys_io = 0x48000000,
- .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
- .boot_params = 0x80000100,
- .map_io = omap_zoom2_map_io,
- .init_irq = omap_zoom2_init_irq,
- .init_machine = omap_zoom2_init,
- .timer = &omap_timer,
-MACHINE_END
--
1.6.5.rc1.19.g8426
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/3] omap: zoom2: update makefile for boardfile name change
2009-10-23 19:23 ` [PATCH 1/3] omap: zoom: reuse zoom2 board file for zoom3 Vikram Pandita
@ 2009-10-23 19:23 ` Vikram Pandita
2009-10-23 19:23 ` [PATCH 3/3] omap: zoom3: add zoom3 board support Vikram Pandita
2009-10-23 23:01 ` [PATCH 1/3] omap: zoom: reuse zoom2 board file for zoom3 Felipe Balbi
1 sibling, 1 reply; 13+ messages in thread
From: Vikram Pandita @ 2009-10-23 19:23 UTC (permalink / raw)
To: linux-omap; +Cc: Vikram Pandita
Accomodate the board file change in Kconfig
arch/arm/mach-omap2/board-zoom2.c -> arch/arm/mach-omap2/board-zoom2-zoom3.c
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
---
arch/arm/mach-omap2/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 03cb4fc..68f7419 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -71,7 +71,7 @@ obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o
obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
board-rx51-peripherals.o \
mmc-twl4030.o
-obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \
+obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2-zoom3.o \
mmc-twl4030.o \
board-zoom-debugboard.o
obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \
--
1.6.5.rc1.19.g8426
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/3] omap: zoom3: add zoom3 board support
2009-10-23 19:23 ` [PATCH 2/3] omap: zoom2: update makefile for boardfile name change Vikram Pandita
@ 2009-10-23 19:23 ` Vikram Pandita
2009-10-23 19:39 ` Aguirre Rodriguez, Sergio Alberto
2009-10-23 23:03 ` Felipe Balbi
0 siblings, 2 replies; 13+ messages in thread
From: Vikram Pandita @ 2009-10-23 19:23 UTC (permalink / raw)
To: linux-omap; +Cc: Vikram Pandita
Add machine type support for zoom3 board
Add board type in Kconfig and Makefile
Reused the zoom board file for zoom2 and zoom3
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
---
arch/arm/mach-omap2/Kconfig | 4 ++++
arch/arm/mach-omap2/Makefile | 3 +++
arch/arm/mach-omap2/board-zoom2-zoom3.c | 4 ++++
3 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 8685df5..fa20996 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -97,6 +97,10 @@ config MACH_OMAP_ZOOM2
bool "OMAP3 Zoom2 board"
depends on ARCH_OMAP3 && ARCH_OMAP34XX
+config MACH_OMAP_ZOOM3
+ bool "OMAP3630 Zoom3 board"
+ depends on ARCH_OMAP3 && ARCH_OMAP34XX
+
config MACH_CM_T35
bool "CompuLab CM-T35 module"
depends on ARCH_OMAP3 && ARCH_OMAP34XX
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 68f7419..fac13ba 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -74,6 +74,9 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2-zoom3.o \
mmc-twl4030.o \
board-zoom-debugboard.o
+obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom2-zoom3.o \
+ mmc-twl4030.o \
+ board-zoom-debugboard.o
obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \
mmc-twl4030.o
diff --git a/arch/arm/mach-omap2/board-zoom2-zoom3.c b/arch/arm/mach-omap2/board-zoom2-zoom3.c
index 4ad9b94..d806dbf 100644
--- a/arch/arm/mach-omap2/board-zoom2-zoom3.c
+++ b/arch/arm/mach-omap2/board-zoom2-zoom3.c
@@ -281,7 +281,11 @@ static void __init omap_zoom2_map_io(void)
omap2_map_common_io();
}
+#ifdef CONFIG_MACH_OMAP_ZOOM3
+MACHINE_START(OMAP_ZOOM3, "OMAP ZOOM3 board")
+#else
MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
+#endif
.phys_io = 0x48000000,
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
--
1.6.5.rc1.19.g8426
^ permalink raw reply related [flat|nested] 13+ messages in thread
* RE: [PATCH 3/3] omap: zoom3: add zoom3 board support
2009-10-23 19:23 ` [PATCH 3/3] omap: zoom3: add zoom3 board support Vikram Pandita
@ 2009-10-23 19:39 ` Aguirre Rodriguez, Sergio Alberto
2009-10-23 19:46 ` Nishanth Menon
2009-10-23 23:03 ` Felipe Balbi
1 sibling, 1 reply; 13+ messages in thread
From: Aguirre Rodriguez, Sergio Alberto @ 2009-10-23 19:39 UTC (permalink / raw)
To: Pandita, Vikram, linux-omap@vger.kernel.org
Vikram,
Just some comments I came across below.
From: linux-omap-owner@vger.kernel.org [linux-omap-owner@vger.kernel.org] On Behalf Of Pandita, Vikram
Sent: Friday, October 23, 2009 2:23 PM
> Add machine type support for zoom3 board
> Add board type in Kconfig and Makefile
> Reused the zoom board file for zoom2 and zoom3
>
> Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
> ---
> arch/arm/mach-omap2/Kconfig | 4 ++++
> arch/arm/mach-omap2/Makefile | 3 +++
> arch/arm/mach-omap2/board-zoom2-zoom3.c | 4 ++++
> 3 files changed, 11 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index 8685df5..fa20996 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -97,6 +97,10 @@ config MACH_OMAP_ZOOM2
> bool "OMAP3 Zoom2 board"
How about also clarifying here ^^ the chip version:
bool "OMAP3430 Zoom2 board"
I mean, just to stick to the convention you're putting below.
> depends on ARCH_OMAP3 && ARCH_OMAP34XX
>
> +config MACH_OMAP_ZOOM3
> + bool "OMAP3630 Zoom3 board"
> + depends on ARCH_OMAP3 && ARCH_OMAP34XX
Shouldn't this be:
depends on ARCH_OMAP3 && ARCH_OMAP36XX
?
> +
> config MACH_CM_T35
> bool "CompuLab CM-T35 module"
> depends on ARCH_OMAP3 && ARCH_OMAP34XX
> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
> index 68f7419..fac13ba 100644
> --- a/arch/arm/mach-omap2/Makefile
> +++ b/arch/arm/mach-omap2/Makefile
> @@ -74,6 +74,9 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
> obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2-zoom3.o \
> mmc-twl4030.o \
> board-zoom-debugboard.o
> +obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom2-zoom3.o \
> + mmc-twl4030.o \
> + board-zoom-debugboard.o
> obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \
> mmc-twl4030.o
>
> diff --git a/arch/arm/mach-omap2/board-zoom2-zoom3.c b/arch/arm/mach-omap2/board-zoom2-zoom3.c
> index 4ad9b94..d806dbf 100644
> --- a/arch/arm/mach-omap2/board-zoom2-zoom3.c
> +++ b/arch/arm/mach-omap2/board-zoom2-zoom3.c
> @@ -281,7 +281,11 @@ static void __init omap_zoom2_map_io(void)
> omap2_map_common_io();
> }
>
> +#ifdef CONFIG_MACH_OMAP_ZOOM3
> +MACHINE_START(OMAP_ZOOM3, "OMAP ZOOM3 board")
Case consistency?
MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")
Regards,
Sergio
> +#else
> MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
> +#endif
> .phys_io = 0x48000000,
> .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
> .boot_params = 0x80000100,
> --
> 1.6.5.rc1.19.g8426
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] omap: zoom3: add zoom3 board support
2009-10-23 19:39 ` Aguirre Rodriguez, Sergio Alberto
@ 2009-10-23 19:46 ` Nishanth Menon
2009-10-23 20:07 ` Aguirre Rodriguez, Sergio Alberto
0 siblings, 1 reply; 13+ messages in thread
From: Nishanth Menon @ 2009-10-23 19:46 UTC (permalink / raw)
To: Aguirre Rodriguez, Sergio Alberto
Cc: Pandita, Vikram, linux-omap@vger.kernel.org
Aguirre Rodriguez, Sergio Alberto had written, on 10/23/2009 02:39 PM,
the following:
> Vikram,
>
> Just some comments I came across below.
>
> From: linux-omap-owner@vger.kernel.org [linux-omap-owner@vger.kernel.org] On Behalf Of Pandita, Vikram
> Sent: Friday, October 23, 2009 2:23 PM
>> Add machine type support for zoom3 board
>> Add board type in Kconfig and Makefile
>> Reused the zoom board file for zoom2 and zoom3
>>
>> Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
>> ---
>> arch/arm/mach-omap2/Kconfig | 4 ++++
>> arch/arm/mach-omap2/Makefile | 3 +++
>> arch/arm/mach-omap2/board-zoom2-zoom3.c | 4 ++++
>> 3 files changed, 11 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
>> index 8685df5..fa20996 100644
>> --- a/arch/arm/mach-omap2/Kconfig
>> +++ b/arch/arm/mach-omap2/Kconfig
>> @@ -97,6 +97,10 @@ config MACH_OMAP_ZOOM2
>> bool "OMAP3 Zoom2 board"
>
> How about also clarifying here ^^ the chip version:
>
> bool "OMAP3430 Zoom2 board"
>
> I mean, just to stick to the convention you're putting below.
>
>> depends on ARCH_OMAP3 && ARCH_OMAP34XX
>>
>> +config MACH_OMAP_ZOOM3
>> + bool "OMAP3630 Zoom3 board"
>> + depends on ARCH_OMAP3 && ARCH_OMAP34XX
>
> Shouldn't this be:
>
> depends on ARCH_OMAP3 && ARCH_OMAP36XX
>
is there an ARCH_OMAP36XX? i believe not ;)..
Linux-OMAP build allows for both boards to be defined at the same time..
so in theory you could have a single uImage. the strategy followed here
will fail it.. since the board file is the same one.. it could be made
to work though..
> ?
>
>> +
>> config MACH_CM_T35
>> bool "CompuLab CM-T35 module"
>> depends on ARCH_OMAP3 && ARCH_OMAP34XX
>> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
>> index 68f7419..fac13ba 100644
>> --- a/arch/arm/mach-omap2/Makefile
>> +++ b/arch/arm/mach-omap2/Makefile
>> @@ -74,6 +74,9 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
>> obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2-zoom3.o \
>> mmc-twl4030.o \
>> board-zoom-debugboard.o
>> +obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom2-zoom3.o \
>> + mmc-twl4030.o \
>> + board-zoom-debugboard.o
>> obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \
>> mmc-twl4030.o
>>
>> diff --git a/arch/arm/mach-omap2/board-zoom2-zoom3.c b/arch/arm/mach-omap2/board-zoom2-zoom3.c
>> index 4ad9b94..d806dbf 100644
>> --- a/arch/arm/mach-omap2/board-zoom2-zoom3.c
>> +++ b/arch/arm/mach-omap2/board-zoom2-zoom3.c
>> @@ -281,7 +281,11 @@ static void __init omap_zoom2_map_io(void)
>> omap2_map_common_io();
>> }
>>
>> +#ifdef CONFIG_MACH_OMAP_ZOOM3
>> +MACHINE_START(OMAP_ZOOM3, "OMAP ZOOM3 board")
>
> Case consistency?
>
> MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")
>
> Regards,
> Sergio
>
>> +#else
>> MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
>> +#endif
>> .phys_io = 0x48000000,
>> .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
>> .boot_params = 0x80000100,
>> --
>> 1.6.5.rc1.19.g8426
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
Regards,
Nishanth Menon
^ permalink raw reply [flat|nested] 13+ messages in thread
* RE: [PATCH 3/3] omap: zoom3: add zoom3 board support
2009-10-23 19:46 ` Nishanth Menon
@ 2009-10-23 20:07 ` Aguirre Rodriguez, Sergio Alberto
2009-10-23 21:17 ` Nishanth Menon
0 siblings, 1 reply; 13+ messages in thread
From: Aguirre Rodriguez, Sergio Alberto @ 2009-10-23 20:07 UTC (permalink / raw)
To: Menon, Nishanth; +Cc: Pandita, Vikram, linux-omap@vger.kernel.org
From: Menon, Nishanth
Sent: Friday, October 23, 2009 2:46 PM
> Aguirre Rodriguez, Sergio Alberto had written, on 10/23/2009 02:39 PM,
> the following:
> > Vikram,
> >
> > Just some comments I came across below.
> >
> > From: linux-omap-owner@vger.kernel.org [linux-omap-owner@vger.kernel.org] On Behalf Of Pandita, Vikram
> > Sent: Friday, October 23, 2009 2:23 PM
> >> Add machine type support for zoom3 board
> >> Add board type in Kconfig and Makefile
> >> Reused the zoom board file for zoom2 and zoom3
> >>
> >> Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
> >> ---
> >> arch/arm/mach-omap2/Kconfig | 4 ++++
> >> arch/arm/mach-omap2/Makefile | 3 +++
> >> arch/arm/mach-omap2/board-zoom2-zoom3.c | 4 ++++
> >> 3 files changed, 11 insertions(+), 0 deletions(-)
> >>
> >> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> >> index 8685df5..fa20996 100644
> >> --- a/arch/arm/mach-omap2/Kconfig
> >> +++ b/arch/arm/mach-omap2/Kconfig
> >> @@ -97,6 +97,10 @@ config MACH_OMAP_ZOOM2
> >> bool "OMAP3 Zoom2 board"
> >
> > How about also clarifying here ^^ the chip version:
> >
> > bool "OMAP3430 Zoom2 board"
> >
> > I mean, just to stick to the convention you're putting below.
> >
> >> depends on ARCH_OMAP3 && ARCH_OMAP34XX
> >>
> >> +config MACH_OMAP_ZOOM3
> >> + bool "OMAP3630 Zoom3 board"
> >> + depends on ARCH_OMAP3 && ARCH_OMAP34XX
> >
> > Shouldn't this be:
> >
> > depends on ARCH_OMAP3 && ARCH_OMAP36XX
> >
> is there an ARCH_OMAP36XX? i believe not ;)..
>
Hmm... (Had this discussion before, not going there...)
>
> Linux-OMAP build allows for both boards to be defined at the same time..
> so in theory you could have a single uImage. the strategy followed here
> will fail it.. since the board file is the same one.. it could be made
> to work though..
>
Not with this approach :)
How about making board-zoom3.c separate from board-zoom2.c, and do a
smarter way to share as much as possible?
To modularize, I'll suggest taking a look at RX51 board files. That way you can have
board-zoom2.c, board-zoom3.c, with the modules shared accordingly in Makefile.
Camera is already doing that ;)
What do you think?
Regards,
Sergio
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] omap: zoom3: add zoom3 board support
2009-10-23 20:07 ` Aguirre Rodriguez, Sergio Alberto
@ 2009-10-23 21:17 ` Nishanth Menon
2009-10-23 23:06 ` Felipe Balbi
0 siblings, 1 reply; 13+ messages in thread
From: Nishanth Menon @ 2009-10-23 21:17 UTC (permalink / raw)
To: Aguirre Rodriguez, Sergio Alberto
Cc: Pandita, Vikram, linux-omap@vger.kernel.org
Aguirre Rodriguez, Sergio Alberto had written, on 10/23/2009 03:07 PM,
the following:
[...]
>> Linux-OMAP build allows for both boards to be defined at the same time..
>> so in theory you could have a single uImage. the strategy followed here
>> will fail it.. since the board file is the same one.. it could be made
>> to work though..
>>
>
> Not with this approach :)
>
> How about making board-zoom3.c separate from board-zoom2.c, and do a
> smarter way to share as much as possible?
>
> To modularize, I'll suggest taking a look at RX51 board files. That way you can have
> board-zoom2.c, board-zoom3.c, with the modules shared accordingly in Makefile.
>
> Camera is already doing that ;)
>
> What do you think?
Ack.
--
Regards,
Nishanth Menon
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] omap: zoom: reuse zoom2 board file for zoom3
2009-10-23 19:23 ` [PATCH 1/3] omap: zoom: reuse zoom2 board file for zoom3 Vikram Pandita
2009-10-23 19:23 ` [PATCH 2/3] omap: zoom2: update makefile for boardfile name change Vikram Pandita
@ 2009-10-23 23:01 ` Felipe Balbi
1 sibling, 0 replies; 13+ messages in thread
From: Felipe Balbi @ 2009-10-23 23:01 UTC (permalink / raw)
To: Vikram Pandita; +Cc: linux-omap
On Fri, Oct 23, 2009 at 02:23:24PM -0500, Vikram Pandita wrote:
> Move:
> arch/arm/mach-omap2/board-zoom2.c -> arch/arm/mach-omap2/board-zoom2-zoom3.c
>
> Zoom2 has an omap3430 SOM board attached to a (main board + debug board)
> Zoom3 has an omap3630 SOM board attached to same (main board + debug board)
>
> The main board/peripherals/debug board remain exactly the same.
> Only change is the omap silicon.
>
> Hence reuse the board file for Zoom2 and Zoom3 boards.
>
> This patch renames the board-zoom2 to board-zoom2-zoom3 to
> reflect this reuse to avoid any confusion
>
> Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
could you generate this with -C, please ?
it makes it easier to see what actually changed in that file ;-)
--
balbi
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] omap: zoom3: add zoom3 board support
2009-10-23 19:23 ` [PATCH 3/3] omap: zoom3: add zoom3 board support Vikram Pandita
2009-10-23 19:39 ` Aguirre Rodriguez, Sergio Alberto
@ 2009-10-23 23:03 ` Felipe Balbi
2009-10-27 21:36 ` Pandita, Vikram
2009-10-28 12:12 ` Welcome: OMAPZoom Tutorial Hour Pandita, Vikram
1 sibling, 2 replies; 13+ messages in thread
From: Felipe Balbi @ 2009-10-23 23:03 UTC (permalink / raw)
To: Vikram Pandita; +Cc: linux-omap
Hi,
On Fri, Oct 23, 2009 at 02:23:26PM -0500, Vikram Pandita wrote:
> diff --git a/arch/arm/mach-omap2/board-zoom2-zoom3.c b/arch/arm/mach-omap2/board-zoom2-zoom3.c
> index 4ad9b94..d806dbf 100644
> --- a/arch/arm/mach-omap2/board-zoom2-zoom3.c
> +++ b/arch/arm/mach-omap2/board-zoom2-zoom3.c
> @@ -281,7 +281,11 @@ static void __init omap_zoom2_map_io(void)
> omap2_map_common_io();
> }
>
> +#ifdef CONFIG_MACH_OMAP_ZOOM3
> +MACHINE_START(OMAP_ZOOM3, "OMAP ZOOM3 board")
> +#else
> MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
> +#endif
what happens if you want to build a kernel for both boards ?
how about just adding a new MACHINE_START() declaration without
ifdeferry ?
Take a look at arch/arm/mach-omap2/board-n8x0.c for an example ;-)
--
balbi
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] omap: zoom3: add zoom3 board support
2009-10-23 21:17 ` Nishanth Menon
@ 2009-10-23 23:06 ` Felipe Balbi
0 siblings, 0 replies; 13+ messages in thread
From: Felipe Balbi @ 2009-10-23 23:06 UTC (permalink / raw)
To: Nishanth Menon
Cc: Aguirre Rodriguez, Sergio Alberto, Pandita, Vikram,
linux-omap@vger.kernel.org
On Fri, Oct 23, 2009 at 04:17:08PM -0500, Nishanth Menon wrote:
> Aguirre Rodriguez, Sergio Alberto had written, on 10/23/2009 03:07
> PM, the following:
> [...]
> >>Linux-OMAP build allows for both boards to be defined at the same time..
> >>so in theory you could have a single uImage. the strategy followed here
> >>will fail it.. since the board file is the same one.. it could be made
> >>to work though..
> >>
> >
> >Not with this approach :)
> >
> >How about making board-zoom3.c separate from board-zoom2.c, and do a
> >smarter way to share as much as possible?
> >
> >To modularize, I'll suggest taking a look at RX51 board files. That way you can have
> >board-zoom2.c, board-zoom3.c, with the modules shared accordingly in Makefile.
> >
> >Camera is already doing that ;)
> >
> >What do you think?
> Ack.
I guess this would only add a file with a MACHINE_START() for zoom3,
right ?
I'd rather go, for this case, board-n8x0.c-ish.
--
balbi
^ permalink raw reply [flat|nested] 13+ messages in thread
* RE: [PATCH 3/3] omap: zoom3: add zoom3 board support
2009-10-23 23:03 ` Felipe Balbi
@ 2009-10-27 21:36 ` Pandita, Vikram
2009-10-28 12:12 ` Welcome: OMAPZoom Tutorial Hour Pandita, Vikram
1 sibling, 0 replies; 13+ messages in thread
From: Pandita, Vikram @ 2009-10-27 21:36 UTC (permalink / raw)
To: me@felipebalbi.com; +Cc: linux-omap@vger.kernel.org
>-----Original Message-----
>From: Felipe Balbi [mailto:me@felipebalbi.com]
>Sent: Friday, October 23, 2009 6:04 PM
>To: Pandita, Vikram
>Cc: linux-omap@vger.kernel.org
>Subject: Re: [PATCH 3/3] omap: zoom3: add zoom3 board support
>
>Hi,
>
>On Fri, Oct 23, 2009 at 02:23:26PM -0500, Vikram Pandita wrote:
>> diff --git a/arch/arm/mach-omap2/board-zoom2-zoom3.c b/arch/arm/mach-omap2/board-zoom2-zoom3.c
>> index 4ad9b94..d806dbf 100644
>> --- a/arch/arm/mach-omap2/board-zoom2-zoom3.c
>> +++ b/arch/arm/mach-omap2/board-zoom2-zoom3.c
>> @@ -281,7 +281,11 @@ static void __init omap_zoom2_map_io(void)
>> omap2_map_common_io();
>> }
>>
>> +#ifdef CONFIG_MACH_OMAP_ZOOM3
>> +MACHINE_START(OMAP_ZOOM3, "OMAP ZOOM3 board")
>> +#else
>> MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
>> +#endif
>
>what happens if you want to build a kernel for both boards ?
>
>how about just adding a new MACHINE_START() declaration without
>ifdeferry ?
>
>Take a look at arch/arm/mach-omap2/board-n8x0.c for an example ;-)
Yes I will have a look at this. Thanks for all the comments.
My zoom3 board has gone bad and so could not look into this yet.
Will keep posted.
>
>--
>balbi
^ permalink raw reply [flat|nested] 13+ messages in thread
* Welcome: OMAPZoom Tutorial Hour
2009-10-23 23:03 ` Felipe Balbi
2009-10-27 21:36 ` Pandita, Vikram
@ 2009-10-28 12:12 ` Pandita, Vikram
1 sibling, 0 replies; 13+ messages in thread
From: Pandita, Vikram @ 2009-10-28 12:12 UTC (permalink / raw)
To: linux-omap@vger.kernel.org
Hello All,
The first OMAPZoom Tutorial Hour will be hosted on Oct 28th at 8:30 AM CST (Central Standard Time)
http://omappedia.org/wiki/Tutorial_Hour
Topics for this session:
1) OMAPZoom.org community overview
2) Zoom OMAP34x-II Mobile Development Platform overview - by LogicPD
3) OMAP Linux kernel development - Overview and process
WebEx: https://ti.webex.com/mw0304l/mywebex/default.do?siteurl=ti&service=1 (VOIP enabled)
Meeting Number: 757949967
Meeting Password: None
Teleconference bridge number in USA: 1-877-561-6828 or (972) 995 7777
Teleconference Participant Code: 71051156
Teleconference bridge numbers for other countries please visit: http://www.ticonferencing.com/globalaccess/
We invite you to present in a future session - please suggest your topics at: http://www.omappedia.org/wiki/Tutorial_Hour_Topics
Regards,
Vikram
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2009-10-28 12:13 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-23 19:23 [PATCH 0/3] Introduce Zoom3 board Vikram Pandita
2009-10-23 19:23 ` [PATCH 1/3] omap: zoom: reuse zoom2 board file for zoom3 Vikram Pandita
2009-10-23 19:23 ` [PATCH 2/3] omap: zoom2: update makefile for boardfile name change Vikram Pandita
2009-10-23 19:23 ` [PATCH 3/3] omap: zoom3: add zoom3 board support Vikram Pandita
2009-10-23 19:39 ` Aguirre Rodriguez, Sergio Alberto
2009-10-23 19:46 ` Nishanth Menon
2009-10-23 20:07 ` Aguirre Rodriguez, Sergio Alberto
2009-10-23 21:17 ` Nishanth Menon
2009-10-23 23:06 ` Felipe Balbi
2009-10-23 23:03 ` Felipe Balbi
2009-10-27 21:36 ` Pandita, Vikram
2009-10-28 12:12 ` Welcome: OMAPZoom Tutorial Hour Pandita, Vikram
2009-10-23 23:01 ` [PATCH 1/3] omap: zoom: reuse zoom2 board file for zoom3 Felipe Balbi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox