Merge source.mvista.com:linux-omap

diff --git a/Documentation/arm/OMAP/README b/Documentation/arm/OMAP/README
index e002e324483acd3c1042a699e4f856068c1ab39a..f8ffb68e8588c5ad43a72c3534c5f963aa7c91af 100644 (file)
--- a/Documentation/arm/OMAP/README
+++ b/Documentation/arm/OMAP/README
@@ -44,7 +44,7 @@ time.
 The first step is to get a bootloader for your board, u-boot is the
 recommended one:
 
-http://sourceforge.net/projects/uboot/
+http://www.denx.de/en/Software/GIT
 
 Then you need to compile it with the same cross compiler as you would use
 for the Linux kernel. Then you need to flash it to the board either via the
@@ -52,40 +52,16 @@ serial port, or by using a JTAG.
 
 Once you have the bootloader running, you can compile the kernel.
 
-You can get the OMAP sources either from the BitKeeper tree, or by
-applying patches. The BitKeeper tree has the most up to date sources
+You can get the OMAP sources either from the OMAP GIT tree, or by
+applying patches. The OMAP GIT tree has the most up to date sources
 and is the recommended one.
 
-- Using BitKeeper:
- 
-You need to download the bk tool from:
-
-http://www.bitmover.com/
-
-Download the dynamic one (x86-glibc22-linux) instead of the static 
-(x86-static-linux). Some users reported problems with the static version.
-
-After bk tool is installed, to learn more about bitkeeper you can follow the
-tutorial at:
-
-http://www.bitkeeper.com/UG/
-
-Then you can clone OMAP Linux by:
+- Using GIT and cloning OMAP GIT tree please follow the README at:
 
-bk clone http://linux-omap.bkbits.net/main
-
-Now, you have a copy (clone) of the reprository. To work with it and to
-compile the kernel you have to check out the files from your local 
-repository by:
-
-bk -r get (or: bk -r edit)
-
-For kernel related BitKeeper information see also kernel documentation in:
-
-Documentation/BK-usage/bk-kernel-howto.txt
+http://www.muru.com/linux/omap/README_OMAP_GIT
 
 Hint: If you are sitting behind a firewall and have to use a proxy for 
-internet access, you can access BitKeeper by http by setting the 
+internet access, you can access GIT by http by setting the
 http_proxy envirionment variable:
 
 http_proxy=http://proxy_username:proxy_password@proxy_name:proxy_port/
@@ -104,7 +80,7 @@ abc.host.com: The name of your proxy you use for internet access
 
 - Using Patches:
 
-If you don't want to use BitKeeper, then you can do the same thing with patch.
+If you don't want to use GIT, then you can do the same thing with patch.
 
 Download the latest OMAP Linux patch from:
 
@@ -125,8 +101,8 @@ $ cat ../Linux-2.6.4-omap1 | patch -p1
 Note: If OMAP patch from muru.com is against a kernel release candidate, 
 marked by -rcX, then kernel can be found on kernel.org under v2.6/testing/
 
-Now, if you have a local kernel tree, either by BitKeeper or by patch, you 
-should look into arch/arm/config/ to see which of the various omap_xxx
+Now, if you have a local kernel tree, either by GIT or by patch, you
+should look into arch/arm/configs/ to see which of the various omap_xxx
 configurations there you want to use. For example, if you have a OMAP1510
 based Innovator board, you select omap_innovator_1510_defconfig by 
 
@@ -206,10 +182,13 @@ time of writing this document in March 2004 four boards are supported:
 Innovator1510 (OMAP1510 processor), Innovator1610 (OMAP1610 processor), 
 Perseus2 (OMAP730 processor) and H2 (OMAP1610 processor).
 
+Please refer http://www.muru.com/linux/omap/ to get latest information on the
+list of boards supported.
+
 /* Discussion needed: How to handle the tons of compatible processors? 
 E.g. what to do if OMAP16xx is mainly identical with OMAP16yy? */
 
