08 Apr, 2011
1 commit
-
…nel/git/lethal/sh-2.6
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
ARM: arch-shmobile: only run FSI init on respective boards
ARM: arch-shmobile: only run HDMI init on respective boards
ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL
07 Apr, 2011
3 commits
-
If several boards are enabled in the kernel configuration,
fsi_init_pm_clock() functions from board-ap4evb.c
will run on any of them. Prevent this by calling these functions from the
.init_machine() callback instead of using device_initcall().Signed-off-by: Kuninori Morimoto
Cc: Magnus Damm
Signed-off-by: Paul Mundt -
If several boards are enabled in the kernel configuration,
hdmi_init_pm_clock() functions from board-ap4evb.c and board-mackerel.c
will run on any of them. Prevent this by calling these functions from the
.init_machine() callback instead of using device_initcall().Signed-off-by: Guennadi Liakhovetski
Cc: Magnus Damm
Tested-by: Kuninori Morimoto
Signed-off-by: Paul Mundt -
I made a bit of a thinko when adding Mackerel to the boards
that support zboot using MMCIF.Reported-by: Magnus Damm
Signed-off-by: Simon Horman
Signed-off-by: Paul Mundt
31 Mar, 2011
2 commits
-
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi
-
…git/tip/linux-2.6-tip
* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
avr32: Fix missing irq namespace conversion
powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip
genirq: Remove the now obsolete config options and select statements
arm: versatile : Fix typo introduced in irq namespace cleanup
sound: Fixup the last user of the old irq functions
genirq: Remove obsolete comment
genirq: Remove now obsolete set_irq_wake()
sh: Fix irq cleanup fallout
x86: apb_timer: Fixup genirq fallout
genirq: Fix misnamed label in handle_edge_eoi_irqFix up crazy conflict in arch/powerpc/include/asm/qe_ic.h:
- commit eead4d5c63ff ("powerpc: qe_ic: Rename get_irq_desc_data and
get_irq_desc_chip") made the helper functions use
irq_desc_get_handler_data() instead of the legacy (and no longer
existing) get_irq_desc_data.- commit d4db35e8dc96 ("powerpc/qe_ic: Fix another breakage from the
irq_data conversion") used irq_desc_get_chip_data() instead.According to Thomas, the former is the correct direct conversion, but it
does look like both should work (arch/powerpc/sysdev/qe_lib/qe_ic.c
seems to initialize both to the same thing), and the chip data in some
ways is the more logical. Somebody should really decide on one of the
other.This merge picks irq_desc_get_handler_data() as the straightforward pure
conversion to new names, as per Thomas.
30 Mar, 2011
4 commits
-
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (65 commits)
ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support
ARM: 6838/1: etm: fix section mismatch warning
ARM: 6837/1: remove unused pci_fixup_prpmc1100
ARM: 6836/1: kprobes/fix emulation of LDR/STR instruction when Rn == PC
Fix the broken build for Marvell Dove platform.
ARM: 6835/1: perf: ensure overflows aren't missed due to IRQ latency
ARM: 6834/1: perf: reset counters on all CPUs during initialisation
ARM: 6833/1: perf: add required isbs() to ARMv7 backend
ARM: 6825/1: kernel/sleep.S: fix Thumb2 compilation issues
ARM: 6807/1: realview: Fix secondary GIC initialisation for EB with MPCore tile
arm: mach-mx3: pcm043: add write-protect and card-detect for SD1
eukrea_mbimxsd51: add SD Card detect
eukrea_mbimxsd25-baseboard: add SD card detect
mx3/eukrea_mbimxsd-baseboard: add SD card detect support
mx3/eukrea_mbimxsd-baseboard: fix gpio request
ARM: mxs/mx28evk: add mmc device
ARM: mxs/mx23evk: add mmc device
ARM: mxs: dynamically allocate mmc device
ARM: mx51_efika: update platform data for new mfd changes
mx2/iomux: Set direction for CSPI2 pins
... -
Commit 6845664(arm: Cleanup the irq namespace) introduces a typo
causing a build failure for the versatile platform.[ tglx: Sorry, my bad. Have no idea how I fatfingered that ]
Signed-off-by: Grant Likely
Cc: Catalin Marinas
Cc: Russell King
Cc: linux-arm-kernel@lists.infradead.org
LKML-Reference:
Signed-off-by: Thomas Gleixner -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (26 commits)
mmc: SDHI should depend on SUPERH || ARCH_SHMOBILE
mmc: tmio_mmc: Move some defines into a shared header
mmc: tmio: support aggressive clock gating
mmc: tmio: fix power-mode interpretation
mmc: tmio: remove work-around for unmasked SDIO interrupts
sh: fix SDHI IO address-range
ARM: mach-shmobile: fix SDHI IO address-range
mmc: tmio: only access registers above 0xff, if available
mfd: remove now redundant sh_mobile_sdhi.h header
sh: convert boards to use linux/mmc/sh_mobile_sdhi.h
ARM: mach-shmobile: convert boards to use linux/mmc/sh_mobile_sdhi.h
mmc: tmio: convert the SDHI MMC driver from MFD to a platform driver
sh: ecovec: use the CONFIG_MMC_TMIO symbols instead of MFD
mmc: tmio: split core functionality, DMA and MFD glue
mmc: tmio: use PIO for short transfers
mmc: tmio-mmc: Improve DMA stability on sh-mobile
mmc: fix mmc_app_send_scr() for dma transfer
mmc: sdhci-esdhc: enable esdhc on imx53
mmc: sdhci-esdhc: use writel/readl as general APIs
mmc: sdhci: add the abort CMDTYPE bits definition
...
29 Mar, 2011
30 commits
-
Use irq_set_chip_and_handler() instead. Converted with coccinelle.
Signed-off-by: Thomas Gleixner
-
Reorder
irq_set_chip()
irq_set_chip_data()
irq_set_handler()to
irq_set_chip()
irq_set_handler()
irq_set_chip_data()so the next patch can combine irq_set_chip() and irq_set_handler() to
irq_set_chip_and_handler().Automated conversion with coccinelle.
Signed-off-by: Thomas Gleixner
-
Convert to the new function names. Automated with coccinelle.
Signed-off-by: Thomas Gleixner
-
Use the generic version and just keep the arch specific output.
Signed-off-by: Thomas Gleixner
-
Remove the obsolete desc_handle_irq() helper.
Signed-off-by: Thomas Gleixner
-
Signed-off-by: Thomas Gleixner
-
Avoid the whole lazy disable dance in the demux handler by providing a
irq_disable() callback.Use the proper accessor functions and tidy up gpio_irq_handler()
Signed-off-by: Thomas Gleixner
-
Make use of the new functionality which ensures that irq_set_type is
called with the chip masked. Unmask is only done when the interrupt is
not disabled.Retrieve the trigger type from irq_data in unmask
Signed-off-by: Thomas Gleixner
-
No need to write the flow type. Core code does already.
Signed-off-by: Thomas Gleixner
-
Signed-off-by: Thomas Gleixner
-
Signed-off-by: Thomas Gleixner
-
Signed-off-by: Thomas Gleixner
-
Signed-off-by: Thomas Gleixner
-
1) Core code stores the flow type already
2) Flow type is accessible in irq_dataSigned-off-by: Thomas Gleixner
-
Store the enabled mask in the local state, so there is no need to
fiddle in the irq descriptor.Signed-off-by: Thomas Gleixner
-
Signed-off-by: Thomas Gleixner
-
Signed-off-by: Thomas Gleixner
-
Use the proper wrappers and use the flow type in irq_data.
Signed-off-by: Thomas Gleixner
-
Signed-off-by: Thomas Gleixner
-
Use the proper accessor function instead of fiddling in the status
bits directly.Signed-off-by: Thomas Gleixner
Cc: linux-arm-kernel@lists.infradead.org -
Remove the open coded access to irq_desc which will fail on sparse irq
and use the proper wrappers.Signed-off-by: Thomas Gleixner
-
The core code handles thees already.
Signed-off-by: Thomas Gleixner
Cc: Colin Cross
Cc: linux-tegra@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org -
The conversion missed, that one of the irq functions is called from
the init code. Split it out, so the irq number based call works.Signed-off-by: Thomas Gleixner
-
Signed-off-by: Thomas Gleixner
-
The machine id cleanup missed to remove the checks for now removed
ids.Signed-off-by: Thomas Gleixner
-
commit 9eac6d0 (ARM: Remove dependency of plat-orion GPIO code on mach
directory includes) missed to convert one instance of
DOVE_GPIO_VIRT_BASE and left the orion_gpio_init() in mpp.cFix it up.
Signed-off-by: Thomas Gleixner
-
That wants to be AT91_SDRAMC0
Signed-off-by: Thomas Gleixner
-
This clocksource function needs to be void.
Signed-off-by: Thomas Gleixner
-
The id removal left this machine check in which breaks the build on
some platforms. Remove it.Signed-off-by: Thomas Gleixner
-
MFD changes in 4ec1b54c ('mfd: mfd_cell is now implicitly available to
mc13xxx drivers') changed the mc13xxx_platform_data struct layout.At the time all users were changed, but this driver was introduced in
another tree at the same time. This updates the mc13xxx_platform_data
user, fixing a build error.Signed-off-by: Andres Salomon
Signed-off-by: Linus Torvalds
