summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'cleanup-decompwdog-3.9' of ↵Olof Johansson2013-02-0545-138/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup From Shawn Guo: The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which are unused on ARM architecure. Samsung has some code setting up wdog in arch_decomp_wdog(). But since CONFIG_S3C_BOOT_WATCHDOG is defined nowhere, it will not run. Otherwise, system can not boot at all when wdog is set up but no one pats it. * tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: samsung: remove unused arch_decomp_wdog() code ARM: remove unused arch_decomp_wdog() ARM: decompress: remove unused ARCH_HAS_DECOMP_WDOG Signed-off-by: Olof Johansson <olof@lixom.net>
| * ARM: samsung: remove unused arch_decomp_wdog() codeShawn Guo2013-01-112-56/+0
| | | | | | | | | | | | | | | | | | | | Besides the fact that CONFIG_S3C_BOOT_WATCHDOG is defined nowhere, with ARCH_HAS_DECOMP_WDOG removed from arch/arm/boot/compressed/decompress.c, all the arch_decomp_wdog() related code is not used. Remove them. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Nicolas Pitre <nico@linaro.org> Acked-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: remove unused arch_decomp_wdog()Shawn Guo2013-01-1142-80/+0
| | | | | | | | | | | | | | | | | | | | With ARCH_HAS_DECOMP_WDOG removed from arch/arm/boot/compressed/decompress.c, all the arch_decomp_wdog() definition at platform level is unneeded. Remmove it. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Nicolas Pitre <nico@linaro.org> Acked-by: Jason Cooper <jason@lakedaemon.net>
| * ARM: decompress: remove unused ARCH_HAS_DECOMP_WDOGShawn Guo2013-01-111-2/+0
| | | | | | | | | | | | | | | | | | ARCH_HAS_DECOMP_WDOG is only used in lib/inflate.c which is not included in arch/arm/boot/compressed/decompress.c now. That said, ARCH_HAS_DECOMP_WDOG is not used at all. Let's remove it. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Nicolas Pitre <nico@linaro.org>
* | Merge branch 'next/cleanup-header' of ↵Olof Johansson2013-02-0498-1793/+817
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup From Kukjin Kim: AS I commented, this makes <mach/*.h> local so that they could be removed. * 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (26 commits) ARM: S3C64XX: Fix missing header error with CONFIG_CPU_IDLE enabled ARM: S3C64XX: make regs-syscon-power.h local ARM: S3C64XX: make regs-sys.h local ARM: S3C64XX: make regs-srom.h local ARM: S3C64XX: make regs-modem.h local ARM: S3C64XX: make regs-gpio-memport.h local ARM: S3C64XX: make crag6410.h local ARM: S3C24XX: remove dsc.c and make regs-dsc.h local ARM: S3C24XX: remove idle.h ARM: S3C2412: cleanup regs-s3c2412.h ARM: S3C2416: remove regs-s3c2416-mem.h and regs-s3c2416.h ARM: S3C24XX: make vr1000-cpld.h, vr1000-irq.h and vr1000-map.h local ARM: S3C24XX: make otom-map.h local ARM: S3C24XX: make osiris-cpld.h and osiris-map.h local ARM: S3C24XX: make h1940.h and h1940-latch.h local ARM: S3C24XX: make gta02.h local ARM: S3C24XX: make bast-cpld.h, bast-irq.h and bast-map.h local ARM: S3C24XX: make anubis-cpld, anubis-irq and anubis-map local ARM: SAMSUNG: cleanup mach/gpio-fns.h gpio-track.h and gpio-nrs.h ARM: SAMSUNG: cleanup mach/regs-audss.h file ... Signed-off-by: Olof Johansson <olof@lixom.net>
| * | ARM: S3C64XX: Fix missing header error with CONFIG_CPU_IDLE enabledTomasz Figa2013-01-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | ARM: S3C64XX: make regs-syscon-power.h localKukjin Kim2013-01-102-6/+5
| | | | | | | | | | | | | | | | | | The header file can be local in mach-s3c64xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C64XX: make regs-sys.h localKukjin Kim2013-01-109-39/+41
| | | | | | | | | | | | | | | | | | The header file can be local in mach-s3c64xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C64XX: make regs-srom.h localKukjin Kim2013-01-104-9/+8
| | | | | | | | | | | | | | | | | | The header file can be local in mach-s3c64xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C64XX: make regs-modem.h localKukjin Kim2013-01-108-13/+12
| | | | | | | | | | | | | | | | | | The header can be local in mach-s3c64xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C64XX: make regs-gpio-memport.h localKukjin Kim2013-01-103-8/+7
| | | | | | | | | | | | | | | | | | | | | The header can be local in mach-s3c64xx/. Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C64XX: make crag6410.h localKukjin Kim2013-01-103-2/+2
| | | | | | | | | | | | | | | | | | | | | The header can be local in mach-s3c64xx/. Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C24XX: remove dsc.c and make regs-dsc.h localKukjin Kim2013-01-106-62/+8
| | | | | | | | | | | | | | | | | | | | | 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>
| * | ARM: S3C24XX: remove idle.hKukjin Kim2013-01-106-29/+0
| | | | | | | | | | | | | | | | | | The <mach/idle.h> is no longer used. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C2412: cleanup regs-s3c2412.hKukjin Kim2013-01-102-37/+14
| | | | | | | | | | | | | | | | | | Move the regs-s3c2412.h into mach-s3c24xx/s3c2412.c file. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C2416: remove regs-s3c2416-mem.h and regs-s3c2416.hKukjin Kim2013-01-102-54/+0
| | | | | | | | | | | | | | | | | | The headers no longer used anywhere now. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C24XX: make vr1000-cpld.h, vr1000-irq.h and vr1000-map.h localKukjin Kim2013-01-105-170/+133
| | | | | | | | | | | | | | | | | | The headers can be local in mach-s3c24xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C24XX: make otom-map.h localKukjin Kim2013-01-102-22/+18
| | | | | | | | | | | | | | | | | | The header can be local in mach-s3c24xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C24XX: make osiris-cpld.h and osiris-map.h localKukjin Kim2013-01-104-52/+29
| | | | | | | | | | | | | | | | | | This makes the headers local in mach-s3c24xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C24XX: make h1940.h and h1940-latch.h localKukjin Kim2013-01-107-79/+62
| | | | | | | | | | | | | | | | | | The headers can be local in mach-s3c24xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C24XX: make gta02.h localKukjin Kim2013-01-102-35/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | ARM: S3C24XX: make bast-cpld.h, bast-irq.h and bast-map.h localKukjin Kim2013-01-1012-296/+242
| | | | | | | | | | | | | | | | | | The headers can be local in mach-s3c24xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S3C24XX: make anubis-cpld, anubis-irq and anubis-map localKukjin Kim2013-01-105-92/+58
| | | | | | | | | | | | | | | | | | The headers can be local in mach-s3c24xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: SAMSUNG: cleanup mach/gpio-fns.h gpio-track.h and gpio-nrs.hKukjin Kim2013-01-109-141/+96
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | ARM: SAMSUNG: cleanup mach/regs-audss.h fileKukjin Kim2013-01-104-38/+4
| | | | | | | | | | | | Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: EXYNOS: move mach/pmu.h file into common.hKukjin Kim2013-01-106-38/+26
| | | | | | | | | | | | Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S5PV210: move regs-sys.h into setup-usb-phy.c fileKukjin Kim2013-01-102-16/+6
| | | | | | | | | | | | | | | | | | | | | 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>
| * | ARM: S5P64X0: move s5p64x0-clock.h into local directoryKukjin Kim2013-01-103-7/+6
| | | | | | | | | | | | | | | | | | The <mach/s5p64x0-clock.h> can be moved into mach-s5p64x0/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S5P64X0: move i2c.h into local directoryKukjin Kim2013-01-105-6/+5
| | | | | | | | | | | | | | | | | | The <mach/i2c.h> can be moved into mach-s5p64x0/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | ARM: S5P64X0: remove gpiolib.c file in mach-s5p64x0Kukjin Kim2013-01-101-508/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | cpufreq: exynos: cleanup exynos-cpufreq headerKukjin Kim2013-01-101-36/+0
| |/ | | | | | | | | Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | ARM: imx: fix imx31-dt.c time-related warningStephen Warren2013-01-311-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6bb27d7 "ARM: delete struct sys_timer" caused the following: arch/arm/mach-imx/imx31-dt.c:56:2: warning: initialization from incompatible pointer type [enabled by default] arch/arm/mach-imx/imx31-dt.c:56:2: warning: (near initialization for ‘__mach_desc_IMX31_DT.init_time’) [enabled by default] This is because mx31_clocks_init_dt() returns int, whereas the .init_time field prototype expects a function returning void. Implement a wrapper so that the prototypes match. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
* | Merge branch 'zynq/timer' of git://git.xilinx.com/linux-xlnx into next/cleanupOlof Johansson2013-01-293-81/+73
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Michal Simek, this is a series of cleanups to timer code on zynq platforms. * 'zynq/timer' of git://git.xilinx.com/linux-xlnx: arm: zynq: timer: Set clock_event cpumask arm: zynq: timer: Fix comment style arm: zynq: timer: Remove redundant #includes arm: zynq: timer: Align columns arm: zynq: timer: Remove unused #defines arm: zynq: timer: Remove unnecessary register write arm: zynq: timer: Replace PSS through PS arm: zynq: Add missing irqchip.h to common.c
| * | arm: zynq: timer: Set clock_event cpumaskSoren Brinkmann2013-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The timers are common to both A9 cores, so let's set the clock event struct's cpumask accordingly, to all possible CPUs. Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Tested-by: Josh Cartwright <josh.cartwright@ni.com>
| * | arm: zynq: timer: Fix comment styleSoren Brinkmann2013-01-281-3/+6
| | | | | | | | | | | | | | | | | | | | | Fixing multi line comment style at two locations. Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Tested-by: Josh Cartwright <josh.cartwright@ni.com>
| * | arm: zynq: timer: Remove redundant #includesSoren Brinkmann2013-01-281-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | Some #includes are implicitly included through others, some are just not needed. Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Tested-by: Josh Cartwright <josh.cartwright@ni.com>
| * | arm: zynq: timer: Align columnsSoren Brinkmann2013-01-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Aligning the columns in a block of #defines, so that the values are starting in the same colum on every line. Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Tested-by: Josh Cartwright <josh.cartwright@ni.com>
| * | arm: zynq: timer: Remove unused #definesSoren Brinkmann2013-01-281-3/+0
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Acked-by: Michal Simek <michal.simek@xilinx.com> Acked-by: John Linn <john.linn@xilinx.com> Tested-by: Josh Cartwright <josh.cartwright@ni.com>
| * | arm: zynq: timer: Remove unnecessary register writeSoren Brinkmann2013-01-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acknowedging an interrupt requires to read the interrupt register only. The write was only required to work around a bug in the QEMU implementation of the TTC, which is fixed. Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Acked-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Tested-by: Josh Cartwright <josh.cartwright@ni.com>
| * | arm: zynq: timer: Replace PSS through PSSoren Brinkmann2013-01-283-69/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The acronym PSS is deprecated by Xilinx. The correct term, which is also used in Xilinx documentation is PS (processing system). This is just a search and replace: - s/PSS/PS/g - s/pss/ps/g Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Tested-by: Josh Cartwright <josh.cartwright@ni.com>
| * | arm: zynq: Add missing irqchip.h to common.cMichal Simek2013-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch: "ARM: use common irqchip_init for GIC init" (sha1: 0529e315bbda5d502c93df2cfafba9bb337fbdf4) should also add linux/irqchip.h header. Error message: arch/arm/mach-zynq/common.c:99:14: error: 'irqchip_init' undeclared here (not in a function) Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | | Merge tag 'ux500-no-idh' of ↵Olof Johansson2013-01-299-3/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup From Linus Walleij: Removal of the <mach/id.h> include from ux500 - First an ACKed MFD patch deleting the only consumer of these cpu_is* functions outside of mach-ux500 - Introduce a new local cpu_is_u8580() in this patch set to avoid clashing with other patch sets. - Finally de-globalize <mach/id.h>. * tag 'ux500-no-idh' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: ux500: de-globalize <mach/id.h> ARM: ux500: Introduce cpu_is_u8580() mfd: prcmu: delete pin control helpers Signed-off-by: Olof Johansson <olof@lixom.net>
| * | | ARM: ux500: de-globalize <mach/id.h>Linus Walleij2013-01-299-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the file <mach/id.h> from the global kernel include scope, making it a pure mach-ux500 detail. All ASIC specifics needed by drivers shall henceforth be passed from either platform data or the device tree. Cc: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| * | | ARM: ux500: Introduce cpu_is_u8580()Maxime Coquelin2013-01-291-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect the subrevision v1 of U8540 and U8580. DB8580 is the FDSOI variant of DB8540. Some differences with DB8540 related to clocks will need to be checked with a cpu_is_u8580() function. Signed-off-by: Maxime Coquelin <maxime.coquelin@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
* | | | Merge tag 'cleanup_for_v3.9_round2' of ↵Olof Johansson2013-01-292-28/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.infradead.org/users/jcooper/linux into next/cleanup From Jason Cooper: cleanup for v3.9 round2 - remove unneeded #includes for mach-dove - remove unneeded #includes and code for the nsa310 * tag 'cleanup_for_v3.9_round2' of git://git.infradead.org/users/jcooper/linux: ARM: dove: cleanup includes ARM: kirkwood: nsa310: cleanup includes and unneeded code
| * | | | ARM: dove: cleanup includesSebastian Hesselbarth2013-01-291-20/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch cleans unneccessary includes and reorders the remaining includes in common dove code. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| * | | | ARM: kirkwood: nsa310: cleanup includes and unneeded codeJason Cooper2013-01-291-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After removing the unneeded linux/i2c.h, linux/of.h was needed for of_machine_is_compatible(). i2c.h had included of.h. Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | | | | arm: zynq: Add missing irqchip.h to common.cMichal Simek2013-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch: "ARM: use common irqchip_init for GIC init" (sha1: 0529e315bbda5d502c93df2cfafba9bb337fbdf4) should also add linux/irqchip.h header. Error message: arch/arm/mach-zynq/common.c:99:14: error: 'irqchip_init' undeclared here (not in a function) Signed-off-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Olof Johansson <olof@lixom.net>
* | | | | Merge tag 'bcm2835-for-3.9-cleanup' of ↵Olof Johansson2013-01-292-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/cleanup From Stephen Warren: ARM: bcm2835: cleanup This pull request simply converts the bcm2835 clocksource driver to use the recently added CLKSRC_OF feature. The branch is based on v3.8-rc3, followed by a merge of arm-soc's timer/cleanup branch. * tag 'bcm2835-for-3.9-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi: ARM: bcm2835: make use of CLKSRC_OF Signed-off-by: Olof Johansson <olof@lixom.net>
| * | | | | ARM: bcm2835: make use of CLKSRC_OFStephen Warren2013-01-142-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using CLKSRC_OF enables deletion of the SoC-specific header bcm2835_timer.h, replacing the custom function bcm2835_timer_init() with the standardized automatic clocksource_of_init(). Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-08 17:02:20 +0000