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
|
||
|---|---|---|
| .. | ||
| include/mach | ||
| board-ape6evm-reference.c | ||
| board-ape6evm.c | ||
| board-armadillo800eva-reference.c | ||
| board-armadillo800eva.c | ||
| board-bockw-reference.c | ||
| board-bockw.c | ||
| board-genmai-reference.c | ||
| board-genmai.c | ||
| board-koelsch-reference.c | ||
| board-koelsch.c | ||
| board-kzm9d-reference.c | ||
| board-kzm9g-reference.c | ||
| board-kzm9g.c | ||
| board-lager-reference.c | ||
| board-lager.c | ||
| board-mackerel.c | ||
| board-marzen-reference.c | ||
| board-marzen.c | ||
| clock-emev2.c | ||
| clock-r7s72100.c | ||
| clock-r8a73a4.c | ||
| clock-r8a7740.c | ||
| clock-r8a7778.c | ||
| clock-r8a7779.c | ||
| clock-r8a7790.c | ||
| clock-r8a7791.c | ||
| clock-sh73a0.c | ||
| clock-sh7372.c | ||
| clock.c | ||
| console.c | ||
| cpuidle.c | ||
| entry-intc.S | ||
| headsmp-scu.S | ||
| headsmp.S | ||
| intc-sh73a0.c | ||
| intc-sh7372.c | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||
| platsmp-apmu.c | ||
| platsmp-scu.c | ||
| platsmp.c | ||
| pm-r8a7740.c | ||
| pm-r8a7779.c | ||
| pm-rmobile.c | ||
| pm-sh73a0.c | ||
| pm-sh7372.c | ||
| setup-emev2.c | ||
| setup-r7s72100.c | ||
| setup-r8a73a4.c | ||
| setup-r8a7740.c | ||
| setup-r8a7778.c | ||
| setup-r8a7779.c | ||
| setup-r8a7790.c | ||
| setup-r8a7791.c | ||
| setup-rcar-gen2.c | ||
| setup-sh73a0.c | ||
| setup-sh7372.c | ||
| sh-gpio.h | ||
| sleep-sh7372.S | ||
| smp-emev2.c | ||
| smp-r8a7779.c | ||
| smp-r8a7790.c | ||
| smp-r8a7791.c | ||
| smp-sh73a0.c | ||
| suspend.c | ||
| timer.c | ||