Skip to content

L
linux
Commit b7c5d0b8 authored by Frank Becker's avatar Frank Becker Committed by Russell King
Browse files
Options

[ARM PATCH] 1703/1: SA Cerf update (cleanup) 

Patch from Frank Becker

Crud removal. Updated cerf doc.

The SA CerfPDA/CerfPOD have long been gone. I see no
community activity. The last official release was 2.4.9.

Removed ifdefs for CERF_CPLD (which referred to the PDA/POD), go figure.
Removed keyboard driver.
Removed default configs for PDA/POD.
Removed PDA/POD related LCD stuff.
parent 9fa4d536
Expand all Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 1984 deletions
Documentation/arm/SA1100/CERF
View file @ b7c5d0b8
*** The StrongARM version of the CerfBoard/Cube has been discontinued ***
The Intrinsyc CerfBoard is a StrongARM 1110-based computer on a board The Intrinsyc CerfBoard is a StrongARM 1110-based computer on a board
that measures approximately 2" square. It includes an Ethernet that measures approximately 2" square. It includes an Ethernet
controller, an RS232-compatible serial port, a USB function port, and controller, an RS232-compatible serial port, a USB function port, and
...@@ -5,7 +7,7 @@ one CompactFlash+ slot on the back. Pictures can be found at the ...@@ -5,7 +7,7 @@ one CompactFlash+ slot on the back. Pictures can be found at the
Intrinsyc website, http://www.intrinsyc.com. Intrinsyc website, http://www.intrinsyc.com.
This document describes the support in the Linux kernel for the This document describes the support in the Linux kernel for the
Intrinsyc CerfBoard as of version 2.4.0-test4-np1. Intrinsyc CerfBoard.
Supported in this version: Supported in this version:
- CompactFlash+ slot (select PCMCIA in General Setup and any options - CompactFlash+ slot (select PCMCIA in General Setup and any options
...@@ -14,24 +16,14 @@ Supported in this version: ...@@ -14,24 +16,14 @@ Supported in this version:
Network Devices) Network Devices)
- Serial ports with a serial console (hardcoded to 38400 8N1) - Serial ports with a serial console (hardcoded to 38400 8N1)
Not supported in this version (yet):
- LCD driver/touchscreen interface
- UDC (a driver exists right now, but is unstable and slow and only
works with the Linux USB)
In order to get this kernel onto your Cerf, you need a server that runs In order to get this kernel onto your Cerf, you need a server that runs
both BOOTP and TFTP. Detailed instructions should have come with your both BOOTP and TFTP. Detailed instructions should have come with your
evaluation kit on how to use the bootloader. This series of commands evaluation kit on how to use the bootloader. This series of commands
will suffice: will suffice:
make cerf_config make ARCH=arm CROSS_COMPILE=arm-linux- cerfcube_defconfig
make xconfig make ARCH=arm CROSS_COMPILE=arm-linux- zImage
make zImage make ARCH=arm CROSS_COMPILE=arm-linux- modules
cp arch/arm/boot/zImage <TFTP directory> cp arch/arm/boot/zImage <TFTP directory>
The default config uses a 4MB RAM disk located at 0xc0500000 as root. support@intrinsyc.com
Setting the board to mount root from a NFS partition works, too.
I-Gene Leong, Intrinsyc Software Inc.
ileong@intrinsyc.com
arch/arm/configs/cerfpda_defconfig deleted 100644 → 0
View file @ 9fa4d536
This diff is collapsed.
arch/arm/configs/cerfpod_defconfig deleted 100644 → 0
View file @ 9fa4d536
This diff is collapsed.
arch/arm/mach-sa1100/Kconfig
View file @ b7c5d0b8
...@@ -37,9 +37,9 @@ config SA1100_CERF ...@@ -37,9 +37,9 @@ config SA1100_CERF
bool "CerfBoard" bool "CerfBoard"
depends on ARCH_SA1100 depends on ARCH_SA1100
help help
The Intrinsyc CerfBoard is based on the StrongARM 1110. The Intrinsyc CerfBoard is based on the StrongARM 1110 (Discontinued).
More information is available at: More information is available at:
<http://www.intrinsyc.com/products/referenceplatforms/cerfboard.html>. <http://www.intrinsyc.com/products/cerfboard/>.
Say Y if configuring for an Intrinsyc CerfBoard. Say Y if configuring for an Intrinsyc CerfBoard.
Say N otherwise. Say N otherwise.
...@@ -60,15 +60,6 @@ config SA1100_CERF_FLASH_32MB ...@@ -60,15 +60,6 @@ config SA1100_CERF_FLASH_32MB
endchoice endchoice
config SA1100_CERF_CPLD
bool "Cerf w/CPLD support (CerfPDA)"
depends on SA1100_CERF
help
Say Y here to support the Linux CerfPDA development kit from
Intrinsyc. This is a StrongARM-1110-based reference platform for
designing custom PDAs. Product info is at
<http://www.intrinsyc.com/products/referencedesigns/cerfpda.asp>.
config SA1100_H3100 config SA1100_H3100
bool "Compaq iPAQ H3100" bool "Compaq iPAQ H3100"
depends on ARCH_SA1100 depends on ARCH_SA1100
......
arch/arm/mach-sa1100/leds-cerf.c
View file @ b7c5d0b8
...@@ -19,24 +19,12 @@ ...@@ -19,24 +19,12 @@
static unsigned int led_state; static unsigned int led_state;
static unsigned int hw_led_state; static unsigned int hw_led_state;
#ifdef CONFIG_SA1100_CERF_CPLD
#define LED_D0 GPIO_GPIO(0)
#define LED_D1 GPIO_GPIO(0)
#define LED_D2 GPIO_GPIO(0)
#define LED_D3 GPIO_GPIO(0)
#define LED_MASK (LED_D0|LED_D1|LED_D2|LED_D3)
#else
#define LED_D0 GPIO_GPIO(0) #define LED_D0 GPIO_GPIO(0)
#define LED_D1 GPIO_GPIO(1) #define LED_D1 GPIO_GPIO(1)
#define LED_D2 GPIO_GPIO(2) #define LED_D2 GPIO_GPIO(2)
#define LED_D3 GPIO_GPIO(3) #define LED_D3 GPIO_GPIO(3)
#define LED_MASK (LED_D0|LED_D1|LED_D2|LED_D3) #define LED_MASK (LED_D0|LED_D1|LED_D2|LED_D3)
#endif
void cerf_leds_event(led_event_t evt) void cerf_leds_event(led_event_t evt)
{ {
unsigned long flags; unsigned long flags;
......
drivers/video/Kconfig
View file @ b7c5d0b8
...@@ -109,29 +109,6 @@ config FB_SA1100 ...@@ -109,29 +109,6 @@ config FB_SA1100
If you plan to use the LCD display with your SA-1100 system, say If you plan to use the LCD display with your SA-1100 system, say
Y here. Y here.
choice
prompt "CerfBoard LCD Display Size"
depends on FB_SA1100 && SA1100_CERF
default CERF_LCD_57_A
config CERF_LCD_38_A
bool "3.8_Color"
config CERF_LCD_38_B
bool "3.8_Mono"
config CERF_LCD_57_A
bool "5.7"
config CERF_LCD_72_A
bool "7.2"
endchoice
config SA1100_CERF_LCD_BACKLIGHT
bool "Cerfboard Backlight (CerfPDA)"
depends on FB_SA1100 && SA1100_CERF_CPLD
config FB_CYBER2000 config FB_CYBER2000
tristate "CyberPro 2000/2010/5000 support" tristate "CyberPro 2000/2010/5000 support"
depends on FB && PCI depends on FB && PCI
......
drivers/video/sa1100fb.c
View file @ b7c5d0b8
...@@ -326,54 +326,6 @@ static struct sa1100fb_mach_info brutus_info __initdata = { ...@@ -326,54 +326,6 @@ static struct sa1100fb_mach_info brutus_info __initdata = {
}; };
#endif #endif
#ifdef CONFIG_SA1100_CERF
static struct sa1100fb_mach_info cerf_info __initdata = {
#if defined(CONFIG_CERF_LCD_72_A)
.pixclock = 171521, .bpp = 8,
.xres = 640, .yres = 480,
.lccr0 = LCCR0_Color | LCCR0_Dual | LCCR0_Pas,
.lccr3 = LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2) |
LCCR3_PixClkDiv(38),
#elif defined(CONFIG_CERF_LCD_57_A)
.pixclock = 171521, .bpp = 8,
.xres = 320, .yres = 240,
.lccr0 = LCCR0_Color | LCCR0_Sngl | LCCR0_Pas,
.lccr3 = LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2) |
LCCR3_PixClkDiv(38),
#elif defined(CONFIG_CERF_LCD_38_A)
.pixclock = 171521, .bpp = 8,
.xres = 240, .yres = 320,
.lccr0 = LCCR0_Color | LCCR0_Sngl | LCCR0_Pas,
.lccr3 = LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(56) |
LCCR3_PixClkDiv(38),
#elif defined(CONFIG_CERF_LCD_38_B)
.pixclock = 171521, .bpp = 4,
.xres = 320, .yres = 240,
.lccr0 = LCCR0_Mono | LCCR0_4PixMono | LCCR0_Sngl | LCCR0_Pas,
.lccr3 = LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(56) |
LCCR3_PixClkDiv(38),
#else
#error "Must have a CerfBoard LCD form factor selected"
#endif
.hsync_len = 5, .vsync_len = 1,
.left_margin = 61, .upper_margin = 3,
.right_margin = 9, .lower_margin = 0,
.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
};
#if 0
static struct sa1100fb_rgb cerf_rgb_16 = {
.red = { .offset = 8, .length = 4, },
.green = { .offset = 4, .length = 4, },
.blue = { .offset = 0, .length = 4, },
.transp = { .offset = 0, .length = 0, },
};
#endif
#endif
#ifdef CONFIG_SA1100_FREEBIRD #ifdef CONFIG_SA1100_FREEBIRD
#warning Please check this carefully #warning Please check this carefully
static struct sa1100fb_mach_info freebird_info __initdata = { static struct sa1100fb_mach_info freebird_info __initdata = {
...@@ -683,11 +635,6 @@ sa1100fb_get_machine_info(struct sa1100fb_info *fbi) ...@@ -683,11 +635,6 @@ sa1100fb_get_machine_info(struct sa1100fb_info *fbi)
inf = &brutus_info; inf = &brutus_info;
} }
#endif #endif
#ifdef CONFIG_SA1100_CERF
if (machine_is_cerf()) {
inf = &cerf_info;
}
#endif
#ifdef CONFIG_SA1100_FREEBIRD #ifdef CONFIG_SA1100_FREEBIRD
if (machine_is_freebird()) { if (machine_is_freebird()) {
inf = &freebird_info; inf = &freebird_info;
...@@ -1294,10 +1241,6 @@ static void sa1100fb_setup_gpio(struct sa1100fb_info *fbi) ...@@ -1294,10 +1241,6 @@ static void sa1100fb_setup_gpio(struct sa1100fb_info *fbi)
} }
/* GPIO15 is used as a bypass for 3.8" displays */
if (machine_is_cerf())
mask |= GPIO_GPIO15;
if (mask) { if (mask) {
GPDR |= mask; GPDR |= mask;
GAFR |= mask; GAFR |= mask;
......
include/asm-arm/arch-sa1100/keyboard.h
View file @ b7c5d0b8
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
extern void gc_kbd_init_hw(void); extern void gc_kbd_init_hw(void);
extern void smartio_kbd_init_hw(void); extern void smartio_kbd_init_hw(void);
extern void cerf_kbd_init_hw(void);
static inline void kbd_init_hw(void) static inline void kbd_init_hw(void)
{ {
...@@ -19,10 +18,6 @@ static inline void kbd_init_hw(void) ...@@ -19,10 +18,6 @@ static inline void kbd_init_hw(void)
gc_kbd_init_hw(); gc_kbd_init_hw();
if (machine_is_adsbitsy()) if (machine_is_adsbitsy())
smartio_kbd_init_hw(); smartio_kbd_init_hw();
#ifdef CONFIG_SA1100_CERF_CPLD
if (machine_is_cerf())
cerf_kbd_init_hw();
#endif
} }
#endif /* _SA1100_KEYBOARD_H */ #endif /* _SA1100_KEYBOARD_H */
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