-2. Start with arch/arm/mach-omap/Kconfig and add a new processor or board 
+2. Start with arch/arm/mach-omap[1/2]/Kconfig and add a new processor or board
 option.
 
 To add a new processor add a new config option to the "OMAP Core Type" choice. 
@@ -241,7 +220,7 @@ arch/arm/mm/Kconfig. E.g. ARCH_OMAP730 in CPU_ARM926T configuration.
 
 3b. Only for new boards: Register the board within ARM Linux machine 
 registration system from RMK. For the CONFIG_ section use the same name like 
-in arch/arm/mach-omap/Kconfig. E.g. MACH_OMAP_yyyy. For MACH_TYPE_ section use 
+in arch/arm/mach-omap[1/2]/Kconfig. E.g. MACH_OMAP_yyyy. For MACH_TYPE_ section use
 OMAP_yyyy where yyyy is the board name like above.
 
 Note: The elements of RMKs machine registration are used in 
@@ -262,14 +241,14 @@ Use board-yyyy.h with yyyy board name or omapxxxx.h with xxxx processor number.
 
 5. Add a processor or board specific section into include/asm-arm/arch-omap/
 hardware.h. Use examples for syntax and use CONFIG_ names as defined in 
-arch/arm/mach-omap/Kconfig.
+arch/arm/mach-omap[1/2]/Kconfig.
 
 6. Add processor or board specific macros to board-yyyy.h or omapxxxx.h. The
 macros to these specific files have to be named OMAPxxxx_ with xxxx processor
 number to make them unique.
 
 7a. Only for new boards: Add a file board-yyyy.c with yyyy board name to 
-arch/arm/mach-omap/. Put board specific initialization code and resource 
+arch/arm/mach-omap[1/2]/. Put board specific initialization code and resource
 description into this file. The first element of MACHINE_START must be equal to 
 MACH_TYPE_ section of machine registration (see arch/arm/tools/mach-types after 
 machine registration at RMKs registration system).
@@ -278,13 +257,13 @@ Put only code into this file that is board specific and not common. See other
 board files for examples.
 
 7b. Only for new processors: Add processor specific IO description and
-iotable_init() to arch/arm/mach-omap/common.c. See examples for the syntax.
+iotable_init() to arch/arm/mach-omap[1/2]/io.c. See examples for the syntax.
 
 If you have introduced new clock definition in 2., add support for this new
-clock in include/asm-arm/arch-omap/clocks.h and arch/arm/mach-omap/clocks.c.
+clock in include/asm-arm/arch-omap/clocks.h and arch/arm/mach-omap[1/2]/clocks.c.
 
 8. Only for new boards: Add "obj-$(CONFIG_MACH_OMAP_yyyy) += board-yyyy.o" with 
-yyyy board name to arch/arm/mach-omap/Makefile. This is used to compile your new
+yyyy board name to arch/arm/mach-omap[1/2]/Makefile. This is used to compile your new
 board specific initialization code from 7a.
 
 9. Check if other of the existing files have to be adjusted for the new 
@@ -292,7 +271,7 @@ processor or board. Things to check:
 
 - Pin multiplexing
 - GPIO configuration
-- Powermanagement
+- Power Management
 - Clocking
 - Interrupt controller and interrupt configuration
 - Additional board specific things (e.g. FPGAs)
@@ -431,6 +410,6 @@ add a linux-c-mode to emacs.
 
 
 ------------------------------------------------------------------
-Last modified 13. June 2004
+Last modified 15. March 2006
 The OMAP Linux Kernel Team
 Dirk Behme <dirk.behme@de.bosch.com>

diff --git a/drivers/char/omap-rtc.c b/drivers/char/omap-rtc.c
index d0e0014b705fd6aade3523b5947aff0ecab5932a..1ae41222bf7440b24e0c0d823d48f9c26dc18fe4 100644 (file)
--- a/drivers/char/omap-rtc.c
+++ b/drivers/char/omap-rtc.c
@@ -121,7 +121,7 @@ static const unsigned char days_in_mo[] =
  *     A very tiny interrupt handler. It runs with SA_INTERRUPT set.
  */
 
