mirror of https://gitee.com/openkylin/linux.git
4bde23f875
This is a first pass of some of the merge window fallout for ARM platforms.
Nothing controversial:
* A system.h fallout fix for OMAP
* PXA fixes for breakage caused by the regulator struct changes
* GPIO fixes for OMAP to properly deal with dynamic IRQ allocation
* A mismerge in our arm-soc tree of an lpc32xx change for networking
* A fix for USB setup on tegra
* An undo of __init annotation of display mux setup on OMAP that's needed
at runtime
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJPdSzXAAoJEIwa5zzehBx3b6sQAIhmAQbkYmlkU5GefUmPR++B
JIu8XFKEgWYaviRPj5cUZ4Lx3DWIIcwcGD2AmFdA2RY6JJmULY2Hw2v9yn8mhDPS
7319kMK/Niu3c/DIwxyXHihOQ0LSF+V4dKyHcX1zhG8MFXtUVNudNMg9DwbWMqhk
IXNNREuTTc5313i6cocSIKizGMqED6xxhnuAAt4cTzT/vfSDicNq7DdH6kmPqTgV
azuAlgvDI+k7RvPQY360hLVXFBEGDZV/uOWJFfgtmZcxwhfRVJuEp6+lGFDHNLXU
jbYt/NeLOOv4C+KEDKolR2YJ/xe/gM//rLD2vErT+DTPUuEyQblo8JXEGsRCdNhF
UWK2PW/gBgVW/tFAaDSCLRYPxWL5IUoE2NA7XOF4Gi8hPn1o8JaRXeAhDRK47xiv
NnS4nYJF6dFsxYCH+SJkiotY8/y+CkDPWhE4lChPWxJTDeMuREGrDkUNCRs06by8
I7AVXqBv00q+e3QjE8zE+1AxQEXBty+DwhyzefGKwI8PntfqhuVSVXb2x7DO2hXk
hBAJt/6nBy0IHa0pRPZ4QkA+phXRES5zAyZ9R3oDEW37t1EqhKEnOsmLU4s9CxAk
Lqelzx31SzTpN1VkqjCkRDxXNC5Ww02WmAO+mWoeCUlvnM4GwpmWriXn9lej87KQ
fbIgpnFen1ftSJn6fLnN
=36Eb
-----END PGP SIGNATURE-----
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc fixes from Olof Johansson:
"This is a first pass of some of the merge window fallout for ARM
platforms.
Nothing controversial:
- A system.h fallout fix for OMAP
- PXA fixes for breakage caused by the regulator struct changes
- GPIO fixes for OMAP to properly deal with dynamic IRQ allocation
- A mismerge in our arm-soc tree of an lpc32xx change for networking
- A fix for USB setup on tegra
- An undo of __init annotation of display mux setup on OMAP that's
needed at runtime"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: pxa: fix build issue on stargate2
ARM: pxa: fix build issue on cm-x300
ARM: pxa: fix build failure for regulator consumer in em-x270.c
ARM: LPC32xx: clock.c: Fix lpc-eth clock reference
ARM: OMAP: pm: fix compilation break
ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition
drivers: input: Fix OMAP_GPIO_IRQ with gpio_to_irq() in ams_delta_serio_exit()
ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()
ARM: pxa: fix regulator related build fail in magician_defconfig
ARM: tegra: Fix device tree AUXDATA for USB/EHCI
ARM: OMAP2+: Remove __init from DSI mux functions
|
||
|---|---|---|
| .. | ||
| am33xx.h | ||
| board-ams-delta.h | ||
| board-sx1.h | ||
| board-voiceblue.h | ||
| board.h | ||
| clkdev_omap.h | ||
| clock.h | ||
| common.h | ||
| cpu.h | ||
| dma-44xx.h | ||
| dma.h | ||
| dmtimer.h | ||
| dsp.h | ||
| flash.h | ||
| fpga.h | ||
| gpio-switch.h | ||
| gpio.h | ||
| gpmc-smc91x.h | ||
| gpmc-smsc911x.h | ||
| gpmc.h | ||
| hardware.h | ||
| i2c.h | ||
| iommu.h | ||
| iommu2.h | ||
| iopgtable.h | ||
| iovmm.h | ||
| irda.h | ||
| irqs-44xx.h | ||
| irqs.h | ||
| keypad.h | ||
| l3_2xxx.h | ||
| l3_3xxx.h | ||
| l4_2xxx.h | ||
| l4_3xxx.h | ||
| lcd_mipid.h | ||
| led.h | ||
| mailbox.h | ||
| mcbsp.h | ||
| mcspi.h | ||
| menelaus.h | ||
| mmc.h | ||
| multi.h | ||
| mux.h | ||
| nand.h | ||
| omap-pm.h | ||
| omap-secure.h | ||
| omap-serial.h | ||
| omap4-keypad.h | ||
| omap7xx.h | ||
| omap16xx.h | ||
| omap24xx.h | ||
| omap34xx.h | ||
| omap44xx.h | ||
| omap730.h | ||
| omap850.h | ||
| omap1510.h | ||
| omap_device.h | ||
| omap_hwmod.h | ||
| onenand.h | ||
| param.h | ||
| prcm.h | ||
| remoteproc.h | ||
| sdrc.h | ||
| serial.h | ||
| sram.h | ||
| tc.h | ||
| ti81xx.h | ||
| timex.h | ||
| uncompress.h | ||
| usb.h | ||
| voltage.h | ||
| vram.h | ||
| vrfb.h | ||