From: ryan@bluewatersys.com (Ryan Mallon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARCH arm: adding new board: CDU
Date: Tue, 05 Apr 2011 08:25:53 +1200 [thread overview]
Message-ID: <4D9A2951.6010901@bluewatersys.com> (raw)
In-Reply-To: <4D998B12.1040909@aksignal.cz>
On 04/04/2011 09:10 PM, Prchal Ji?? wrote:
> Hi,
> this is separated PATCH adding new board CDU.
Please repost as a new email with a proper change log. This patch
shouldn't depend on the CDU audio driver patch. This should still build
and run, just without audio support.
Few more comments below.
~Ryan
<snip>
> diff -uprN -X linux-2.6.38-vanilla/Documentation/dontdiff linux-2.6.38-vanilla/arch/arm/mach-at91/board-cdu.c
> linux-2.6.38-patch/arch/arm/mach-at91/board-cdu.c
> --- linux-2.6.38-vanilla/arch/arm/mach-at91/board-cdu.c 1970-01-01 01:00:00.000000000 +0100
> +++ linux-2.6.38-patch/arch/arm/mach-at91/board-cdu.c 2011-03-28 15:52:03.413048601 +0200
> @@ -0,0 +1,332 @@
> +/*
> + * linux/arch/arm/mach-at91/board-cdu.c
> + *
> + * Copyright (C) 2005 SAN People
> + * Copyright (C) 2006 Atmel
> + * Copyright (C) 2011 AKsignal Brno
> + * jiri.prchal at aksignal.cz
> + *
> + * 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/mm.h>
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/spi/spi.h>
> +#include <linux/clk.h>
> +#include <linux/spi/mcp23s08.h>
> +#include <linux/dma-mapping.h>
> +
> +#include <mach/hardware.h>
> +#include <asm/setup.h>
> +#include <asm/mach-types.h>
> +#include <asm/irq.h>
> +
> +#include <asm/mach/arch.h>
> +#include <asm/mach/map.h>
> +#include <asm/mach/irq.h>
> +
> +#include <mach/board.h>
> +#include <mach/gpio.h>
> +#include <mach/at91sam9_smc.h>
> +
> +#include "sam9_smc.h"
> +#include "generic.h"
> +
> +static void __init cdu_map_io(void)
> +{
> + /* Initialize processor: 6 MHz crystal */
> + at91sam9260_initialize(6000000);
> +
> + /* DBGU on ttyS0. (Rx & Tx only) */
> + at91_register_uart(0, 0, 0);
> +
> + /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
> + at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
> + | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
> + | ATMEL_UART_RI);
> +
> + /* USART1 on ttyS2. (Rx, Tx, RTS) */
> + at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_RTS);
> +
> + /* USART2 on ttyS3. (Rx, Tx, RTS) */
> + at91_register_uart(AT91SAM9260_ID_US2, 3, ATMEL_UART_RTS);
> +
> + /* USART3 on ttyS4. (Rx, Tx, RTS) */
> + at91_register_uart(AT91SAM9260_ID_US3, 4, ATMEL_UART_RTS);
> +
> + /* USART4 on ttyS5. (Tx) */
> + /* EBUS - transmit audio, no rx */
> + /*at91_register_uart(AT91SAM9260_ID_US4, 5, 0);*/
> +
> + /* set serial console to ttyS0 (ie, DBGU) */
> + at91_set_serial_console(0);
> +}
> +
> +static void __init cdu_init_irq(void)
> +{
> + at91sam9260_init_interrupts(NULL);
> +}
> +
> +/*
> + * USB Host port
> + */
> +static struct at91_usbh_data __initdata cdu_usbh_data = {
> + .ports = 2,
> +};
> +
> +/*
> + * USB Device port
> + */
> +static struct at91_udc_data __initdata cdu_udc_data = {
> + .vbus_pin = AT91_PIN_PC15,
> + .pullup_pin = 0, /* pull-up driven by UDC */
> +};
> +
> +/*
> + * SPI devices.
> + */
> +#define MCP23S08_GPIO_BASE 128
> +
> +static const struct mcp23s08_platform_data mcp23s08_gpio_info = {
> + .chip[0].is_present = true,
> + .chip[0].pullups = 0,
> + .base = MCP23S08_GPIO_BASE,
> +};
> +
> +static struct spi_board_info cdu_spi_devices[] = {
> + { /* ADC LTC2488 */
> + .modalias = "spidev",
> + .chip_select = 0,
> + .max_speed_hz = 1 * 1000 * 1000,
You have max_speed_hz set as (1 * 1000 * 1000) in some cases and 1000000
in others. Please be consistent. Nitpicky: chip_select and bus_num
should go next to each since they are related.
> + .bus_num = 1,
> + },
> + { /* GPIO expander MCP23S08 */
> + .modalias = "mcp23s08",
> + .chip_select = 1,
> + .max_speed_hz = 1000000,
> + .bus_num = 1,
> + .platform_data = &mcp23s08_gpio_info,
> + .mode = SPI_MODE_3,
> + },
> + { /* non volatile memory (F-RAM) FM25VN10 */
> + .modalias = "spidev",
> + .chip_select = 2,
> + .max_speed_hz = 1 * 1000 * 1000,
> + .bus_num = 1,
> + },
> + { /* audiocodec TLV320AIC3106 */
> + .modalias = "tlv320aic3x-codec",
> + .chip_select = 3,
> + .max_speed_hz = 1000000,
> + .bus_num = 1,
> + .mode = SPI_MODE_1,
> + },
> +};
> +
> +/*
> + * MACB Ethernet device
> + */
> +static struct at91_eth_data __initdata cdu_macb_data = {
> + /*.phy_irq_pin = ... not connected */
Delete this line.
> + .is_rmii = 1,
> +};
> +
> +/*
> + * NAND flash
> + */
> +static struct mtd_partition __initdata cdu_nand_partition[] = {
> + {
> + .name = "bootstrap",
> + .offset = 0,
> + .size = SZ_256K,
> + },
> + {
> + .name = "uboot",
> + .offset = MTDPART_OFS_APPEND,
> + .size = SZ_512K,
> + },
> + {
> + .name = "ubootenv",
> + .offset = MTDPART_OFS_APPEND,
> + .size = SZ_256K,
> + },
> + {
> + .name = "kernel",
> + .offset = MTDPART_OFS_APPEND,
> + .size = SZ_4M,
> + },
> + {
> + .name = "rootfs",
> + .offset = MTDPART_OFS_APPEND,
> + .size = MTDPART_SIZ_FULL,
> + },
> +};
> +
> +static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
> +{
> + *num_partitions = ARRAY_SIZE(cdu_nand_partition);
> + return cdu_nand_partition;
> +}
> +
> +static struct atmel_nand_data __initdata cdu_nand_data = {
> + .ale = 21,
> + .cle = 22,
> + /*.det_pin = ... not connected */
Just delete this line.
> + .rdy_pin = AT91_PIN_PC13,
> + .enable_pin = AT91_PIN_PC14,
> + .partition_info = nand_partitions,
> + .bus_width_16 = 0,
> +};
> +
> +static struct sam9_smc_config __initdata cdu_nand_smc_config = {
> + .ncs_read_setup = 0,
> + .nrd_setup = 1,
> + .ncs_write_setup = 0,
> + .nwe_setup = 1,
> +
> + .ncs_read_pulse = 3,
> + .nrd_pulse = 3,
> + .ncs_write_pulse = 3,
> + .nwe_pulse = 3,
> +
> + .read_cycle = 5,
> + .write_cycle = 5,
> +
> + .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE,
Split this line since it runs over 80 columns (especially once you add |
AT91_SMC_DBW_8).
> + .tdf_cycles = 2,
> +};
> +
> +static void __init cdu_add_device_nand(void)
> +{
> + /* setup bus-width 8 */
> + cdu_nand_smc_config.mode |= AT91_SMC_DBW_8;
Move this up into the initialisation above.
> +
> + /* configure chip-select 3 (NAND) */
> + sam9_smc_configure(3, &cdu_nand_smc_config);
> +
> + at91_add_device_nand(&cdu_nand_data);
> +}
> +
> +/*
> +* MCI (SD/MMC)
> +*/
> +static struct at91_mmc_data __initdata ek_mmc_data = {
> + .slot_b = 0,
> + .wire4 = 1,
> + /*.det_pin = ... not connected */
> + /*.wp_pin = ... not connected */
> + /*.vcc_pin = ... not connected */
Delete these lines.
> +};
> +
> +/*
> + * LEDs
> + */
> +static struct gpio_led cdu_leds[] = {
> + {
> + .name = "red",
> + .gpio = AT91_PIN_PC10,
> + .default_trigger = "timer",
> + },
> + {
> + .name = "green",
> + .gpio = AT91_PIN_PA5,
> + .default_trigger = "heartbeat",
> + },
> + {
> + .name = "yellow",
> + .gpio = AT91_PIN_PB20,
> + .active_low = 1,
> + .default_trigger = "mmc0",
> + },
> + {
> + .name = "blue",
> + .gpio = AT91_PIN_PB21,
> + .active_low = 1,
> + .default_trigger = "nand-disk",
> + },
> +};
> +
> +/*
> + * GPIOs
> + */
> +static struct gpio gpios[] = {
> + { AT91_PIN_PA0, GPIOF_OUT_INIT_LOW, "ebus_dir"},
> + { AT91_PIN_PA1, GPIOF_OUT_INIT_LOW, "time_dir"},
> + { AT91_PIN_PB12, GPIOF_OUT_INIT_LOW, "gsm_rst"},
> + { AT91_PIN_PB13, GPIOF_OUT_INIT_LOW, "gsm_on"},
> + { AT91_PIN_PC2, GPIOF_IN, "por"},
> + { AT91_PIN_PC7, GPIOF_OUT_INIT_HIGH, "spk_shdn"},
> +
> + { AT91_PIN_PC0, GPIOF_IN, "in13"},
> + { AT91_PIN_PC1, GPIOF_IN, "in14"},
> + { AT91_PIN_PA22, GPIOF_IN, "in17"},
> + { AT91_PIN_PA23, GPIOF_IN, "in18"},
> + { AT91_PIN_PA24, GPIOF_IN, "in19"},
> + { AT91_PIN_PA25, GPIOF_IN, "in20"},
> +
> + { AT91_PIN_PA26, GPIOF_OUT_INIT_LOW, "out15"},
> + { AT91_PIN_PA27, GPIOF_OUT_INIT_LOW, "out16"},
> + { AT91_PIN_PA28, GPIOF_OUT_INIT_LOW, "out17"},
> + { AT91_PIN_PA29, GPIOF_OUT_INIT_LOW, "out18"},
> + { AT91_PIN_PA30, GPIOF_OUT_INIT_LOW, "out19"},
> + { AT91_PIN_PB29, GPIOF_OUT_INIT_LOW, "out20"},
> +
> + { MCP23S08_GPIO_BASE + 0, GPIOF_IN, "busadrp"},
> + { MCP23S08_GPIO_BASE + 2, GPIOF_IN, "busadr5"},
> + { MCP23S08_GPIO_BASE + 3, GPIOF_IN, "busadr4"},
> + { MCP23S08_GPIO_BASE + 4, GPIOF_IN, "busadr3"},
> + { MCP23S08_GPIO_BASE + 5, GPIOF_IN, "busadr2"},
> + { MCP23S08_GPIO_BASE + 6, GPIOF_IN, "busadr1"},
> + { MCP23S08_GPIO_BASE + 7, GPIOF_IN, "busadr0"},
> +};
> +
> +static void __init cdu_add_gpio(void)
> +{
gpio_request_array(gpios, ARRAY_SIZE(gpios));
> + int i;
> +
> + for (i = 0; i < ARRAY_SIZE(gpios); i++) {
> + gpio_request_one(gpios[i].gpio, gpios[i].flags, gpios[i].label);
> + gpio_export_name(gpios[i].gpio, 0, gpios[i].label);
What does this function do? I can't find it anywhere.
> + }
> +}
> +
> +/*
> + * init
> + */
> +static void __init cdu_board_init(void)
> +{
> + at91_add_device_serial();
> + at91_add_device_usbh(&cdu_usbh_data);
> + at91_add_device_udc(&cdu_udc_data);
> + at91_add_device_spi(cdu_spi_devices, ARRAY_SIZE(cdu_spi_devices));
> + cdu_add_device_nand();
> + at91_add_device_eth(&cdu_macb_data);
> + at91_add_device_mmc(0, &ek_mmc_data);
> + at91_add_device_ssc(AT91SAM9260_ID_SSC, (ATMEL_SSC_TF | ATMEL_SSC_TK | ATMEL_SSC_TD | ATMEL_SSC_RD));
> + at91_gpio_leds(cdu_leds, ARRAY_SIZE(cdu_leds));
> + cdu_add_gpio ();
No space between gpio and ().
> +}
> +
> +MACHINE_START(AT91SAM9260EK, "CDU")
> + /* Maintainer: AKsignal Brno */
Website/email contact?
> + .boot_params = AT91_SDRAM_BASE + 0x100,
> + .timer = &at91sam926x_timer,
> + .map_io = cdu_map_io,
> + .init_irq = cdu_init_irq,
> + .init_machine = cdu_board_init,
> +MACHINE_END
> diff -uprN -X linux-2.6.38-vanilla/Documentation/dontdiff linux-2.6.38-vanilla/arch/arm/mach-at91/Kconfig
> linux-2.6.38-patch/arch/arm/mach-at91/Kconfig
> --- linux-2.6.38-vanilla/arch/arm/mach-at91/Kconfig 2011-03-15 02:20:32.000000000 +0100
> +++ linux-2.6.38-patch/arch/arm/mach-at91/Kconfig 2011-03-16 09:19:40.000000000 +0100
> @@ -213,6 +213,12 @@ config MACH_AT91SAM9260EK
> Select this if you are using Atmel's AT91SAM9260-EK or AT91SAM9XE Evaluation Kit
> <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3933>
>
> +config MACH_CDU
> + bool "CDU AKsignal board"
> + help
> + Select this if you are using AKsignal CDU board
> + <http://www.aksignal.cz>
> +
> config MACH_CAM60
> bool "KwikByte KB9260 (CAM60) board"
> help
> diff -uprN -X linux-2.6.38-vanilla/Documentation/dontdiff linux-2.6.38-vanilla/arch/arm/mach-at91/Makefile
> linux-2.6.38-patch/arch/arm/mach-at91/Makefile
> --- linux-2.6.38-vanilla/arch/arm/mach-at91/Makefile 2011-03-15 02:20:32.000000000 +0100
> +++ linux-2.6.38-patch/arch/arm/mach-at91/Makefile 2011-03-16 09:19:40.000000000 +0100
> @@ -40,6 +40,7 @@ obj-$(CONFIG_MACH_ECO920) += board-eco92
>
> # AT91SAM9260 board-specific support
> obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o
> +obj-$(CONFIG_MACH_CDU) += board-cdu.o
> obj-$(CONFIG_MACH_CAM60) += board-cam60.o
> obj-$(CONFIG_MACH_SAM9_L9260) += board-sam9-l9260.o
> obj-$(CONFIG_MACH_USB_A9260) += board-usb-a9260.o
> diff -uprN -X linux-2.6.38-vanilla/Documentation/dontdiff linux-2.6.38-vanilla/MAINTAINERS linux-2.6.38-patch/MAINTAINERS
> --- linux-2.6.38-vanilla/MAINTAINERS 2011-03-15 02:20:32.000000000 +0100
> +++ linux-2.6.38-patch/MAINTAINERS 2011-03-25 08:37:56.693049978 +0100
> @@ -1640,6 +1640,13 @@ F: include/linux/can/error.h
> F: include/linux/can/netlink.h
> F: include/linux/can/platform/
>
> +CDU BOARD
> +M: Jiri Prchal <jiri.prchal@aksignal.cz>
> +L: linux-arch at vger.kernel.org
> +W: http://www.linux4sam.org
> +S: Supported
> +F: arch/arm/mach-at91/
> +
> CELL BROADBAND ENGINE ARCHITECTURE
> M: Arnd Bergmann <arnd@arndb.de>
> L: linuxppc-dev at lists.ozlabs.org
> Soubory linux-2.6.38-vanilla/scripts/recordmcount a linux-2.6.38-patch/scripts/recordmcount jsou r??zn??
--
Bluewater Systems Ltd - ARM Technology Solution Centre
Ryan Mallon 5 Amuri Park, 404 Barbadoes St
ryan at bluewatersys.com PO Box 13 889, Christchurch 8013
http://www.bluewatersys.com New Zealand
Phone: +64 3 3779127 Freecall: Australia 1800 148 751
Fax: +64 3 3779135 USA 1800 261 2934
WARNING: multiple messages have this Message-ID (diff)
From: Ryan Mallon <ryan@bluewatersys.com>
To: "Prchal Jiří" <jiri.prchal@aksignal.cz>
Cc: linux-arm-kernel@lists.infradead.org, linux@maxim.org.za,
nicolas.ferre@atmel.com, plagnioj@jcrosoft.co,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ARCH arm: adding new board: CDU
Date: Tue, 05 Apr 2011 08:25:53 +1200 [thread overview]
Message-ID: <4D9A2951.6010901@bluewatersys.com> (raw)
In-Reply-To: <4D998B12.1040909@aksignal.cz>
On 04/04/2011 09:10 PM, Prchal Jiří wrote:
> Hi,
> this is separated PATCH adding new board CDU.
Please repost as a new email with a proper change log. This patch
shouldn't depend on the CDU audio driver patch. This should still build
and run, just without audio support.
Few more comments below.
~Ryan
<snip>
> diff -uprN -X linux-2.6.38-vanilla/Documentation/dontdiff linux-2.6.38-vanilla/arch/arm/mach-at91/board-cdu.c
> linux-2.6.38-patch/arch/arm/mach-at91/board-cdu.c
> --- linux-2.6.38-vanilla/arch/arm/mach-at91/board-cdu.c 1970-01-01 01:00:00.000000000 +0100
> +++ linux-2.6.38-patch/arch/arm/mach-at91/board-cdu.c 2011-03-28 15:52:03.413048601 +0200
> @@ -0,0 +1,332 @@
> +/*
> + * linux/arch/arm/mach-at91/board-cdu.c
> + *
> + * Copyright (C) 2005 SAN People
> + * Copyright (C) 2006 Atmel
> + * Copyright (C) 2011 AKsignal Brno
> + * jiri.prchal@aksignal.cz
> + *
> + * 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/mm.h>
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/spi/spi.h>
> +#include <linux/clk.h>
> +#include <linux/spi/mcp23s08.h>
> +#include <linux/dma-mapping.h>
> +
> +#include <mach/hardware.h>
> +#include <asm/setup.h>
> +#include <asm/mach-types.h>
> +#include <asm/irq.h>
> +
> +#include <asm/mach/arch.h>
> +#include <asm/mach/map.h>
> +#include <asm/mach/irq.h>
> +
> +#include <mach/board.h>
> +#include <mach/gpio.h>
> +#include <mach/at91sam9_smc.h>
> +
> +#include "sam9_smc.h"
> +#include "generic.h"
> +
> +static void __init cdu_map_io(void)
> +{
> + /* Initialize processor: 6 MHz crystal */
> + at91sam9260_initialize(6000000);
> +
> + /* DBGU on ttyS0. (Rx & Tx only) */
> + at91_register_uart(0, 0, 0);
> +
> + /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
> + at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
> + | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
> + | ATMEL_UART_RI);
> +
> + /* USART1 on ttyS2. (Rx, Tx, RTS) */
> + at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_RTS);
> +
> + /* USART2 on ttyS3. (Rx, Tx, RTS) */
> + at91_register_uart(AT91SAM9260_ID_US2, 3, ATMEL_UART_RTS);
> +
> + /* USART3 on ttyS4. (Rx, Tx, RTS) */
> + at91_register_uart(AT91SAM9260_ID_US3, 4, ATMEL_UART_RTS);
> +
> + /* USART4 on ttyS5. (Tx) */
> + /* EBUS - transmit audio, no rx */
> + /*at91_register_uart(AT91SAM9260_ID_US4, 5, 0);*/
> +
> + /* set serial console to ttyS0 (ie, DBGU) */
> + at91_set_serial_console(0);
> +}
> +
> +static void __init cdu_init_irq(void)
> +{
> + at91sam9260_init_interrupts(NULL);
> +}
> +
> +/*
> + * USB Host port
> + */
> +static struct at91_usbh_data __initdata cdu_usbh_data = {
> + .ports = 2,
> +};
> +
> +/*
> + * USB Device port
> + */
> +static struct at91_udc_data __initdata cdu_udc_data = {
> + .vbus_pin = AT91_PIN_PC15,
> + .pullup_pin = 0, /* pull-up driven by UDC */
> +};
> +
> +/*
> + * SPI devices.
> + */
> +#define MCP23S08_GPIO_BASE 128
> +
> +static const struct mcp23s08_platform_data mcp23s08_gpio_info = {
> + .chip[0].is_present = true,
> + .chip[0].pullups = 0,
> + .base = MCP23S08_GPIO_BASE,
> +};
> +
> +static struct spi_board_info cdu_spi_devices[] = {
> + { /* ADC LTC2488 */
> + .modalias = "spidev",
> + .chip_select = 0,
> + .max_speed_hz = 1 * 1000 * 1000,
You have max_speed_hz set as (1 * 1000 * 1000) in some cases and 1000000
in others. Please be consistent. Nitpicky: chip_select and bus_num
should go next to each since they are related.
> + .bus_num = 1,
> + },
> + { /* GPIO expander MCP23S08 */
> + .modalias = "mcp23s08",
> + .chip_select = 1,
> + .max_speed_hz = 1000000,
> + .bus_num = 1,
> + .platform_data = &mcp23s08_gpio_info,
> + .mode = SPI_MODE_3,
> + },
> + { /* non volatile memory (F-RAM) FM25VN10 */
> + .modalias = "spidev",
> + .chip_select = 2,
> + .max_speed_hz = 1 * 1000 * 1000,
> + .bus_num = 1,
> + },
> + { /* audiocodec TLV320AIC3106 */
> + .modalias = "tlv320aic3x-codec",
> + .chip_select = 3,
> + .max_speed_hz = 1000000,
> + .bus_num = 1,
> + .mode = SPI_MODE_1,
> + },
> +};
> +
> +/*
> + * MACB Ethernet device
> + */
> +static struct at91_eth_data __initdata cdu_macb_data = {
> + /*.phy_irq_pin = ... not connected */
Delete this line.
> + .is_rmii = 1,
> +};
> +
> +/*
> + * NAND flash
> + */
> +static struct mtd_partition __initdata cdu_nand_partition[] = {
> + {
> + .name = "bootstrap",
> + .offset = 0,
> + .size = SZ_256K,
> + },
> + {
> + .name = "uboot",
> + .offset = MTDPART_OFS_APPEND,
> + .size = SZ_512K,
> + },
> + {
> + .name = "ubootenv",
> + .offset = MTDPART_OFS_APPEND,
> + .size = SZ_256K,
> + },
> + {
> + .name = "kernel",
> + .offset = MTDPART_OFS_APPEND,
> + .size = SZ_4M,
> + },
> + {
> + .name = "rootfs",
> + .offset = MTDPART_OFS_APPEND,
> + .size = MTDPART_SIZ_FULL,
> + },
> +};
> +
> +static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
> +{
> + *num_partitions = ARRAY_SIZE(cdu_nand_partition);
> + return cdu_nand_partition;
> +}
> +
> +static struct atmel_nand_data __initdata cdu_nand_data = {
> + .ale = 21,
> + .cle = 22,
> + /*.det_pin = ... not connected */
Just delete this line.
> + .rdy_pin = AT91_PIN_PC13,
> + .enable_pin = AT91_PIN_PC14,
> + .partition_info = nand_partitions,
> + .bus_width_16 = 0,
> +};
> +
> +static struct sam9_smc_config __initdata cdu_nand_smc_config = {
> + .ncs_read_setup = 0,
> + .nrd_setup = 1,
> + .ncs_write_setup = 0,
> + .nwe_setup = 1,
> +
> + .ncs_read_pulse = 3,
> + .nrd_pulse = 3,
> + .ncs_write_pulse = 3,
> + .nwe_pulse = 3,
> +
> + .read_cycle = 5,
> + .write_cycle = 5,
> +
> + .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE,
Split this line since it runs over 80 columns (especially once you add |
AT91_SMC_DBW_8).
> + .tdf_cycles = 2,
> +};
> +
> +static void __init cdu_add_device_nand(void)
> +{
> + /* setup bus-width 8 */
> + cdu_nand_smc_config.mode |= AT91_SMC_DBW_8;
Move this up into the initialisation above.
> +
> + /* configure chip-select 3 (NAND) */
> + sam9_smc_configure(3, &cdu_nand_smc_config);
> +
> + at91_add_device_nand(&cdu_nand_data);
> +}
> +
> +/*
> +* MCI (SD/MMC)
> +*/
> +static struct at91_mmc_data __initdata ek_mmc_data = {
> + .slot_b = 0,
> + .wire4 = 1,
> + /*.det_pin = ... not connected */
> + /*.wp_pin = ... not connected */
> + /*.vcc_pin = ... not connected */
Delete these lines.
> +};
> +
> +/*
> + * LEDs
> + */
> +static struct gpio_led cdu_leds[] = {
> + {
> + .name = "red",
> + .gpio = AT91_PIN_PC10,
> + .default_trigger = "timer",
> + },
> + {
> + .name = "green",
> + .gpio = AT91_PIN_PA5,
> + .default_trigger = "heartbeat",
> + },
> + {
> + .name = "yellow",
> + .gpio = AT91_PIN_PB20,
> + .active_low = 1,
> + .default_trigger = "mmc0",
> + },
> + {
> + .name = "blue",
> + .gpio = AT91_PIN_PB21,
> + .active_low = 1,
> + .default_trigger = "nand-disk",
> + },
> +};
> +
> +/*
> + * GPIOs
> + */
> +static struct gpio gpios[] = {
> + { AT91_PIN_PA0, GPIOF_OUT_INIT_LOW, "ebus_dir"},
> + { AT91_PIN_PA1, GPIOF_OUT_INIT_LOW, "time_dir"},
> + { AT91_PIN_PB12, GPIOF_OUT_INIT_LOW, "gsm_rst"},
> + { AT91_PIN_PB13, GPIOF_OUT_INIT_LOW, "gsm_on"},
> + { AT91_PIN_PC2, GPIOF_IN, "por"},
> + { AT91_PIN_PC7, GPIOF_OUT_INIT_HIGH, "spk_shdn"},
> +
> + { AT91_PIN_PC0, GPIOF_IN, "in13"},
> + { AT91_PIN_PC1, GPIOF_IN, "in14"},
> + { AT91_PIN_PA22, GPIOF_IN, "in17"},
> + { AT91_PIN_PA23, GPIOF_IN, "in18"},
> + { AT91_PIN_PA24, GPIOF_IN, "in19"},
> + { AT91_PIN_PA25, GPIOF_IN, "in20"},
> +
> + { AT91_PIN_PA26, GPIOF_OUT_INIT_LOW, "out15"},
> + { AT91_PIN_PA27, GPIOF_OUT_INIT_LOW, "out16"},
> + { AT91_PIN_PA28, GPIOF_OUT_INIT_LOW, "out17"},
> + { AT91_PIN_PA29, GPIOF_OUT_INIT_LOW, "out18"},
> + { AT91_PIN_PA30, GPIOF_OUT_INIT_LOW, "out19"},
> + { AT91_PIN_PB29, GPIOF_OUT_INIT_LOW, "out20"},
> +
> + { MCP23S08_GPIO_BASE + 0, GPIOF_IN, "busadrp"},
> + { MCP23S08_GPIO_BASE + 2, GPIOF_IN, "busadr5"},
> + { MCP23S08_GPIO_BASE + 3, GPIOF_IN, "busadr4"},
> + { MCP23S08_GPIO_BASE + 4, GPIOF_IN, "busadr3"},
> + { MCP23S08_GPIO_BASE + 5, GPIOF_IN, "busadr2"},
> + { MCP23S08_GPIO_BASE + 6, GPIOF_IN, "busadr1"},
> + { MCP23S08_GPIO_BASE + 7, GPIOF_IN, "busadr0"},
> +};
> +
> +static void __init cdu_add_gpio(void)
> +{
gpio_request_array(gpios, ARRAY_SIZE(gpios));
> + int i;
> +
> + for (i = 0; i < ARRAY_SIZE(gpios); i++) {
> + gpio_request_one(gpios[i].gpio, gpios[i].flags, gpios[i].label);
> + gpio_export_name(gpios[i].gpio, 0, gpios[i].label);
What does this function do? I can't find it anywhere.
> + }
> +}
> +
> +/*
> + * init
> + */
> +static void __init cdu_board_init(void)
> +{
> + at91_add_device_serial();
> + at91_add_device_usbh(&cdu_usbh_data);
> + at91_add_device_udc(&cdu_udc_data);
> + at91_add_device_spi(cdu_spi_devices, ARRAY_SIZE(cdu_spi_devices));
> + cdu_add_device_nand();
> + at91_add_device_eth(&cdu_macb_data);
> + at91_add_device_mmc(0, &ek_mmc_data);
> + at91_add_device_ssc(AT91SAM9260_ID_SSC, (ATMEL_SSC_TF | ATMEL_SSC_TK | ATMEL_SSC_TD | ATMEL_SSC_RD));
> + at91_gpio_leds(cdu_leds, ARRAY_SIZE(cdu_leds));
> + cdu_add_gpio ();
No space between gpio and ().
> +}
> +
> +MACHINE_START(AT91SAM9260EK, "CDU")
> + /* Maintainer: AKsignal Brno */
Website/email contact?
> + .boot_params = AT91_SDRAM_BASE + 0x100,
> + .timer = &at91sam926x_timer,
> + .map_io = cdu_map_io,
> + .init_irq = cdu_init_irq,
> + .init_machine = cdu_board_init,
> +MACHINE_END
> diff -uprN -X linux-2.6.38-vanilla/Documentation/dontdiff linux-2.6.38-vanilla/arch/arm/mach-at91/Kconfig
> linux-2.6.38-patch/arch/arm/mach-at91/Kconfig
> --- linux-2.6.38-vanilla/arch/arm/mach-at91/Kconfig 2011-03-15 02:20:32.000000000 +0100
> +++ linux-2.6.38-patch/arch/arm/mach-at91/Kconfig 2011-03-16 09:19:40.000000000 +0100
> @@ -213,6 +213,12 @@ config MACH_AT91SAM9260EK
> Select this if you are using Atmel's AT91SAM9260-EK or AT91SAM9XE Evaluation Kit
> <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3933>
>
> +config MACH_CDU
> + bool "CDU AKsignal board"
> + help
> + Select this if you are using AKsignal CDU board
> + <http://www.aksignal.cz>
> +
> config MACH_CAM60
> bool "KwikByte KB9260 (CAM60) board"
> help
> diff -uprN -X linux-2.6.38-vanilla/Documentation/dontdiff linux-2.6.38-vanilla/arch/arm/mach-at91/Makefile
> linux-2.6.38-patch/arch/arm/mach-at91/Makefile
> --- linux-2.6.38-vanilla/arch/arm/mach-at91/Makefile 2011-03-15 02:20:32.000000000 +0100
> +++ linux-2.6.38-patch/arch/arm/mach-at91/Makefile 2011-03-16 09:19:40.000000000 +0100
> @@ -40,6 +40,7 @@ obj-$(CONFIG_MACH_ECO920) += board-eco92
>
> # AT91SAM9260 board-specific support
> obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o
> +obj-$(CONFIG_MACH_CDU) += board-cdu.o
> obj-$(CONFIG_MACH_CAM60) += board-cam60.o
> obj-$(CONFIG_MACH_SAM9_L9260) += board-sam9-l9260.o
> obj-$(CONFIG_MACH_USB_A9260) += board-usb-a9260.o
> diff -uprN -X linux-2.6.38-vanilla/Documentation/dontdiff linux-2.6.38-vanilla/MAINTAINERS linux-2.6.38-patch/MAINTAINERS
> --- linux-2.6.38-vanilla/MAINTAINERS 2011-03-15 02:20:32.000000000 +0100
> +++ linux-2.6.38-patch/MAINTAINERS 2011-03-25 08:37:56.693049978 +0100
> @@ -1640,6 +1640,13 @@ F: include/linux/can/error.h
> F: include/linux/can/netlink.h
> F: include/linux/can/platform/
>
> +CDU BOARD
> +M: Jiri Prchal <jiri.prchal@aksignal.cz>
> +L: linux-arch@vger.kernel.org
> +W: http://www.linux4sam.org
> +S: Supported
> +F: arch/arm/mach-at91/
> +
> CELL BROADBAND ENGINE ARCHITECTURE
> M: Arnd Bergmann <arnd@arndb.de>
> L: linuxppc-dev@lists.ozlabs.org
> Soubory linux-2.6.38-vanilla/scripts/recordmcount a linux-2.6.38-patch/scripts/recordmcount jsou rĹŻznĂŠ
--
Bluewater Systems Ltd - ARM Technology Solution Centre
Ryan Mallon 5 Amuri Park, 404 Barbadoes St
ryan@bluewatersys.com PO Box 13 889, Christchurch 8013
http://www.bluewatersys.com New Zealand
Phone: +64 3 3779127 Freecall: Australia 1800 148 751
Fax: +64 3 3779135 USA 1800 261 2934
next prev parent reply other threads:[~2011-04-04 20:25 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-24 6:54 [PATCH 0/2] mmc: zboot helpers Simon Horman
2011-03-24 6:54 ` Simon Horman
2011-03-24 6:54 ` [PATCH 1/2] mmc, ARM: Rename SuperH Mobile ARM " Simon Horman
2011-03-24 6:54 ` Simon Horman
2011-03-24 9:10 ` [PATCH] mmc, AT91: fix init fequency problem Prchal Jiří
2011-03-24 9:10 ` Prchal Jiří
2011-03-24 10:20 ` [PATCH 1/2] ALSA: ASoc: TLV320AIC3X: ad SPI and clock on GPIO2 or BCLK Prchal Jiří
2011-04-02 8:26 ` Mark Brown
2011-04-02 8:26 ` [alsa-devel] " Mark Brown
2011-04-04 7:49 ` Prchal Jiří
2011-04-04 8:03 ` Mark Brown
2011-04-04 8:01 ` [PATCH] ALSA: ASoc: new functions snd_soc_7_8_* Prchal Jiří
2011-04-04 8:05 ` Mark Brown
2011-04-04 8:05 ` Mark Brown
2011-03-24 10:43 ` [PATCH 2/2] ALSA: ASoc: putting together AT91SAM9260 and TLV320AIC3X Prchal Jiří
2011-03-24 20:07 ` Ryan Mallon
2011-03-24 20:07 ` Ryan Mallon
2011-04-04 8:57 ` Prchal Jiří
2011-04-04 20:07 ` Ryan Mallon
2011-04-04 20:07 ` Ryan Mallon
2011-04-04 9:10 ` [PATCH] ARCH arm: adding new board: CDU Prchal Jiří
2011-04-04 9:10 ` Prchal Jiří
2011-04-04 9:16 ` Russell King - ARM Linux
2011-04-04 9:16 ` Russell King - ARM Linux
2011-04-04 9:24 ` Russell King - ARM Linux
2011-04-04 9:24 ` Russell King - ARM Linux
2011-04-04 20:25 ` Ryan Mallon [this message]
2011-04-04 20:25 ` Ryan Mallon
2011-05-31 13:05 ` PROBLEM: ARM: PCM plugin Ima-ADPCM doesn't work properly Prchal Jiří
2011-03-24 6:54 ` [PATCH 2/2] mmc: Add MMC_PROGRESS_* Simon Horman
2011-03-24 6:54 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D9A2951.6010901@bluewatersys.com \
--to=ryan@bluewatersys.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.