# Unable to generate patch - multiple common ancestors exist # Origin: 56dca4ceb7b39aa4173aa1cb822c860ced2be1ec # Branch: ab399b0bedf71f61dd48a38d23bd8b65df69767c # Ancestors: # 200b7a8dc09504bc0aedac567a307a6e533f39e5 # 3ce2f76f5dfeeacd128db9e5cd6945bac0ea0b2a # # So what follows is just the textual description of changes # Unable to generate patch - multiple common ancestors exist # Author: Russell King (Thu Feb 4 18:19:04 GMT 2010) # Committer: Russell King (Thu Feb 4 18:19:04 GMT 2010) # # ARM: Fix the fscking git rerere repeated fuckup # # Signed-off-by: Russell King # # arch/arm/mach-versatile/core.c | 2 ++ # 1 files changed, 2 insertions(+), 0 deletions(-) # # Author: Russell King (Thu Feb 4 18:15:51 GMT 2010) # Committer: Russell King (Thu Feb 4 18:15:51 GMT 2010) # # Merge branch 'devel-stable' into devel # # Conflicts: # arch/arm/Makefile # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Russell King (Thu Feb 4 18:15:35 GMT 2010) # Committer: Russell King (Thu Feb 4 18:15:35 GMT 2010) # # Merge branch 'versatile' into devel # # Conflicts: # arch/arm/mach-realview/core.c # arch/arm/mach-versatile/core.c # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Russell King (Thu Feb 4 18:14:58 GMT 2010) # Committer: Russell King (Thu Feb 4 18:14:58 GMT 2010) # # Merge branch 'misc' into devel # # Conflicts: # arch/arm/Kconfig # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Russell King (Thu Feb 4 18:13:43 GMT 2010) # Committer: Russell King (Thu Feb 4 18:13:43 GMT 2010) # # Merge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-streaming', 'perf', 'pnx' and 'u300' into devel # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Russell King (Thu Feb 4 18:13:17 GMT 2010) # Committer: Russell King (Thu Feb 4 18:13:17 GMT 2010) # # ARM: Fix badly placed nuc932 Kconfig entry # # Signed-off-by: Russell King # # arch/arm/Kconfig | 4 ++-- # 1 files changed, 2 insertions(+), 2 deletions(-) # # Author: Linus Walleij (Thu Feb 4 11:50:13 GMT 2010) # Committer: Russell King (Thu Feb 4 18:06:41 GMT 2010) # # ARM: 5914/1: Modify PL031 for Nomadik and U8500 v2 # # This extends the existing PrimeCell PL031 driver with support for # the ST Microelectronics and ST-Ericsson derivatives, in a first # and second version as used on the Nomadik and U8500 platforms. # It also rids the old ioctl() alarm on/off functions in favor of # the new .alarm_irq_enable field of the RTC class ops. # # Signed-off-by: Linus Walleij # Signed-off-by: Russell King # # drivers/rtc/rtc-pl031.c | 365 ++++++++++++++++++++++++++++++++++++++++++----- # 1 files changed, 327 insertions(+), 38 deletions(-) # # Author: Srinidhi Kasagar (Wed Feb 3 12:02:48 GMT 2010) # Committer: Russell King (Thu Feb 4 18:06:40 GMT 2010) # # ARM: 5913/1: ARM U8500: add I2C platform configurations # # This adds platform configurations to support four # i2c controllers found on early MOP500 platform # # This depends on the patch 5908/1 for build to succeed. # # Signed-off-by: Srinidhi Kasagar # Signed-off-by: Russell King # # arch/arm/mach-ux500/board-mop500.c | 75 ++++++++++++++++++++++++++++++++++++ # 1 files changed, 75 insertions(+), 0 deletions(-) # # Author: Srinidhi Kasagar (Mon Feb 1 13:58:22 GMT 2010) # Committer: Russell King (Thu Feb 4 18:04:50 GMT 2010) # # ARM: 5908/1: nomadik: add platform specific i2c configuration # # This adds the platform specific i2c configuration # data structures to setup the nomadik/ux500 i2c block. # # Signed-off-by: srinidhi kasagar # Signed-off-by: Russell King # # arch/arm/plat-nomadik/include/plat/i2c.h | 37 ++++++++++++++++++++++++++++++ # 1 files changed, 37 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/plat-nomadik/include/plat/i2c.h # # Author: Linus Walleij (Thu Feb 4 11:50:58 GMT 2010) # Committer: Russell King (Thu Feb 4 18:04:40 GMT 2010) # # ARM: 5915/1: Add RTC PL031 derivative platform config for ux500 # # This configures the PL031 RTC resources for ux500. # # Signed-off-by: Linus Walleij # Signed-off-by: Russell King # # arch/arm/mach-ux500/board-mop500.c | 13 +++++++++++++ # 1 files changed, 13 insertions(+), 0 deletions(-) # # Author: Tony Lindgren (Mon Feb 1 22:26:53 GMT 2010) # Committer: Russell King (Thu Feb 4 17:57:34 GMT 2010) # # ARM: 5910/1: ARM: Add tmp register for addruart and loadsp # # Otherwise more complicated uart configuration won't be possible. # We can use r1 for tmp register for both head.S and debug.S. # # NOTE: This patch depends on another patch to add the the tmp register # into all debug-macro.S files. That can be done with: # # $ sed -i -e "s/addruart,rx|addruart, rx/addruart, rx, tmp/" # arch/arm/*/include/*/debug-macro.S # # Signed-off-by: Tony Lindgren # Signed-off-by: Russell King # # arch/arm/boot/compressed/head.S | 20 ++++++++++---------- # arch/arm/kernel/debug.S | 12 ++++++------ # arch/arm/mach-aaec2000/include/mach/debug-macro.S | 2 +- # arch/arm/mach-at91/include/mach/debug-macro.S | 2 +- # arch/arm/mach-clps711x/include/mach/debug-macro.S | 2 +- # arch/arm/mach-davinci/include/mach/debug-macro.S | 2 +- # arch/arm/mach-dove/include/mach/debug-macro.S | 2 +- # arch/arm/mach-ebsa110/include/mach/debug-macro.S | 2 +- # arch/arm/mach-ep93xx/include/mach/debug-macro.S | 2 +- # .../arm/mach-footbridge/include/mach/debug-macro.S | 4 ++-- # arch/arm/mach-gemini/include/mach/debug-macro.S | 2 +- # arch/arm/mach-h720x/include/mach/debug-macro.S | 2 +- # .../arm/mach-integrator/include/mach/debug-macro.S | 2 +- # arch/arm/mach-iop13xx/include/mach/debug-macro.S | 2 +- # arch/arm/mach-iop32x/include/mach/debug-macro.S | 2 +- # arch/arm/mach-iop33x/include/mach/debug-macro.S | 2 +- # arch/arm/mach-ixp2000/include/mach/debug-macro.S | 2 +- # arch/arm/mach-ixp23xx/include/mach/debug-macro.S | 2 +- # arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 2 +- # arch/arm/mach-kirkwood/include/mach/debug-macro.S | 2 +- # arch/arm/mach-ks8695/include/mach/debug-macro.S | 2 +- # arch/arm/mach-l7200/include/mach/debug-macro.S | 2 +- # arch/arm/mach-lh7a40x/include/mach/debug-macro.S | 2 +- # arch/arm/mach-loki/include/mach/debug-macro.S | 2 +- # arch/arm/mach-mmp/include/mach/debug-macro.S | 2 +- # arch/arm/mach-msm/include/mach/debug-macro.S | 4 ++-- # arch/arm/mach-mv78xx0/include/mach/debug-macro.S | 2 +- # arch/arm/mach-netx/include/mach/debug-macro.S | 2 +- # arch/arm/mach-nomadik/include/mach/debug-macro.S | 2 +- # arch/arm/mach-ns9xxx/include/mach/debug-macro.S | 2 +- # arch/arm/mach-omap1/include/mach/debug-macro.S | 2 +- # arch/arm/mach-omap2/include/mach/debug-macro.S | 2 +- # arch/arm/mach-orion5x/include/mach/debug-macro.S | 2 +- # arch/arm/mach-pnx4008/include/mach/debug-macro.S | 2 +- # arch/arm/mach-pxa/include/mach/debug-macro.S | 2 +- # arch/arm/mach-realview/include/mach/debug-macro.S | 2 +- # arch/arm/mach-rpc/include/mach/debug-macro.S | 2 +- # arch/arm/mach-s3c2410/include/mach/debug-macro.S | 2 +- # arch/arm/mach-s3c24a0/include/mach/debug-macro.S | 2 +- # arch/arm/mach-s3c6400/include/mach/debug-macro.S | 2 +- # arch/arm/mach-s5pc100/include/mach/debug-macro.S | 2 +- # arch/arm/mach-sa1100/include/mach/debug-macro.S | 2 +- # arch/arm/mach-shark/include/mach/debug-macro.S | 2 +- # arch/arm/mach-u300/include/mach/debug-macro.S | 2 +- # arch/arm/mach-ux500/include/mach/debug-macro.S | 2 +- # arch/arm/mach-versatile/include/mach/debug-macro.S | 2 +- # arch/arm/plat-mxc/include/mach/debug-macro.S | 2 +- # arch/arm/plat-stmp3xxx/include/mach/debug-macro.S | 2 +- # 48 files changed, 64 insertions(+), 64 deletions(-) # # Author: Russell King (Thu Feb 4 17:55:27 GMT 2010) # Committer: Russell King (Thu Feb 4 17:55:27 GMT 2010) # # Merge commit '200b7a8' into misc # # Conflicts: # arch/arm/Kconfig # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Daniel Jacobowitz (Tue Feb 2 17:22:16 GMT 2010) # Committer: Russell King (Thu Feb 4 17:52:24 GMT 2010) # # ARM: 5912/1: Define a 32-bit Thumb-2 breakpoint instruction # # Recognize 0xf7f0 0xa000 as a 32-bit breakpoint instruction for # Thumb-2. # # Signed-off-by: Daniel Jacobowitz # Signed-off-by: Russell King # # arch/arm/kernel/ptrace.c | 31 +++++++++++++++++++++++++++++++ # 1 files changed, 31 insertions(+), 0 deletions(-) # # Author: Tony Lindgren (Mon Feb 1 22:30:26 GMT 2010) # Committer: Russell King (Thu Feb 4 17:52:23 GMT 2010) # # ARM: 5911/1: ARM: Select CPU_32v6K for CPU_V7 only if ARCH_OMAP2 is not selected # # Otherwise the kernel built with both CPU_V6 and CPU_V7 will not # boot on omap2. # # Signed-off-by: Tony Lindgren # Signed-off-by: Russell King # # arch/arm/mm/Kconfig | 4 ++-- # 1 files changed, 2 insertions(+), 2 deletions(-) # # Author: Jean PIHET (Tue Jan 26 17:51:05 GMT 2010) # Committer: Russell King (Tue Feb 2 19:46:54 GMT 2010) # # ARM: 5903/1: arm/perfevents: add support for ARMv7 # # Adds the Performance Events support for ARMv7 processor, using # the PMNC unit in HW. # # Supports the following: # - Cortex-A8 and Cortex-A9 processors, # - dynamic detection of the number of available counters, # based on the PMCR value, # - runtime detection of the CPU arch (v6 or v7) # and model (Cortex-A8 or Cortex-A9) # # Tested on OMAP3 (Cortex-A8) only. # # Signed-off-by: Jean Pihet # Signed-off-by: Russell King # # arch/arm/Kconfig | 2 # arch/arm/kernel/perf_event.c | 936 ++++++++++++++++++++++++++++++++++++++++++ # 2 files changed, 933 insertions(+), 5 deletions(-) # # Author: Jamie Iles (Tue Feb 2 19:25:44 GMT 2010) # Committer: Russell King (Tue Feb 2 19:46:43 GMT 2010) # # ARM: 5902/4: arm/perfevents: implement perf event support for ARMv6 # # This patch implements support for ARMv6 performance counters in the # Linux performance events subsystem. ARMv6 architectures that have the # performance counters should enable HW_PERF_EVENTS to get hardware # performance events support in addition to the software events. # # Note: only ARM Ltd ARM cores are supported. # # This implementation also provides an ARM PMU abstraction layer to allow # ARMv7 and others to be supported in the future by adding new a # 'struct arm_pmu'. # # Cc: Jean Pihet # Cc: Will Deacon # Signed-off-by: Jamie Iles # Signed-off-by: Russell King # # arch/arm/Kconfig | 8 # arch/arm/kernel/Makefile | 1 # arch/arm/kernel/perf_event.c | 1348 ++++++++++++++++++++++++++++++++++++++++++ # 3 files changed, 1357 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/kernel/perf_event.c # # Author: Jamie Iles (Tue Feb 2 19:24:58 GMT 2010) # Committer: Russell King (Tue Feb 2 19:46:42 GMT 2010) # # ARM: 5900/2: arm: enable support for software perf events # # The perf events subsystem allows counting of both hardware and # software events. This patch implements the bare minimum for software # performance events. # # Cc: Peter Zijlstra # Cc: Ingo Molnar # Signed-off-by: Jamie Iles # Signed-off-by: Russell King # # arch/arm/Kconfig | 2 ++ # arch/arm/include/asm/perf_event.h | 31 +++++++++++++++++++++++++++++++ # arch/arm/mm/fault.c | 7 +++++++ # 3 files changed, 40 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/include/asm/perf_event.h # # Author: Jamie Iles (Tue Feb 2 19:24:07 GMT 2010) # Committer: Russell King (Tue Feb 2 19:46:42 GMT 2010) # # ARM: 5901/2: arm/oprofile: reserve the PMU when starting # # Make sure that we have access to the performance counters and # that they aren't being used by perf events or anything else. # # Cc: Will Deacon # Cc: Jean Pihet # Signed-off-by: Jamie Iles # Signed-off-by: Russell King # # arch/arm/oprofile/op_model_arm11_core.c | 4 +-- # arch/arm/oprofile/op_model_arm11_core.h | 4 +-- # arch/arm/oprofile/op_model_mpcore.c | 42 ++++++++++++++++--------------- # arch/arm/oprofile/op_model_v6.c | 30 ++++++++++++++-------- # arch/arm/oprofile/op_model_v7.c | 30 ++++++++++++++-------- # arch/arm/oprofile/op_model_v7.h | 4 +-- # arch/arm/oprofile/op_model_xscale.c | 35 ++++++++++++++------------ # 7 files changed, 85 insertions(+), 64 deletions(-) # # Author: Jamie Iles (Tue Feb 2 19:23:15 GMT 2010) # Committer: Russell King (Tue Feb 2 19:46:42 GMT 2010) # # ARM: 5899/2: arm: provide a mechanism to reserve performance counters # # To add support for perf events and to allow the hardware counters to be # shared with oprofile, we need a way to reserve access to the pmu # (performance monitor unit). Platforms with PMU interrupts should # register the interrupts in arch/arm/kernel/pmu.c # # Signed-off-by: Jamie Iles # Signed-off-by: Russell King # # arch/arm/Kconfig | 5 ++ # arch/arm/include/asm/pmu.h | 75 ++++++++++++++++++++++++++++++++ # arch/arm/kernel/Makefile | 1 # arch/arm/kernel/pmu.c | 103 ++++++++++++++++++++++++++++++++++++++++++++ # 4 files changed, 184 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/include/asm/pmu.h # create mode 100644 arch/arm/kernel/pmu.c # # Author: Russell King (Wed Jan 27 22:11:32 GMT 2010) # Committer: Russell King (Wed Jan 27 22:11:32 GMT 2010) # # Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Mikael Pettersson (Sat Jan 9 12:03:59 GMT 2010) # Committer: Russell King (Wed Jan 27 22:04:18 GMT 2010) # # ARM: 5869/1: ixp4xx: implement sched_clock() # # Add a better sched_clock() to the ixp4xx platform, # implemented via its clocksource support. # # This is based on the sched_clock() I implemented for # the IOP platform. Tested on a ds101 ixp420 machine. # # Signed-off-by: Mikael Pettersson # Signed-off-by: Russell King # # arch/arm/mach-ixp4xx/common.c | 11 +++++++++++ # 1 files changed, 11 insertions(+), 0 deletions(-) # # Author: Catalin Marinas (Tue Jan 26 18:09:42 GMT 2010) # Committer: Russell King (Wed Jan 27 22:03:42 GMT 2010) # # ARM: 5905/1: ARM: Global ASID allocation on SMP # # The current ASID allocation algorithm doesn't ensure the notification # of the other CPUs when the ASID rolls over. This may lead to two # processes using the same ASID (but different generation) or multiple # threads of the same process using different ASIDs. # # This patch adds the broadcasting of the ASID rollover event to the # other CPUs. To avoid a race on multiple CPUs modifying "cpu_last_asid" # during the handling of the broadcast, the ASID numbering now starts at # "smp_processor_id() + 1". At rollover, the cpu_last_asid will be set # to NR_CPUS. # # Signed-off-by: Catalin Marinas # Signed-off-by: Russell King # # arch/arm/include/asm/mmu.h | 1 # arch/arm/include/asm/mmu_context.h | 15 ++++ # arch/arm/mm/context.c | 124 ++++++++++++++++++++++++++++++++---- # 3 files changed, 126 insertions(+), 14 deletions(-) # # Author: wanzongshun (Thu Dec 31 14:06:05 GMT 2009) # Committer: Russell King (Wed Jan 27 22:03:00 GMT 2010) # # ARM: 5859/1: Add nuc93x platform support # # The previous nuc932 support patches have been discarded by me and because it belongs to # another SoCs series named nuc93x,at present, which included nuc931 and nuc932, I think it is # better to create a new mach-nuc93x,So I made the patch,and request your advice.Thanks! # # Signed-off-by: Wan ZongShun # Signed-off-by: Russell King # # arch/arm/Kconfig | 11 ++ # arch/arm/Makefile | 1 # arch/arm/mach-nuc93x/Kconfig | 19 +++ # arch/arm/mach-nuc93x/Makefile | 14 ++ # arch/arm/mach-nuc93x/Makefile.boot | 3 # arch/arm/mach-nuc93x/clock.c | 83 ++++++++++++++ # arch/arm/mach-nuc93x/clock.h | 36 ++++++ # arch/arm/mach-nuc93x/cpu.c | 135 ++++++++++++++++++++++ # arch/arm/mach-nuc93x/cpu.h | 48 ++++++++ # arch/arm/mach-nuc93x/dev.c | 42 +++++++ # arch/arm/mach-nuc93x/include/mach/clkdev.h | 7 + # arch/arm/mach-nuc93x/include/mach/entry-macro.S | 32 +++++ # arch/arm/mach-nuc93x/include/mach/hardware.h | 22 ++++ # arch/arm/mach-nuc93x/include/mach/io.h | 28 +++++ # arch/arm/mach-nuc93x/include/mach/irqs.h | 59 ++++++++++ # arch/arm/mach-nuc93x/include/mach/map.h | 139 +++++++++++++++++++++++ # arch/arm/mach-nuc93x/include/mach/memory.h | 21 +++ # arch/arm/mach-nuc93x/include/mach/regs-clock.h | 53 +++++++++ # arch/arm/mach-nuc93x/include/mach/regs-ebi.h | 33 +++++ # arch/arm/mach-nuc93x/include/mach/regs-irq.h | 42 +++++++ # arch/arm/mach-nuc93x/include/mach/regs-serial.h | 52 +++++++++ # arch/arm/mach-nuc93x/include/mach/regs-timer.h | 28 +++++ # arch/arm/mach-nuc93x/include/mach/system.h | 28 +++++ # arch/arm/mach-nuc93x/include/mach/timex.h | 25 ++++ # arch/arm/mach-nuc93x/include/mach/uncompress.h | 50 ++++++++ # arch/arm/mach-nuc93x/include/mach/vmalloc.h | 23 ++++ # arch/arm/mach-nuc93x/irq.c | 66 +++++++++++ # arch/arm/mach-nuc93x/mach-nuc932evb.c | 45 +++++++ # arch/arm/mach-nuc93x/nuc932.c | 65 +++++++++++ # arch/arm/mach-nuc93x/nuc932.h | 29 +++++ # arch/arm/mach-nuc93x/time.c | 100 +++++++++++++++++ # 31 files changed, 1339 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/mach-nuc93x/Kconfig # create mode 100644 arch/arm/mach-nuc93x/Makefile # create mode 100644 arch/arm/mach-nuc93x/Makefile.boot # create mode 100644 arch/arm/mach-nuc93x/clock.c # create mode 100644 arch/arm/mach-nuc93x/clock.h # create mode 100644 arch/arm/mach-nuc93x/cpu.c # create mode 100644 arch/arm/mach-nuc93x/cpu.h # create mode 100644 arch/arm/mach-nuc93x/dev.c # create mode 100644 arch/arm/mach-nuc93x/include/mach/clkdev.h # create mode 100644 arch/arm/mach-nuc93x/include/mach/entry-macro.S # create mode 100644 arch/arm/mach-nuc93x/include/mach/hardware.h # create mode 100644 arch/arm/mach-nuc93x/include/mach/io.h # create mode 100644 arch/arm/mach-nuc93x/include/mach/irqs.h # create mode 100644 arch/arm/mach-nuc93x/include/mach/map.h # create mode 100644 arch/arm/mach-nuc93x/include/mach/memory.h # create mode 100644 arch/arm/mach-nuc93x/include/mach/regs-clock.h # create mode 100644 arch/arm/mach-nuc93x/include/mach/regs-ebi.h # create mode 100644 arch/arm/mach-nuc93x/include/mach/regs-irq.h # create mode 100644 arch/arm/mach-nuc93x/include/mach/regs-serial.h # create mode 100644 arch/arm/mach-nuc93x/include/mach/regs-timer.h # create mode 100644 arch/arm/mach-nuc93x/include/mach/system.h # create mode 100644 arch/arm/mach-nuc93x/include/mach/timex.h # create mode 100644 arch/arm/mach-nuc93x/include/mach/uncompress.h # create mode 100644 arch/arm/mach-nuc93x/include/mach/vmalloc.h # create mode 100644 arch/arm/mach-nuc93x/irq.c # create mode 100644 arch/arm/mach-nuc93x/mach-nuc932evb.c # create mode 100644 arch/arm/mach-nuc93x/nuc932.c # create mode 100644 arch/arm/mach-nuc93x/nuc932.h # create mode 100644 arch/arm/mach-nuc93x/time.c # # Author: Linus Walleij (Mon Jan 25 06:14:46 GMT 2010) # Committer: Russell King (Wed Jan 27 22:00:47 GMT 2010) # # ARM: 5896/1: MMCI: work around a hardware bug in U300 # # In the U300 some hardware bug makes the status flag not come up # signalling a successful write (or anything else, like an error, for # that matter) on write requests. This little quirk makes the writes # work on U300. # # Signed-off-by: Linus Walleij # Signed-off-by: Russell King # # drivers/mmc/host/mmci.c | 11 +++++++++++ # 1 files changed, 11 insertions(+), 0 deletions(-) # # Author: Linus Walleij (Mon Jan 25 06:18:16 GMT 2010) # Committer: Russell King (Wed Jan 27 22:00:47 GMT 2010) # # ARM: 5895/2: Alter name of U300 watchdog resource # # This changes the bus name of the U300 watchdog from just "wdog" # to "coh901327_wdog" which is used to match the corresponding # driver. This makes the watchdog probe properly. # # Signed-off-by: Linus Walleij # Signed-off-by: Russell King # # arch/arm/mach-u300/core.c | 4 ++-- # 1 files changed, 2 insertions(+), 2 deletions(-) # # Author: Linus Walleij (Fri Jan 22 12:53:30 GMT 2010) # Committer: Russell King (Wed Jan 27 22:00:46 GMT 2010) # # ARM: 5893/1: SPI AMBA PL022: Limit TX FIFO fills # # Added logic to cap TX FIFO fill size based on current free RX # FIFO entries instead of TX status flags. This is to prevent # an issue with RX FIFO overflows. # # Signed-off-by: Kevin Wells # Signed-off-by: Linus Walleij # Signed-off-by: Russell King # # drivers/spi/amba-pl022.c | 18 ++++++++++++------ # 1 files changed, 12 insertions(+), 6 deletions(-) # # Author: Linus Walleij (Thu Dec 17 08:46:24 GMT 2009) # Committer: Russell King (Wed Jan 27 22:00:15 GMT 2010) # # ARM: 5852/1: Add COH 901 318 DMA driver platform config for U300 # # This adds platform configuration for the COH 901 318 DMA driver # for the U300 series mobile platforms. # # Signed-off-by: Linus Walleij # Signed-off-by: Russell King # # arch/arm/mach-u300/core.c | 1039 ++++++++++++++++++++++++ # arch/arm/mach-u300/include/mach/dma_channels.h | 69 ++ # 2 files changed, 1108 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/mach-u300/include/mach/dma_channels.h # # Author: Jeremy Kerr (Wed Jan 27 00:13:31 GMT 2010) # Committer: Russell King (Wed Jan 27 21:58:21 GMT 2010) # # ARM: 5906/1: arm: change command_line to cmd_line # # drivers/of/fdt expects a cmd_line symbol, while arm uses command_line. # Change to the former, so that we can eventually share with the fdt # code. # # Signed-off-by: Jeremy Kerr # Signed-off-by: Russell King # # arch/arm/kernel/setup.c | 8 ++++---- # 1 files changed, 4 insertions(+), 4 deletions(-) # # Author: Ben Dooks (Mon Jan 25 01:39:23 GMT 2010) # Committer: Ben Dooks (Tue Jan 26 00:50:04 GMT 2010) # # ARM: SAMSUNG: Fix bad use of __initdata for s3c_register_clocks() # # Functions should be marked __init, not __initdata. # # Signed-off-by: Ben Dooks # # arch/arm/plat-samsung/clock.c | 2 +- # 1 files changed, 1 insertions(+), 1 deletions(-) # # Author: Maurus Cuelenaere (Fri Jan 22 22:29:16 GMT 2010) # Committer: Ben Dooks (Tue Jan 26 00:50:03 GMT 2010) # # ARM: SAMSUNG: Fix null pointer dereference in ADC driver # # ARM: SAMSUNG: Fix null pointer dereference in ADC driver # # Use struct adc_device instead of relying on client (which could be # NULL) when checking for SoC type. # # Signed-off-by: Maurus Cuelenaere # Signed-off-by: Ben Dooks # # arch/arm/plat-samsung/adc.c | 2 +- # 1 files changed, 1 insertions(+), 1 deletions(-) # # Author: Thomas Abraham (Fri Jan 22 01:50:42 GMT 2010) # Committer: Ben Dooks (Tue Jan 26 00:50:01 GMT 2010) # # ARM: S5PV210: Add serial port support # # This patch adds UART serial port support for S5PV210. # # Signed-off-by: Thomas Abraham # Signed-off-by: Kukjin Kim # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c/include/plat/regs-serial.h | 30 +++++ # drivers/serial/Kconfig | 9 +- # drivers/serial/Makefile | 1 # drivers/serial/s5pv210.c | 154 ++++++++++++++++++++++++++ # 4 files changed, 193 insertions(+), 1 deletions(-) # create mode 100644 drivers/serial/s5pv210.c # # Author: Will Deacon (Wed Jan 20 18:06:26 GMT 2010) # Committer: Russell King (Mon Jan 25 21:15:25 GMT 2010) # # ARM: 5890/1: Fix incorrect Realview board IRQs for L220 and PMU # # In anticipation of PMU support for Realview boards, the IRQs defined # for some of these boards need updating. # # This patch removes incorrect L220 IRQ definitions, corrects incorrect PMU # IRQs and adds any missing IRQs that are required. # # Signed-off-by: Will Deacon # Signed-off-by: Russell King # # arch/arm/mach-realview/include/mach/irqs-pb1176.h | 1 + # arch/arm/mach-realview/include/mach/irqs-pba8.h | 8 ++------ # arch/arm/mach-realview/include/mach/irqs-pbx.h | 14 ++++---------- # 3 files changed, 7 insertions(+), 16 deletions(-) # # Author: Ryan Mallon (Fri Jan 22 00:42:02 GMT 2010) # Committer: Russell King (Mon Jan 25 21:14:29 GMT 2010) # # ARM: 5892/1: ep93xx: Add support for Simplemachines Sim.One board # # Add support for the Simplemachines EP9307 based Sim.One board. # # Cc: Hartley Sweeten # Cc: Sergio Sorrenti # Signed-off-by: Ryan Mallon # Acked-by: Hartley Sweeten # Signed-off-by: Russell King # # arch/arm/mach-ep93xx/Kconfig | 7 +++ # arch/arm/mach-ep93xx/Makefile | 1 # arch/arm/mach-ep93xx/simone.c | 97 +++++++++++++++++++++++++++++++++++++++++ # 3 files changed, 105 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/mach-ep93xx/simone.c # # Author: Will Deacon (Wed Jan 20 18:05:07 GMT 2010) # Committer: Russell King (Mon Jan 25 21:13:31 GMT 2010) # # ARM: 5889/1: Add atomic64 routines for ARMv6k and above. # # In preparation for perf-events support, ARM needs to support atomic64_t # operations. v6k and above support the ldrexd and strexd instructions to # do just that. # # This patch adds atomic64 support to the ARM architecture. v6k and above # make use of new instructions whilst older cores fall back on the generic # solution using spinlocks. If and when v7-M cores are supported by Linux, # they will need to fall back on the spinlock implementation too. # # Signed-off-by: Will Deacon # Acked-by: Catalin Marinas # Signed-off-by: Russell King # # arch/arm/Kconfig | 1 # arch/arm/include/asm/atomic.h | 228 +++++++++++++++++++++++++++++++++++++++++ # 2 files changed, 229 insertions(+), 0 deletions(-) # # Author: Rabin Vincent (Mon Jan 25 18:43:03 GMT 2010) # Committer: Russell King (Mon Jan 25 21:13:31 GMT 2010) # # ARM: 5897/1: spinlock: don't use deprecated barriers on ARMv7 # # On ARMv7, the use of the cp15 operations for barriers is deprecated # in favour of the isb, dsb, and dmb instructions. Change the locking # functions to use the appropriate type of dsb for the architecture # being built for. # # Signed-off-by: Rabin Vincent # Signed-off-by: Russell King # # arch/arm/include/asm/spinlock.h | 36 +++++++++++++++++++++++------------- # 1 files changed, 23 insertions(+), 13 deletions(-) # # Author: Ben Dooks (Wed Jan 20 06:09:40 GMT 2010) # Committer: Ben Dooks (Thu Jan 21 10:17:33 GMT 2010) # # ARM: S5P6440: Add HSMMC and OTG base addresses to map.h # # Add the HSOTG and HSMMC block addresses to the map.h file. # # Signed-off-by: Ben Dooks # # arch/arm/mach-s5p6440/include/mach/map.h | 8 ++++++++ # 1 files changed, 8 insertions(+), 0 deletions(-) # # Author: Ben Dooks (Thu Jan 21 04:31:38 GMT 2010) # Committer: Ben Dooks (Thu Jan 21 05:24:52 GMT 2010) # # ARM: S3C64XX: Tidy up common code in s3c64xx_spi_set_info() # # The s3c64xx_spi_set_info() sets one of two platform data structures depending # on which controller is being specified. Change to taking a pointer to the # relevant platform data structure and then having one set of code to place # the data into the area being pointed to. # # Cc: Jassi Brar # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c64xx/dev-spi.c | 15 +++++++++------ # 1 files changed, 9 insertions(+), 6 deletions(-) # # Author: Maurus Cuelenaere (Thu Jan 21 00:37:28 GMT 2010) # Committer: Ben Dooks (Thu Jan 21 04:55:16 GMT 2010) # # ARM: S3C64XX: Fix typo in s3c-hsotg platform data # # ARM: S3C64XX: Fix typo in s3c-hsotg platform data # # Signed-off-by: Maurus Cuelenaere # Signed-off-by: Ben Dooks # # arch/arm/plat-samsung/include/plat/udc-hs.h | 4 ++-- # 1 files changed, 2 insertions(+), 2 deletions(-) # # Author: Mark Brown (Wed Jan 20 13:06:05 GMT 2010) # Committer: Ben Dooks (Thu Jan 21 04:55:15 GMT 2010) # # ARM: SAMSUNG: Staticise gpiolib implementation functions # # They are not exported, they are referenced via vtables. # # Signed-off-by: Mark Brown # Signed-off-by: Ben Dooks # # arch/arm/plat-samsung/gpiolib.c | 16 +++++++++------- # 1 files changed, 9 insertions(+), 7 deletions(-) # # Author: Mark Brown (Wed Jan 20 13:06:04 GMT 2010) # Committer: Ben Dooks (Thu Jan 21 04:55:15 GMT 2010) # # ARM: S3C64XX: Staticise audio platform data # # It's not exported. # # Signed-off-by: Mark Brown # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c64xx/dev-audio.c | 6 +++--- # 1 files changed, 3 insertions(+), 3 deletions(-) # # Author: Mark Brown (Wed Jan 20 12:05:55 GMT 2010) # Committer: Ben Dooks (Thu Jan 21 04:55:15 GMT 2010) # # ARM: S3C64XX: Fix dev-audio build # # As reported when the patch was posted commit 71269364 ("ARM: S3C64XX: # Add I2S resources in platform code") uses pin names for the IISv4 # data output pins which are not present in mainline, causing dev-audio # to fail to build. Fix this by using the defines which are actually # present in the kernel source. # # Signed-off-by: Mark Brown # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c64xx/dev-audio.c | 6 +++--- # 1 files changed, 3 insertions(+), 3 deletions(-) # # Author: Mark Brown (Tue Jan 19 15:26:56 GMT 2010) # Committer: Ben Dooks (Thu Jan 21 04:55:15 GMT 2010) # # ARM: SMDK6410: Set up interrupt range for WM835x on 1190-EV1 PMIC board # # The WM835x driver won't actually use this yet but it will in the # future when the changes converting it to genirq are merged. # # Signed-off-by: Mark Brown # Signed-off-by: Ben Dooks # # arch/arm/mach-s3c6410/mach-smdk6410.c | 1 + # arch/arm/plat-s3c64xx/include/plat/irqs.h | 4 ++++ # 2 files changed, 5 insertions(+), 0 deletions(-) # # Author: Ben Dooks (Wed Jan 20 03:29:25 GMT 2010) # Committer: Ben Dooks (Thu Jan 21 04:45:58 GMT 2010) # # ARM: SAMSUNG: Move pm-check.c to plat-samsung # # Move the pm-check.c file to plat-samsung for all Samsung SoC users, and # update Kconfig names to make them SAMSUNG_ instead of S3C2410_ # # Sed expresions used to make the change: # # s/S3C2410_PM_DEBUG/SAMSUNG_PM_DEBUG/g # s/S3C2410_PM_CHECK/SAMSUNG_PM_CHECK/g # # Signed-off-by: Ben Dooks # # arch/arm/configs/mini2440_defconfig | 4 ++- # arch/arm/configs/s3c2410_defconfig | 4 ++- # arch/arm/plat-s3c/Kconfig | 44 ---------------------------------- # arch/arm/plat-s3c/Makefile | 1 - # arch/arm/plat-s3c/include/plat/pm.h | 4 ++- # arch/arm/plat-s3c/pm.c | 6 ++--- # arch/arm/plat-samsung/Kconfig | 45 +++++++++++++++++++++++++++++++++++ # arch/arm/plat-samsung/Makefile | 1 + # arch/arm/plat-samsung/pm-check.c | 8 +++--- # 9 files changed, 59 insertions(+), 58 deletions(-) # rename arch/arm/{plat-s3c/pm-check.c => plat-samsung/pm-check.c} (95%) # # Author: Ben Dooks (Wed Jan 20 03:22:24 GMT 2010) # Committer: Ben Dooks (Thu Jan 21 04:45:57 GMT 2010) # # ARM: SAMSUNG: Move pmw.c to plat-samsung # # Move the PWM driver support to plat-samsung, as these PWM blocks are # close enough across the current range to be supported by this driver. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c/Makefile | 4 ---- # arch/arm/plat-samsung/Makefile | 4 ++++ # arch/arm/plat-samsung/pwm.c | 0 # 3 files changed, 4 insertions(+), 4 deletions(-) # rename arch/arm/{plat-s3c/pwm.c => plat-samsung/pwm.c} (100%) # # Author: Ben Dooks (Wed Jan 20 02:09:28 GMT 2010) # Committer: Ben Dooks (Thu Jan 21 04:45:51 GMT 2010) # # ARM: SAMSUNG: Move more support into plat-samsung # # Move header files which are not likely to be touched in # any further support addition out of plat-s3c's include # directory into plat-samsung. # # Signed-off-by: Ben Dooks # # arch/arm/plat-samsung/include/plat/dma-core.h | 0 # arch/arm/plat-samsung/include/plat/hwmon.h | 0 # arch/arm/plat-samsung/include/plat/iic-core.h | 0 # arch/arm/plat-samsung/include/plat/iic.h | 0 # arch/arm/plat-samsung/include/plat/nand.h | 0 # arch/arm/plat-samsung/include/plat/regs-ac97.h | 0 # arch/arm/plat-samsung/include/plat/regs-adc.h | 0 # arch/arm/plat-samsung/include/plat/regs-iic.h | 0 # arch/arm/plat-samsung/include/plat/regs-irqtype.h | 0 # arch/arm/plat-samsung/include/plat/regs-nand.h | 0 # arch/arm/plat-samsung/include/plat/regs-rtc.h | 0 # .../plat-samsung/include/plat/regs-s3c2412-iis.h | 0 # arch/arm/plat-samsung/include/plat/regs-sdhci.h | 0 # arch/arm/plat-samsung/include/plat/regs-timer.h | 0 # .../plat-samsung/include/plat/regs-usb-hsotg-phy.h | 0 # .../arm/plat-samsung/include/plat/regs-usb-hsotg.h | 0 # arch/arm/plat-samsung/include/plat/regs-watchdog.h | 0 # arch/arm/plat-samsung/include/plat/sdhci.h | 0 # arch/arm/plat-samsung/include/plat/udc-hs.h | 0 # .../arm/plat-samsung/include/plat/watchdog-reset.h | 0 # 20 files changed, 0 insertions(+), 0 deletions(-) # rename arch/arm/{plat-s3c/include/plat/dma-core.h => plat-samsung/include/plat/dma-core.h} (100%) # rename arch/arm/{plat-s3c/include/plat/hwmon.h => plat-samsung/include/plat/hwmon.h} (100%) # rename arch/arm/{plat-s3c/include/plat/iic-core.h => plat-samsung/include/plat/iic-core.h} (100%) # rename arch/arm/{plat-s3c/include/plat/iic.h => plat-samsung/include/plat/iic.h} (100%) # rename arch/arm/{plat-s3c/include/plat/nand.h => plat-samsung/include/plat/nand.h} (100%) # rename arch/arm/{plat-s3c/include/plat/regs-ac97.h => plat-samsung/include/plat/regs-ac97.h} (100%) # rename arch/arm/{plat-s3c/include/plat/regs-adc.h => plat-samsung/include/plat/regs-adc.h} (100%) # rename arch/arm/{plat-s3c/include/plat/regs-iic.h => plat-samsung/include/plat/regs-iic.h} (100%) # rename arch/arm/{plat-s3c/include/plat/regs-irqtype.h => plat-samsung/include/plat/regs-irqtype.h} (100%) # rename arch/arm/{plat-s3c/include/plat/regs-nand.h => plat-samsung/include/plat/regs-nand.h} (100%) # rename arch/arm/{plat-s3c/include/plat/regs-rtc.h => plat-samsung/include/plat/regs-rtc.h} (100%) # rename arch/arm/{plat-s3c/include/plat/regs-s3c2412-iis.h => plat-samsung/include/plat/regs-s3c2412-iis.h} (100%) # rename arch/arm/{plat-s3c/include/plat/regs-sdhci.h => plat-samsung/include/plat/regs-sdhci.h} (100%) # rename arch/arm/{plat-s3c/include/plat/regs-timer.h => plat-samsung/include/plat/regs-timer.h} (100%) # rename arch/arm/{plat-s3c/include/plat/regs-usb-hsotg-phy.h => plat-samsung/include/plat/regs-usb-hsotg-phy.h} (100%) # rename arch/arm/{plat-s3c/include/plat/regs-usb-hsotg.h => plat-samsung/include/plat/regs-usb-hsotg.h} (100%) # rename arch/arm/{plat-s3c/include/plat/regs-watchdog.h => plat-samsung/include/plat/regs-watchdog.h} (100%) # rename arch/arm/{plat-s3c/include/plat/sdhci.h => plat-samsung/include/plat/sdhci.h} (100%) # rename arch/arm/{plat-s3c/include/plat/udc-hs.h => plat-samsung/include/plat/udc-hs.h} (100%) # rename arch/arm/{plat-s3c/include/plat/watchdog-reset.h => plat-samsung/include/plat/watchdog-reset.h} (100%) # # Author: Russell King (Wed Jan 20 17:02:54 GMT 2010) # Committer: Russell King (Wed Jan 20 17:02:54 GMT 2010) # # ARM: add notify_die() support # # Kernel debuggers want to be informed of die() events, so that they # can take some action to allow the problem to be inspected. Provide # the hook in a similar manner to x86. # # Note that we currently don't implement the individual trap hooks. # # Acked-by: Jason Wessel # Signed-off-by: Russell King # # arch/arm/include/asm/system.h | 3 +-- # arch/arm/kernel/traps.c | 35 +++++++++++++++++++++++++---------- # 2 files changed, 26 insertions(+), 12 deletions(-) # # Author: Andrew Victor (Tue Dec 15 21:00:18 GMT 2009) # Committer: Russell King (Wed Jan 20 12:36:27 GMT 2010) # # ARM: 5851/1: [AT91] AT572D940HF-EK board support # # Add support for the Atmel AT572D940HF-EK board (development board for # the AT572D940HF processor). # # Signed-off-by: Antonio R. Costa # Signed-off-by: Andrew Victor # Signed-off-by: Russell King # # arch/arm/configs/at572d940hfek_defconfig | 1640 +++++++++++++++++++++++++++++ # arch/arm/mach-at91/Kconfig | 17 # arch/arm/mach-at91/Makefile | 3 # arch/arm/mach-at91/board-at572d940hf_ek.c | 328 ++++++ # 4 files changed, 1988 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/configs/at572d940hfek_defconfig # create mode 100644 arch/arm/mach-at91/board-at572d940hf_ek.c # # Author: Andrew Victor (Tue Dec 15 20:57:27 GMT 2009) # Committer: Russell King (Wed Jan 20 12:34:06 GMT 2010) # # ARM: 5850/1: [AT91] AT572D940HF processor support # # Add support for the Atmel AT572D940HF processor (DIOPSIS range). # This processor integrates an ARM926 core, a DSP and the SoC # peripherals usually found on an AT91 processor (USART, SSC, SPI, TWI, # CAN, etc) # # Signed-off-by: Antonio R. Costa # Signed-off-by: Andrew Victor # Signed-off-by: Russell King # # arch/arm/mach-at91/Kconfig | 6 # arch/arm/mach-at91/Makefile | 1 # arch/arm/mach-at91/at572d940hf.c | 377 ++++++++ # arch/arm/mach-at91/at572d940hf_devices.c | 970 ++++++++++++++++++++ # arch/arm/mach-at91/clock.c | 8 # arch/arm/mach-at91/clock.h | 2 # arch/arm/mach-at91/generic.h | 2 # arch/arm/mach-at91/include/mach/at572d940hf.h | 123 +++ # .../mach-at91/include/mach/at572d940hf_matrix.h | 123 +++ # arch/arm/mach-at91/include/mach/at91_pmc.h | 1 # arch/arm/mach-at91/include/mach/board.h | 5 # arch/arm/mach-at91/include/mach/cpu.h | 8 # arch/arm/mach-at91/include/mach/hardware.h | 2 # arch/arm/mach-at91/include/mach/timex.h | 5 # 14 files changed, 1628 insertions(+), 5 deletions(-) # create mode 100644 arch/arm/mach-at91/at572d940hf.c # create mode 100644 arch/arm/mach-at91/at572d940hf_devices.c # create mode 100644 arch/arm/mach-at91/include/mach/at572d940hf.h # create mode 100644 arch/arm/mach-at91/include/mach/at572d940hf_matrix.h # # Author: Hartley Sweeten (Tue Jan 12 18:09:12 GMT 2010) # Committer: Russell King (Wed Jan 20 12:28:29 GMT 2010) # # ARM: 5881/1: vic.c: reorganize code # # This reorganizes the vic.c code in anticipation of a second patch # to use struct vic_device as the data stored in set_irq_chip_data(). # # The code now has the following flow: # # 1) struct vic_device definition, static variables, and to_vic() # moved to the start of the code. # 2) common code (vic_init2) # 3) vic power management callbacks # 4) vic power management initialization/registration # 5) irq_chip callbacks # 6) vendor specific vic initialization # 7) vic initialization # # In addition the typo vik_init_st is fixed (vic_init_st). # # There is no functional change with this patch. # # Tested-by: Linus Walleij # Cc: Ben Dooks # Cc: Alessandro Rubini # # Comments from Hartley Sweeten: # # Please change from Cc to: # Tested-by: Alessandro Rubini # Signed-off-by: H Hartley Sweeten # Signed-off-by: Russell King # # arch/arm/common/vic.c | 265 ++++++++++++++++++++++++------------------------- # 1 files changed, 132 insertions(+), 133 deletions(-) # # Author: Ben Dooks (Tue Jan 19 09:53:46 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 09:53:46 GMT 2010) # # ARM: Merge next-samsung-s5p6440-iodec # # Merge branch 'next-samsung-s5p6440-iodec' into next-samsung-try10 # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Ben Dooks (Mon Nov 23 23:32:31 GMT 2009) # Committer: Ben Dooks (Tue Jan 19 09:53:19 GMT 2010) # # ARM: SAMSUNG: Add initial documentation directory and overview # # Start Documentation/arm/Samsung and add an initial overview file # which whilst is not complete, is better than nothing. # # Signed-off-by: Ben Dooks # # Documentation/arm/Samsung/Overview.txt | 86 ++++++++++++++++++++++++++++++++ # 1 files changed, 86 insertions(+), 0 deletions(-) # create mode 100644 Documentation/arm/Samsung/Overview.txt # # Author: Kukjin Kim (Tue Jan 19 02:21:39 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 09:52:54 GMT 2010) # # ARM: S5P6440: Add IO descriptor for ChipID block. # # This patch adds the IO descriptor for ChipID block in S5P6440. # # Signed-off-by: Kukjin Kim # Signed-off-by: Ben Dooks # # arch/arm/mach-s5p6440/include/mach/map.h | 5 +++++ # 1 files changed, 5 insertions(+), 0 deletions(-) # # Author: Ben Dooks (Tue Jan 19 08:14:46 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 09:46:02 GMT 2010) # # ARM: SAMSUNG: Remove empty gpio-core.h and use central plat/gpio-core.h # # Rename mach-s3c2410/include/mach/gpio-core.h to mach/gpio-track.h so that # it can be included by when needed. # # Eliminate all other empty gpio-core.h files and just include the # as necessary. # # Signed-off-by: Ben Dooks # # arch/arm/mach-s3c2410/include/mach/gpio-track.h | 1 - # arch/arm/mach-s3c6400/include/mach/gpio-core.h | 21 --------------------- # arch/arm/mach-s5p6440/include/mach/gpio-core.h | 19 ------------------- # arch/arm/mach-s5pc100/include/mach/gpio-core.h | 21 --------------------- # arch/arm/plat-s3c24xx/gpiolib.c | 2 +- # arch/arm/plat-s3c64xx/gpiolib.c | 2 +- # arch/arm/plat-s5pc1xx/gpio-config.c | 2 +- # arch/arm/plat-s5pc1xx/gpiolib.c | 2 +- # arch/arm/plat-samsung/gpio-config.c | 2 +- # arch/arm/plat-samsung/gpio.c | 2 +- # arch/arm/plat-samsung/include/plat/gpio-core.h | 2 ++ # arch/arm/plat-samsung/pm-gpio.c | 2 +- # 12 files changed, 9 insertions(+), 69 deletions(-) # rename arch/arm/mach-s3c2410/include/mach/{gpio-core.h => gpio-track.h} (96%) # delete mode 100644 arch/arm/mach-s3c6400/include/mach/gpio-core.h # delete mode 100644 arch/arm/mach-s5p6440/include/mach/gpio-core.h # delete mode 100644 arch/arm/mach-s5pc100/include/mach/gpio-core.h # # Author: Ben Dooks (Mon Jan 18 09:00:55 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 09:37:19 GMT 2010) # # ARM: SAMSUNG: Move GPIO headers to plat-samsung # # Move the GPIO and GPIO configuration headers into arch/arm/plat-samsung # as they are common to all the Samsung SoCs. # # Signed-off-by: Ben Dooks # # .../plat-samsung/include/plat/gpio-cfg-helpers.h | 0 # arch/arm/plat-samsung/include/plat/gpio-cfg.h | 0 # arch/arm/plat-samsung/include/plat/gpio-core.h | 0 # 3 files changed, 0 insertions(+), 0 deletions(-) # rename arch/arm/{plat-s3c/include/plat/gpio-cfg-helpers.h => plat-samsung/include/plat/gpio-cfg-helpers.h} (100%) # rename arch/arm/{plat-s3c/include/plat/gpio-cfg.h => plat-samsung/include/plat/gpio-cfg.h} (100%) # rename arch/arm/{plat-s3c/include/plat/gpio-core.h => plat-samsung/include/plat/gpio-core.h} (100%) # # Author: Ben Dooks (Mon Jan 18 02:22:38 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 09:37:19 GMT 2010) # # ARM: SAMSUNG: Move gpiolib support in gpio.c to plat-samsung # # Move the gpio.c code containing the core gpiolib and GPIO support to # plat-samsung from plat-s3c as it is used by all current Samsung SoCs. # # Note, we didn't move this to gpiolib.c as it contains code that is not # strictly for gpiolib support and the 4bit code is already called gpiolib.c # so make the change easier by not renaming both files in one go. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c/Makefile | 1 - # arch/arm/plat-samsung/Makefile | 1 + # arch/arm/plat-samsung/gpio.c | 0 # 3 files changed, 1 insertions(+), 1 deletions(-) # rename arch/arm/{plat-s3c/gpio.c => plat-samsung/gpio.c} (100%) # # Author: Ben Dooks (Mon Jan 18 01:47:45 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 09:37:19 GMT 2010) # # ARM: SAMSUNG: Move pm-gpio into plat-samsung # # Move the pm-gpio code into plat-samsung. # # Note, this should be changed later to properly compile the 4bit code if # the 4bit settings are enabled. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c/Makefile | 1 - # arch/arm/plat-samsung/Makefile | 4 ++++ # arch/arm/plat-samsung/pm-gpio.c | 0 # 3 files changed, 4 insertions(+), 1 deletions(-) # rename arch/arm/{plat-s3c/pm-gpio.c => plat-samsung/pm-gpio.c} (100%) # # Author: Kukjin Kim (Tue Jan 19 06:31:17 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 09:37:18 GMT 2010) # # ARM: S5P6440: Add S5P6440 GPIO support # # This patch adds Samsung's S5P6440 GPIO support. # # Signed-off-by: Adityapratap Sharma # Signed-off-by: Atul Dahiya # Signed-off-by: Kukjin Kim # Signed-off-by: Ben Dooks # # arch/arm/mach-s5p6440/Makefile | 2 # arch/arm/mach-s5p6440/include/mach/regs-gpio.h | 54 ++++ # arch/arm/mach-s5p6440/s5p6440-gpio.c | 322 ++++++++++++++++++++++++ # arch/arm/plat-s5p/Kconfig | 4 # 4 files changed, 381 insertions(+), 1 deletions(-) # create mode 100644 arch/arm/mach-s5p6440/include/mach/regs-gpio.h # create mode 100644 arch/arm/mach-s5p6440/s5p6440-gpio.c # # Author: Kukjin Kim (Tue Jan 19 06:30:54 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 09:37:18 GMT 2010) # # ARM: SAMSUNG: Move GPIO common functions to plat-samsung # # This patch moves GPIO common functions (from plat-s3c64xx) into plat-samsung. # and adds the config option to build the plat-samsung/gpiolib for Samsung SoCs. # # Signed-off-by: Adityapratap Sharma # Signed-off-by: Atul Dahiya # Signed-off-by: Kukjin Kim # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c/include/plat/gpio-core.h | 28 ++++ # arch/arm/plat-s3c64xx/Kconfig | 1 # arch/arm/plat-s3c64xx/gpiolib.c | 162 ----------------------- # arch/arm/plat-samsung/Kconfig | 7 + # arch/arm/plat-samsung/Makefile | 1 # arch/arm/plat-samsung/gpiolib.c | 197 ++++++++++++++++++++++++++++ # 6 files changed, 236 insertions(+), 160 deletions(-) # create mode 100644 arch/arm/plat-samsung/gpiolib.c # # Author: Ben Dooks (Tue Jan 19 09:36:16 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 09:36:16 GMT 2010) # # ARM: Merge next-samsung-serial1 # # Merge branch 'next-samsung-serial1' into next-samsung-try7 # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Ben Dooks (Tue Jan 19 09:36:12 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 09:36:12 GMT 2010) # # ARM: Merge next-samsung-clock2 # # Merge branch 'next-samsung-clock2' into next-samsung-try7 # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Ben Dooks (Tue Jan 19 09:36:09 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 09:36:09 GMT 2010) # # ARM: Merge next-samsung-devupdates1 # # Merge branch 'next-samsung-devupdates1' into next-samsung-try7 # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Ben Dooks (Tue Jan 19 09:36:04 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 09:36:04 GMT 2010) # # ARM: Merge next-jassi-spi # # Merge branch 'next-jassi-spi' into next-samsung-try7 # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Thomas Abraham (Thu Jan 14 06:05:38 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 08:50:47 GMT 2010) # # ARM: SAMSUNG: serial: Modify console initialization. # # This patch modifies s3c24xx_serial_initconsole function to accept multiple # platform UART information structures. This is required on platforms that have # differences among the instances of UART ports. As an example, the FIFO sizes # could be different for each UART instance and hence multiple platform UART # information structures would be needed. # # This patch also modifies the s3c24xx_console_init macro since it wraps the # call to the s3c24xx_serial_initconsole function. # # Signed-off-by: Thomas Abraham # Signed-off-by: Ben Dooks # # drivers/serial/samsung.c | 6 +++--- # drivers/serial/samsung.h | 19 ++++++++++++------- # 2 files changed, 15 insertions(+), 10 deletions(-) # # Author: Ben Dooks (Tue Jan 19 08:49:59 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 08:49:59 GMT 2010) # # ARM: Merge next-samsung-clock2 # # Merge branch 'next-samsung-clock2' into next-samsung-try5 # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Ben Dooks (Tue Jan 19 08:48:35 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 08:48:35 GMT 2010) # # ARM: Merge next-samsung-devupdates1 # # Merge branch 'next-samsung-devupdates1' into next-samsung-try5 # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Ben Dooks (Tue Jan 19 08:47:39 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 08:47:39 GMT 2010) # # ARM: Merge next-jassi-spi # # Merge branch 'next-jassi-spi' into next-samsung-try5 # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Ben Dooks (Tue Jan 19 08:42:25 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 08:42:25 GMT 2010) # # ARM: Merge next-s3c6410-andygreen # # Merge branch 'next-s3c6410-andygreen' into next-samsung-try5 # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Ben Dooks (Tue Jan 19 08:42:02 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 08:42:02 GMT 2010) # # ARM: Merge next-samsung-mc-adc # # Merge branch 'next-samsung-mc-adc' into next-samsung-try5 # # Conflicts: # arch/arm/mach-s3c6400/include/mach/map.h # (fix ADC and RTC merge) # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Ben Dooks (Mon Jan 18 07:24:22 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 08:21:38 GMT 2010) # # ARM: S3C24XX: Add mci platform data set call s3c24xx_mci_set_platdata(). # # Add a s3c24xx_mci_set_platdata() call for all the machine files that have # platform data for the MCI driver. This brings the MCI device into line with # the other devices with __initdata and a specific call to ensure the right # structure type is being passed. # # Signed-off-by: Ben Dooks # # arch/arm/mach-s3c2410/mach-h1940.c | 5 ++--- # arch/arm/mach-s3c2440/mach-at2440evb.c | 5 ++--- # arch/arm/mach-s3c2440/mach-mini2440.c | 3 +-- # arch/arm/plat-s3c24xx/devs.c | 13 +++++++++++++ # arch/arm/plat-s3c24xx/include/plat/mci.h | 9 +++++++++ # 5 files changed, 27 insertions(+), 8 deletions(-) # # Author: Ben Dooks (Fri Jan 15 06:09:20 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 00:23:52 GMT 2010) # # ARM: MINI2440: Remove commented out devices from device array # # There's no point in having these in until there is proper support for # them, so remove as they only confuse the device changing script. # # Signed-off-by: Ben Dooks # # arch/arm/mach-s3c2440/mach-mini2440.c | 3 --- # 1 files changed, 0 insertions(+), 3 deletions(-) # # Author: Ben Dooks (Wed Jan 13 05:59:46 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 00:23:51 GMT 2010) # # ARM: SAMSUNG: Add platform data registration for OHCI # # Add a platform data helper for the OHCI device # # Signed-off-by: Ben Dooks # # arch/arm/mach-s3c2410/usb-simtec.c | 4 ++-- # arch/arm/mach-s3c2442/mach-gta02.c | 5 ++--- # arch/arm/plat-s3c/include/plat/usb-control.h | 2 ++ # arch/arm/plat-samsung/dev-usb.c | 21 ++++++++++++++++++++- # 4 files changed, 26 insertions(+), 6 deletions(-) # # Author: Ben Dooks (Tue Jan 12 06:15:28 GMT 2010) # Committer: Ben Dooks (Tue Jan 19 00:23:50 GMT 2010) # # ARM: SAMSUNG: Make UART device code common # # Move s3c24xx_uart_devs, s3c24xx_uart_src and the platform devices to a # common entry in plat-samsung since they are the same in all the current # implementations. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c24xx/devs.c | 28 ------------------------ # arch/arm/plat-s3c64xx/dev-uart.c | 29 ------------------------- # arch/arm/plat-s5p/dev-uart.c | 28 ------------------------ # arch/arm/plat-s5pc1xx/dev-uart.c | 29 ------------------------- # arch/arm/plat-samsung/Makefile | 1 + # arch/arm/plat-samsung/dev-uart.c | 44 ++++++++++++++++++++++++++++++++++++++ # 6 files changed, 45 insertions(+), 114 deletions(-) # create mode 100644 arch/arm/plat-samsung/dev-uart.c # # Author: Jassi Brar (Mon Jan 18 08:32:02 GMT 2010) # Committer: Ben Dooks (Mon Jan 18 09:27:52 GMT 2010) # # ARM: S3C64XX: SPI: Define SPI controller devices # # Platform devices for SPI Controller of S3C64XX are defined and exported for # machines to include. Also, controller setup helper functions are defined for # machine code to set runtime configuration of the controller and the bus. # # Signed-off-by: Jassi Brar # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c/include/plat/devs.h | 3 + # arch/arm/plat-s3c64xx/Makefile | 1 # arch/arm/plat-s3c64xx/dev-spi.c | 180 +++++++++++++++++++++++++++++++++ # 3 files changed, 184 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/plat-s3c64xx/dev-spi.c # # Author: Jassi Brar (Mon Jan 18 08:45:52 GMT 2010) # Committer: Ben Dooks (Mon Jan 18 09:27:15 GMT 2010) # # ARM: S3C64XX: SPI: Header for passing platform data # # We need a way to pass controller specific information to the SPI driver. # For that purpose new headers are made. # # SPI Controller is assumed 'type-s3c64xx' and can be defined for newer SoCs. # Hence, that part is placed under plat-samsung to be shared across newer SoCs. # # SoC specific part - spi source clocks, will be placed # under plat-/include/plat/ # # Signed-off-by: Jassi Brar # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c64xx/include/plat/spi-clocks.h | 18 ++++++ # arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 67 ++++++++++++++++++++++ # 2 files changed, 85 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/plat-s3c64xx/include/plat/spi-clocks.h # create mode 100644 arch/arm/plat-samsung/include/plat/s3c64xx-spi.h # # Author: Jassi Brar (Mon Jan 18 07:15:08 GMT 2010) # Committer: Ben Dooks (Mon Jan 18 08:26:58 GMT 2010) # # ARM: S3C64XX: SPI: Define SPI-48M clock sources # # Defined special 48MHz clock sources for SPI-0,1. # # Signed-off-by: Jassi Brar # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c64xx/clock.c | 12 ++++++++++++ # 1 files changed, 12 insertions(+), 0 deletions(-) # # Author: Jassi Brar (Mon Jan 18 07:15:07 GMT 2010) # Committer: Ben Dooks (Mon Jan 18 08:26:48 GMT 2010) # # ARM: S3C64XX: SPI: Add SPI controller register base # # Added SPI controller register base. # # Signed-off-by: Jassi Brar # Signed-off-by: Ben Dooks # # arch/arm/mach-s3c6400/include/mach/map.h | 2 ++ # 1 files changed, 2 insertions(+), 0 deletions(-) # # Author: Ben Dooks (Mon Jan 18 06:57:42 GMT 2010) # Committer: Ben Dooks (Mon Jan 18 07:00:56 GMT 2010) # # ARM: SAMSUNG: Fix bug in clksrc-clk round_rate call. # # The call has been assuming all clksrc-clks' divider size is 4 bits, but # this may not be the case anymore. Use the reg_div.size parameter to # calculate the maximum value it can take and check against that. # # Signed-off-by: Ben Dooks # # arch/arm/plat-samsung/clock-clksrc.c | 8 +++++--- # 1 files changed, 5 insertions(+), 3 deletions(-) # # Author: Ben Dooks (Mon Jan 18 06:37:25 GMT 2010) # Committer: Ben Dooks (Mon Jan 18 06:37:25 GMT 2010) # # ARM: SAMSUNG: Fix clksrc-clk's checks for bad register settings # # The WARN_ON() was only checking the first clock in the array, instead of # being executed for each clksrc clock being registered. # # Since this is an array of clocks, WARN_ON() does not provide a lot of # useful information about the problem, so change to using printk(KERN_ERR) # to report the problem to the console. # # As a note, we still try and register the clock even if these problems are # present just in case and to avoid changing the behaviour of the registration # process. # # Signed-off-by: Ben Dooks # # arch/arm/plat-samsung/clock-clksrc.c | 6 ++++-- # 1 files changed, 4 insertions(+), 2 deletions(-) # # Author: Thomas Abraham (Mon Jan 18 05:30:16 GMT 2010) # Committer: Ben Dooks (Mon Jan 18 06:28:37 GMT 2010) # # ARM: SAMSUNG: Add check to ensure that clksrc_clk does have multiple clock sources # # Adds a additional check in s3c_set_clksrc function to ensure that the clksrc_clk # does have a choice of multiple clock sources. In addition to this, a check is # added to ensure that a parent is assigned to the clksrc_clk in case it does not # have a choice of parent clocks. # # Signed-off-by: Thomas Abraham # Signed-off-by: Ben Dooks # # arch/arm/plat-samsung/clock-clksrc.c | 11 ++++++++--- # 1 files changed, 8 insertions(+), 3 deletions(-) # # Author: Ben Dooks (Mon Jan 18 04:24:01 GMT 2010) # Committer: Ben Dooks (Mon Jan 18 06:28:28 GMT 2010) # # ARM: S5PC1XX: Register pd0 and hd0 clocks, remove unecessary dummy_enable # # The clk_hd0 and clk_pd0 where given a local dummy_enable call due to # not being registered with the clock code, which they really should have # been. Register these two clocks and remove the clk_dummy_enable as this # is done by the default clock registration code. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s5pc1xx/clock.c | 9 ++------- # 1 files changed, 2 insertions(+), 7 deletions(-) # # Author: Andy Green (Tue Dec 29 14:40:43 GMT 2009) # Committer: Ben Dooks (Mon Jan 18 02:41:04 GMT 2010) # # ARM: SMDK6410: Add comments on ethernet connectivity # # LAN9115 Ethernet only works on SMDK6410 if certain switches # are set in specific ways. Document the requirement. # # Signed-off-by: Andy Green # Signed-off-by: Ben Dooks # # arch/arm/mach-s3c6410/mach-smdk6410.c | 10 ++++++++++ # 1 files changed, 10 insertions(+), 0 deletions(-) # # Author: Andy Green (Tue Dec 29 14:40:30 GMT 2009) # Committer: Ben Dooks (Mon Jan 18 02:41:03 GMT 2010) # # ARM: S3C64XX: Add virtual mapping for S3C64XX SROM area # # This adds the physical address of the SROM unit, and # applies a virtual mapping for it to the S3C_VA_MEM # slot. # # Signed-off-by: Andy Green # Signed-off-by: Ben Dooks # # arch/arm/mach-s3c6400/include/mach/map.h | 2 ++ # arch/arm/plat-s3c64xx/cpu.c | 5 +++++ # 2 files changed, 7 insertions(+), 0 deletions(-) # # Author: Andy Green (Tue Dec 29 14:40:36 GMT 2009) # Committer: Ben Dooks (Mon Jan 18 02:41:03 GMT 2010) # # ARM: SMDK6410: Add nC1 chipselect SROM setup # # Since the mach-smdk6410.c file claims it can start up the # smsc9115 ethernet device on the board, it should take care # about configuring the necessary chip select nCS1 so it can # see the chip. The select defaults to 8-bit mode so without # config the Ethernet doesn't work. # # This patch uses the new SROM definitions to set nCS1 to the # state found in the Samsung U-Boot port for 6410. It may be # more conservative that it needs to be since those settings # were marked as for CS8900A also using this chip select. # # But this change is enough to get the ethernet working when # booted with Qi. # # Signed-off-by: Andy Green # Signed-off-by: Ben Dooks # # arch/arm/mach-s3c6410/mach-smdk6410.c | 27 +++++++++++++++++++++++++-- # 1 files changed, 25 insertions(+), 2 deletions(-) # # Author: Andy Green (Tue Dec 29 14:40:23 GMT 2009) # Committer: Ben Dooks (Mon Jan 18 02:41:03 GMT 2010) # # ARM: S3C64XX: Add SROM register definitions # # This introduces a platform file for s3c64xx that defines # the SROM unit registers that control chip select # characteristics. # # Signed-off-by: Andy Green # Signed-off-by: Ben Dooks # # arch/arm/mach-s3c6400/include/mach/map.h | 12 +++++ # arch/arm/plat-s3c64xx/include/plat/regs-srom.h | 59 ++++++++++++++++++++++++ # 2 files changed, 71 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/plat-s3c64xx/include/plat/regs-srom.h # # Author: Ben Dooks (Mon Jan 18 00:35:29 GMT 2010) # Committer: Ben Dooks (Mon Jan 18 00:35:29 GMT 2010) # # ARM: Merge next-s3c64xx # # Merge branch 'next-s3c64xx' into next-samsung # # Conflicts: # arch/arm/mach-s3c6400/include/mach/map.h # ( ADC and RTC PA merge fixed) # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Maurus Cuelenaere (Wed Jan 13 23:30:34 GMT 2010) # Committer: Ben Dooks (Mon Jan 18 00:30:49 GMT 2010) # # ARM: S3C64XX: Add S3C64XX support to the generic Samsung ADC driver # # Add S3C64XX support to the generic Samsung ADC driver # # Signed-off-by: Maurus Cuelenaere # Signed-off-by: Ben Dooks # # arch/arm/mach-s3c6400/include/mach/map.h | 1 + # arch/arm/plat-s3c/include/plat/regs-adc.h | 3 ++ # arch/arm/plat-s3c64xx/Makefile | 4 +++ # arch/arm/plat-s3c64xx/dev-adc.c | 46 +++++++++++++++++++++++++++++ # arch/arm/plat-samsung/adc.c | 27 ++++++++++++++++- # 5 files changed, 79 insertions(+), 2 deletions(-) # create mode 100644 arch/arm/plat-s3c64xx/dev-adc.c # # Author: Maurus Cuelenaere (Wed Jan 13 23:30:31 GMT 2010) # Committer: Ben Dooks (Mon Jan 18 00:30:49 GMT 2010) # # ARM: SAMSUNG: Move S3C24XX ADC driver to plat-samsung # # Move S3C24XX ADC driver to plat-samsung # # Signed-off-by: Maurus Cuelenaere # Signed-off-by: Ben Dooks # # arch/arm/configs/mini2440_defconfig | 2 +- # arch/arm/configs/s3c2410_defconfig | 2 +- # arch/arm/plat-s3c24xx/Kconfig | 7 ------- # arch/arm/plat-s3c24xx/Makefile | 1 - # arch/arm/plat-samsung/Kconfig | 9 +++++++++ # arch/arm/plat-samsung/Makefile | 4 ++++ # arch/arm/plat-samsung/adc.c | 4 ++-- # arch/arm/plat-samsung/include/plat/adc.h | 4 ++-- # 8 files changed, 19 insertions(+), 14 deletions(-) # rename arch/arm/{plat-s3c24xx/adc.c => plat-samsung/adc.c} (99%) # rename arch/arm/{plat-s3c/include/plat/adc.h => plat-samsung/include/plat/adc.h} (92%) # # Author: Jassi Brar (Wed Jan 6 06:33:44 GMT 2010) # Committer: Ben Dooks (Sun Jan 17 23:47:21 GMT 2010) # # ARM: S3C64XX: Add I2S resources in platform code # # Define resources needed by the I2S drivers in platform code. # Audio cfg_gpio callback and IORESOURCE_DMA are added. # # Signed-off-by: Jassi Brar # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c64xx/dev-audio.c | 91 +++++++++++++++++++++++++++++++++++++ # 1 files changed, 90 insertions(+), 1 deletions(-) # # Author: Maurus Cuelenaere (Tue Jan 12 00:40:14 GMT 2010) # Committer: Ben Dooks (Sun Jan 17 23:47:21 GMT 2010) # # ARM: S3C64XX: Add S3C64XX RTC platform driver # # Add S3C64XX RTC platform driver # # Signed-off-by: Maurus Cuelenaere # Signed-off-by: Ben Dooks # # arch/arm/mach-s3c6400/include/mach/map.h | 1 + # arch/arm/plat-s3c64xx/Makefile | 1 + # arch/arm/plat-s3c64xx/dev-rtc.c | 43 ++++++++++++++++++++++++++++++ # 3 files changed, 45 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/plat-s3c64xx/dev-rtc.c # # Author: Russell King (Thu Jan 14 20:09:34 GMT 2010) # Committer: Russell King (Sun Jan 17 22:30:36 GMT 2010) # # ARM: Make Integrator/Versatile/Reaview VCO code similar # # Signed-off-by: Russell King # # arch/arm/mach-integrator/impd1.c | 16 ++++------------ # arch/arm/mach-integrator/include/mach/clkdev.h | 3 ++- # arch/arm/mach-integrator/integrator_cp.c | 9 +++++---- # arch/arm/mach-realview/core.c | 15 +++++++-------- # arch/arm/mach-realview/include/mach/clkdev.h | 2 +- # arch/arm/mach-versatile/core.c | 10 +++++----- # arch/arm/mach-versatile/include/mach/clkdev.h | 2 +- # 7 files changed, 25 insertions(+), 32 deletions(-) # # Author: Russell King (Thu Jan 14 20:07:35 GMT 2010) # Committer: Russell King (Sun Jan 17 22:30:35 GMT 2010) # # ARM: Realview/Versatile: separate out common sched_clock() # # Provide a common sched_clock() implementation for Versatile and # Realview. # # Signed-off-by: Russell King # # arch/arm/mach-realview/core.c | 16 ---------- # arch/arm/mach-versatile/core.c | 22 -------------- # arch/arm/plat-versatile/Makefile | 2 + # arch/arm/plat-versatile/sched-clock.c | 53 +++++++++++++++++++++++++++++++++ # 4 files changed, 55 insertions(+), 38 deletions(-) # create mode 100644 arch/arm/plat-versatile/sched-clock.c # # Author: Russell King (Sun Jan 17 16:20:56 GMT 2010) # Committer: Russell King (Sun Jan 17 22:30:35 GMT 2010) # # ARM: Integrator: move 16-bit timer support to Integrator/AP # # Only Integrator/AP has 16-bit timers, so move the support into the # Integrator/AP specific support files. # # Signed-off-by: Russell King # # arch/arm/mach-integrator/common.h | 1 # arch/arm/mach-integrator/core.c | 157 ------------------------------ # arch/arm/mach-integrator/integrator_ap.c | 158 +++++++++++++++++++++++++++++- # arch/arm/mach-integrator/integrator_cp.c | 2 # 4 files changed, 155 insertions(+), 163 deletions(-) # delete mode 100644 arch/arm/mach-integrator/common.h # # Author: Russell King (Sat Jan 16 23:52:12 GMT 2010) # Committer: Russell King (Sun Jan 17 22:30:07 GMT 2010) # # ARM: Integrator: convert Integrator/CP to use SP804 timer support # # The Integrator/CP board has SP804-compatible timer modules, so use # the SP804-compatible code from Versatile and Realview. # # Signed-off-by: Russell King # # arch/arm/mach-integrator/Kconfig | 1 + # arch/arm/mach-integrator/integrator_cp.c | 14 ++++++++++++-- # 2 files changed, 13 insertions(+), 2 deletions(-) # # Author: Russell King (Fri Jan 15 18:19:56 GMT 2010) # Committer: Russell King (Sun Jan 17 22:30:07 GMT 2010) # # ARM: Realview/Versatile: don't use magic numbers for timer frequency # # Signed-off-by: Russell King # # arch/arm/plat-versatile/timer-sp.c | 12 +++++------- # 1 files changed, 5 insertions(+), 7 deletions(-) # # Author: Russell King (Thu Jan 14 22:37:12 GMT 2010) # Committer: Russell King (Sun Jan 17 22:30:06 GMT 2010) # # ARM: Realview/Versatile: remove useless TIMER_RELOAD calculations # # Realview/Versatile copied the Integrator timer code, including the # calculations for ensuring that the reload value fits into the 16-bit # counter. However, these platforms have a 32-bit counter which is # clocked at a slower rate. # # The result is that the preprocessor conditions are never triggered: # TICKS_PER_uSEC = 1, mSEC_10 = 10000, which is 0x2710 - less than # 0x10000. # # So, remove the unnecessary complexity, reducing the TIMER_RELOAD # calculation to just: # # TICKS_PER_uSEC * mSEC_10 # # Signed-off-by: Russell King # # arch/arm/plat-versatile/timer-sp.c | 12 +----------- # 1 files changed, 1 insertions(+), 11 deletions(-) # # Author: Russell King (Thu Jan 14 13:30:16 GMT 2010) # Committer: Russell King (Sun Jan 17 22:30:06 GMT 2010) # # ARM: Realview/Versatile: separate out common SP804 timer code # # Signed-off-by: Russell King # # arch/arm/Kconfig | 5 + # arch/arm/mach-realview/core.c | 139 ------------------- # arch/arm/mach-versatile/core.c | 135 ------------------ # arch/arm/plat-versatile/Makefile | 1 # arch/arm/plat-versatile/include/plat/timer-sp.h | 2 # arch/arm/plat-versatile/timer-sp.c | 168 +++++++++++++++++++++++ # 6 files changed, 182 insertions(+), 268 deletions(-) # create mode 100644 arch/arm/plat-versatile/include/plat/timer-sp.h # create mode 100644 arch/arm/plat-versatile/timer-sp.c # # Author: Russell King (Thu Jan 14 12:48:06 GMT 2010) # Committer: Russell King (Sun Jan 17 22:30:06 GMT 2010) # # ARM: Realview/Versatile/Integrator: separate out common clock code # # Signed-off-by: Russell King # # arch/arm/Kconfig | 6 ++ # arch/arm/Makefile | 1 # arch/arm/mach-integrator/Makefile | 2 - # arch/arm/mach-realview/Makefile | 2 - # arch/arm/mach-realview/clock.c | 64 ------------------------- # arch/arm/mach-realview/clock.h | 20 -------- # arch/arm/mach-realview/core.c | 2 - # arch/arm/mach-realview/include/mach/clkdev.h | 9 +++ # arch/arm/mach-realview/realview_eb.c | 1 # arch/arm/mach-realview/realview_pb1176.c | 1 # arch/arm/mach-realview/realview_pb11mp.c | 1 # arch/arm/mach-realview/realview_pba8.c | 1 # arch/arm/mach-versatile/Makefile | 2 - # arch/arm/mach-versatile/clock.c | 65 ------------------------- # arch/arm/mach-versatile/clock.h | 21 -------- # arch/arm/mach-versatile/core.c | 2 - # arch/arm/mach-versatile/include/mach/clkdev.h | 9 +++ # arch/arm/plat-versatile/Makefile | 1 # arch/arm/plat-versatile/clock.c | 4 +- # 19 files changed, 33 insertions(+), 181 deletions(-) # delete mode 100644 arch/arm/mach-realview/clock.c # delete mode 100644 arch/arm/mach-realview/clock.h # delete mode 100644 arch/arm/mach-versatile/clock.c # delete mode 100644 arch/arm/mach-versatile/clock.h # create mode 100644 arch/arm/plat-versatile/Makefile # rename arch/arm/{mach-integrator/clock.c => plat-versatile/clock.c} (94%) # # Author: Russell King (Sat Jan 16 20:16:10 GMT 2010) # Committer: Russell King (Sun Jan 17 22:30:06 GMT 2010) # # ARM: ICST: kill duplicate icst code # # The only difference between ICST307 and ICST525 are the two arrays # for calculating the S parameter; the code is now identical. Merge # the two files and kill the duplicated code. # # Signed-off-by: Russell King # # arch/arm/Kconfig | 6 +- # arch/arm/common/Kconfig | 5 -- # arch/arm/common/Makefile | 3 - # arch/arm/common/icst.c | 19 +++--- # arch/arm/common/icst525.c | 99 ------------------------------ # arch/arm/include/asm/hardware/icst.h | 24 +++++++ # arch/arm/include/asm/hardware/icst307.h | 34 ---------- # arch/arm/include/asm/hardware/icst525.h | 33 ---------- # arch/arm/mach-integrator/clock.c | 10 ++- # arch/arm/mach-integrator/cpu.c | 20 +++--- # arch/arm/mach-integrator/impd1.c | 2 - # arch/arm/mach-integrator/integrator_cp.c | 2 - # arch/arm/mach-realview/clock.c | 10 ++- # arch/arm/mach-realview/core.c | 2 - # arch/arm/mach-realview/realview_eb.c | 1 # arch/arm/mach-realview/realview_pb1176.c | 1 # arch/arm/mach-realview/realview_pb11mp.c | 1 # arch/arm/mach-realview/realview_pba8.c | 1 # arch/arm/mach-versatile/clock.c | 10 ++- # arch/arm/mach-versatile/core.c | 2 - # 20 files changed, 67 insertions(+), 218 deletions(-) # rename arch/arm/common/{icst307.c => icst.c} (82%) # delete mode 100644 arch/arm/common/icst525.c # delete mode 100644 arch/arm/include/asm/hardware/icst307.h # delete mode 100644 arch/arm/include/asm/hardware/icst525.h # # Author: Russell King (Sat Jan 16 19:46:19 GMT 2010) # Committer: Russell King (Sun Jan 17 22:30:05 GMT 2010) # # ARM: ICST: indirect s2div and idx2s arrays via icst_params # # Signed-off-by: Russell King # # arch/arm/common/icst307.c | 18 +++++++++++------- # arch/arm/common/icst525.c | 18 +++++++++++------- # arch/arm/include/asm/hardware/icst.h | 2 ++ # arch/arm/include/asm/hardware/icst307.h | 3 +++ # arch/arm/include/asm/hardware/icst525.h | 3 +++ # arch/arm/mach-integrator/cpu.c | 4 ++++ # arch/arm/mach-integrator/impd1.c | 2 ++ # arch/arm/mach-integrator/integrator_cp.c | 2 ++ # arch/arm/mach-realview/core.c | 2 ++ # arch/arm/mach-versatile/core.c | 2 ++ # 10 files changed, 42 insertions(+), 14 deletions(-) # # Author: Russell King (Sat Jan 16 19:49:39 GMT 2010) # Committer: Russell King (Sun Jan 17 22:30:05 GMT 2010) # # ARM: ICST: move minimum VCO frequency to icst_params # # Signed-off-by: Russell King # # arch/arm/common/icst307.c | 2 +- # arch/arm/common/icst525.c | 2 +- # arch/arm/include/asm/hardware/icst.h | 1 + # arch/arm/mach-integrator/cpu.c | 2 ++ # arch/arm/mach-integrator/impd1.c | 1 + # arch/arm/mach-integrator/integrator_cp.c | 1 + # arch/arm/mach-realview/core.c | 1 + # arch/arm/mach-versatile/core.c | 1 + # 8 files changed, 9 insertions(+), 2 deletions(-) # # Author: Russell King (Sat Jan 16 17:28:44 GMT 2010) # Committer: Russell King (Sun Jan 17 22:30:05 GMT 2010) # # ARM: ICST: use Hz instead of kHz # # This makes the ICST support fit more nicely with the clk API, # eliminating the need to *1000 and /1000 in places. # # Signed-off-by: Russell King # # arch/arm/common/icst307.c | 8 ++++---- # arch/arm/common/icst525.c | 8 ++++---- # arch/arm/include/asm/hardware/icst307.h | 8 ++++---- # arch/arm/include/asm/hardware/icst525.h | 10 +++++----- # arch/arm/mach-integrator/clock.c | 8 ++++---- # arch/arm/mach-integrator/cpu.c | 22 +++++++++++----------- # arch/arm/mach-integrator/impd1.c | 6 +++--- # arch/arm/mach-integrator/integrator_cp.c | 2 +- # arch/arm/mach-realview/clock.c | 8 ++++---- # arch/arm/mach-realview/core.c | 2 +- # arch/arm/mach-versatile/clock.c | 8 ++++---- # arch/arm/mach-versatile/core.c | 2 +- # 12 files changed, 46 insertions(+), 46 deletions(-) # # Author: Russell King (Sat Jan 16 18:08:47 GMT 2010) # Committer: Russell King (Sun Jan 17 22:30:05 GMT 2010) # # ARM: ICST: provide definitions for max/min VCO frequencies # # Signed-off-by: Russell King # # arch/arm/common/icst307.c | 2 +- # arch/arm/common/icst525.c | 2 +- # arch/arm/include/asm/hardware/icst307.h | 7 +++++++ # arch/arm/include/asm/hardware/icst525.h | 8 ++++++++ # arch/arm/mach-integrator/cpu.c | 4 ++-- # arch/arm/mach-integrator/impd1.c | 2 +- # arch/arm/mach-integrator/integrator_cp.c | 2 +- # arch/arm/mach-realview/core.c | 2 +- # arch/arm/mach-versatile/core.c | 2 +- # 9 files changed, 23 insertions(+), 8 deletions(-) # # Author: Russell King (Sat Jan 16 17:15:07 GMT 2010) # Committer: Russell King (Sun Jan 17 22:30:04 GMT 2010) # # ARM: ICST: icst.*_ps_to_vco() functions are unused, remove them # # These functions were originally implemented for the CLCD driver before # we had clk API support. Since the CLCD driver does not use these # anymore, we can remove them. # # Signed-off-by: Russell King # # arch/arm/common/icst307.c | 64 ------------------------------- # arch/arm/common/icst525.c | 65 ------------------------------- # arch/arm/include/asm/hardware/icst307.h | 1 # arch/arm/include/asm/hardware/icst525.h | 1 # 4 files changed, 0 insertions(+), 131 deletions(-) # # Author: Russell King (Sat Jan 16 16:27:28 GMT 2010) # Committer: Russell King (Sun Jan 17 22:30:04 GMT 2010) # # ARM: ICST: merge common ICST VCO structures # # The structures for the ICST307 and ICST525 VCO devices are # identical, so merge them together. # # Signed-off-by: Russell King # # arch/arm/common/icst307.c | 14 +++++------ # arch/arm/common/icst525.c | 14 +++++------ # arch/arm/include/asm/hardware/icst.h | 32 ++++++++++++++++++++++++ # arch/arm/include/asm/hardware/icst307.h | 21 +++------------- # arch/arm/include/asm/hardware/icst525.h | 21 +++------------- # arch/arm/mach-integrator/clock.c | 5 ++-- # arch/arm/mach-integrator/cpu.c | 10 ++++---- # arch/arm/mach-integrator/impd1.c | 4 ++- # arch/arm/mach-integrator/include/mach/clkdev.h | 6 ++--- # arch/arm/mach-integrator/integrator_cp.c | 4 ++- # arch/arm/mach-realview/clock.c | 4 ++- # arch/arm/mach-realview/clock.h | 7 +++-- # arch/arm/mach-realview/core.c | 4 ++- # arch/arm/mach-versatile/clock.c | 4 ++- # arch/arm/mach-versatile/clock.h | 7 +++-- # arch/arm/mach-versatile/core.c | 4 ++- # 16 files changed, 85 insertions(+), 76 deletions(-) # create mode 100644 arch/arm/include/asm/hardware/icst.h # # Author: Russell King (Sun Jan 17 20:45:12 GMT 2010) # Committer: Russell King (Sun Jan 17 22:30:04 GMT 2010) # # ARM: Integrator: convert to use register definitions # # Rather than using converted base address plus offset, use the register # address itself now that IO_ADDRESS() can cope with these. # # Signed-off-by: Russell King # # arch/arm/mach-integrator/core.c | 12 ++++++------ # arch/arm/mach-integrator/cpu.c | 8 ++++---- # arch/arm/mach-integrator/integrator_ap.c | 2 +- # arch/arm/mach-integrator/integrator_cp.c | 10 +++++----- # arch/arm/mach-integrator/pci_v3.c | 6 +++--- # 5 files changed, 19 insertions(+), 19 deletions(-) # # Author: Russell King (Sun Jan 17 20:23:57 GMT 2010) # Committer: Russell King (Sun Jan 17 21:58:39 GMT 2010) # # ARM: Integrator: allow IO_ADDRESS() to be used for register addresses # # Signed-off-by: Russell King # # arch/arm/mach-integrator/include/mach/hardware.h | 14 +++++++------- # 1 files changed, 7 insertions(+), 7 deletions(-) # # Author: Russell King (Sun Jan 17 19:59:58 GMT 2010) # Committer: Russell King (Sun Jan 17 21:57:13 GMT 2010) # # ARM: Integrator: fix Integrator/CP definitions, move to platform.h # # Signed-off-by: Russell King # # arch/arm/mach-integrator/include/mach/platform.h | 14 +++++--- # arch/arm/mach-integrator/integrator_ap.c | 4 +- # arch/arm/mach-integrator/integrator_cp.c | 38 ++++++++++------------ # 3 files changed, 28 insertions(+), 28 deletions(-) # # Author: Russell King (Sun Jan 17 19:27:09 GMT 2010) # Committer: Russell King (Sun Jan 17 21:55:41 GMT 2010) # # ARM: Realview/Versatile/Integrator: remove unused definitions from platform.h # # Signed-off-by: Russell King # # arch/arm/mach-integrator/include/mach/platform.h | 42 +--------------------- # arch/arm/mach-realview/include/mach/platform.h | 20 ---------- # arch/arm/mach-versatile/include/mach/platform.h | 26 +------------- # 3 files changed, 4 insertions(+), 84 deletions(-) # # Author: Russell King (Fri Jan 15 22:12:46 GMT 2010) # Committer: Russell King (Sun Jan 17 17:20:29 GMT 2010) # # ARM: Integrator: pass 'khz' to integrator_time_init # # This is now what the clocksource/clockevent initialization functions # want, so give them the timer tick rate directly. # # Signed-off-by: Russell King # # arch/arm/mach-integrator/common.h | 2 +- # arch/arm/mach-integrator/core.c | 6 +++--- # arch/arm/mach-integrator/integrator_ap.c | 2 +- # arch/arm/mach-integrator/integrator_cp.c | 2 +- # 4 files changed, 6 insertions(+), 6 deletions(-) # # Author: Russell King (Fri Jan 15 21:49:23 GMT 2010) # Committer: Russell King (Sun Jan 17 17:20:29 GMT 2010) # # ARM: Integrator: convert to generic clockevent support # # Signed-off-by: Russell King # # arch/arm/Kconfig | 1 # arch/arm/mach-integrator/core.c | 107 +++++++++++++++++++++++++++------------ # 2 files changed, 74 insertions(+), 34 deletions(-) # # Author: Russell King (Fri Jan 15 18:10:33 GMT 2010) # Committer: Russell King (Sun Jan 17 17:20:29 GMT 2010) # # ARM: Integrator: convert to generic time support # # Signed-off-by: Russell King # # arch/arm/Kconfig | 1 # arch/arm/mach-integrator/common.h | 1 # arch/arm/mach-integrator/core.c | 62 +++++++++++++++--------------- # arch/arm/mach-integrator/integrator_ap.c | 1 # arch/arm/mach-integrator/integrator_cp.c | 1 # 5 files changed, 31 insertions(+), 35 deletions(-) # # Author: Russell King (Sat Jan 16 15:07:08 GMT 2010) # Committer: Russell King (Sun Jan 17 17:20:29 GMT 2010) # # ARM: Improve documentation in arm_timer.h # # Signed-off-by: Russell King # # arch/arm/include/asm/hardware/arm_timer.h | 39 ++++++++++++++++++----------- # 1 files changed, 24 insertions(+), 15 deletions(-) # # Author: Russell King (Thu Jan 14 19:59:37 GMT 2010) # Committer: Russell King (Sun Jan 17 17:20:29 GMT 2010) # # ARM: Fix Versatile&Integrator includes to behave in the same way as Realview # # Realview doesn't include mach/platform.h in mach/hardware.h, so # make versatile behave in the same way. Also, move the definition # of __io_address() into mach/hardware.h, just like Realview. # # Signed-off-by: Russell King # # arch/arm/mach-integrator/core.c | 1 + # arch/arm/mach-integrator/cpu.c | 1 + # .../arm/mach-integrator/include/mach/entry-macro.S | 1 + # arch/arm/mach-integrator/include/mach/hardware.h | 3 ++- # arch/arm/mach-integrator/integrator_ap.c | 1 + # arch/arm/mach-integrator/integrator_cp.c | 1 + # arch/arm/mach-integrator/leds.c | 1 + # arch/arm/mach-integrator/pci_v3.c | 1 + # arch/arm/mach-versatile/core.c | 4 ++-- # arch/arm/mach-versatile/include/mach/entry-macro.S | 1 + # arch/arm/mach-versatile/include/mach/hardware.h | 3 ++- # 11 files changed, 14 insertions(+), 4 deletions(-) # # Author: Ben Dooks (Sun Nov 29 14:34:56 GMT 2009) # Committer: Ben Dooks (Fri Jan 15 10:33:19 GMT 2010) # # ARM: S3C2412: Fixup commented out device in SMDK2413 # # The SMDK2413 has a commented out device that does not have any setup # data for it, so remove it for now. # # Signed-off-by: Ben Dooks # # arch/arm/mach-s3c2412/mach-smdk2413.c | 1 - # 1 files changed, 0 insertions(+), 1 deletions(-) # # Author: Ben Dooks (Mon Nov 23 00:13:39 GMT 2009) # Committer: Ben Dooks (Fri Jan 15 10:33:19 GMT 2010) # # ARM: S3C: Rename s3c_device_usb to s3c_device_ohci # # Prepare for the forthcoming device changes by renaming s3c_device_usb to # s3c_device_ohci as this is what the device represents. # # Signed-off-by: Ben Dooks # # arch/arm/mach-s3c2410/mach-amlm5900.c | 2 +- # arch/arm/mach-s3c2410/mach-bast.c | 2 +- # arch/arm/mach-s3c2410/mach-h1940.c | 2 +- # arch/arm/mach-s3c2410/mach-n30.c | 2 +- # arch/arm/mach-s3c2410/mach-otom.c | 2 +- # arch/arm/mach-s3c2410/mach-qt2410.c | 2 +- # arch/arm/mach-s3c2410/mach-smdk2410.c | 2 +- # arch/arm/mach-s3c2410/mach-tct_hammer.c | 2 +- # arch/arm/mach-s3c2410/mach-vr1000.c | 2 +- # arch/arm/mach-s3c2410/usb-simtec.c | 2 +- # arch/arm/mach-s3c2412/mach-jive.c | 2 +- # arch/arm/mach-s3c2412/mach-smdk2413.c | 2 +- # arch/arm/mach-s3c2412/mach-vstms.c | 2 +- # arch/arm/mach-s3c2440/mach-anubis.c | 2 +- # arch/arm/mach-s3c2440/mach-at2440evb.c | 2 +- # arch/arm/mach-s3c2440/mach-mini2440.c | 2 +- # arch/arm/mach-s3c2440/mach-nexcoder.c | 2 +- # arch/arm/mach-s3c2440/mach-rx3715.c | 2 +- # arch/arm/mach-s3c2440/mach-smdk2440.c | 2 +- # arch/arm/mach-s3c2442/mach-gta02.c | 4 ++-- # arch/arm/mach-s3c6410/mach-hmt.c | 2 +- # arch/arm/mach-s3c6410/mach-smdk6410.c | 2 +- # arch/arm/plat-s3c/include/plat/devs.h | 2 +- # arch/arm/plat-samsung/dev-usb.c | 4 ++-- # 24 files changed, 26 insertions(+), 26 deletions(-) # # Author: Kukjin Kim (Wed Jan 13 23:23:53 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 10:16:47 GMT 2010) # # ARM: S5P6440: Add serial port support # # This patch adds UART serial port support for S5P6440 CPU. Most of the # serial support of Samsung's 6400 CPU is reused for 6440 CPU. # # Signed-off-by: Kukjin Kim # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c/include/plat/devs.h | 1 # arch/arm/plat-s5p/dev-uart.c | 165 +++++++++++++++++++++++++++++++++ # drivers/serial/Kconfig | 8 +- # 3 files changed, 170 insertions(+), 4 deletions(-) # create mode 100644 arch/arm/plat-s5p/dev-uart.c # # Author: Kukjin Kim (Wed Jan 13 23:23:04 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 10:16:43 GMT 2010) # # ARM: S5P6440: Add configuration file # # This patch adds Samsung's S5P6440 default configuration file. # # Signed-off-by: Kukjin Kim # Signed-off-by: Ben Dooks # # arch/arm/configs/s5p6440_defconfig | 969 ++++++++++++++++++++++++++++++++++++ # 1 files changed, 969 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/configs/s5p6440_defconfig # # Author: Kukjin Kim (Wed Jan 13 23:22:00 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 10:16:36 GMT 2010) # # ARM: S5P6440: Add Board support file # # This patch adds Samsung's SMDK6440 board support file. # # Signed-off-by: Kukjin Kim # Signed-off-by: Ben Dooks # # arch/arm/mach-s5p6440/mach-smdk6440.c | 111 +++++++++++++++++++++++++++++++++ # 1 files changed, 111 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/mach-s5p6440/mach-smdk6440.c # # Author: Kukjin Kim (Wed Jan 13 23:19:36 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 10:16:32 GMT 2010) # # ARM: S5P6440: Add new Kconfig and Makefiles # # This patch adds the Kconfig and Makefile for the new S5P6440 machine # and platform directories. It also updates arch/arm Kconfig and Makefiles # to include the support for the new S5P6440 CPU. # # Signed-off-by: Kukjin Kim # Signed-off-by: Ben Dooks # # arch/arm/Kconfig | 13 +++++++++++- # arch/arm/Makefile | 2 ++ # arch/arm/mach-s5p6440/Kconfig | 23 +++++++++++++++++++++ # arch/arm/mach-s5p6440/Makefile | 19 ++++++++++++++++++ # arch/arm/mach-s5p6440/Makefile.boot | 2 ++ # arch/arm/plat-s5p/Kconfig | 38 +++++++++++++++++++++++++++++++++++ # arch/arm/plat-s5p/Makefile | 24 ++++++++++++++++++++++ # 7 files changed, 120 insertions(+), 1 deletions(-) # create mode 100644 arch/arm/mach-s5p6440/Kconfig # create mode 100644 arch/arm/mach-s5p6440/Makefile # create mode 100644 arch/arm/mach-s5p6440/Makefile.boot # create mode 100644 arch/arm/plat-s5p/Kconfig # create mode 100644 arch/arm/plat-s5p/Makefile # # Author: Kukjin Kim (Wed Jan 13 23:15:39 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 10:16:27 GMT 2010) # # ARM: S5P6440: Add Timer support # # This patch adds timer support for S5P6440 CPU. # # Signed-off-by: Atul Dahiya # Signed-off-by: Kukjin Kim # Signed-off-by: Ben Dooks # # arch/arm/mach-s5p6440/include/mach/pwm-clock.h | 62 ++++++++++++++++++++++++ # arch/arm/mach-s5p6440/include/mach/tick.h | 24 +++++++++ # 2 files changed, 86 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/mach-s5p6440/include/mach/pwm-clock.h # create mode 100644 arch/arm/mach-s5p6440/include/mach/tick.h # # Author: Kukjin Kim (Wed Jan 13 23:14:40 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 10:16:21 GMT 2010) # # ARM: S5P6440: Add IRQ support # # This patch adds IRQ support for S5P6440 CPU. # # Signed-off-by: Adityapratap Sharma # Signed-off-by: Kukjin Kim # Signed-off-by: Ben Dooks # # arch/arm/mach-s5p6440/include/mach/irqs.h | 111 +++++++++++++++++++++++++ # arch/arm/mach-s5p6440/include/mach/regs-irq.h | 19 ++++ # arch/arm/plat-s5p/include/plat/irqs.h | 83 +++++++++++++++++++ # arch/arm/plat-s5p/irq.c | 73 ++++++++++++++++ # 4 files changed, 286 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/mach-s5p6440/include/mach/irqs.h # create mode 100644 arch/arm/mach-s5p6440/include/mach/regs-irq.h # create mode 100644 arch/arm/plat-s5p/include/plat/irqs.h # create mode 100644 arch/arm/plat-s5p/irq.c # # Author: Kukjin Kim (Wed Jan 13 23:13:37 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 10:16:16 GMT 2010) # # ARM: S5P6440: Add Clock and PLL support # # This patch adds clock and pll support for S5P6440. This patch are based on # Harald Welte's patches and Ben's plat-samsung. # # Signed-off-by: Thomas Abraham # Signed-off-by: Kukjin Kim # Signed-off-by: Ben Dooks # # arch/arm/mach-s5p6440/include/mach/regs-clock.h | 130 ++++ # arch/arm/plat-s5p/clock.c | 136 ++++ # arch/arm/plat-s5p/include/plat/pll.h | 83 +++ # arch/arm/plat-s5p/include/plat/s5p-clock.h | 38 + # arch/arm/plat-s5p/s5p6440-clock.c | 698 +++++++++++++++++++++++ # arch/arm/plat-samsung/include/plat/clock.h | 1 # 6 files changed, 1086 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/mach-s5p6440/include/mach/regs-clock.h # create mode 100644 arch/arm/plat-s5p/clock.c # create mode 100644 arch/arm/plat-s5p/include/plat/pll.h # create mode 100644 arch/arm/plat-s5p/include/plat/s5p-clock.h # create mode 100644 arch/arm/plat-s5p/s5p6440-clock.c # # Author: Kukjin Kim (Thu Jan 14 06:29:17 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 10:16:08 GMT 2010) # # ARM: S5P6440: Add new CPU initialization support # # This patch adds Samsung's S5P6440 CPU support. # # Signed-off-by: Kukjin Kim # Signed-off-by: Ben Dooks # # arch/arm/mach-s5p6440/cpu.c | 114 ++++++++++++++++++++++ # arch/arm/mach-s5p6440/include/mach/debug-macro.S | 37 +++++++ # arch/arm/mach-s5p6440/include/mach/entry-macro.S | 16 +++ # arch/arm/mach-s5p6440/include/mach/gpio-core.h | 19 ++++ # arch/arm/mach-s5p6440/include/mach/gpio.h | 80 +++++++++++++++ # arch/arm/mach-s5p6440/include/mach/hardware.h | 18 +++ # arch/arm/mach-s5p6440/include/mach/map.h | 94 ++++++++++++++++++ # arch/arm/mach-s5p6440/include/mach/memory.h | 19 ++++ # arch/arm/mach-s5p6440/include/mach/system.h | 26 +++++ # arch/arm/mach-s5p6440/include/mach/uncompress.h | 24 +++++ # arch/arm/plat-s3c/include/plat/cpu.h | 3 + # arch/arm/plat-s5p/cpu.c | 90 +++++++++++++++++ # arch/arm/plat-s5p/include/plat/s5p6440.h | 37 +++++++ # arch/arm/plat-s5p/s5p6440-init.c | 50 ++++++++++ # arch/arm/plat-s5p/setup-i2c0.c | 25 +++++ # 15 files changed, 652 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/mach-s5p6440/cpu.c # create mode 100644 arch/arm/mach-s5p6440/include/mach/debug-macro.S # create mode 100644 arch/arm/mach-s5p6440/include/mach/entry-macro.S # create mode 100644 arch/arm/mach-s5p6440/include/mach/gpio-core.h # create mode 100644 arch/arm/mach-s5p6440/include/mach/gpio.h # create mode 100644 arch/arm/mach-s5p6440/include/mach/hardware.h # create mode 100644 arch/arm/mach-s5p6440/include/mach/map.h # create mode 100644 arch/arm/mach-s5p6440/include/mach/memory.h # create mode 100644 arch/arm/mach-s5p6440/include/mach/system.h # create mode 100644 arch/arm/mach-s5p6440/include/mach/uncompress.h # create mode 100644 arch/arm/plat-s5p/cpu.c # create mode 100644 arch/arm/plat-s5p/include/plat/s5p6440.h # create mode 100644 arch/arm/plat-s5p/s5p6440-init.c # create mode 100644 arch/arm/plat-s5p/setup-i2c0.c # # Author: Ben Dooks (Tue Jan 12 05:13:58 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:16 GMT 2010) # # ARM: S5PC1XX: Use common UART IRQ handling code # # Use the common UART IRQ handling code for the S5PC100 system. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s5pc1xx/Kconfig | 1 # arch/arm/plat-s5pc1xx/irq.c | 116 +---------------------------------------- # 2 files changed, 4 insertions(+), 113 deletions(-) # # Author: Ben Dooks (Thu Jan 7 05:41:38 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:16 GMT 2010) # # ARM: S5PC1XX: Move to using standard timer IRQ handling code # # Move to using the standard VIC/Timer IRQ handling code added previously # to avoid duplicating code. # # Thanks to Marek Szyprowski for pointing out dual Kconfig change. # # Signed-off-by: Ben Dooks # # arch/arm/mach-s5pc100/include/mach/tick.h | 2 - # arch/arm/plat-s5pc1xx/Kconfig | 1 # arch/arm/plat-s5pc1xx/include/plat/irqs.h | 19 ++++-- # arch/arm/plat-s5pc1xx/irq.c | 88 ++--------------------------- # 4 files changed, 22 insertions(+), 88 deletions(-) # # Author: Ben Dooks (Tue Jan 12 04:10:59 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:16 GMT 2010) # # ARM: S5PC1XX: Remove definitions deleted by previous clksrc changes # # Remove the definitions we've deleted in the previous updates to the # clksrc_clk for arch/arm/plat-s5pc1xx/include/plat/regs-clock.h. # # Added comments about the removal to the clock header since we only need # these defines in one place (and they've now been removed there) we get # rid of them from the header. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s5pc1xx/include/plat/regs-clock.h | 119 +---------------------- # 1 files changed, 6 insertions(+), 113 deletions(-) # # Author: Ben Dooks (Tue Jan 12 03:52:43 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:15 GMT 2010) # # ARM: SAMSUNG: Add script to change old clksrc_clk to new register defs # # This script is used to change the old style clksrc_clk as originally # found in plat-s3c64xx to the new style. It is here for reference if needed # for future code merges. # # Signed-off-by: Ben Dooks # # .../arm/Samsung/clksrc-change-registers.awk | 167 ++++++++++++++++++++ # 1 files changed, 167 insertions(+), 0 deletions(-) # create mode 100755 Documentation/arm/Samsung/clksrc-change-registers.awk # # Author: Ben Dooks (Tue Jan 12 03:49:17 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:15 GMT 2010) # # ARM: S5PC1XX: Change clksrc_clks to use array of clocks # # Remove the individual 'struct clksrc_clks' and place them into an array # so that we can simply use s3c_register_clksrcs to register tham all in one # go. # # Since the spdif clock relies on the audio clock, move the audio clocks # into their own arrary. # # Thanks to Marek Szyprowski for testing and pointing out the four clocks # what where missed from the clock list. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s5pc1xx/s5pc100-clock.c | 416 ++++++++++++++------------------- # 1 files changed, 179 insertions(+), 237 deletions(-) # # Author: Ben Dooks (Tue Jan 12 03:39:58 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:15 GMT 2010) # # ARM: S5PC1XX: Move clock definitions around ready to turn into clksrc arrays # # Move the clock definitions around ready to turn the clocks into an array # of clocks and register them in one go. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s5pc1xx/s5pc100-clock.c | 250 +++++++++++++++++---------------- # 1 files changed, 127 insertions(+), 123 deletions(-) # # Author: Ben Dooks (Tue Jan 12 03:19:28 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:14 GMT 2010) # # ARM: S5PC1XX: Move to using generic clksrc_clk for clock code # # Remove the copy of the old s3c64xx struct clksrc_clk and use the new one # in plat-samsung. This eliminates a bug in the set_parent() call where it # failed to set the clk->parent after sucesfully updating the clock. # # The script that was used to automate much of the process will be supplied # seperately. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s5pc1xx/Kconfig | 1 # arch/arm/plat-s5pc1xx/s5pc100-clock.c | 388 ++++++++------------------------- # 2 files changed, 97 insertions(+), 292 deletions(-) # # Author: Kukjin Kim (Mon Jan 11 03:21:51 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:14 GMT 2010) # # ARM: SAMSUNG: Add config option for number of additional GPIO pins. # # This patch adds a configuration option for specifing the number # of additional GPIO pins to be used in addition to the GPIO pins # supported onchip. # # Signed-off-by: Kukjin Kim # Signed-off-by: Ben Dooks # # arch/arm/plat-samsung/Kconfig | 8 ++++++++ # 1 files changed, 8 insertions(+), 0 deletions(-) # # Author: Ben Dooks (Wed Jan 6 23:59:26 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:14 GMT 2010) # # ARM: Add common entry code for system with two VICs # # Add a common entry-macro-vic2.S for systems where there are two VICs # so that the machine or platform directories just need to setup the # correct information before including into # their own entry-macro.S file. # # Since this code is from the S3C64XX project, we update the S3C64XX # machine entry code to use this new header. # # Signed-off-by: Ben Dooks # # arch/arm/include/asm/entry-macro-vic2.S | 57 ++++++++++++++++++++++ # arch/arm/mach-s3c6400/include/mach/entry-macro.S | 28 ----------- # arch/arm/mach-s3c6400/include/mach/map.h | 4 +- # arch/arm/mach-s3c6400/include/mach/tick.h | 2 - # arch/arm/plat-s3c64xx/cpu.c | 4 +- # arch/arm/plat-s3c64xx/include/plat/irqs.h | 8 ++- # arch/arm/plat-s3c64xx/irq.c | 4 +- # 7 files changed, 69 insertions(+), 38 deletions(-) # create mode 100644 arch/arm/include/asm/entry-macro-vic2.S # # Author: Ben Dooks (Wed Jan 6 02:18:44 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:14 GMT 2010) # # ARM: SAMSUNG: Move IRQ UART handling for newer devices to plat-samsung # # Move the handling for the UART interrupts out of the s3c64xx specific # code and into plat-samsung so that it can be used by all implementations # that need it. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c64xx/Kconfig | 1 # arch/arm/plat-s3c64xx/irq.c | 117 +------------------- # arch/arm/plat-samsung/Kconfig | 5 + # arch/arm/plat-samsung/Makefile | 1 # arch/arm/plat-samsung/include/plat/irq-uart.h | 20 +++ # arch/arm/plat-samsung/irq-uart.c | 143 +++++++++++++++++++++++++ # 6 files changed, 173 insertions(+), 114 deletions(-) # create mode 100644 arch/arm/plat-samsung/include/plat/irq-uart.h # create mode 100644 arch/arm/plat-samsung/irq-uart.c # # Author: Ben Dooks (Wed Jan 6 01:14:51 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:13 GMT 2010) # # ARM: SAMSUNG: Move IRQ VIC timer handling out to common header files # # Move the VIC based timer interrupt handling out of plat-s3c64xx and # into plat-samsung to be re-used for other systems. This also reduces # the code size as we now have a common init routine and use the irq_desc # to store the interrupt number of the timer. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c64xx/Kconfig | 1 # arch/arm/plat-s3c64xx/irq.c | 90 ++------------------ # arch/arm/plat-samsung/Kconfig | 7 ++ # arch/arm/plat-samsung/Makefile | 2 # arch/arm/plat-samsung/include/plat/irq-vic-timer.h | 13 +++ # arch/arm/plat-samsung/irq-vic-timer.c | 86 +++++++++++++++++++ # 6 files changed, 116 insertions(+), 83 deletions(-) # create mode 100644 arch/arm/plat-samsung/include/plat/irq-vic-timer.h # create mode 100644 arch/arm/plat-samsung/irq-vic-timer.c # # Author: Ben Dooks (Tue Jan 5 17:28:20 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:13 GMT 2010) # # ARM: SAMSUNG: Move gpio-config.c into plat-samsung # # The arch/arm/plat-s3c/gpio-config.c file is common to pretty much all the Samsung # SoCs, so move it to arch/arm/plat-samsung # # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c/Kconfig | 33 --------------------------------- # arch/arm/plat-s3c/Makefile | 1 - # arch/arm/plat-samsung/Kconfig | 35 +++++++++++++++++++++++++++++++++++ # arch/arm/plat-samsung/Makefile | 1 + # arch/arm/plat-samsung/gpio-config.c | 0 # 5 files changed, 36 insertions(+), 34 deletions(-) # rename arch/arm/{plat-s3c/gpio-config.c => plat-samsung/gpio-config.c} (100%) # # Author: Ben Dooks (Tue Jan 5 17:45:09 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:13 GMT 2010) # # ARM: SAMSUNG: Move device definitions in plat-samsung # # Move all the platform device definitions from plat-s3c into plat-samsung # # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c/Kconfig | 42 --------------------------------- # arch/arm/plat-s3c/Makefile | 12 --------- # arch/arm/plat-samsung/Kconfig | 42 +++++++++++++++++++++++++++++++++ # arch/arm/plat-samsung/Makefile | 12 +++++++++ # arch/arm/plat-samsung/dev-fb.c | 0 # arch/arm/plat-samsung/dev-hsmmc.c | 0 # arch/arm/plat-samsung/dev-hsmmc1.c | 0 # arch/arm/plat-samsung/dev-hsmmc2.c | 0 # arch/arm/plat-samsung/dev-i2c0.c | 0 # arch/arm/plat-samsung/dev-i2c1.c | 0 # arch/arm/plat-samsung/dev-nand.c | 0 # arch/arm/plat-samsung/dev-usb-hsotg.c | 0 # arch/arm/plat-samsung/dev-usb.c | 0 # 13 files changed, 54 insertions(+), 54 deletions(-) # rename arch/arm/{plat-s3c/dev-fb.c => plat-samsung/dev-fb.c} (100%) # rename arch/arm/{plat-s3c/dev-hsmmc.c => plat-samsung/dev-hsmmc.c} (100%) # rename arch/arm/{plat-s3c/dev-hsmmc1.c => plat-samsung/dev-hsmmc1.c} (100%) # rename arch/arm/{plat-s3c/dev-hsmmc2.c => plat-samsung/dev-hsmmc2.c} (100%) # rename arch/arm/{plat-s3c/dev-i2c0.c => plat-samsung/dev-i2c0.c} (100%) # rename arch/arm/{plat-s3c/dev-i2c1.c => plat-samsung/dev-i2c1.c} (100%) # rename arch/arm/{plat-s3c/dev-nand.c => plat-samsung/dev-nand.c} (100%) # rename arch/arm/{plat-s3c/dev-usb-hsotg.c => plat-samsung/dev-usb-hsotg.c} (100%) # rename arch/arm/{plat-s3c/dev-usb.c => plat-samsung/dev-usb.c} (100%) # # Author: Ben Dooks (Tue Jan 5 17:39:28 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:12 GMT 2010) # # ARM: SAMSUNG: Move pwm-clock code into plat-samsung # # Move the code for the pwm-clock into plat-samsung, as it is common to # all Samsung SoCs. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c/Makefile | 1 - # arch/arm/plat-samsung/Makefile | 1 + # arch/arm/plat-samsung/pwm-clock.c | 0 # 3 files changed, 1 insertions(+), 1 deletions(-) # rename arch/arm/{plat-s3c/pwm-clock.c => plat-samsung/pwm-clock.c} (100%) # # Author: Kukjin Kim (Thu Jan 14 03:50:23 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:12 GMT 2010) # # ARM: SAMSUNG: Make clk_default_setrate and clk_ops_def_setrate visible # # This patch makes clk_default_setrate and clk_ops_def_setrate available # to code outside plat-samsung clock code. # # Signed-off-by: Thomas Abraham # Signed-off-by: Kukjin Kim # Signed-off-by: Ben Dooks # # arch/arm/plat-s5pc1xx/clock.c | 14 ++------------ # arch/arm/plat-samsung/clock.c | 4 ++-- # arch/arm/plat-samsung/include/plat/clock.h | 3 +++ # 3 files changed, 7 insertions(+), 14 deletions(-) # # Author: Ben Dooks (Tue Jan 5 16:53:25 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:11 GMT 2010) # # ARM: SAMSUNG: Do not register set_parent call if no source # # If there is no source register defined, do not register a clksrc # clock with a valid .set_parent in the ops. # # Signed-off-by: Ben Dooks # # arch/arm/plat-samsung/clock-clksrc.c | 10 +++++++++- # 1 files changed, 9 insertions(+), 1 deletions(-) # # Author: Ben Dooks (Tue Jan 5 16:21:38 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:11 GMT 2010) # # ARM: SAMSUNG: Add call to register array of clocks # # Add s3c_register_clocks() to register an array of clocks, printing # an error message if there is a problem. Replace all points in the code # where this could be used. # # Signed-off-by: Ben Dooks # # arch/arm/mach-s3c2443/clock.c | 9 +-------- # arch/arm/plat-s3c/pwm-clock.c | 18 ++++-------------- # arch/arm/plat-s3c64xx/clock.c | 10 +--------- # arch/arm/plat-s5pc1xx/clock.c | 12 ++---------- # arch/arm/plat-samsung/clock.c | 22 ++++++++++++++++++++++ # arch/arm/plat-samsung/include/plat/clock.h | 2 ++ # 6 files changed, 32 insertions(+), 41 deletions(-) # # Author: Ben Dooks (Tue Jan 5 16:07:57 GMT 2010) # Committer: Ben Dooks (Fri Jan 15 08:10:11 GMT 2010) # # ARM: SAMSUNG: Do not allow get/set/round rate calls with no divider # # If the reg_div field is not set, then do not register clk_ops with the # get/set/round rate calls as these will fail to work. # # Signed-off-by: Ben Dooks # # arch/arm/plat-samsung/clock-clksrc.c | 15 +++++++++++++-- # 1 files changed, 13 insertions(+), 2 deletions(-) # # Author: Ben Dooks (Wed Dec 23 18:43:48 GMT 2009) # Committer: Ben Dooks (Fri Jan 15 08:10:11 GMT 2010) # # ARM: SAMSUNG: Move clock.c to arch/arm/plat-samsung # # This is the core implementation of the clock code for all Samsung based # SoCs, so move it to arch/arm/plat-samsung (the clock.h file has already # been moved). # # Since the file is built for every Samsung SoC, no changes are needed to the # Kconfig system. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c/Makefile | 3 +-- # arch/arm/plat-samsung/Makefile | 4 ++++ # arch/arm/plat-samsung/clock.c | 0 # 3 files changed, 5 insertions(+), 2 deletions(-) # rename arch/arm/{plat-s3c/clock.c => plat-samsung/clock.c} (100%) # # Author: Ben Dooks (Wed Dec 9 00:08:35 GMT 2009) # Committer: Ben Dooks (Fri Jan 15 08:10:10 GMT 2010) # # ARM: S3C64XX: Avoid announcing clksrc clocks twice # # The new code calls the clock setup code on registration which # can be before the clock system has been fully initialised. The # following code re-does this setup at the end of the clock # registration and thus we get two printings. # # Update the calls to only print on the last pass or when doing # the necessary resume work. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c64xx/s3c6400-clock.c | 4 ++-- # arch/arm/plat-samsung/clock-clksrc.c | 16 +++++++++++----- # arch/arm/plat-samsung/include/plat/clock-clksrc.h | 10 +++++++++- # 3 files changed, 22 insertions(+), 8 deletions(-) # # Author: Ben Dooks (Tue Dec 8 01:26:07 GMT 2009) # Committer: Ben Dooks (Fri Jan 15 08:10:10 GMT 2010) # # ARM: S3C64XX: Fixup .reg_src and .reg_div with named initialisers # # Change these two fields to have named initialisers as per the # review comments from Kyungmin Park. # # sed used: # # s@\.reg_src\(.*\)=\(.*\){\(.*\),\(.*\),\(.*\)}@.reg_src\1=\2{ .reg =\3, .shift =\4, .size =\5 }@g # s@\.reg_div\(.*\)=\(.*\){\(.*\),\(.*\),\(.*\)}@.reg_div\1=\2{ .reg =\3, .shift =\4, .size =\5 }@g # # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c64xx/s3c6400-clock.c | 50 +++++++++++++++++---------------- # 1 files changed, 25 insertions(+), 25 deletions(-) # # Author: Ben Dooks (Tue Dec 1 01:24:37 GMT 2009) # Committer: Ben Dooks (Fri Jan 15 08:10:10 GMT 2010) # # ARM: SAMSUNG: Reduce size of struct clk. # # Reduce the size of struct clk by 12 bytes and make defining clocks with # common implementation functions easier by moving the set_rate, get_rate, # round_rate and set_parent calls into a new structure called 'struct clk_ops' # and using that instead. # # This change does make a few clocks larger as they need their own clk_ops, # but this is outweighed by the number of clocks with either no ops or having # a common set of ops. # # Update all the users of this. # # Signed-off-by: Ben Dooks # # arch/arm/mach-s3c2412/clock.c | 52 +++++++----- # arch/arm/mach-s3c2440/clock.c | 6 + # arch/arm/mach-s3c2442/clock.c | 6 + # arch/arm/mach-s3c2443/clock.c | 88 +++++++++++++------- # arch/arm/plat-s3c/clock.c | 31 ++++--- # arch/arm/plat-s3c/pwm-clock.c | 94 +++++++++++---------- # arch/arm/plat-s3c24xx/clock-dclk.c | 22 +++-- # arch/arm/plat-s3c24xx/s3c244x-clock.c | 4 + # arch/arm/plat-s3c64xx/s3c6400-clock.c | 14 ++- # arch/arm/plat-s5pc1xx/clock.c | 8 +- # arch/arm/plat-s5pc1xx/s5pc100-clock.c | 126 ++++++++++++---------------- # arch/arm/plat-samsung/clock-clksrc.c | 17 ++-- # arch/arm/plat-samsung/include/plat/clock.h | 29 ++++++ # 13 files changed, 286 insertions(+), 211 deletions(-) # # Author: Harald Welte (Tue Dec 1 01:24:36 GMT 2009) # Committer: Ben Dooks (Fri Jan 15 08:10:09 GMT 2010) # # ARM: S3C64XX: Remove unused clock definitions from clock header # # Clean out the definitions we are no longer using after the new clock # code updates. # # Signed-off-by: Harald Welte # [ben-linux@fluff.org: split from initial patch provided] # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 71 ----------------------- # 1 files changed, 1 insertions(+), 70 deletions(-) # # Author: Ben Dooks (Tue Dec 1 01:24:35 GMT 2009) # Committer: Ben Dooks (Fri Jan 15 08:10:09 GMT 2010) # # ARM: S3C64XX: Use new clock-clksrc.c code for clocks. # # Move the s3c6400-clock.c implementation over to use the new common # plat-samsung based clock-clksrc.c. # # Note, this does not delete the clocks definitions that are now unused # in the regs-clock.h to reduce the quantity of change in this commit. # # Based on original patches by Harald Welte. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c64xx/Kconfig | 1 # arch/arm/plat-s3c64xx/s3c6400-clock.c | 241 +++++---------------------------- # 2 files changed, 40 insertions(+), 202 deletions(-) # # Author: Harald Welte (Tue Dec 1 01:24:34 GMT 2009) # Committer: Ben Dooks (Fri Jan 15 08:10:09 GMT 2010) # # ARM: SAMSUNG: Add core clock implementation for clksrc based clocks # # Add a core for the clksrc clock implementation, which is found in many of # the newer Samsung SoCs into plat-samsung. # # Signed-off-by: Harald Welte # [ben-linux@fluff.org: split from original patch to make change smaller] # [ben-linux@fluff.org: split clk and clksrc changes] # [ben-linux@fluff.org: moved to plat-samsung from plat-s3c] # [ben-linux@fluff.org: re-wrote headers after splits] # [ben-linux@fluff.org: added better documentation to headers] # Signed-off-by: Ben Dooks # # arch/arm/plat-samsung/Kconfig | 5 + # arch/arm/plat-samsung/Makefile | 1 # arch/arm/plat-samsung/clock-clksrc.c | 177 +++++++++++++++++++++ # arch/arm/plat-samsung/include/plat/clock-clksrc.h | 75 +++++++++ # 4 files changed, 258 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/plat-samsung/clock-clksrc.c # create mode 100644 arch/arm/plat-samsung/include/plat/clock-clksrc.h # # Author: Ben Dooks (Mon Nov 30 01:31:32 GMT 2009) # Committer: Ben Dooks (Fri Jan 15 08:10:08 GMT 2010) # # ARM: S3C64XX: Compress s3c6400-clock.c code # # The individually named clocks are all static to the code # and thus can be compressed into a single array and then # the array can be referenced. This removes the need for # a seperate array of pointers to clocks. # # Fix a minor problem of re-initialising the pointers in # s3c6400_set_clksrc() as this is also called by the cpufreq # code. Move these initialisations to the code that does the # registration. # # Based on Harald Welte's original clock changes patch. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c64xx/s3c6400-clock.c | 334 +++++++++++++++------------------ # 1 files changed, 154 insertions(+), 180 deletions(-) # # Author: Ben Dooks (Mon Nov 30 01:10:57 GMT 2009) # Committer: Ben Dooks (Fri Jan 15 08:10:08 GMT 2010) # # ARM: S3C64XX: Cleanup common init code in s3c6400-clock.c # # Remove the four fields from clksrc_clk.clk which are always the same # and init them when the clock is registered. This helps remove the amount # of repeated code. # # This is a re-work of Harald Welte's clock changes for the latest kernel. # # Signed-off-by: Ben Dooks # # arch/arm/plat-s3c64xx/s3c6400-clock.c | 49 +++------------------------------ # 1 files changed, 5 insertions(+), 44 deletions(-) # # Author: Ben Dooks (Mon Nov 30 00:40:47 GMT 2009) # Committer: Ben Dooks (Fri Jan 15 08:10:08 GMT 2010) # # ARM: SAMSUNG: Move to plat-samsung # # Move the header to plat-samsung where it can be used by all # the platforms, and readies it for the next round of clock updates where # the clock code will be amalgamated. # # Signed-off-by: Ben Dooks # # arch/arm/plat-samsung/include/plat/clock.h | 0 # 1 files changed, 0 insertions(+), 0 deletions(-) # rename arch/arm/{plat-s3c/include/plat/clock.h => plat-samsung/include/plat/clock.h} (100%) # # Author: Hartley Sweeten (Mon Jan 11 20:41:29 GMT 2010) # Committer: Russell King (Tue Jan 12 12:39:47 GMT 2010) # # ARM: 5879/1: ep93xx: define magic numbers for pll1 and pll2 # # Add defines for the pll register magic numbers that determine if # the pll's are bypassed and if pll2 is enabled. Rename the clock # set registers to more closely match the datasheet. Also, remove # the unnecessary braces since each conditional statement is a single # statement. # # Signed-off-by: H Hartley Sweeten # Acked-by: Ryan Mallon # Signed-off-by: Russell King # # arch/arm/mach-ep93xx/clock.c | 20 ++++++++++++-------- # arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 7 +++++-- # 2 files changed, 17 insertions(+), 10 deletions(-) # # Author: Hartley Sweeten (Mon Jan 11 20:38:00 GMT 2010) # Committer: Russell King (Tue Jan 12 12:38:33 GMT 2010) # # ARM: 5878/1: ep93xx: register the pwm devices on the edb93xx dev boards # # Add the platform init code to register the pwm devices that exist # on the various edb93xx development boards. # # Signed-off-by: H Hartley Sweeten # Acked-by: Ryan Mallon # Signed-off-by: Russell King # # arch/arm/mach-ep93xx/edb93xx.c | 21 +++++++++++++++++++++ # 1 files changed, 21 insertions(+), 0 deletions(-) # # Author: Hartley Sweeten (Mon Jan 11 18:33:16 GMT 2010) # Committer: Russell King (Tue Jan 12 12:38:32 GMT 2010) # # ARM: 5877/1: ep93xx: use pr_fmt in core.c # # Use pr_fmt to prefix kernel output with the module name. # # Signed-off-by: H Hartley Sweeten # Acked-by: Ryan Mallon # Signed-off-by: Russell King # # arch/arm/mach-ep93xx/core.c | 9 +++++---- # 1 files changed, 5 insertions(+), 4 deletions(-) # # Author: Hartley Sweeten (Mon Jan 11 17:36:02 GMT 2010) # Committer: Russell King (Tue Jan 12 12:38:32 GMT 2010) # # ARM: 5876/1: ep93xx: use pr_fmt in dma-m2p.c # # Use pr_fmt to prefix kernel output with the module name. # # Signed-off-by: H Hartley Sweeten # Acked-by: Ryan Mallon # Signed-off-by: Russell King # # arch/arm/mach-ep93xx/dma-m2p.c | 6 ++++-- # 1 files changed, 4 insertions(+), 2 deletions(-) # # Author: Hartley Sweeten (Mon Jan 11 17:30:41 GMT 2010) # Committer: Russell King (Tue Jan 12 12:38:32 GMT 2010) # # ARM: 5875/1: ep93xx: use pr_fmt in clock.c # # Use pr_fmt to prefix kernel output with the module name and change # all printk messages to pr_ format. # # Signed-off-by: H Hartley Sweeten # Acked-by: Ryan Mallon # Signed-off-by: Russell King # # arch/arm/mach-ep93xx/clock.c | 6 ++++-- # 1 files changed, 4 insertions(+), 2 deletions(-) # # Author: Jeremy Kerr (Mon Jan 11 22:17:34 GMT 2010) # Committer: Russell King (Tue Jan 12 12:35:58 GMT 2010) # # ARM: 5880/1: arm: use generic infrastructure for early params # # The ARM setup code includes its own parser for early params, there's # also one in the generic init code. # # This patch removes __early_init (and related code) from # arch/arm/kernel/setup.c, and changes users to the generic early_init # macro instead. # # The generic macro takes a char * argument, rather than char **, so we # need to update the parser functions a little. # # Signed-off-by: Jeremy Kerr # Signed-off-by: Russell King # # arch/arm/include/asm/setup.h | 12 ------- # arch/arm/kernel/setup.c | 62 ++++++++++--------------------------- # arch/arm/kernel/vmlinux.lds.S | 4 -- # arch/arm/mach-footbridge/common.c | 7 ++-- # arch/arm/mm/init.c | 12 ++++--- # arch/arm/mm/mmu.c | 41 +++++++++++++----------- # 6 files changed, 48 insertions(+), 90 deletions(-) # # Author: Russell King (Tue Jan 12 12:28:00 GMT 2010) # Committer: Russell King (Tue Jan 12 12:28:00 GMT 2010) # # ARM: Consolidate clks_register() and similar # # Most machine classes want some way to register a block of clk_lookup # structures, and most do it by implementing a clks_register() type # function which walks an array, or by open-coding a loop. # # Consolidate all this into clkdev_add_table(). # # Acked-by: H Hartley Sweeten # Reviewed-by: Kevin Hilman # Acked-by: Eric Miao # Signed-off-by: Russell King # # arch/arm/common/clkdev.c | 10 ++++++++++ # arch/arm/include/asm/clkdev.h | 3 +++ # arch/arm/mach-bcmring/core.c | 3 +-- # arch/arm/mach-ep93xx/clock.c | 4 +--- # arch/arm/mach-integrator/core.c | 3 +-- # arch/arm/mach-integrator/integrator_cp.c | 4 +--- # arch/arm/mach-mmp/clock.c | 8 -------- # arch/arm/mach-mmp/clock.h | 2 -- # arch/arm/mach-mmp/pxa168.c | 2 +- # arch/arm/mach-mmp/pxa910.c | 2 +- # arch/arm/mach-mx1/clock.c | 4 +--- # arch/arm/mach-mx2/clock_imx21.c | 4 +--- # arch/arm/mach-mx2/clock_imx27.c | 4 +--- # arch/arm/mach-mx25/clock.c | 6 +----- # arch/arm/mach-mx3/clock-imx35.c | 4 +--- # arch/arm/mach-mx3/clock.c | 4 +--- # arch/arm/mach-mxc91231/clock.c | 4 +--- # arch/arm/mach-pnx4008/clock.c | 5 +---- # arch/arm/mach-pxa/clock.c | 8 -------- # arch/arm/mach-pxa/clock.h | 4 ---- # arch/arm/mach-pxa/eseries.c | 2 +- # arch/arm/mach-pxa/pxa25x.c | 4 ++-- # arch/arm/mach-pxa/pxa27x.c | 2 +- # arch/arm/mach-pxa/pxa300.c | 4 ++-- # arch/arm/mach-pxa/pxa320.c | 2 +- # arch/arm/mach-pxa/pxa3xx.c | 2 +- # arch/arm/mach-realview/core.c | 5 +---- # arch/arm/mach-u300/clock.c | 5 +---- # arch/arm/mach-ux500/clock.c | 5 +---- # arch/arm/mach-versatile/core.c | 3 +-- # arch/arm/mach-w90x900/clock.c | 9 --------- # arch/arm/mach-w90x900/clock.h | 1 - # arch/arm/mach-w90x900/cpu.c | 2 +- # arch/arm/plat-stmp3xxx/clock.c | 3 +-- # 34 files changed, 41 insertions(+), 96 deletions(-) # # Author: Russell King (Tue Jan 12 12:27:38 GMT 2010) # Committer: Russell King (Tue Jan 12 12:27:38 GMT 2010) # # Merge branch 'pnx' into misc # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Russell King (Sun Jan 10 17:33:56 GMT 2010) # Committer: Russell King (Sun Jan 10 17:34:09 GMT 2010) # # Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable # # 0 files changed, 0 insertions(+), 0 deletions(-) # # Author: Russell King (Sun Jan 10 17:23:29 GMT 2010) # Committer: Russell King (Sun Jan 10 17:23:29 GMT 2010) # # ARM: Move creation of /proc/cpu out of alignment.c # # Always creating this directory avoids other users having to jump # through silly hoops when they want to share this directory. # # Signed-off-by: Russell King # # arch/arm/Kconfig | 4 ++++ # arch/arm/kernel/setup.c | 15 ++++++++++++++- # arch/arm/mm/alignment.c | 6 +----- # 3 files changed, 19 insertions(+), 6 deletions(-) # # Author: Russell King (Sun Jan 10 17:15:32 GMT 2010) # Committer: Russell King (Sun Jan 10 17:22:18 GMT 2010) # # ARM: move LED support code out of arch/arm/kernel/time.c # # Signed-off-by: Russell King # # arch/arm/kernel/Makefile | 1 # arch/arm/kernel/leds.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++ # arch/arm/kernel/time.c | 104 ------------------------------------------ # 3 files changed, 116 insertions(+), 104 deletions(-) # create mode 100644 arch/arm/kernel/leds.c # # Author: Russell King (Sun Jan 10 17:05:08 GMT 2010) # Committer: Russell King (Sun Jan 10 17:22:18 GMT 2010) # # ARM: remove old RTC support # # All RTC drivers have been converted to rtclib, so the old code # providing the set_rtc function pointer, save_time_delta() and # restore_time_delta() functions is obsolete. Remove it. # # Signed-off-by: Russell King # # arch/arm/include/asm/mach/time.h | 8 ---- # arch/arm/kernel/time.c | 74 -------------------------------------- # 2 files changed, 0 insertions(+), 82 deletions(-) # # Author: Russell King (Fri Dec 18 11:10:03 GMT 2009) # Committer: Russell King (Sun Jan 10 17:22:18 GMT 2010) # # ARM: Add caller information to ioremap # # This allows the procfs vmallocinfo file to show who created the ioremap # regions. Note: __builtin_return_address(0) doesn't do what's expected # if its used in an inline function, so we leave __arm_ioremap callers # in such places alone. # # Signed-off-by: Russell King # # arch/arm/include/asm/io.h | 11 +++++++- # arch/arm/mach-davinci/io.c | 2 +- # arch/arm/mach-iop13xx/io.c | 7 +++-- # arch/arm/mach-msm/io.c | 3 ++ # arch/arm/mm/ioremap.c | 57 ++++++++++++++++++++++++++------------------ # arch/arm/mm/nommu.c | 12 +++++++++ # arch/arm/plat-iop/io.c | 3 ++ # arch/arm/plat-omap/io.c | 2 +- # 8 files changed, 65 insertions(+), 32 deletions(-) # # Author: Russell King (Sat Nov 21 12:58:13 GMT 2009) # Committer: Russell King (Sun Jan 10 13:09:45 GMT 2010) # # ARM: PNX4008: use msecs_to_jiffies() rather than open-coding it # # Signed-off-by: Russell King # # drivers/i2c/busses/i2c-pnx.c | 4 ++-- # 1 files changed, 2 insertions(+), 2 deletions(-) # # Author: Russell King (Sat Nov 21 12:56:13 GMT 2009) # Committer: Russell King (Sun Jan 10 13:09:45 GMT 2010) # # ARM: PNX4008: i2c-pnx makes no use of asm/uaccess.h nor asm/irq.h # # Remove unnecessary includes # # Signed-off-by: Russell King # # drivers/i2c/busses/i2c-pnx.c | 2 -- # 1 files changed, 0 insertions(+), 2 deletions(-) # # Author: Russell King (Sat Nov 21 12:46:31 GMT 2009) # Committer: Russell King (Sun Jan 10 13:09:45 GMT 2010) # # ARM: PNX4008: i2c-pnx: don't split messages across several lines # # It makes them harder to grep for. # # Signed-off-by: Russell King # # drivers/i2c/busses/i2c-pnx.c | 81 +++++++++++++++++++++++------------------- # 1 files changed, 44 insertions(+), 37 deletions(-) # # Author: Russell King (Sat Nov 21 12:40:00 GMT 2009) # Committer: Russell King (Sun Jan 10 13:09:44 GMT 2010) # # ARM: PNX4008: Use i2c driver data for passing between internal functions # # Since the drivers data now contains the i2c adapter structure, we can # pass around the drivers data between internal functions (which is what # they want) rather than using the i2c adapter structure and having an # additional pointer dereference each time. # # Signed-off-by: Russell King # # drivers/i2c/busses/i2c-pnx.c | 132 ++++++++++++++++++++---------------------- # 1 files changed, 62 insertions(+), 70 deletions(-) # # Author: Russell King (Sat Nov 21 12:25:27 GMT 2009) # Committer: Russell King (Sun Jan 10 13:09:44 GMT 2010) # # ARM: PNX4008: move i2c_adapter structure inside the drivers private data # # Signed-off-by: Russell King # # arch/arm/mach-pnx4008/i2c.c | 18 +++--------------- # drivers/i2c/busses/i2c-pnx.c | 40 ++++++++++++++++++++-------------------- # include/linux/i2c-pnx.h | 4 +++- # 3 files changed, 26 insertions(+), 36 deletions(-) # # Author: Russell King (Sat Nov 21 12:10:54 GMT 2009) # Committer: Russell King (Sat Jan 2 11:06:01 GMT 2010) # # ARM: PNX4008: kzalloc i2c drivers internal data # # Signed-off-by: Russell King # # arch/arm/mach-pnx4008/i2c.c | 25 +++++++------------------ # drivers/i2c/busses/i2c-pnx.c | 29 +++++++++++++++++++---------- # include/linux/i2c-pnx.h | 4 ++-- # 3 files changed, 28 insertions(+), 30 deletions(-) # # Author: Russell King (Sat Nov 21 11:58:36 GMT 2009) # Committer: Russell King (Sat Jan 2 11:06:01 GMT 2010) # # ARM: PNX4008: Make ioaddr 'void __iomem *' rather than 'u32' # # This avoids unnecessary casting. # # Signed-off-by: Russell King # # drivers/i2c/busses/i2c-pnx.c | 8 ++++---- # include/linux/i2c-pnx.h | 2 +- # 2 files changed, 5 insertions(+), 5 deletions(-) # # Author: Russell King (Sat Nov 21 11:43:33 GMT 2009) # Committer: Russell King (Sat Jan 2 11:06:01 GMT 2010) # # ARM: PNX4008: remove platform definitions from mach/timex.h # # mach/timex.h is only supposed to contain a definition for # CLOCK_TICK_RATE. Remove additional includes, and move private # definitions to a private header file. # # Signed-off-by: Russell King # # arch/arm/mach-pnx4008/include/mach/timex.h | 54 ---------------------- # arch/arm/mach-pnx4008/pm.c | 2 + # arch/arm/mach-pnx4008/time.c | 2 + # arch/arm/mach-pnx4008/time.h | 70 ++++++++++++++++++++++++++++ # 4 files changed, 74 insertions(+), 54 deletions(-) # create mode 100644 arch/arm/mach-pnx4008/time.h # # Author: Russell King (Fri Nov 20 12:46:07 GMT 2009) # Committer: Russell King (Sat Jan 2 11:06:01 GMT 2010) # # ARM: PNX4008: get i2c clock rate from clk API # # Acked-by: Vitaly Wool # Signed-off-by: Russell King # # arch/arm/mach-pnx4008/clock.c | 9 ++++++--- # arch/arm/mach-pnx4008/i2c.c | 9 --------- # drivers/i2c/busses/i2c-pnx.c | 15 ++++----------- # include/linux/i2c-pnx.h | 1 - # 4 files changed, 10 insertions(+), 24 deletions(-) # # Author: Russell King (Fri Nov 20 11:44:46 GMT 2009) # Committer: Russell King (Sat Jan 2 11:06:00 GMT 2010) # # ARM: PNX4008: convert i2c-pnx to use clk API enable/disable calls # # clk_set_rate() is not supposed to be used to turn clocks on and off. # That's what clk_enable/clk_disable is for. # # Acked-by: Vitaly Wool # Signed-off-by: Russell King # # arch/arm/mach-pnx4008/clock.c | 12 ++++++------ # drivers/i2c/busses/i2c-pnx.c | 18 +++++++++--------- # 2 files changed, 15 insertions(+), 15 deletions(-) # # Author: Russell King (Fri Nov 20 11:12:26 GMT 2009) # Committer: Russell King (Sat Jan 2 11:06:00 GMT 2010) # # ARM: PNX4008: move i2c clock start/stop into driver # # Acked-by: Vitaly Wool # Signed-off-by: Russell King # # arch/arm/mach-pnx4008/i2c.c | 36 ------------------------------------ # drivers/i2c/busses/i2c-pnx.c | 39 ++++++++++++++++++++++++++++++--------- # include/linux/i2c-pnx.h | 4 ++-- # 3 files changed, 32 insertions(+), 47 deletions(-) # # Author: Russell King (Fri Nov 20 10:50:34 GMT 2009) # Committer: Russell King (Sat Jan 2 11:06:00 GMT 2010) # # ARM: PNX4008: move i2c suspend/resume callbacks into driver # # Acked-by: Vitaly Wool # Signed-off-by: Russell King # # arch/arm/mach-pnx4008/i2c.c | 24 ------------------------ # drivers/i2c/busses/i2c-pnx.c | 9 +++++++-- # include/linux/i2c-pnx.h | 4 ---- # 3 files changed, 7 insertions(+), 30 deletions(-) # # Author: Russell King (Fri Nov 20 10:46:24 GMT 2009) # Committer: Russell King (Sat Jan 2 11:06:00 GMT 2010) # # ARM: PNX4008: convert i2c clocks to match by device only # # Acked-by: Vitaly Wool # Signed-off-by: Russell King # # arch/arm/mach-pnx4008/clock.c | 6 +++--- # arch/arm/mach-pnx4008/i2c.c | 8 ++------ # 2 files changed, 5 insertions(+), 9 deletions(-) # # Author: Russell King (Fri Nov 20 13:04:14 GMT 2009) # Committer: Russell King (Sat Jan 2 11:06:00 GMT 2010) # # ARM: PNX4008: convert watchdog to use clk API enable/disable calls # # clk_set_rate() is not supposed to be used to turn clocks on and off. # That's what clk_enable/clk_disable is for. # # Acked-by: Wim Van Sebroeck # Acked-by: Vitaly Wool # Signed-off-by: Russell King # # arch/arm/mach-pnx4008/clock.c | 4 ++-- # drivers/watchdog/pnx4008_wdt.c | 37 ++++++++++++++++++++++++------------- # 2 files changed, 26 insertions(+), 15 deletions(-) # # Author: Russell King (Fri Nov 20 13:07:28 GMT 2009) # Committer: Russell King (Sat Jan 2 11:05:59 GMT 2010) # # ARM: PNX4008: convert watchdog clocks to match by device only # # Acked-by: Wim Van Sebroeck # Acked-by: Vitaly Wool # Signed-off-by: Russell King # # arch/arm/mach-pnx4008/clock.c | 2 +- # drivers/watchdog/pnx4008_wdt.c | 2 +- # 2 files changed, 2 insertions(+), 2 deletions(-) # # Author: Russell King (Fri Nov 20 11:28:59 GMT 2009) # Committer: Russell King (Sat Jan 2 11:05:59 GMT 2010) # # ARM: PNX4008: provide clock enable/disable methods and initialization # # Acked-by: Vitaly Wool # Signed-off-by: Russell King # # arch/arm/mach-pnx4008/clock.c | 35 +++++++++++++++++++++++------------ # arch/arm/mach-pnx4008/clock.h | 4 +++- # 2 files changed, 26 insertions(+), 13 deletions(-) # # Author: Russell King (Fri Nov 20 11:25:44 GMT 2009) # Committer: Russell King (Sat Jan 2 11:05:59 GMT 2010) # # ARM: PNX4008: simplify clk enable/disable paths # # Acked-by: Vitaly Wool # Signed-off-by: Russell King # # arch/arm/mach-pnx4008/clock.c | 55 +++++++++++++++++------------------------ # 1 files changed, 23 insertions(+), 32 deletions(-) # # Author: Russell King (Fri Nov 20 10:32:41 GMT 2009) # Committer: Russell King (Sat Jan 2 11:05:59 GMT 2010) # # ARM: PNX4008: convert to clkdev # # Acked-by: Vitaly Wool # Signed-off-by: Russell King # # arch/arm/Kconfig | 1 # arch/arm/mach-pnx4008/clock.c | 69 +++++++++++++++------------ # arch/arm/mach-pnx4008/clock.h | 2 - # arch/arm/mach-pnx4008/include/mach/clkdev.h | 7 +++ # 4 files changed, 46 insertions(+), 33 deletions(-) # create mode 100644 arch/arm/mach-pnx4008/include/mach/clkdev.h # # Author: Russell King (Sat Oct 31 16:52:16 GMT 2009) # Committer: Russell King (Mon Dec 21 21:32:28 GMT 2009) # # ARM: dma-mapping: fix for speculative prefetching # # ARMv6 and ARMv7 CPUs can perform speculative prefetching, which makes # DMA cache coherency handling slightly more interesting. Rather than # being able to rely upon the CPU not accessing the DMA buffer until DMA # has completed, we now must expect that the cache could be loaded with # possibly stale data from the DMA buffer. # # Where DMA involves data being transferred to the device, we clean the # cache before handing it over for DMA, otherwise we invalidate the buffer # to get rid of potential writebacks. On DMA Completion, if data was # transferred from the device, we invalidate the buffer to get rid of # any stale speculative prefetches. # # Signed-off-by: Russell King # # arch/arm/mm/cache-v6.S | 10 ++++--- # arch/arm/mm/cache-v7.S | 10 ++++--- # arch/arm/mm/dma-mapping.c | 68 ++++++++++++++++++++------------------------- # 3 files changed, 42 insertions(+), 46 deletions(-) # # Author: Russell King (Thu Nov 26 16:24:19 GMT 2009) # Committer: Russell King (Mon Dec 21 21:31:48 GMT 2009) # # ARM: dma-mapping: remove dmac_clean_range and dmac_inv_range # # These are now unused, and so can be removed. # # Signed-off-by: Russell King # # arch/arm/include/asm/cacheflush.h | 23 ----------------------- # arch/arm/mm/cache-fa.S | 6 ++---- # arch/arm/mm/cache-v3.S | 29 +---------------------------- # arch/arm/mm/cache-v4.S | 29 +---------------------------- # arch/arm/mm/cache-v4wb.S | 6 ++---- # arch/arm/mm/cache-v4wt.S | 15 +-------------- # arch/arm/mm/cache-v6.S | 6 ++---- # arch/arm/mm/cache-v7.S | 6 ++---- # arch/arm/mm/proc-arm1020.S | 6 ++---- # arch/arm/mm/proc-arm1020e.S | 6 ++---- # arch/arm/mm/proc-arm1022.S | 6 ++---- # arch/arm/mm/proc-arm1026.S | 6 ++---- # arch/arm/mm/proc-arm920.S | 6 ++---- # arch/arm/mm/proc-arm922.S | 6 ++---- # arch/arm/mm/proc-arm925.S | 6 ++---- # arch/arm/mm/proc-arm926.S | 6 ++---- # arch/arm/mm/proc-arm940.S | 6 ++---- # arch/arm/mm/proc-arm946.S | 6 ++---- # arch/arm/mm/proc-feroceon.S | 12 ++++-------- # arch/arm/mm/proc-mohawk.S | 6 ++---- # arch/arm/mm/proc-xsc3.S | 6 ++---- # arch/arm/mm/proc-xscale.S | 8 ++------ # 22 files changed, 41 insertions(+), 171 deletions(-) # # Author: Russell King (Thu Nov 26 16:19:58 GMT 2009) # Committer: Russell King (Mon Dec 21 21:31:48 GMT 2009) # # ARM: dma-mapping: provide per-cpu type map/unmap functions # # Signed-off-by: Russell King # # arch/arm/include/asm/cacheflush.h | 9 ++++++++ # arch/arm/kernel/asm-offsets.c | 5 ++++ # arch/arm/mm/cache-fa.S | 26 +++++++++++++++++++++++ # arch/arm/mm/cache-v3.S | 24 +++++++++++++++++++++ # arch/arm/mm/cache-v4.S | 24 +++++++++++++++++++++ # arch/arm/mm/cache-v4wb.S | 26 +++++++++++++++++++++++ # arch/arm/mm/cache-v4wt.S | 25 ++++++++++++++++++++++ # arch/arm/mm/cache-v6.S | 26 +++++++++++++++++++++++ # arch/arm/mm/cache-v7.S | 26 +++++++++++++++++++++++ # arch/arm/mm/dma-mapping.c | 29 +++++++++++--------------- # arch/arm/mm/proc-arm1020.S | 26 +++++++++++++++++++++++ # arch/arm/mm/proc-arm1020e.S | 26 +++++++++++++++++++++++ # arch/arm/mm/proc-arm1022.S | 26 +++++++++++++++++++++++ # arch/arm/mm/proc-arm1026.S | 26 +++++++++++++++++++++++ # arch/arm/mm/proc-arm920.S | 26 +++++++++++++++++++++++ # arch/arm/mm/proc-arm922.S | 26 +++++++++++++++++++++++ # arch/arm/mm/proc-arm925.S | 26 +++++++++++++++++++++++ # arch/arm/mm/proc-arm926.S | 26 +++++++++++++++++++++++ # arch/arm/mm/proc-arm940.S | 26 +++++++++++++++++++++++ # arch/arm/mm/proc-arm946.S | 26 +++++++++++++++++++++++ # arch/arm/mm/proc-feroceon.S | 42 +++++++++++++++++++++++++++++++++++++ # arch/arm/mm/proc-mohawk.S | 26 +++++++++++++++++++++++ # arch/arm/mm/proc-xsc3.S | 26 +++++++++++++++++++++++ # arch/arm/mm/proc-xscale.S | 41 ++++++++++++++++++++++++++++++++++++ # 24 files changed, 598 insertions(+), 17 deletions(-) # # Author: Uwe Kleine-König (Thu Dec 17 13:56:57 GMT 2009) # Committer: Eric Miao (Fri Dec 18 07:35:20 GMT 2009) # # [ARM] pxa/ttc_dkb: remove duplicate macro definition # # ARRAY_AND_SIZE is already defined arch/arm/mach-mmp/common.h which is # already included. # # Signed-off-by: Uwe Kleine-König # Cc: Russell King # Cc: Bin Yang # Acked-by: Haojian Zhuang # Signed-off-by: Eric Miao # # arch/arm/mach-mmp/ttc_dkb.c | 2 -- # 1 files changed, 0 insertions(+), 2 deletions(-) # # Author: Daniel Mack (Fri Nov 27 12:47:11 GMT 2009) # Committer: Eric Miao (Fri Dec 18 07:34:58 GMT 2009) # # [ARM] pxa/raumfeld: add defconfig # # Signed-off-by: Daniel Mack # Signed-off-by: Eric Miao # # arch/arm/configs/raumfeld_defconfig | 1898 +++++++++++++++++++++++++++++++++++ # 1 files changed, 1898 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/configs/raumfeld_defconfig # # Author: Daniel Mack (Fri Nov 27 12:47:09 GMT 2009) # Committer: Eric Miao (Fri Dec 18 07:34:38 GMT 2009) # # [ARM] pxa/raumfeld: add platform support # # This adds support for Raumfeld's 'Controller', 'Connector', 'Speaker S' # and 'Speaker M' devices. They're all based on PXA303 SoCs. # # Signed-off-by: Daniel Mack # Signed-off-by: Eric Miao # # arch/arm/mach-pxa/Kconfig | 18 + # arch/arm/mach-pxa/Makefile | 3 # arch/arm/mach-pxa/raumfeld.c | 1100 ++++++++++++++++++++++++++++++++++++++++++ # 3 files changed, 1121 insertions(+), 0 deletions(-) # create mode 100644 arch/arm/mach-pxa/raumfeld.c # # Author: Russell King (Tue Nov 24 14:41:01 GMT 2009) # Committer: Russell King (Mon Dec 14 22:45:55 GMT 2009) # # ARM: dma-mapping: simplify dma_cache_maint_page # # dma_cache_maint_contiguous is now simple enough to live inside # dma_cache_maint_page, so move it there. # # Signed-off-by: Russell King # # arch/arm/mm/dma-mapping.c | 42 ++++++++++++++++++------------------------ # 1 files changed, 18 insertions(+), 24 deletions(-) # # Author: Russell King (Tue Nov 24 17:53:33 GMT 2009) # Committer: Russell King (Mon Dec 14 22:45:55 GMT 2009) # # ARM: dma-mapping: move selection of page ops out of dma_cache_maint_contiguous # # Signed-off-by: Russell King # # arch/arm/mm/dma-mapping.c | 59 +++++++++++++++++++++++---------------------- # 1 files changed, 30 insertions(+), 29 deletions(-) # # Author: Russell King (Tue Nov 24 16:27:17 GMT 2009) # Committer: Russell King (Mon Dec 14 22:45:54 GMT 2009) # # ARM: dma-mapping: push buffer ownership down into dma-mapping.c # # Signed-off-by: Russell King # # arch/arm/include/asm/dma-mapping.h | 39 +++++++++++++++++++++++------------- # arch/arm/mm/dma-mapping.c | 34 ++++++++++++++++++++++++++++--- # 2 files changed, 55 insertions(+), 18 deletions(-) # # Author: Russell King (Sat Oct 31 16:52:16 GMT 2009) # Committer: Russell King (Mon Dec 14 22:45:54 GMT 2009) # # ARM: dma-mapping: introduce the idea of buffer ownership # # The DMA API has the notion of buffer ownership; make it explicit in the # ARM implementation of this API. This gives us a set of hooks to allow # us to deal with CPU cache issues arising from non-cache coherent DMA. # # Signed-off-by: Russell King # Tested-By: Jamie Iles # # arch/arm/common/dmabounce.c | 4 ++ # arch/arm/include/asm/dma-mapping.h | 64 ++++++++++++++++++++++++++---------- # arch/arm/mm/dma-mapping.c | 13 +++++-- # 3 files changed, 58 insertions(+), 23 deletions(-) # # Author: Russell King (Thu Nov 5 13:29:36 GMT 2009) # Committer: Russell King (Mon Dec 14 14:54:28 GMT 2009) # # ARM: Fix ptrace accesses # # Signed-off-by: Russell King # # arch/arm/include/asm/cacheflush.h | 24 +---------------- # arch/arm/include/asm/smp_plat.h | 5 ++++ # arch/arm/mm/flush.c | 51 +++++++++++++++++++++++++++++++------ # 3 files changed, 50 insertions(+), 30 deletions(-) # # Author: Russell King (Mon Oct 5 15:34:22 BST 2009) # Committer: Russell King (Mon Oct 5 15:42:16 BST 2009) # # ARM: Flush user mapping on VIVT processors when copying a page # # Steven Walter writes: # > I've been tracking down an instance of userspace data corruption, # > and I believe I have found a window during fork where data can be # > lost. The corruption is occurring on an ARMv5 system with VIVT # > caches. Here's the scenario in question. Thread A is forking, # > Thread B is running in userspace: # > # > Thread A: flush_cache_mm() (dup_mmap) # > Thread B: writes to a page in the above mm # > Thread A: pte_wrprotect() the above page (copy_one_pte) # > Thread B: writes to the same page again # > # > During thread B's second write, he'll take a fault and enter the # > do_wp_page() case. We'll end up calling copy_page(), which notably # > uses the kernel virtual addresses for the old and new pages. This # > means that the new page does not necessarily have the data from the # > first write. Now there are two conflicting copies of the same # > cache-line in dcache. If the userspace cache-line flushes before # > the kernel cache-line, we lose the changes made during the first # > write. do_wp_page does call flush_dcache_page on the newly-copied # > page, but there's still a window where the CPU could flush the # > userspace cache-line before then. # # Resolve this by flushing the user mapping before copying the page # on processors with a writeback VIVT cache. # # Note: this does have a performance impact, and so needs further # consideration before being merged - can we optimize out some of # the cache flushes if, eg, we know that the page isn't yet mapped? # # Thread: # Signed-off-by: Russell King # # arch/arm/mm/copypage-feroceon.c | 1 + # arch/arm/mm/copypage-v4wb.c | 1 + # arch/arm/mm/copypage-xsc3.c | 1 + # 3 files changed, 3 insertions(+), 0 deletions(-) # # Author: Russell King (Mon Oct 5 15:17:45 BST 2009) # Committer: Russell King (Mon Oct 5 15:17:45 BST 2009) # # ARM: Pass VMA to copy_user_highpage() implementations # # Our copy_user_highpage() implementations may require cache maintainence. # Ensure that implementations have all necessary details to perform this # maintainence. # # Signed-off-by: Russell King # # arch/arm/include/asm/page.h | 7 ++++--- # arch/arm/mm/copypage-feroceon.c | 2 +- # arch/arm/mm/copypage-v3.c | 2 +- # arch/arm/mm/copypage-v4mc.c | 2 +- # arch/arm/mm/copypage-v4wb.c | 2 +- # arch/arm/mm/copypage-v4wt.c | 2 +- # arch/arm/mm/copypage-v6.c | 4 ++-- # arch/arm/mm/copypage-xsc3.c | 2 +- # arch/arm/mm/copypage-xscale.c | 2 +- # 9 files changed, 13 insertions(+), 12 deletions(-) #