11 Jun, 2012
8 commits
-
Since the VIC was converted to use generic IRQ domains IRQ 0
is silently ignored. This IRQ is used on the Nomadik so we're
missing it now. Bump all IRQ numbers by one since they are
now decoupled from the hardware IRQ numbers.Cc: Grant Likely
Acked-by: Rob Herring
Signed-off-by: Linus Walleij -
This registers the MMC device for the Nomadik so we can access
MMC/SD cards, which is pretty nice.Acked-by: Arnd Bergmann
Signed-off-by: Linus Walleij -
Add board data to register all the Nomadik I2C devices.
Acked-by: Arnd Bergmann
Signed-off-by: Linus Walleij -
The Nomadik has two dedicated I2C bus blocks for I2C0 and I2C1,
and a bitbanged GPIO connection on two pins for the USB portions
of the STw4811 chip. Register all three as bit-banged GPIO for
the moment.Acked-by: Arnd Bergmann
Signed-off-by: Linus Walleij -
Remove more custom stuff by simply converting the Nomadik machine
to use generic clocks and move the driver to drivers/clk.Acked-by: Arnd Bergmann
Cc: Mike Turquette
Signed-off-by: Linus Walleij -
This registers the PL031 derivate found in the Nomadik 8815
SoCs.Acked-by: Arnd Bergmann
Signed-off-by: Linus Walleij -
This makes AMBA devices on the Nomadik main CPU die register
dynamically, and refactor the registration of the RNG to use
this.Acked-by: Arnd Bergmann
Signed-off-by: Linus Walleij -
Register the NHK8815 GPIO devices dynamically like the Ux500 does
it.Acked-by: Arnd Bergmann
Signed-off-by: Linus Walleij
02 Jun, 2012
1 commit
-
Pull mtd update from David Woodhouse:
- More robust parsing especially of xattr data in JFFS2
- Updates to mxc_nand and gpmi drivers to support new boards and device tree
- Improve consistency of information about ECC strength in NAND devices
- Clean up partition handling of plat_nand
- Support NAND drivers without dedicated access to OOB area
- BCH hardware ECC support for OMAP
- Other fixes and cleanups, and a few new device IDsFixed trivial conflict in drivers/mtd/nand/gpmi-nand/gpmi-nand.c due to
added include files next to each other.* tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd: (75 commits)
mtd: mxc_nand: move ecc strengh setup before nand_scan_tail
mtd: block2mtd: fix recursive call of mtd_writev
mtd: gpmi-nand: define ecc.strength
mtd: of_parts: fix breakage in Kconfig
mtd: nand: fix scan_read_raw_oob
mtd: docg3 fix in-middle of blocks reads
mtd: cfi_cmdset_0002: Slight cleanup of fixup messages
mtd: add fixup for S29NS512P NOR flash.
jffs2: allow to complete xattr integrity check on first GC scan
jffs2: allow to discriminate between recoverable and non-recoverable errors
mtd: nand: omap: add support for hardware BCH ecc
ARM: OMAP3: gpmc: add BCH ecc api and modes
mtd: nand: check the return code of 'read_oob/read_oob_raw'
mtd: nand: remove 'sndcmd' parameter of 'read_oob/read_oob_raw'
mtd: m25p80: Add support for Winbond W25Q80BW
jffs2: get rid of jffs2_sync_super
jffs2: remove unnecessary GC pass on sync
jffs2: remove unnecessary GC pass on umount
jffs2: remove lock_super
mtd: gpmi: add gpmi support for mx6q
...
15 May, 2012
1 commit
-
The nomadik gpio code has been converted to pinctrl, but the nomadik platform
still expects the old code to be present. Change it to use the new one instead.Signed-off-by: Arnd Bergmann
Reviewed-by: Linus Walleij
14 May, 2012
1 commit
-
No drivers use auto-increment NAND, so kill the NO_AUTOINCR option entirely.
Signed-off-by: Brian Norris
Signed-off-by: Artem Bityutskiy
Signed-off-by: David Woodhouse
30 Mar, 2012
1 commit
-
Pull "ARM: cleanups of io includes" from Olof Johansson:
"Rob Herring has done a sweeping change cleaning up all of the
mach/io.h includes, moving some of the oft-repeated macros to a common
location and removing a bunch of boiler plate. This is another step
closer to a common zImage for multiple platforms."Fix up various fairly trivial conflicts ( removal vs changes
around it, tegra localtimer.o is *still* gone, yadda-yadda).* tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
ARM: tegra: Include assembler.h in sleep.S to fix build break
ARM: pxa: use common IOMEM definition
ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
ARM: __io abuse cleanup
ARM: create a common IOMEM definition
ARM: iop13xx: fix missing declaration of iop13xx_init_early
ARM: fix ioremap/iounmap for !CONFIG_MMU
ARM: kill off __mem_pci
ARM: remove bunch of now unused mach/io.h files
ARM: make mach/io.h include optional
ARM: clps711x: remove unneeded include of mach/io.h
ARM: dove: add explicit include of dove.h to addr-map.c
ARM: at91: add explicit include of hardware.h to uncompressor
ARM: ep93xx: clean-up mach/io.h
ARM: tegra: clean-up mach/io.h
ARM: orion5x: clean-up mach/io.h
ARM: davinci: remove unneeded mach/io.h include
[media] davinci: remove includes of mach/io.h
ARM: OMAP: Remove remaining includes for mach/io.h
ARM: msm: clean-up mach/io.h
...
21 Mar, 2012
1 commit
-
Conflicts:
arch/arm/mach-tegra/Makefile
arch/arm/mach-vexpress/core.hThe tegra Makefile was changed in four different branches
in the same line. This merge should reduce the amount
of churn.Signed-off-by: Arnd Bergmann
07 Mar, 2012
1 commit
-
Now that many platforms don't need mach/io.h, remove the unused ones.
Signed-off-by: Rob Herring
Acked-by: Shawn Guo
Acked-by: Linus Walleij
Acked-by: H Hartley Sweeten
Acked-by: Jean-Christophe PLAGNIOL-VILLARD
Acked-by: Jamie Iles
Acked-by: Pawel Moll
Acked-by: Nicolas Pitre
23 Feb, 2012
1 commit
22 Feb, 2012
1 commit
-
Now that most platforms don't need disable_fiq and arch_ret_to_user
macros, we can remove the empty macros or empty entry-macro.S files.Signed-off-by: Rob Herring
Acked-by: Jamie Iles
Acked-by: Nicolas Pitre
Acked-by: Tony Lindgren
Acked-by: Linus Walleij
Acked-by: Ryan Mallon
Acked-by: Nicolas Ferre
Acked-by: H Hartley Sweeten
Acked-by: Shawn Guo
31 Jan, 2012
1 commit
-
Pass the base offset to the Nomadik MTU timer in the init call
instead of keeping a global pointer to be assigned.Acked-by: Alessandro Rubini
Signed-off-by: Linus Walleij
27 Jan, 2012
2 commits
-
Acked-by: Alessandro Rubini
Acked-by: Linus Walleij
Signed-off-by: Russell King
25 Jan, 2012
1 commit
-
Acked-by: Alessandro Rubini
Acked-by: Linus Walleij
Signed-off-by: Russell King
21 Jan, 2012
1 commit
-
When this is the only content remaining in mach/system.h then the
whole file is removed.Signed-off-by: Nicolas Pitre
Acked-by: H Hartley Sweeten
Acked-and-tested-by: Jamie Iles
Acked-by: Tony Lindgren
Acked-by: David Brown
Acked-by: Stephen Warren
Acked-by: Linus Walleij
05 Jan, 2012
3 commits
-
Conflicts:
arch/arm/mach-exynos/cpu.cThe changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c. -
Remove the now empty arch_reset() from all the mach/system.h includes,
and remove its callsite. Remove arm_machine_restart() as this function
no longer does anything useful.For samsung platforms, remove the include of mach/system-reset.h and
plat/system-reset.h from their respective mach/system.h headers as these
just define their arch_reset functions. As a result, the s3c2410 and
plat-samsung system-reset.h files are no longer referenced, so remove
these files entirely.Acked-by: Nicolas Pitre
Acked-by: H Hartley Sweeten
Acked-by: Jamie Iles
Acked-by: Tony Lindgren
Acked-by: Linus Walleij
Signed-off-by: Russell King -
Hook the Nomadik NHK platform restart code into the new restart hook.
Signed-off-by: Russell King
06 Dec, 2011
1 commit
01 Dec, 2011
1 commit
-
The symbols from cpu-8815.c were being broadcast across the
entire kernel but are only really used locally in mach-nomadik
so let's localize them.Signed-off-by: Linus Walleij
Signed-off-by: Russell King
27 Nov, 2011
1 commit
-
Signed-off-by: Nicolas Pitre
16 Nov, 2011
1 commit
-
Now that there is a generic IRQ handler for multiple VIC devices use it
for nomadik to help building multi platform kernels.Cc: Alessandro Rubini
Acked-by: Linus Walleij
Cc: STEricsson
Tested-by: Thomas Abraham
Signed-off-by: Jamie Iles
29 Oct, 2011
1 commit
-
…git-cur/linux-2.6-arm
* 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)
ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET
ARM: gic, local timers: use the request_percpu_irq() interface
ARM: gic: consolidate PPI handling
ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
ARM: mach-s5p64x0: remove mach/memory.h
ARM: mach-s3c64xx: remove mach/memory.h
ARM: plat-mxc: remove mach/memory.h
ARM: mach-prima2: remove mach/memory.h
ARM: mach-zynq: remove mach/memory.h
ARM: mach-bcmring: remove mach/memory.h
ARM: mach-davinci: remove mach/memory.h
ARM: mach-pxa: remove mach/memory.h
ARM: mach-ixp4xx: remove mach/memory.h
ARM: mach-h720x: remove mach/memory.h
ARM: mach-vt8500: remove mach/memory.h
ARM: mach-s5pc100: remove mach/memory.h
ARM: mach-tegra: remove mach/memory.h
ARM: plat-tcc: remove mach/memory.h
ARM: mach-mmp: remove mach/memory.h
ARM: mach-cns3xxx: remove mach/memory.h
...Fix up mostly pretty trivial conflicts in:
- arch/arm/Kconfig
- arch/arm/include/asm/localtimer.h
- arch/arm/kernel/Makefile
- arch/arm/mach-shmobile/board-ap4evb.c
- arch/arm/mach-u300/core.c
- arch/arm/mm/dma-mapping.c
- arch/arm/mm/proc-v7.S
- arch/arm/plat-omap/Kconfig
largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP ->
CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and
addition of NEED_MACH_MEMORY_H next to HAVE_IDE.
27 Oct, 2011
1 commit
-
* 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)
ARM: 7135/1: ep93xx: bring back missing
ARM: 7104/1: plat-pxa: break out GPIO driver specifics
ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
ARM: 7101/1: arm/tegra: Replace with
ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
ARM: 7083/1: rewrite U300 GPIO to use gpiolib
ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
ARM: 7057/1: mach-pnx4008: rename GPIO header
ARM: 7056/1: plat-nomadik: kill off
ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
ARM: 7043/1: mach-ixp2000: rename GPIO header
...Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually
17 Oct, 2011
1 commit
-
Boards used to specify zreladdr in their Makefile.boot with
zreladdr-y := x, so conflicting zreladdrs were silently overwritten.
This patch changes this to zreladdr-y += x, so that we end
up with multiple words in zreladdr in such a case. We can
detect this later and complain if necessary.Signed-off-by: Sascha Hauer
Signed-off-by: Russell King
14 Oct, 2011
1 commit
-
Signed-off-by: Nicolas Pitre
26 Sep, 2011
1 commit
-
Some platforms (like OMAP not to name it) are doing rather complicated
hacks just to determine the base UART address to use. Let's give their
addruart macro some slack by providing an extra work register which will
allow for much needed cleanups.This is basically a no-op as this commit is only adding the extra argument
to the macro but no one is using it yet.Signed-off-by: nicolas Pitre
Reviewed-by: Kevin Hilman
23 Aug, 2011
1 commit
-
After recent consolidations the Nomadik is entirely
superfluous, so get rid of it.Reported-by: Russell King
Signed-off-by: Linus Walleij
Signed-off-by: Russell King
22 Aug, 2011
2 commits
-
The file is included from upper directories
and deal with generic GPIO and gpiolib stuff. Break out the
platform and driver specific defines and functions into its own
header file.Cc: Srinidhi Kasagar
Cc: Alessandro Rubini
Signed-off-by: Linus Walleij
Signed-off-by: Russell King -
Signed-off-by: Nicolas Pitre
Acked-by: Arnd Bergmann
20 Jul, 2011
1 commit
-
Now most of ARM machines has the alsmot same __clk_get/put() macro
So place it at the arch/arm/include/asm/clkdev.h and remove the reduntant header files
But some machines don't have the same form as above. It can use the machince specific clkdev file by HAVE_MACH_CLKDEV config
Now there are only 3 caese.
1) define the clk structure with clkdev macro => Need to move clk structure to proper header file
arch/arm/mach-versatile/include/mach/clkdev.h
arch/arm/mach-realview/include/mach/clkdev.h
arch/arm/mach-vexpress/include/mach/clkdev.h
arch/arm/mach-integrator/include/mach/clkdev.h2) export the __clk_get/put function at clock.c
arch/arm/mach-shmobile/include/mach/clkdev.h
3) demuxing the clk source
arch/arm/mach-u300/include/mach/clkdev.hAcked-by: Viresh Kumar
Acked-by: H Hartley Sweeten
Acked-by: Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Kyungmin Park
27 May, 2011
1 commit
-
This moves the Nomadik GPIO driver out of arch/arm/plat-nomadik
and into the desired location indicated by the subsystem
maintainer.Signed-off-by: Linus Walleij
[grant.likely: squashed with kconfig fixup]
Signed-off-by: Grant Likely
18 Feb, 2011
1 commit
-
This uncouple PHYS_OFFSET from the platform definitions, thereby
facilitating run-time computation of the physical memory offset.Acked-by: Nicolas Pitre
Acked-by: Viresh Kumar
Acked-by: H Hartley Sweeten
Acked-by: Magnus Damm
Acked-by: Tony Lindgren
Acked-by: Jean-Christophe PLAGNIOL-VILLARD
Acked-by: Wan ZongShun
Acked-by: Kukjin Kim
Acked-by: Eric Miao
Acked-by: Jiandong Zheng
Signed-off-by: Russell King
26 Nov, 2010
1 commit
-
factorise some generic infrastructure to assist looking up struct clks
for the ARM & SH architecture.as the code is identical at 99%
put the arch specific code for allocation as example in asm/clkdev.h
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
Acked-by: Paul Mundt
Signed-off-by: Russell King
