mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
903a9f77d1
This branch is reducing in size for every release since most board-related
changes have started happening in devicetrees now. Still, we have some things
going on here.
* Renesas platforms are still adding a bit more legacy device support, something
that should trail off shortly as they move to full DT.
* We group most defconfig updates into this branch out of old habits
* Removal of legacy OMAP2 platforms over to DT continues, and a handful of old
code is being removed here.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJS4VhpAAoJEIwa5zzehBx3dgMP/2qc+pY4Sx13x5gWMyj29kQd
LF6JeGLbj3+F+brPh8nXg6feOcsqVN9lpQ7v4+u1tLv6XfYe5kzBTDwF9MFbZi4I
lV9o4cehcZWjCEx+JIbg1MvuNUCU2k1H7HmDIiOQIuoL9j58f2ZywlH/HmLuo2iZ
j5Aly006x0s1lUIDhw2w9PJZzzSRBfPr8hW8q+JdLZinlA5Nd4jSxDX0QoSZE+2t
2GJMb//Ej1KbLO7fcM6BImNtB0kz4xRkPvINJwh1xGHYKY0BzMCYS3K2zBgoeyut
/olOK2xpnSjzcp1ToVQSAa7Mr1zbiyxQTKkqRHMnKyD/BTMzgoSVHxCA7yGYsCjz
mc6AW4v1ucfvXrz0qPXd9fHCIYMyvn6PPv3DmRFU/tR3zJaakI2RvYZFaeyK3RIn
0NGwMQBe3gGIHFAK5Q9hrPyZtbtGicKHjd6eNrNIVeSyTi1njbviTFRHA5yMqWBL
eHRM5KxCnp7+6ES61J0YCSF121/V3GT1rJyJnABl3B2UYj/qKXUBAJ2aPqCspWOG
pcbI7fdeyV67YJvgrV5s8eO7HtPJs9KtOw7Fng4P4Kgjy2XLNfVhQRkaAwe4P914
HCtZfKCVe4xOWLFHDWApaRpfeOFXZgd0hLOG5jiAEhBRZbRALS044Ta9mAFKqQxx
v0mqo85bCHixiFWz1UVc
=wLdE
-----END PGP SIGNATURE-----
Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC board updates from Olof Johansson:
"This branch is reducing in size for every release since most
board-related changes have started happening in devicetrees now.
Still, we have some things going on here.
* Renesas platforms are still adding a bit more legacy device
support, something that should trail off shortly as they move to
full DT
* We group most defconfig updates into this branch out of old habits
* Removal of legacy OMAP2 platforms over to DT continues, and a
handful of old code is being removed here"
* tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
ARM: dts: OMAP2: fix interrupt number for rng
ARM: dts: Split omap3 pinmux core device
ARM: dts: Add omap specific pinctrl defines to use padconf addresses
ARM: bcm2835: bcm2835_defconfig updates
ARM: msm_defconfig: Enable restart driver
defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
ARM: msm: Add support for APQ8074 Dragonboard
ARM: exynos_defconfig: Enable S2MPS11 voltage regulator
ARM: tegra: Enable DRM panel support
ARM: shmobile: mackerel: Fix USBHS pinconf entry
ARM: shmobile: Let Koelsch multiplatform boot with Koelsch DTB
ARM: shmobile: Let Lager multiplatform boot with Lager DTB
ARM: shmobile: Remove non-multiplatform Koelsch reference support
ARM: shmobile: Remove non-multiplatform Lager reference support
ARM: shmobile: koelsch-reference: Instantiate clkdevs for SCIF and CMT
ARM: shmobile: lager-reference: Instantiate clkdevs for SCIF and CMT
ARM: shmobile: koelsch-reference: Remove duplicate CCF initialization
ARM: shmobile: lager-reference: Enable multiplaform kernel support
ARM: shmobile: armadillo: Set backlight enable GPIO
ARM: shmobile: Koelsch: add Ether support
...
Conflicts:
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
|
||
|---|---|---|
| .. | ||
| ac97_codec.h | ||
| aci.h | ||
| ad1816a.h | ||
| ad1843.h | ||
| adau1373.h | ||
| aess.h | ||
| ak4xxx-adda.h | ||
| ak4113.h | ||
| ak4114.h | ||
| ak4117.h | ||
| ak4531_codec.h | ||
| ak4641.h | ||
| alc5623.h | ||
| asequencer.h | ||
| asound.h | ||
| asoundef.h | ||
| atmel-abdac.h | ||
| atmel-ac97c.h | ||
| compress_driver.h | ||
| control.h | ||
| core.h | ||
| cs42l52.h | ||
| cs42l73.h | ||
| cs4231-regs.h | ||
| cs4271.h | ||
| cs8403.h | ||
| cs8427.h | ||
| da7213.h | ||
| da9055.h | ||
| designware_i2s.h | ||
| dmaengine_pcm.h | ||
| emu10k1.h | ||
| emu10k1_synth.h | ||
| emu8000.h | ||
| emu8000_reg.h | ||
| emux_legacy.h | ||
| emux_synth.h | ||
| es1688.h | ||
| gus.h | ||
| hda_hwdep.h | ||
| hda_verbs.h | ||
| hwdep.h | ||
| i2c.h | ||
| info.h | ||
| initval.h | ||
| jack.h | ||
| l3.h | ||
| max9768.h | ||
| max98088.h | ||
| max98090.h | ||
| max98095.h | ||
| memalloc.h | ||
| minors.h | ||
| mixer_oss.h | ||
| mpu401.h | ||
| opl3.h | ||
| opl4.h | ||
| pcm-indirect.h | ||
| pcm.h | ||
| pcm_oss.h | ||
| pcm_params.h | ||
| pt2258.h | ||
| pxa2xx-lib.h | ||
| rawmidi.h | ||
| rcar_snd.h | ||
| rt5640.h | ||
| s3c24xx_uda134x.h | ||
| sb.h | ||
| sb16_csp.h | ||
| seq_device.h | ||
| seq_kernel.h | ||
| seq_midi_emul.h | ||
| seq_midi_event.h | ||
| seq_oss.h | ||
| seq_oss_legacy.h | ||
| seq_virmidi.h | ||
| sh_dac_audio.h | ||
| sh_fsi.h | ||
| simple_card.h | ||
| snd_wavefront.h | ||
| soc-dai.h | ||
| soc-dapm.h | ||
| soc-dpcm.h | ||
| soc.h | ||
| soundfont.h | ||
| spear_dma.h | ||
| spear_spdif.h | ||
| sta32x.h | ||
| tas5086.h | ||
| tea6330t.h | ||
| timer.h | ||
| tlv.h | ||
| tlv320aic3x.h | ||
| tlv320aic32x4.h | ||
| tlv320dac33-plat.h | ||
| tpa6130a2-plat.h | ||
| uda134x.h | ||
| uda1380.h | ||
| util_mem.h | ||
| vx_core.h | ||
| wavefront.h | ||
| wm0010.h | ||
| wm1250-ev1.h | ||
| wm2000.h | ||
| wm2200.h | ||
| wm5100.h | ||
| wm8903.h | ||
| wm8904.h | ||
| wm8955.h | ||
| wm8960.h | ||
| wm8962.h | ||
| wm8993.h | ||
| wm8996.h | ||
| wm9081.h | ||
| wm9090.h | ||
| wss.h | ||