Prev: MIPS: JZ4740: Add clock API support.
Next: [PATCH] drivers/staging/batman-adv: Convert MAC_FMT to %pM
From: Russell King - ARM Linux on 2 Jun 2010 19:20
On Wed, Jun 02, 2010 at 01:54:43PM -0400, Jacob Tanenbaum wrote:
> Adding LogicPD OMAP3 board support
>
> Adding support for LogicPD's OMAP 3530 LV SOM and
> OMAP 35x Torpedo board.
>
> Signed-off-by: Jacob Tanenbaum <Jacob.Tanenbaum(a)logicpd.com>

I assume no OMAP folk have seen this? It probably makes sense to
add Cc's for the linux-omap list and Tony Lindgren.

> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index 2455dcc..f670faa 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -69,6 +69,14 @@ config MACH_OMAP_LDP
> depends on ARCH_OMAP3
> select OMAP_PACKAGE_CBB
>
> +config MACH_OMAP3530_LV_SOM
> + bool "OMAP3 Logic 3530 LV SOM board"
> + depends on ARCH_OMAP3

Tabs, not spaces.

> +
> +config MACH_OMAP3_TORPEDO
> + bool "OMAP3 Logic 35x Torpedo board"
> + depends on ARCH_OMAP3
> +
> config MACH_OVERO
> bool "Gumstix Overo board"
> depends on ARCH_OMAP3
> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
> index 4b9fc57..77422be 100644
> --- a/arch/arm/mach-omap2/Makefile
> +++ b/arch/arm/mach-omap2/Makefile
> @@ -109,6 +109,10 @@ obj-$(CONFIG_MACH_DEVKIT8000) += board-devkit8000.o \
> hsmmc.o
> obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o \
> hsmmc.o
> +obj-$(CONFIG_MACH_OMAP3530_LV_SOM) += board-omap3logic.o \
> + hsmmc.o
> +obj-$(CONFIG_MACH_OMAP3_TORPEDO) += board-omap3logic.o \
> + hsmmc.o

Ditto.

> obj-$(CONFIG_MACH_OVERO) += board-overo.o \
> hsmmc.o
> obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \
> diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c
> new file mode 100644
> index 0000000..fe5db85
> --- /dev/null
> +++ b/arch/arm/mach-omap2/board-omap3logic.c
> @@ -0,0 +1,185 @@
> +/*
> + * linux/arch/arm/mach-omap2/board-omap3logic.c
> + *
> + * Copyright (C) 2010 Li-Pro.Net
> + * Stephan Linz <linz(a)li-pro.net>
> + *
> + * Copyright (C) 2010 Logic Product Development, Inc.
> + * Peter Barada <peter.barada(a)logicpd.com>
> + *
> + * Modified from Beagle, EVM, and RX51
> + *
> + * 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/delay.h>
> +#include <linux/err.h>
> +#include <linux/clk.h>
> +#include <linux/io.h>
> +#include <linux/gpio.h>
> +
> +#include <linux/regulator/machine.h>
> +
> +#include<linux/i2c/twl.h>

Missing space.

> +
> +#include <mach/hardware.h>
> +#include <asm/mach-types.h>
> +#include <asm/mach/arch.h>
> +#include <asm/mach/map.h>
> +
> +#include "mux.h"
> +
> +#include <plat/mux.h>
> +#include <plat/board.h>
> +#include <plat/common.h>
> +#include <plat/gpmc.h>
> +#include <plat/timer-gp.h>
> +
> +/* Micron MT46H32M32LF-6 */
> +/* FIXME: borrowed from sdram-micron-mt46h32m32lf-6.h because on LogicPD
> + * boards we can't use the default values -- why? I suspect the reason
> + * lies in the boot strap code. We correct this part if we have ported
> + * U-Boot and X-Load. */
> +#include <plat/sdrc.h>

Blank line here please.

