summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-02-03ARM: S3C24XX: move s3c2416 irq init to common irq codeHeiko Stuebner
This is needed to further clean up the irq init. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-02-03ARM: S3C24XX: Modify s3c_irq_wake to use the hwirq propertyHeiko Stuebner
This gets rid of the use of static irq mappings there. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-02-03ARM: S3C24XX: Move irq syscore-ops to irq-pmHeiko Stuebner
With this the definition of s3c24xx_irq_syscore_ops can also move to common.h from plat/pm.h and the definitions of s3c24xx_irq_suspend and s3c24xx_irq_resume are also not necessary anymore in plat/pm.h Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-29ARM: S3C24XX: transform irq handling into a declarative formHeiko Stuebner
The irqs available on the machine and even the bit settings in the irq registers differ a lot through all the s3c24xx subarchitectures. This results in each subarch having its own irq init which adds its specific irqs to the base ones created in plat-s3c24xx/irq.c. This of course makes a future move to devicetree hard to implement. Therefore this patch transforms the base irq handling to a declarative style, where the irq types as well as its parent/child relationship gets read from a predefined datastructure, which later on can hopefully be easily represented in devicetree too. It should also be easy to include the subarch specific irqs here in later patches, reducing code size and duplication. It should not affect anything outside of the file, as the original irq numbers and their handling are preserved (hopefully) correctly. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-21ARM: S3C24XX: Move mach-s3c2440/ pll into mach-s3c24xx/Kukjin Kim
This patch moves mach-s3c2440/pll into mach-s3c24xx/ and removes arch/arm/mach-s3c2440/ directory in kernel. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-21ARM: S3C24XX: Move mach-s3c2440/ cpufreq driver into mach-s3c24xx/Kukjin Kim
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-21ARM: S3C24XX: Move mach-s3c2412/ cpufreq driver into mach-s3c24xx/Kukjin Kim
This patch moves mach-s3c2412/cpufreq driver into mach-s3c24xx/ and removes arch/arm/mach-s3c2412/ directory in kernel. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-21ARM: S3C2412: Remove useless codes mach-s3c2412/gpio.cKukjin Kim
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-21ARM: S3C24XX: Move mach-s3c2410/ pll into mach-s3c24xx/Kukjin Kim
This patch moves mach-s3c2410/pll into mach-s3c24xx/ and removes arch/arm/mach-s3c2410/ directory in kernel. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-21ARM: S3C24XX: Move mach-s3c2410/ cpufreq into mach-s3c24xx/Kukjin Kim
Basically, the cpufreq driver for s3c2410 should be implemented into drivers/cpufreq, but we don't need to keep the mach-s3c2410 directory. So this patch moves current cpufreq driver into mach-s3c24xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C64XX: Fix missing header error with CONFIG_CPU_IDLE enabledTomasz Figa
Recently the regs-syscon-power.h header was moved from mach-s3c64xx/include/mach to mach-s3c64xx/, but cpuidle.c was not updated to include the header from its new location, which caused build error with CONFIG_CPU_IDLE enabled. This patch fixed the problem by updating the include line with proper header location. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C64XX: make regs-syscon-power.h localKukjin Kim
The header file can be local in mach-s3c64xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C64XX: make regs-sys.h localKukjin Kim
The header file can be local in mach-s3c64xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C64XX: make regs-srom.h localKukjin Kim
The header file can be local in mach-s3c64xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C64XX: make regs-modem.h localKukjin Kim
The header can be local in mach-s3c64xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C64XX: make regs-gpio-memport.h localKukjin Kim
The header can be local in mach-s3c64xx/. Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C64XX: make crag6410.h localKukjin Kim
The header can be local in mach-s3c64xx/. Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C24XX: remove dsc.c and make regs-dsc.h localKukjin Kim
The mach-s3c2440/dsc.c is no longer used and the header, regs-dsc.h can be local in mach-s3c24xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C24XX: remove idle.hKukjin Kim
The <mach/idle.h> is no longer used. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C2412: cleanup regs-s3c2412.hKukjin Kim
Move the regs-s3c2412.h into mach-s3c24xx/s3c2412.c file. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C2416: remove regs-s3c2416-mem.h and regs-s3c2416.hKukjin Kim
The headers no longer used anywhere now. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C24XX: make vr1000-cpld.h, vr1000-irq.h and vr1000-map.h localKukjin Kim
The headers can be local in mach-s3c24xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C24XX: make otom-map.h localKukjin Kim
The header can be local in mach-s3c24xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C24XX: make osiris-cpld.h and osiris-map.h localKukjin Kim
This makes the headers local in mach-s3c24xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C24XX: make h1940.h and h1940-latch.h localKukjin Kim
The headers can be local in mach-s3c24xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C24XX: make gta02.h localKukjin Kim
The header can be local in mach-s3c24xx/ and sort out inclusions. Accordingly, the GTA02_ macro in driver can be replaced. Cc: Sangbeom Kim <sbkim73@samsung.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C24XX: make bast-cpld.h, bast-irq.h and bast-map.h localKukjin Kim
The headers can be local in mach-s3c24xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S3C24XX: make anubis-cpld, anubis-irq and anubis-map localKukjin Kim
The headers can be local in mach-s3c24xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: SAMSUNG: cleanup mach/gpio-fns.h gpio-track.h and gpio-nrs.hKukjin Kim
remove <mach/gpio-fns.h>, <mach/gpio-track.h> and <plat/gpio-fns.h> Acked-by: Linus Walleij <linus.walleij@linaro.org> Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: SAMSUNG: cleanup mach/regs-audss.h fileKukjin Kim
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: EXYNOS: move mach/pmu.h file into common.hKukjin Kim
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S5PV210: move regs-sys.h into setup-usb-phy.c fileKukjin Kim
The <mach/regs-sys.h> can be moved into mach-s5pv210/setup-usb-phy.c file. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S5P64X0: move s5p64x0-clock.h into local directoryKukjin Kim
The <mach/s5p64x0-clock.h> can be moved into mach-s5p64x0/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S5P64X0: move i2c.h into local directoryKukjin Kim
The <mach/i2c.h> can be moved into mach-s5p64x0/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10ARM: S5P64X0: remove gpiolib.c file in mach-s5p64x0Kukjin Kim
Since S5P64X0 gpiolib is supported in drivers/gpio/gpio-samsung.c, this can be removed. Probably, removing this file is missed when S5P64X0 gpiolib was supported in drivers/gpio/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-01-10cpufreq: exynos: cleanup exynos-cpufreq headerKukjin Kim
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-12-21Linux 3.8-rc1Linus Torvalds
2012-12-21Merge git://www.linux-watchdog.org/linux-watchdogLinus Torvalds
Pull watchdog updates from Wim Van Sebroeck: "This includes some fixes and code improvements (like clk_prepare_enable and clk_disable_unprepare), conversion from the omap_wdt and twl4030_wdt drivers to the watchdog framework, addition of the SB8x0 chipset support and the DA9055 Watchdog driver and some OF support for the davinci_wdt driver." * git://www.linux-watchdog.org/linux-watchdog: (22 commits) watchdog: mei: avoid oops in watchdog unregister code path watchdog: Orion: Fix possible null-deference in orion_wdt_probe watchdog: sp5100_tco: Add SB8x0 chipset support watchdog: davinci_wdt: add OF support watchdog: da9052: Fix invalid free of devm_ allocated data watchdog: twl4030_wdt: Change TWL4030_MODULE_PM_RECEIVER to TWL_MODULE_PM_RECEIVER watchdog: remove depends on CONFIG_EXPERIMENTAL watchdog: Convert dev_printk(KERN_<LEVEL> to dev_<level>( watchdog: DA9055 Watchdog driver watchdog: omap_wdt: eliminate goto watchdog: omap_wdt: delete redundant platform_set_drvdata() calls watchdog: omap_wdt: convert to devm_ functions watchdog: omap_wdt: convert to new watchdog core watchdog: WatchDog Timer Driver Core: fix comment watchdog: s3c2410_wdt: use clk_prepare_enable and clk_disable_unprepare watchdog: imx2_wdt: Select the driver via ARCH_MXC watchdog: cpu5wdt.c: add missing del_timer call watchdog: hpwdt.c: Increase version string watchdog: Convert twl4030_wdt to watchdog core davinci_wdt: preparation for switch to common clock framework ...
2012-12-21Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6Linus Torvalds
Pull CIFS fixes from Steve French: "Misc small cifs fixes" * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: cifs: eliminate cifsERROR variable cifs: don't compare uniqueids in cifs_prime_dcache unless server inode numbers are in use cifs: fix double-free of "string" in cifs_parse_mount_options
2012-12-21Merge tag 'dm-3.8-fixes' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm Pull dm update from Alasdair G Kergon: "Miscellaneous device-mapper fixes, cleanups and performance improvements. Of particular note: - Disable broken WRITE SAME support in all targets except linear and striped. Use it when kcopyd is zeroing blocks. - Remove several mempools from targets by moving the data into the bio's new front_pad area(which dm calls 'per_bio_data'). - Fix a race in thin provisioning if discards are misused. - Prevent userspace from interfering with the ioctl parameters and use kmalloc for the data buffer if it's small instead of vmalloc. - Throttle some annoying error messages when I/O fails." * tag 'dm-3.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm: (36 commits) dm stripe: add WRITE SAME support dm: remove map_info dm snapshot: do not use map_context dm thin: dont use map_context dm raid1: dont use map_context dm flakey: dont use map_context dm raid1: rename read_record to bio_record dm: move target request nr to dm_target_io dm snapshot: use per_bio_data dm verity: use per_bio_data dm raid1: use per_bio_data dm: introduce per_bio_data dm kcopyd: add WRITE SAME support to dm_kcopyd_zero dm linear: add WRITE SAME support dm: add WRITE SAME support dm: prepare to support WRITE SAME dm ioctl: use kmalloc if possible dm ioctl: remove PF_MEMALLOC dm persistent data: improve improve space map block alloc failure message dm thin: use DMERR_LIMIT for errors ...
2012-12-21Revert "nfsd: warn on odd reply state in nfsd_vfs_read"J. Bruce Fields
This reverts commit 79f77bf9a4e3dd5ead006b8f17e7c4ff07d8374e. This is obviously wrong, and I have no idea how I missed seeing the warning in testing: I must just not have looked at the right logs. The caller bumps rq_resused/rq_next_page, so it will always be hit on a large enough read. Reported-by: Dave Jones <davej@redhat.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-12-21Merge tag 'rdma-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband Pull more infiniband changes from Roland Dreier: "Second batch of InfiniBand/RDMA changes for 3.8: - cxgb4 changes to fix lookup engine hash collisions - mlx4 changes to make flow steering usable - fix to IPoIB to avoid pinning dst reference for too long" * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: RDMA/cxgb4: Fix bug for active and passive LE hash collision path RDMA/cxgb4: Fix LE hash collision bug for passive open connection RDMA/cxgb4: Fix LE hash collision bug for active open connection mlx4_core: Allow choosing flow steering mode mlx4_core: Adjustments to Flow Steering activation logic for SR-IOV mlx4_core: Fix error flow in the flow steering wrapper mlx4_core: Add QPN enforcement for flow steering rules set by VFs cxgb4: Add LE hash collision bug fix path in LLD driver cxgb4: Add T4 filter support IPoIB: Call skb_dst_drop() once skb is enqueued for sending
2012-12-21Merge tag 'asm-generic' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic Pull asm-generic cleanup from Arnd Bergmann: "These are a few cleanups for asm-generic: - a set of patches from Lars-Peter Clausen to generalize asm/mmu.h and use it in the architectures that don't need any special handling. - A patch from Will Deacon to remove the {read,write}s{b,w,l} as discussed during the arm64 review - A patch from James Hogan that helps with the meta architecture series." * tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: xtensa: Use generic asm/mmu.h for nommu h8300: Use generic asm/mmu.h c6x: Use generic asm/mmu.h asm-generic/mmu.h: Add support for FDPIC asm-generic/mmu.h: Remove unused vmlist field from mm_context_t asm-generic: io: remove {read,write} string functions asm-generic/io.h: remove asm/cacheflush.h include
2012-12-21ARM: dts: fix duplicated build target and alphabetical sort out for exynosKukjin Kim
Commit db5b0ae00712 ("Merge tag 'dt' of git://git.kernel.org/.../arm-soc") causes a duplicated build target. This patch fixes it and sorts out the build target alphabetically so that we can recognize something wrong easily. Cc: Olof Johansson <olof@lixom.net> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-12-21dm stripe: add WRITE SAME supportMike Snitzer
Rename stripe_map_discard to stripe_map_range and reuse it for WRITE SAME bio processing. Signed-off-by: Mike Snitzer <snitzer@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2012-12-21dm: remove map_infoMikulas Patocka
This patch removes map_info from bio-based device mapper targets. map_info is still used for request-based targets. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2012-12-21dm snapshot: do not use map_contextMikulas Patocka
Eliminate struct map_info from dm-snap. map_info->ptr was used in dm-snap to indicate if the bio was tracked. If map_info->ptr was non-NULL, the bio was linked in tracked_chunk_hash. This patch removes the use of map_info->ptr. We determine if the bio was tracked based on hlist_unhashed(&c->node). If hlist_unhashed is true, the bio is not tracked, if it is false, the bio is tracked. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2012-12-21dm thin: dont use map_contextMikulas Patocka
This patch removes endio_hook_pool from dm-thin and uses per-bio data instead. This patch removes any use of map_info in preparation for the next patch that removes map_info from bio-based device mapper. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2012-12-21dm raid1: dont use map_contextMikulas Patocka
Don't use map_info any more in dm-raid1. map_info was used for writes to hold the region number. For this purpose we add a new field dm_bio_details to dm_raid1_bio_record. map_info was used for reads to hold a pointer to dm_raid1_bio_record (if the pointer was non-NULL, bio details were saved; if the pointer was NULL, bio details were not saved). We use dm_raid1_bio_record.details->bi_bdev for this purpose. If bi_bdev is NULL, details were not saved, if bi_bdev is non-NULL, details were saved. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2012-12-21dm flakey: dont use map_contextMikulas Patocka
Replace map_info with a per-bio structure "struct per_bio_data" in dm-flakey. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>