Skip to content

L
linux
Commit c15524a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'for_linus' of git://github.com/at91linux/linux-2.6-at91 

* 'for_linus' of git://github.com/at91linux/linux-2.6-at91:
  at91: Refactor Stamp9G20 and PControl G20 board file
  at91: Fix uhpck clock rate in upll case
parents a6ac1f0a c20b4dd3
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 136 deletions
arch/arm/mach-at91/Makefile
View file @ c15524a4
...@@ -65,7 +65,7 @@ obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o ...@@ -65,7 +65,7 @@ obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o
obj-$(CONFIG_MACH_CPU9G20) += board-cpu9krea.o obj-$(CONFIG_MACH_CPU9G20) += board-cpu9krea.o
obj-$(CONFIG_MACH_STAMP9G20) += board-stamp9g20.o obj-$(CONFIG_MACH_STAMP9G20) += board-stamp9g20.o
obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o
obj-$(CONFIG_MACH_PCONTROL_G20) += board-pcontrol-g20.o obj-$(CONFIG_MACH_PCONTROL_G20) += board-pcontrol-g20.o board-stamp9g20.o
# AT91SAM9260/AT91SAM9G20 board-specific support # AT91SAM9260/AT91SAM9G20 board-specific support
obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o
......
arch/arm/mach-at91/board-pcontrol-g20.c
View file @ c15524a4
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <mach/board.h> #include <mach/board.h>
#include <mach/at91sam9_smc.h> #include <mach/at91sam9_smc.h>
#include <mach/stamp9g20.h>
#include "sam9_smc.h" #include "sam9_smc.h"
#include "generic.h" #include "generic.h"
...@@ -38,11 +39,7 @@ ...@@ -38,11 +39,7 @@
static void __init pcontrol_g20_map_io(void) static void __init pcontrol_g20_map_io(void)
{ {
/* Initialize processor: 18.432 MHz crystal */ stamp9g20_map_io();
at91sam9260_initialize(18432000);
/* DGBU on ttyS0. (Rx, Tx) only TTL -> JTAG connector X7 17,19 ) */
at91_register_uart(0, 0, 0);
/* USART0 on ttyS1. (Rx, Tx, CTS, RTS) piggyback A2 */ /* USART0 on ttyS1. (Rx, Tx, CTS, RTS) piggyback A2 */
at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS
...@@ -54,9 +51,6 @@ static void __init pcontrol_g20_map_io(void) ...@@ -54,9 +51,6 @@ static void __init pcontrol_g20_map_io(void)
/* USART2 on ttyS3. (Rx, Tx) 9bit-Bus Multidrop-mode X4 */ /* USART2 on ttyS3. (Rx, Tx) 9bit-Bus Multidrop-mode X4 */
at91_register_uart(AT91SAM9260_ID_US4, 3, 0); at91_register_uart(AT91SAM9260_ID_US4, 3, 0);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
...@@ -66,38 +60,6 @@ static void __init init_irq(void) ...@@ -66,38 +60,6 @@ static void __init init_irq(void)
} }
/*
* NAND flash 512MiB 1,8V 8-bit, sector size 128 KiB
*/
static struct atmel_nand_data __initdata nand_data = {
.ale = 21,
.cle = 22,
.rdy_pin = AT91_PIN_PC13,
.enable_pin = AT91_PIN_PC14,
};
/*
* Bus timings; unit = 7.57ns
*/
static struct sam9_smc_config __initdata nand_smc_config = {
.ncs_read_setup = 0,
.nrd_setup = 2,
.ncs_write_setup = 0,
.nwe_setup = 2,
.ncs_read_pulse = 4,
.nrd_pulse = 4,
.ncs_write_pulse = 4,
.nwe_pulse = 4,
.read_cycle = 7,
.write_cycle = 7,
.mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE
| AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8,
.tdf_cycles = 3,
};
static struct sam9_smc_config __initdata pcontrol_smc_config[2] = { { static struct sam9_smc_config __initdata pcontrol_smc_config[2] = { {
.ncs_read_setup = 16, .ncs_read_setup = 16,
.nrd_setup = 18, .nrd_setup = 18,
...@@ -138,14 +100,6 @@ static struct sam9_smc_config __initdata pcontrol_smc_config[2] = { { ...@@ -138,14 +100,6 @@ static struct sam9_smc_config __initdata pcontrol_smc_config[2] = { {
.tdf_cycles = 1, .tdf_cycles = 1,
} }; } };
static void __init add_device_nand(void)
{
/* configure chip-select 3 (NAND) */
sam9_smc_configure(3, &nand_smc_config);
at91_add_device_nand(&nand_data);
}
static void __init add_device_pcontrol(void) static void __init add_device_pcontrol(void)
{ {
/* configure chip-select 4 (IO compatible to 8051 X4 ) */ /* configure chip-select 4 (IO compatible to 8051 X4 ) */
...@@ -155,23 +109,6 @@ static void __init add_device_pcontrol(void) ...@@ -155,23 +109,6 @@ static void __init add_device_pcontrol(void)
} }
/*
* MCI (SD/MMC)
* det_pin, wp_pin and vcc_pin are not connected
*/
#if defined(CONFIG_MMC_ATMELMCI) || defined(CONFIG_MMC_ATMELMCI_MODULE)
static struct mci_platform_data __initdata mmc_data = {
.slot[0] = {
.bus_width = 4,
},
};
#else
static struct at91_mmc_data __initdata mmc_data = {
.wire4 = 1,
};
#endif
/* /*
* USB Host port * USB Host port
*/ */
...@@ -265,42 +202,13 @@ static struct spi_board_info pcontrol_g20_spi_devices[] = { ...@@ -265,42 +202,13 @@ static struct spi_board_info pcontrol_g20_spi_devices[] = {
}; };
/*
* Dallas 1-Wire DS2431
*/
static struct w1_gpio_platform_data w1_gpio_pdata = {
.pin = AT91_PIN_PA29,
.is_open_drain = 1,
};
static struct platform_device w1_device = {
.name = "w1-gpio",
.id = -1,
.dev.platform_data = &w1_gpio_pdata,
};
static void add_wire1(void)
{
at91_set_GPIO_periph(w1_gpio_pdata.pin, 1);
at91_set_multi_drive(w1_gpio_pdata.pin, 1);
platform_device_register(&w1_device);
}
static void __init pcontrol_g20_board_init(void) static void __init pcontrol_g20_board_init(void)
{ {
at91_add_device_serial(); stamp9g20_board_init();
add_device_nand();
#if defined(CONFIG_MMC_ATMELMCI) || defined(CONFIG_MMC_ATMELMCI_MODULE)
at91_add_device_mci(0, &mmc_data);
#else
at91_add_device_mmc(0, &mmc_data);
#endif
at91_add_device_usbh(&usbh_data); at91_add_device_usbh(&usbh_data);
at91_add_device_eth(&macb_data); at91_add_device_eth(&macb_data);
at91_add_device_i2c(pcontrol_g20_i2c_devices, at91_add_device_i2c(pcontrol_g20_i2c_devices,
ARRAY_SIZE(pcontrol_g20_i2c_devices)); ARRAY_SIZE(pcontrol_g20_i2c_devices));
add_wire1();
add_device_pcontrol(); add_device_pcontrol();
at91_add_device_spi(pcontrol_g20_spi_devices, at91_add_device_spi(pcontrol_g20_spi_devices,
ARRAY_SIZE(pcontrol_g20_spi_devices)); ARRAY_SIZE(pcontrol_g20_spi_devices));
......
arch/arm/mach-at91/board-stamp9g20.c
View file @ c15524a4
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "generic.h" #include "generic.h"
static void __init portuxg20_map_io(void) void __init stamp9g20_map_io(void)
{ {
/* Initialize processor: 18.432 MHz crystal */ /* Initialize processor: 18.432 MHz crystal */
at91sam9260_initialize(18432000); at91sam9260_initialize(18432000);
...@@ -40,6 +40,24 @@ static void __init portuxg20_map_io(void) ...@@ -40,6 +40,24 @@ static void __init portuxg20_map_io(void)
/* DGBU on ttyS0. (Rx & Tx only) */ /* DGBU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0); at91_register_uart(0, 0, 0);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
}
static void __init stamp9g20evb_map_io(void)
{
stamp9g20_map_io();
/* 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);
}
static void __init portuxg20_map_io(void)
{
stamp9g20_map_io();
/* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
| ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DTR | ATMEL_UART_DSR
...@@ -56,26 +74,6 @@ static void __init portuxg20_map_io(void) ...@@ -56,26 +74,6 @@ static void __init portuxg20_map_io(void)
/* USART5 on ttyS6. (Rx, Tx only) */ /* USART5 on ttyS6. (Rx, Tx only) */
at91_register_uart(AT91SAM9260_ID_US5, 6, 0); at91_register_uart(AT91SAM9260_ID_US5, 6, 0);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
}
static void __init stamp9g20_map_io(void)
{
/* Initialize processor: 18.432 MHz crystal */
at91sam9260_initialize(18432000);
/* DGBU 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);
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
} }
static void __init init_irq(void) static void __init init_irq(void)
...@@ -156,7 +154,7 @@ static struct at91_udc_data __initdata portuxg20_udc_data = { ...@@ -156,7 +154,7 @@ static struct at91_udc_data __initdata portuxg20_udc_data = {
.pullup_pin = 0, /* pull-up driven by UDC */ .pullup_pin = 0, /* pull-up driven by UDC */
}; };
static struct at91_udc_data __initdata stamp9g20_udc_data = { static struct at91_udc_data __initdata stamp9g20evb_udc_data = {
.vbus_pin = AT91_PIN_PA22, .vbus_pin = AT91_PIN_PA22,
.pullup_pin = 0, /* pull-up driven by UDC */ .pullup_pin = 0, /* pull-up driven by UDC */
}; };
...@@ -190,7 +188,7 @@ static struct gpio_led portuxg20_leds[] = { ...@@ -190,7 +188,7 @@ static struct gpio_led portuxg20_leds[] = {
} }
}; };
static struct gpio_led stamp9g20_leds[] = { static struct gpio_led stamp9g20evb_leds[] = {
{ {
.name = "D8", .name = "D8",
.gpio = AT91_PIN_PB18, .gpio = AT91_PIN_PB18,
...@@ -250,7 +248,7 @@ void add_w1(void) ...@@ -250,7 +248,7 @@ void add_w1(void)
} }
static void __init generic_board_init(void) void __init stamp9g20_board_init(void)
{ {
/* Serial */ /* Serial */
at91_add_device_serial(); at91_add_device_serial();
...@@ -262,34 +260,40 @@ static void __init generic_board_init(void) ...@@ -262,34 +260,40 @@ static void __init generic_board_init(void)
#else #else
at91_add_device_mmc(0, &mmc_data); at91_add_device_mmc(0, &mmc_data);
#endif #endif
/* USB Host */
at91_add_device_usbh(&usbh_data);
/* Ethernet */
at91_add_device_eth(&macb_data);
/* I2C */
at91_add_device_i2c(NULL, 0);
/* W1 */ /* W1 */
add_w1(); add_w1();
} }
static void __init portuxg20_board_init(void) static void __init portuxg20_board_init(void)
{ {
generic_board_init(); stamp9g20_board_init();
/* SPI */ /* USB Host */
at91_add_device_spi(portuxg20_spi_devices, ARRAY_SIZE(portuxg20_spi_devices)); at91_add_device_usbh(&usbh_data);
/* USB Device */ /* USB Device */
at91_add_device_udc(&portuxg20_udc_data); at91_add_device_udc(&portuxg20_udc_data);
/* Ethernet */
at91_add_device_eth(&macb_data);
/* I2C */
at91_add_device_i2c(NULL, 0);
/* SPI */
at91_add_device_spi(portuxg20_spi_devices, ARRAY_SIZE(portuxg20_spi_devices));
/* LEDs */ /* LEDs */
at91_gpio_leds(portuxg20_leds, ARRAY_SIZE(portuxg20_leds)); at91_gpio_leds(portuxg20_leds, ARRAY_SIZE(portuxg20_leds));
} }
static void __init stamp9g20_board_init(void) static void __init stamp9g20evb_board_init(void)
{ {
generic_board_init(); stamp9g20_board_init();
/* USB Host */
at91_add_device_usbh(&usbh_data);
/* USB Device */ /* USB Device */
at91_add_device_udc(&stamp9g20_udc_data); at91_add_device_udc(&stamp9g20evb_udc_data);
/* Ethernet */
at91_add_device_eth(&macb_data);
/* I2C */
at91_add_device_i2c(NULL, 0);
/* LEDs */ /* LEDs */
at91_gpio_leds(stamp9g20_leds, ARRAY_SIZE(stamp9g20_leds)); at91_gpio_leds(stamp9g20evb_leds, ARRAY_SIZE(stamp9g20evb_leds));
} }
MACHINE_START(PORTUXG20, "taskit PortuxG20") MACHINE_START(PORTUXG20, "taskit PortuxG20")
...@@ -305,7 +309,7 @@ MACHINE_START(STAMP9G20, "taskit Stamp9G20") ...@@ -305,7 +309,7 @@ MACHINE_START(STAMP9G20, "taskit Stamp9G20")
/* Maintainer: taskit GmbH */ /* Maintainer: taskit GmbH */
.boot_params = AT91_SDRAM_BASE + 0x100, .boot_params = AT91_SDRAM_BASE + 0x100,
.timer = &at91sam926x_timer, .timer = &at91sam926x_timer,
.map_io = stamp9g20_map_io, .map_io = stamp9g20evb_map_io,
.init_irq = init_irq, .init_irq = init_irq,
.init_machine = stamp9g20_board_init, .init_machine = stamp9g20evb_board_init,
MACHINE_END MACHINE_END
arch/arm/mach-at91/clock.c
View file @ c15524a4
...@@ -658,7 +658,7 @@ static void __init at91_upll_usbfs_clock_init(unsigned long main_clock) ...@@ -658,7 +658,7 @@ static void __init at91_upll_usbfs_clock_init(unsigned long main_clock)
/* Now set uhpck values */ /* Now set uhpck values */
uhpck.parent = &utmi_clk; uhpck.parent = &utmi_clk;
uhpck.pmc_mask = AT91SAM926x_PMC_UHP; uhpck.pmc_mask = AT91SAM926x_PMC_UHP;
uhpck.rate_hz = utmi_clk.parent->rate_hz; uhpck.rate_hz = utmi_clk.rate_hz;
uhpck.rate_hz /= 1 + ((at91_sys_read(AT91_PMC_USB) & AT91_PMC_OHCIUSBDIV) >> 8); uhpck.rate_hz /= 1 + ((at91_sys_read(AT91_PMC_USB) & AT91_PMC_OHCIUSBDIV) >> 8);
} }
......
arch/arm/mach-at91/include/mach/stamp9g20.h 0 → 100644
View file @ c15524a4
#ifndef __MACH_STAMP9G20_H
#define __MACH_STAMP9G20_H
void stamp9g20_map_io(void);
void stamp9g20_board_init(void);
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7