diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-09 10:04:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-09 10:04:17 -0700 |
| commit | 0ff4c01b279a590a2826ade9321ad8c7ca5a1b6c (patch) | |
| tree | d2d280cbfa92f087921ba2eae30944765b806b14 /MAINTAINERS | |
| parent | 0160e00ae8e987be8822745fb166aa76451c9bcc (diff) | |
| parent | 900a9020af7a023f9b64c919fddf8a7486108962 (diff) | |
| download | talos-op-linux-0ff4c01b279a590a2826ade9321ad8c7ca5a1b6c.tar.gz talos-op-linux-0ff4c01b279a590a2826ade9321ad8c7ca5a1b6c.zip | |
Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC 64-bit changes from Olof Johansson:
"Changes to platform code for 64-bit ARM platforms.
Most of these are small changes to the one defconfig we use on arm64
(no per-platform configs there), to enable new drivers.
There are also a few other changes. Broadcom sold off their 'Vulcan'
design to Cavium, where it is now called ThunderX2. While we normally
don't rename stuff based on marketing's whims, it seemed appropriate
to bring in renames on a few things such as MAINTAINERS, etc"
* tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
arm64: sunxi: always enable reset controller
arm64: defconfig: enable the Safexcel crypto engine as a module
arm64: configs: enable SDHCI driver for Xenon
MAINTAINERS: Broadcom Vulcan is now Cavium ThunderX2
arm64: defconfig: add Allwinner USB PHY
arm64: defconfig: enable MVPP2
arm64: defconfig: Enable video, DRM and LPASS drivers for Exynos5433 and Exynos7
arm64: exynos: Enable Exynos PMU and PM domains drivers
arm64: only select PINCTRL for Allwinner platforms
arm64: set CONFIG_MMC_BCM2835=y in defconfig
arm64: defconfig: enable I2C_PXA
arm64: defconfig: enable MVNETA
ARM64: defconfig: enable the leds-pwm driver and default-on trigger
arm64: defconfig: Enable SH Mobile I2C controller
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 41590d3a665a..f42daf74f541 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2867,13 +2867,6 @@ L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/broadcom/bcmsysport.* -BROADCOM VULCAN ARM64 SOC -M: Jayachandran C. <c.jayachandran@gmail.com> -M: bcm-kernel-feedback-list@broadcom.com -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm64/boot/dts/broadcom/vulcan* - BROADCOM NETXTREME-E ROCE DRIVER M: Selvin Xavier <selvin.xavier@broadcom.com> M: Devesh Sharma <devesh.sharma@broadcom.com> @@ -3067,7 +3060,7 @@ CAVIUM THUNDERX2 ARM64 SOC M: Jayachandran C <jnair@caviumnetworks.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -F: arch/arm64/boot/dts/cavium/thunder-99xx* +F: arch/arm64/boot/dts/cavium/thunder2-99xx* F: Documentation/devicetree/bindings/arm/cavium-thunder2.txt CAVIUM I2C DRIVER |
