summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/arch-iop3xx/serial.h76
-rw-r--r--include/asm-arm/arch-s3c2410/regs-dsc.h32
-rw-r--r--include/asm-arm/arch-s3c2410/regs-iic.h10
-rw-r--r--include/asm-arm/mach/flash.h19
-rw-r--r--include/asm-arm/mach/map.h1
5 files changed, 44 insertions, 94 deletions
diff --git a/include/asm-arm/arch-iop3xx/serial.h b/include/asm-arm/arch-iop3xx/serial.h
deleted file mode 100644
index 61192f98c066..000000000000
--- a/include/asm-arm/arch-iop3xx/serial.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * include/asm-arm/arch-iop3xx/serial.h
- */
-#include <linux/config.h>
-
-/*
- * This assumes you have a 1.8432 MHz clock for your UART.
- *
- * It'd be nice if someone built a serial card with a 24.576 MHz
- * clock, since the 16550A is capable of handling a top speed of 1.5
- * megabits/second; but this requires the faster clock.
- */
-#define BASE_BAUD ( 1843200 / 16 )
-
-/* Standard COM flags */
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
-
-#ifdef CONFIG_ARCH_IQ80321
-
-#define IRQ_UART1 IRQ_IQ80321_UART
-
-#define RS_TABLE_SIZE 1
-
-#define STD_SERIAL_PORT_DEFNS \
- /* UART CLK PORT IRQ FLAGS */ \
- { 0, BASE_BAUD, 0xfe800000, IRQ_UART1, STD_COM_FLAGS }, /* ttyS0 */
-#endif // CONFIG_ARCH_IQ80321
-
-#ifdef CONFIG_ARCH_IQ31244
-
-#define IRQ_UART1 IRQ_IQ31244_UART
-
-#define RS_TABLE_SIZE 1
-
-#define STD_SERIAL_PORT_DEFNS \
- /* UART CLK PORT IRQ FLAGS */ \
- { 0, BASE_BAUD, 0xfe800000, IRQ_UART1, STD_COM_FLAGS }, /* ttyS0 */
-#endif // CONFIG_ARCH_IQ31244
-
-#ifdef CONFIG_ARCH_IQ80331
-
-#undef BASE_BAUD
-
-#define BASE_BAUD ( 33334000 / 16 )
-
-#define IRQ_UART0 IRQ_IQ80331_UART0
-#define IRQ_UART1 IRQ_IQ80331_UART1
-
-#define RS_TABLE_SIZE 2
-
-#define STD_SERIAL_PORT_DEFNS \
- { \
- /*type: PORT_XSCALE,*/ \
- /*xmit_fifo_size: 32,*/ \
- baud_base: BASE_BAUD, \
- irq: IRQ_UART0, \
- flags: STD_COM_FLAGS, \
- iomem_base: IQ80331_UART0_VIRT, \
- io_type: SERIAL_IO_MEM, \
- iomem_reg_shift: 2 \
- }, /* ttyS0 */ \
- { \
- /*type: PORT_XSCALE,*/ \
- /*xmit_fifo_size: 32,*/ \
- baud_base: BASE_BAUD, \
- irq: IRQ_UART1, \
- flags: STD_COM_FLAGS, \
- iomem_base: IQ80331_UART1_VIRT, \
- io_type: SERIAL_IO_MEM, \
- iomem_reg_shift: 2 \
- } /* ttyS1 */
-#endif // CONFIG_ARCH_IQ80331
-
-
-#define EXTRA_SERIAL_PORT_DEFNS
-
diff --git a/include/asm-arm/arch-s3c2410/regs-dsc.h b/include/asm-arm/arch-s3c2410/regs-dsc.h
index 0da1ec7b7675..a023b0434efe 100644
--- a/include/asm-arm/arch-s3c2410/regs-dsc.h
+++ b/include/asm-arm/arch-s3c2410/regs-dsc.h
@@ -20,15 +20,15 @@
#ifdef CONFIG_CPU_S3C2440
-#define S3C2440_DSC0 S3C2410_GPIOREG(0xc0)
-#define S3C2440_DSC1 S3C2410_GPIOREG(0xc4)
+#define S3C2440_DSC0 S3C2410_GPIOREG(0xc4)
+#define S3C2440_DSC1 S3C2410_GPIOREG(0xc8)
#define S3C2440_SELECT_DSC0 (0)
#define S3C2440_SELECT_DSC1 (1<<31)
#define S3C2440_DSC_GETSHIFT(x) ((x) & 31)
-#define S3C2440_DSC0_ENABLE (1<<31)
+#define S3C2440_DSC0_DISABLE (1<<31)
#define S3C2440_DSC0_ADDR (S3C2440_SELECT_DSC0 | 8)
#define S3C2440_DSC0_ADDR_12mA (0<<8)
@@ -69,19 +69,19 @@
#define S3C2440_DSC0_DATA0_6mA (3<<0)
#define S3C2440_DSC0_DATA0_MASK (3<<0)
-#define S3C2440_DSC1_SCK0 (S3C2440_SELECT_DSC1 | 28)
-#define S3C2440_DSC1_SCK0_12mA (0<<28)
-#define S3C2440_DSC1_SCK0_10mA (1<<28)
-#define S3C2440_DSC1_SCK0_8mA (2<<28)
-#define S3C2440_DSC1_SCK0_6mA (3<<28)
-#define S3C2440_DSC1_SCK0_MASK (3<<28)
-
-#define S3C2440_DSC1_SCK1 (S3C2440_SELECT_DSC1 | 26)
-#define S3C2440_DSC1_SCK1_12mA (0<<26)
-#define S3C2440_DSC1_SCK1_10mA (1<<26)
-#define S3C2440_DSC1_SCK1_8mA (2<<26)
-#define S3C2440_DSC1_SCK1_6mA (3<<26)
-#define S3C2440_DSC1_SCK1_MASK (3<<26)
+#define S3C2440_DSC1_SCK1 (S3C2440_SELECT_DSC1 | 28)
+#define S3C2440_DSC1_SCK1_12mA (0<<28)
+#define S3C2440_DSC1_SCK1_10mA (1<<28)
+#define S3C2440_DSC1_SCK1_8mA (2<<28)
+#define S3C2440_DSC1_SCK1_6mA (3<<28)
+#define S3C2440_DSC1_SCK1_MASK (3<<28)
+
+#define S3C2440_DSC1_SCK0 (S3C2440_SELECT_DSC1 | 26)
+#define S3C2440_DSC1_SCK0_12mA (0<<26)
+#define S3C2440_DSC1_SCK0_10mA (1<<26)
+#define S3C2440_DSC1_SCK0_8mA (2<<26)
+#define S3C2440_DSC1_SCK0_6mA (3<<26)
+#define S3C2440_DSC1_SCK0_MASK (3<<26)
#define S3C2440_DSC1_SCKE (S3C2440_SELECT_DSC1 | 24)
#define S3C2440_DSC1_SCKE_10mA (0<<24)
diff --git a/include/asm-arm/arch-s3c2410/regs-iic.h b/include/asm-arm/arch-s3c2410/regs-iic.h
index 381ab4baf208..fed3288e2046 100644
--- a/include/asm-arm/arch-s3c2410/regs-iic.h
+++ b/include/asm-arm/arch-s3c2410/regs-iic.h
@@ -11,6 +11,7 @@
*
* Changelog:
* 03-Oct-2004 BJD Initial include for Linux
+ * 08-Nov-2004 BJD Added S3C2440 filter register
*/
#ifndef __ASM_ARCH_REGS_IIC_H
@@ -24,6 +25,7 @@
#define S3C2410_IICSTAT S3C2410_IICREG(0x04)
#define S3C2410_IICADD S3C2410_IICREG(0x08)
#define S3C2410_IICDS S3C2410_IICREG(0x0C)
+#define S3C2440_IICLC S3C2410_IICREG(0x10)
#define S3C2410_IICCON_ACKEN (1<<7)
#define S3C2410_IICCON_TXDIV_16 (0<<6)
@@ -47,4 +49,12 @@
#define S3C2410_IICSTAT_ADDR0 (1<<1)
#define S3C2410_IICSTAT_LASTBIT (1<<0)
+#define S3C2410_IICLC_SDA_DELAY0 (0 << 0)
+#define S3C2410_IICLC_SDA_DELAY5 (1 << 0)
+#define S3C2410_IICLC_SDA_DELAY10 (2 << 0)
+#define S3C2410_IICLC_SDA_DELAY15 (3 << 0)
+#define S3C2410_IICLC_SDA_DELAY_MASK (3 << 0)
+
+#define S3C2410_IICLC_FILTER_ON (1<<2)
+
#endif /* __ASM_ARCH_REGS_IIC_H */
diff --git a/include/asm-arm/mach/flash.h b/include/asm-arm/mach/flash.h
index f7b86a1be96d..a92887d4b2cb 100644
--- a/include/asm-arm/mach/flash.h
+++ b/include/asm-arm/mach/flash.h
@@ -2,18 +2,33 @@
* linux/include/asm-arm/mach/flash.h
*
* Copyright (C) 2003 Russell King, All Rights Reserved.
+ *
+ * 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.
*/
#ifndef ASMARM_MACH_FLASH_H
-#define ASMAMR_MACH_FLASH_H
+#define ASMARM_MACH_FLASH_H
struct mtd_partition;
+/*
+ * map_name: the map probe function name
+ * width: width of mapped device
+ * init: method called at driver/device initialisation
+ * exit: method called at driver/device removal
+ * set_vpp: method called to enable or disable VPP
+ * parts: optional array of mtd_partitions for static partitioning
+ * nr_parts: number of mtd_partitions for static partitoning
+ */
struct flash_platform_data {
const char *map_name;
- int width;
+ unsigned int width;
int (*init)(void);
void (*exit)(void);
void (*set_vpp)(int on);
+ struct mtd_partition *parts;
+ unsigned int nr_parts;
};
#endif
diff --git a/include/asm-arm/mach/map.h b/include/asm-arm/mach/map.h
index 284df8bb76d1..2a75545a2d04 100644
--- a/include/asm-arm/mach/map.h
+++ b/include/asm-arm/mach/map.h
@@ -23,6 +23,7 @@ struct meminfo;
#define MT_MINICLEAN 2
#define MT_VECTORS 3
#define MT_MEMORY 4
+#define MT_ROM 5
extern void create_memmap_holes(struct meminfo *);
extern void memtable_init(struct meminfo *);
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-09 00:04:55 +0000