-static irqreturn_t rtc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t rtc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
        /*
         *      Either an alarm interrupt or update complete interrupt.

diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index 3fc037483c06afe1519295a25e8ae5311df34872..c3a750e56c430c330d4b0c586dda5823a1d2c47d 100644 (file)
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -450,7 +450,7 @@ static int menelaus_scan_bus(struct i2c_adapter *bus)
 }
 
 static struct i2c_driver menelaus_i2c_driver = {
-       .driver {
+       .driver = {
                .name           = DRIVER_NAME,
        },
        .id             = I2C_DRIVERID_MISC, /*FIXME:accroding to i2c-ids.h */

diff --git a/drivers/i2c/chips/tlv320aic23.c b/drivers/i2c/chips/tlv320aic23.c
index b62ea5318c9bbb43499c11eff5cb5b3d21f7c8db..7fdd1d3608b2c41141901acff4b79df27b0f53df 100644 (file)
--- a/drivers/i2c/chips/tlv320aic23.c
+++ b/drivers/i2c/chips/tlv320aic23.c
@@ -154,7 +154,7 @@ static int tlv320aic23_attach_adapter(struct i2c_adapter *adapter)
 }
 
 static struct i2c_driver tlv320aic23_driver = {
-       .driver {
+       .driver = {
                .name   = "OMAP+TLV320AIC23 codec",
                /*.flags        = I2C_DF_NOTIFY,*/
        },
@@ -594,7 +594,7 @@ static int audio_i2c_resume(struct platform_device *dev)
 }
 
 static struct platform_driver audio_i2c_driver = {
-       .driver {
+       .driver = {
                .owner  = THIS_MODULE,
                .name   = "audio-i2c",
        },

diff --git a/drivers/input/keyboard/innovator_ps2.c b/drivers/input/keyboard/innovator_ps2.c
index c0889dcd5b96f6827fcc0baf93081add38c8e400..c3bce96b43eba1c2a0788140c6c37df3776439f7 100644 (file)
--- a/drivers/input/keyboard/innovator_ps2.c
+++ b/drivers/input/keyboard/innovator_ps2.c
@@ -330,13 +330,10 @@ typedef struct _kdb_report_t {
 
 
 static u8 buffer[JUNO_BUFFER_SIZE];
-static u8 block[JUNO_BLOCK_SIZE];
 
 static void do_hid_tasklet(unsigned long);
 DECLARE_TASKLET(hid_tasklet, do_hid_tasklet, 0);
 static struct innovator_hid_dev *hid;
-static spinlock_t innovator_fpga_hid_lock = SPIN_LOCK_UNLOCKED;
-static atomic_t innovator_fpga_hid_busy = ATOMIC_INIT(0);
 
 struct innovator_hid_dev {
        struct input_dev mouse, keyboard;
@@ -378,12 +375,6 @@ innovator_fpga_hid_set_bits(u8 x)
        innovator_fpga_hid_frob(x, x);
 }
 
-static void
-innovator_fpga_hid_clear_bits(u8 x)
-{
-       innovator_fpga_hid_frob(x, 0);
-}
-
 static void
 SS(int value)
 {
@@ -697,13 +688,6 @@ report_async(void * p, int n)
        return ret;
 }
 
-static int
-verify_init(u8 * p)
-{
-       return (((simple_t *)p)->cmd_code == 0x01) ? 0 : -1;
-}
-
-
 /*
  * Host command helper functions:
  */
@@ -1150,7 +1134,7 @@ static void innovator_ps2_device_release(struct device *dev)
 
 static int innovator_ps2_suspend(struct device *dev, pm_message_t state)
 {
-       u8 pmcomm;
+       u8 pmcomm = 0;
 
        /*
         * Set SUS_STATE in REG_PM_COMM (Page 0 R0).  This will cause
@@ -1173,7 +1157,7 @@ static int innovator_ps2_suspend(struct device *dev, pm_message_t state)
 
 static int innovator_ps2_resume(struct device *dev)
 {
-       u8 pmcomm;
+       u8 pmcomm = 0;
 
        /*
         * Clear SUS_STATE from REG_PM_COMM (Page 0 R0).