mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
65f2e753f1
This reverts commit 5dd7bf59e0.
Conflicts:
scripts/mod/file2alias.c
This change is wrong on many levels. First and foremost, it causes a
regression. On boot on Assabet, which this patch gives a codec id of
'ucb1x00', it gives:
ucb1x00 ID not found: 1005
0x1005 is a valid ID for the UCB1300 device.
Secondly, this patch is way over the top in terms of complexity. The
only device which has been seen to be connected with this MCP code is
the UCB1x00 (UCB1200, UCB1300 etc) devices, and they all use the same
driver. Adding a match table, requiring the codec string to match the
hardware ID read out of the ID register, etc is completely over the top
when we can just read the hardware ID register.
91 lines
1.9 KiB
C
91 lines
1.9 KiB
C
/*
|
|
* linux/arch/arm/mach-sa1100/shannon.c
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/device.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/tty.h>
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/partitions.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/setup.h>
|
|
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/flash.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/serial_sa1100.h>
|
|
#include <mach/mcp.h>
|
|
#include <mach/shannon.h>
|
|
|
|
#include "generic.h"
|
|
|
|
static struct mtd_partition shannon_partitions[] = {
|
|
{
|
|
.name = "BLOB boot loader",
|
|
.offset = 0,
|
|
.size = 0x20000
|
|
},
|
|
{
|
|
.name = "kernel",
|
|
.offset = MTDPART_OFS_APPEND,
|
|
.size = 0xe0000
|
|
},
|
|
{
|
|
.name = "initrd",
|
|
.offset = MTDPART_OFS_APPEND,
|
|
.size = MTDPART_SIZ_FULL
|
|
}
|
|
};
|
|
|
|
static struct flash_platform_data shannon_flash_data = {
|
|
.map_name = "cfi_probe",
|
|
.parts = shannon_partitions,
|
|
.nr_parts = ARRAY_SIZE(shannon_partitions),
|
|
};
|
|
|
|
static struct resource shannon_flash_resource = {
|
|
.start = SA1100_CS0_PHYS,
|
|
.end = SA1100_CS0_PHYS + SZ_4M - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
};
|
|
|
|
static struct mcp_plat_data shannon_mcp_data = {
|
|
.mccr0 = MCCR0_ADM,
|
|
.sclk_rate = 11981000,
|
|
};
|
|
|
|
static void __init shannon_init(void)
|
|
{
|
|
sa11x0_register_mtd(&shannon_flash_data, &shannon_flash_resource, 1);
|
|
sa11x0_register_mcp(&shannon_mcp_data);
|
|
}
|
|
|
|
static void __init shannon_map_io(void)
|
|
{
|
|
sa1100_map_io();
|
|
|
|
sa1100_register_uart(0, 3);
|
|
sa1100_register_uart(1, 1);
|
|
|
|
Ser1SDCR0 |= SDCR0_SUS;
|
|
GAFR |= (GPIO_UART_TXD | GPIO_UART_RXD);
|
|
GPDR |= GPIO_UART_TXD | SHANNON_GPIO_CODEC_RESET;
|
|
GPDR &= ~GPIO_UART_RXD;
|
|
PPAR |= PPAR_UPR;
|
|
|
|
/* reset the codec */
|
|
GPCR = SHANNON_GPIO_CODEC_RESET;
|
|
GPSR = SHANNON_GPIO_CODEC_RESET;
|
|
}
|
|
|
|
MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)")
|
|
.atag_offset = 0x100,
|
|
.map_io = shannon_map_io,
|
|
.init_irq = sa1100_init_irq,
|
|
.timer = &sa1100_timer,
|
|
.init_machine = shannon_init,
|
|
.restart = sa11x0_restart,
|
|
MACHINE_END
|