> +static struct omap_sdrc_params mt46h32m32lf6_sdrc_params[] = {
> + [0] = {
> + .rate = 166000000,
> + .actim_ctrla = 0xaa9db4c6,
> + .actim_ctrlb = 0x00011517,
> + .rfr_ctrl = 0x0004e201,
> + .mr = 0x00000032,
> + },
> + [1] = {
> + .rate = 165941176,
> + .actim_ctrla = 0xaa9db4c6,
> + .actim_ctrlb = 0x00011517,
> + .rfr_ctrl = 0x0004e201,
> + .mr = 0x00000032,
> + },
> + [2] = {
> + .rate = 83000000,
> + .actim_ctrla = 0x8a99b481,
> + .actim_ctrlb = 0x00011312,
> + .rfr_ctrl = 0x0003de01,
> + .mr = 0x00000032,
> + },
> + [3] = {
> + .rate = 82970588,
> + .actim_ctrla = 0x8a99b481,
> + .actim_ctrlb = 0x00011312,
> + .rfr_ctrl = 0x0003de01,
> + .mr = 0x00000032,
> + },
> + [4] = {
> + .rate = 0
> + },
> +};
> +
> +static int omap3logic_twl_gpio_setup(struct device *dev,
> + unsigned gpio, unsigned ngpio)
> +{
> + return 0;
> +}
> +
> +static struct twl4030_gpio_platform_data omap3logic_gpio_data = {
> + .gpio_base = OMAP_MAX_GPIO_LINES,
> + .irq_base = TWL4030_GPIO_IRQ_BASE,
> + .irq_end = TWL4030_GPIO_IRQ_END,
> + .use_leds = true,
> + .pullups = BIT(1),
> + .pulldowns = BIT(2) | BIT(6) | BIT(7) | BIT(8)
> + | BIT(13) | BIT(15) | BIT(16) | BIT(17),
> + .setup = omap3logic_twl_gpio_setup,
> +};
> +
> +static struct twl4030_platform_data omap3logic_twldata = {
> + .irq_base = TWL4030_IRQ_BASE,
> + .irq_end = TWL4030_IRQ_END,
> +
> + /* platform_data for children goes here */
> + .gpio = &omap3logic_gpio_data,
> +};
> +
> +static struct i2c_board_info __initdata omap3logic_i2c_boardinfo[] = {
> + {
> + I2C_BOARD_INFO("twl4030", 0x48),
> + .flags = I2C_CLIENT_WAKE,
> + .irq = INT_34XX_SYS_NIRQ,
> + .platform_data = &omap3logic_twldata,
> + },
> +};
> +
> +static int __init omap3logic_i2c_init(void)
> +{
> + omap_register_i2c_bus(1, 2600, omap3logic_i2c_boardinfo,
> + ARRAY_SIZE(omap3logic_i2c_boardinfo));
> + return 0;
> +}
> +
> +static struct omap_board_config_kernel omap3logic_config[] __initdata = {
> +};
> +
> +static void __init omap3logic_init_irq(void)
> +{
> + omap_board_config = omap3logic_config;
> + omap_board_config_size = ARRAY_SIZE(omap3logic_config);
> + omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
> + mt46h32m32lf6_sdrc_params);
> + omap_init_irq();
> +#ifdef CONFIG_OMAP_32K_TIMER
> + omap2_gp_clockevent_set_gptimer(12);
> +#endif
> + omap_gpio_init();
> +}
> +
> +static struct platform_device *omap3logic_devices[] __initdata = {
> +};

If there's no platform devices, don't supply this.

> +
> +static void __init omap3logic_init(void)
> +{
> + omap3logic_i2c_init();
> + platform_add_devices(omap3logic_devices,
> + ARRAY_SIZE(omap3logic_devices));
> + omap_serial_init();
> +
> + /* Ensure SDRC pins are mux'd for self-refresh */
> +/* omap_cfg_reg(H16_34XX_SDRC_CKE0);
> + omap_cfg_reg(H17_34XX_SDRC_CKE1);
> + omap_cfg_reg(SDRC_CKE0);
> + omap_cfg_reg(SDRC_CKE1); */
> + omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
> + omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
> +}
> +
> +static void __init omap3logic_map_io(void)
> +{
> + omap2_set_globals_343x();
> + omap34xx_map_common_io();
> +}
> +
> +MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board")
> + /* Maintainer: Peter Barada <peterb(a)logicpd.com> */
> + .phys_io = 0x48000000,
> + .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
> + .boot_params = 0x80000100,
> + .map_io = omap3logic_map_io,
> + .init_irq = omap3logic_init_irq,
> + .init_machine = omap3logic_init,
> + .timer = &omap_timer,
> +MACHINE_END
> +
> +MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board")
> + /* Maintainer: Peter Barada <peterb(a)logicpd.com> */
> + .phys_io = 0x48000000,
> + .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
> + .boot_params = 0x80000100,
> + .map_io = omap3logic_map_io,
> + .init_irq = omap3logic_init_irq,
> + .init_machine = omap3logic_init,
> + .timer = &omap_timer,
> +MACHINE_END

So, the kernel will recognise both of these boards at boot time, but
fail if the relevant board is not selected in the configuration
because if (machine_is_xxx()) will be false.

A better thing to do is to wrap these declarations in ifdefs so the
kernel can issue its standard message rather than mysteriously going
wrong.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: MIPS: JZ4740: Add clock API support.
Next: [PATCH] drivers/staging/batman-adv: Convert MAC_FMT to %pM