Menu
▾
▴
[Hackndev-commit] SF.net SVN: hackndev: [1251] linux4palm/linux/trunk
|
From: <mar...@us...> - 2007-08-21 10:56:35
|
Revision: 1251
http://hackndev.svn.sourceforge.net/hackndev/?rev=1251&view=rev
Author: marex_z71
Date: 2007-08-21 03:56:33 -0700 (Tue, 21 Aug 2007)
Log Message:
-----------
HTC_Beetles: major update
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/Kconfig
linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/Makefile
linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable.c
linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_rom.c
Removed Paths:
-------------
linux4palm/linux/trunk/arch/arm/mach-pxa/htcbeetles/
linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles-asic.h
linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles-gpio.h
linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles.h
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/Kconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/Kconfig 2007-08-20 22:56:19 UTC (rev 1250)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/Kconfig 2007-08-21 10:56:33 UTC (rev 1251)
@@ -1,27 +1,64 @@
-menuconfig MACH_HW6900
- bool "HTC Sable (hPaq hw69xx)"
+menuconfig HTC_HW6X00
+ bool "HTC Beetles/Sable (hPaq hw65xx/hw69xx)"
select PXA27x
select BOARD_IRQ_MAP_BIG
select KEYBOARD_GPIO
select KEYBOARD_PXA27x
help
Say Y here if you intend to run this kernel on a
- HTC Sable (iPAQ hw691x). Currently there is only basic support
- for this PDA.
+ HTC Beetles or Sable (iPAQ hw651x or hw691x).
+ Currently there is only basic support for this PDA.
+config MACH_HTCBEETLES
+ bool "HTC Beetles (hPaq hw65xx)"
+ depends on HTC_HW6X00
+ select PXA27x
+ select BOARD_IRQ_MAP_BIG
+ select KEYBOARD_GPIO
+ select KEYBOARD_PXA27x
+ help
+ HTC Beetles (iPAQ hw651x) support.
+
+config MACH_HW6900
+ bool "HTC Sable (hPaq hw69xx)"
+ depends on HTC_HW6X00
+ select PXA27x
+ select BOARD_IRQ_MAP_BIG
+ select KEYBOARD_GPIO
+ select KEYBOARD_PXA27x
+ help
+ HTC Sable (iPAQ hw691x) support.
+
config HTCSABLE_LCD
- tristate "HTC Sable LCD"
- depends on MACH_HW6900 && HTC_ASIC3 && LCD_CLASS_DEVICE
+ tristate "HTC Beetles/Sable LCD"
+ depends on HTC_HW6X00 && ( MACH_HW6900 || MACH_HTCBEETLES ) && HTC_ASIC3 && LCD_CLASS_DEVICE
help
This driver provides support for changing power and brightness
on HTC Sable LCD display.
config HTCSABLE_BACKLIGHT
- bool "HTC Sable Backlight"
- depends on MACH_HW6900 && HTC_ASIC3 && BACKLIGHT_CLASS_DEVICE
+ bool "HTC Beetles/Sable Backlight"
+ depends on HTC_HW6X00 && ( MACH_HW6900 || MACH_HTCBEETLES ) && HTC_ASIC3 && BACKLIGHT_CLASS_DEVICE
help
This driver provides support for changing power and brightness
on HTC Sable LCD backlight.
+config HTCSABLE_ROM
+ bool "HTC Beetles/Sable ROM"
+ depends on HTC_HW6X00 && ( MACH_HW6900 || MACH_HTCBEETLES ) && HTC_ASIC3 && MTD
+ help
+ This driver provides access to devices' ROM
+ (where IPL bootloader) is stored.
+config HTCSABLE_BT
+ bool "HTC Beetles/Sable Bluetooth"
+ depends on HTC_HW6X00 && ( MACH_HW6900 || MACH_HTCBEETLES ) && HTC_ASIC3 && BT
+ help
+ This driver provides support for Bluetooth module.
+
+config HTCSABLE_PHONE
+ bool "HTC Beetles/Sable Phone"
+ depends on HTC_HW6X00 && ( MACH_HW6900 || MACH_HTCBEETLES ) && HTC_ASIC3
+ help
+ This driver provides support for Phone module.
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/Makefile
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/Makefile 2007-08-20 22:56:19 UTC (rev 1250)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/Makefile 2007-08-21 10:56:33 UTC (rev 1251)
@@ -1,16 +1,17 @@
#
# Makefile for HTC Sable
#
-obj-$(CONFIG_MACH_HW6900) += htcsable.o htcsable_udc.o \
+obj-$(CONFIG_MACH_HTCBEETLES) += htcsable.o htcsable_udc.o \
htcsable_ts2.o \
htcsable_pm.o \
htcsable_core.o \
htcsable_keyboard.o \
htcsable_buttons.o \
- htcsable_kbd.o \
- htcsable_bt.o htcsable_phone.o \
- htcsable_rom.o
+ htcsable_kbd.o
-obj-$(CONFIG_HTCSABLE_LCD) += htcsable_lcd.o
-obj-$(CONFIG_HTCSABLE_BACKLIGHT) += htcsable_bl.o
+obj-$(CONFIG_HTCSABLE_BT) += htcsable_bt.o
+obj-$(CONFIG_HTCSABLE_PHONE) += htcsable_phone.o
+obj-$(CONFIG_HTCSABLE_ROM) += htcsable_rom.o
+obj-$(CONFIG_HTCSABLE_LCD) += htcsable_lcd.o
+obj-$(CONFIG_HTCSABLE_BACKLIGHT) += htcsable_bl.o
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable.c 2007-08-20 22:56:19 UTC (rev 1250)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable.c 2007-08-21 10:56:33 UTC (rev 1251)
@@ -33,8 +33,13 @@
#include "../generic.h"
+#ifdef CONFIG_HTCSABLE_BT
#include "htcsable_bt.h"
+#endif
+
+#ifdef CONFIG_HTCSABLE_PHONE
#include "htcsable_phone.h"
+#endif
/*
* * Bluetooth - Relies on other loadable modules, like ASIC3 and Core,
@@ -43,6 +48,7 @@
* * bluetooth (obviously).
* */
+#ifdef CONFIG_HTCSABLE_BT
static struct htcsable_bt_funcs bt_funcs;
static void
@@ -51,7 +57,9 @@
if (bt_funcs.configure != NULL)
bt_funcs.configure( state );
}
+#endif
+#ifdef CONFIG_HTCSABLE_PHONE
static struct htcsable_phone_funcs phone_funcs;
static void
@@ -60,6 +68,7 @@
if (phone_funcs.configure != NULL)
phone_funcs.configure( state );
}
+#endif
static struct pxafb_mode_info htcsable_lcd_modes[] = {
{
@@ -102,6 +111,7 @@
/* Bluetooth */
+#ifdef CONFIG_HTCSABLE_BT
static struct platform_device htcsable_bt = {
.name = "htcsable_bt",
.id = -1,
@@ -109,7 +119,9 @@
.platform_data = &bt_funcs,
},
};
+#endif
+#ifdef CONFIG_HTCSABLE_PHONE
static struct platform_device htcsable_phone = {
.name = "htcsable_phone",
.id = -1,
@@ -117,8 +129,8 @@
.platform_data = &phone_funcs,
},
};
+#endif
-
static struct platform_device *htcsable_asic3_devices[] __initdata = {
&htcsable_ts,
&htcsable_kbd,
@@ -128,8 +140,12 @@
#ifdef CONFIG_HTCSABLE_BACKLIGHT
&htcsable_bl,
#endif
+#ifdef CONFIG_HTCSABLE_BT
&htcsable_bt,
+#endif
+#ifdef CONFIG_HTCSABLE_PHONE
&htcsable_phone,
+#endif
&htcsable_udc,
};
@@ -231,15 +247,20 @@
&htcsable_core,
};
+#ifdef CONFIG_HTCSABLE_BT
static struct platform_pxa_serial_funcs htcsable_pxa_bt_funcs = {
.configure = htcsable_bt_configure,
};
+#endif
+
+#ifdef CONFIG_HTCSABLE_PHONE
static struct platform_pxa_serial_funcs htcsable_pxa_phone_funcs = {
.configure = htcsable_phone_configure,
#if 0
.ioctl = htcsable_phone_ioctl,
#endif
};
+#endif
static void __init htcsable_map_io(void)
{
@@ -248,8 +269,12 @@
pxa_map_io();
/* Is this correct? If yes, please add comment, that vendor was drunk when did soldering. */
+#ifdef CONFIG_HTCSABLE_BT
pxa_set_ffuart_info(&htcsable_pxa_bt_funcs);
+#endif
+#ifdef CONFIG_HTCSABLE_PHONE
pxa_set_btuart_info(&htcsable_pxa_phone_funcs);
+#endif
// sport = platform_get_drvdata(&ffuart device);
// printk("sport=0x%x\n", (unsigned int)sport);
@@ -272,6 +297,18 @@
platform_add_devices( devices, ARRAY_SIZE(devices) );
}
+#ifdef CONFIG_MACH_HTCBEETLES
+MACHINE_START(HTCBEETLES, "HTC Beetles")
+ .phys_io = 0x40000000,
+ .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
+ .boot_params = 0xa0000100,
+ .map_io = htcsable_map_io,
+ .init_irq = pxa_init_irq,
+ .timer = &pxa_timer,
+ .init_machine = htcsable_init,
+MACHINE_END
+#endif
+#ifdef CONFIG_MACH_HW6900
MACHINE_START(HW6900, "HTC Sable")
.phys_io = 0x40000000,
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
@@ -281,4 +318,4 @@
.timer = &pxa_timer,
.init_machine = htcsable_init,
MACHINE_END
-
+#endif
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_rom.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_rom.c 2007-08-20 22:56:19 UTC (rev 1250)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_rom.c 2007-08-21 10:56:33 UTC (rev 1251)
@@ -37,10 +37,8 @@
{
int retval = 0;
-#if defined(CONFIG_MACH_BLUEANGEL)
- if (! machine_is_sable() )
+ if (!(machine_is_hw6900() || machine_is_htcbeetles()))
return -ENODEV;
-#endif
sable_map.virt = ioremap(sable_map.phys, sable_map.size);
if (!sable_map.virt) {
Deleted: linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles-asic.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles-asic.h 2007-08-20 22:56:19 UTC (rev 1250)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles-asic.h 2007-08-21 10:56:33 UTC (rev 1251)
@@ -1,39 +0,0 @@
-/*
- * include/asm/arm/arch-pxa/htcbeetles-asic.h
- *
- * Authors: Giuseppe Zompatori <giu...@ya...>
- *
- * based on previews work, see below:
- *
- * include/asm/arm/arch-pxa/hx4700-asic.h
- * Copyright (c) 2004 SDG Systems, LLC
- *
- */
-
-#ifndef _HTCBEETLES_ASIC_H_
-#define _HTCBEETLES_ASIC_H_
-
-#include <asm/hardware/ipaq-asic3.h>
-
-/* ASIC3 */
-
-#define HTCBEETLES_ASIC3_GPIO_PHYS PXA_CS4_PHYS
-#define HTCBEETLES_ASIC3_MMC_PHYS PXA_CS3_PHYS+0x02000000
-
-/* TODO: some information is missing here :) */
-
-/* ASIC3 GPIO A bank */
-
-#define GPIOA_USB_PUEN 7 /* Output */
-
-/* ASIC3 GPIO B bank */
-
-#define GPIOB_USB_DETECT 6 /* Input */
-
-/* ASIC3 GPIO C bank */
-
-/* ASIC3 GPIO D bank */
-
-#endif /* _HTCBEETLES_ASIC_H_ */
-
-extern struct platform_device htcbeetles_asic3;
Deleted: linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles-gpio.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles-gpio.h 2007-08-20 22:56:19 UTC (rev 1250)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles-gpio.h 2007-08-21 10:56:33 UTC (rev 1251)
@@ -1,80 +0,0 @@
-/*
- * include/asm-arm/arch-pxa/htcbeetles-gpio.h
- * History:
- *
- * 2004-12-10 Michael Opdenacker. Wrote down GPIO settings as identified by Jamey Hicks.
- * Reused the h2200-gpio.h file as a template.
- */
-
-#ifndef _HTCBEETLES_GPIO_H_
-#define _HTCBEETLES_GPIO_H_
-
-#include <asm/arch/pxa-regs.h>
-
-#define GET_HTCBEETLES_GPIO(gpio) \
- (GPLR(GPIO_NR_HTCBEETLES_ ## gpio) & GPIO_bit(GPIO_NR_HTCBEETLES_ ## gpio))
-
-#define SET_HTCBEETLES_GPIO(gpio, setp) \
-do { \
-if (setp) \
- GPSR(GPIO_NR_HTCBEETLES_ ## gpio) = GPIO_bit(GPIO_NR_HTCBEETLES_ ## gpio); \
-else \
- GPCR(GPIO_NR_HTCBEETLES_ ## gpio) = GPIO_bit(GPIO_NR_HTCBEETLES_ ## gpio); \
-} while (0)
-
-#define SET_HTCBEETLES_GPIO_N(gpio, setp) \
-do { \
-if (setp) \
- GPCR(GPIO_NR_HTCBEETLES_ ## gpio ## _N) = GPIO_bit(GPIO_NR_HTCBEETLES_ ## gpio ## _N); \
-else \
- GPSR(GPIO_NR_HTCBEETLES_ ## gpio ## _N) = GPIO_bit(GPIO_NR_HTCBEETLES_ ## gpio ## _N); \
-} while (0)
-
-#define HTCBEETLES_IRQ(gpio) \
- IRQ_GPIO(GPIO_NR_HTCBEETLES_ ## gpio)
-
-#define GPIO_NR_HTCBEETLES_KEY_ON_N 0
-#define GPIO_NR_HTCBEETLES_GP_RST_N 1
-
-#define GPIO_NR_HTCBEETLES_ASIC3_EXT_INT 9
-#define GPIO_NR_HTCBEETLES_ASIC3_SDIO_INT_N 13
-
-#define GPIO_NR_HTCBEETLES_TOUCHPANEL_IRQ_N 115
-
-/* TODO: should be checked */
-
-#define GPIO_NR_HTCBEETLES_TOUCHSCREEN_SPI_CLK_MD (23 | GPIO_ALT_FN_2_IN)
-#define GPIO_NR_HTCBEETLES_TOUCHSCREEN_SPI_CS_N_MD (24 | GPIO_ALT_FN_2_IN)
-#define GPIO_NR_HTCBEETLES_TOUCHSCREEN_SPI_DO_MD (25 | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_HTCBEETLES_TOUCHSCREEN_SPI_DI_MD (26 | GPIO_ALT_FN_1_IN)
-
-#define GPIO_NR_HTCBEETLES_I2S_BCK_MD (28 | GPIO_ALT_FN_1_OUT)
-#define GPIO_NR_HTCBEETLES_I2S_DIN_MD (29 | GPIO_ALT_FN_2_IN)
-#define GPIO_NR_HTCBEETLES_I2S_DOUT_MD (30 | GPIO_ALT_FN_1_OUT)
-#define GPIO_NR_HTCBEETLES_I2S_SYNC_MD (31 | GPIO_ALT_FN_1_OUT)
-
-#define GPIO_NR_HTCBEETLES_COM_RXD_MD (34 | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_HTCBEETLES_COM_CTS_MD (35 | GPIO_ALT_FN_1_IN)
-
-#define GPIO_NR_HTCBEETLES_COM_TXD_MD (39 | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_HTCBEETLES_COM_RTS_MD (41 | GPIO_ALT_FN_2_OUT)
-
-#define GPIO_NR_HTCBEETLES_BT_RXD_MD (42 | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_HTCBEETLES_BT_TXD_MD (43 | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_HTCBEETLES_BT_UART_CTS_MD (44 | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_HTCBEETLES_BT_UART_RTS_MD (45 | GPIO_ALT_FN_2_OUT)
-
-#define GPIO_NR_HTCBEETLES_STD_RXD_MD (46 | GPIO_ALT_FN_2_IN)
-#define GPIO_NR_HTCBEETLES_STD_TXD_MD (47 | GPIO_ALT_FN_1_OUT)
-
-#define GPIO_NR_HTCBEETLES_POE_N_MD (48 | GPIO_ALT_FN_2_OUT | GPIO_DFLT_HIGH)
-#define GPIO_NR_HTCBEETLES_PWE_N_MD (49 | GPIO_ALT_FN_2_OUT | GPIO_DFLT_HIGH)
-
-#define GPIO_NR_HTCBEETLES_I2S_SYSCLK_MD (113 | GPIO_ALT_FN_1_OUT)
-
-#define GPIO_NR_HTCBEETLES_PWM1OUT_MD (115 | GPIO_ALT_FN_3_OUT)
-
-#define GPIO_NR_HTCBEETLES_I2C_SCL_MD (117 | GPIO_ALT_FN_1_OUT)
-#define GPIO_NR_HTCBEETLES_I2C_SDA_MD (118 | GPIO_ALT_FN_1_OUT)
-
-#endif /* _HTCBEETLES_GPIO_H */
Deleted: linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles.h 2007-08-20 22:56:19 UTC (rev 1250)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles.h 2007-08-21 10:56:33 UTC (rev 1251)
@@ -1,3 +0,0 @@
-#include <asm/arch/irqs.h>
-
-#define HTCBEETLES_ASIC3_IRQ_BASE IRQ_BOARD_START
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
