Commit 4a4743e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC non-critical bug fixes from Arnd Bergmann:
 "These are bug fixes for harmless problems that were not important
  enough to get fixed in 3.17.  The majority of these are OMAP specific,
  but there are also a couple for Marvell mvebu, cns3xxx, and others, as
  well as some updates for the MAINTAINERS file.

  In particular, Robert Jarzmik and Daniel Mack now volunteered to help
  out maintaining the PXA platform, Krzysztof Halasa took over the
  cns3xxx platform, Carlo Caione is the maintainer for the new Amlogic
  meson platform, and Matthias Brugger is now listed for the mediatek
  platform he recently contributed"

* tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (42 commits)
  MAINTAINERS: update Shawn's email address
  MAINTAINERS: condense some Tegra related entries
  MAINTAINERS: add Alexandre Courbot for Tegra
  MAINTAINERS: CNS3xxx and IXP4xx update.
  MAINTAINERS: Add maintainers entry for Mediatek SoCs
  arm, vt8500, LLVMLlinux: Use mcr instead of mcr% for mach-vt8500
  MAINTAINERS: add a third maintainer to mach-bcm
  CNS3xxx: Fix PCIe read size limit.
  CNS3xxx: Fix logical PCIe topology.
  CNS3xxx: Fix debug UART.
  MAINTAINERS: Add entry for the Amlogic MesonX SoCs
  MAINTAINERS: update ARM pxa maintainers
  ARM: at91/PMC: don't forget to write PMC_PCDR register to disable clocks
  ARM: at91: fix at91sam9263ek DT mmc pinmuxing settings
  ARM: mvebu: Netgear RN102: Use Hardware BCH ECC
  ARM: Kirkwood: Fix DT based DSA.
  ARM: OMAP2+: make of_device_ids const
  ARM: omap2: make arrays containing machine compatible strings const
  ARM: LPC32xx: Fix reset function
  ARM: mvebu: Netgear RN2120: Use Hardware BCH ECC
  ...
parents da01e614 5df27823

MAINTAINERS

+25 −24
Original line number Diff line number Diff line
@@ -846,6 +846,12 @@ M: Emilio López <emilio@elopez.com.ar> 
S:	Maintained

F:	drivers/clk/sunxi/



ARM/Amlogic MesonX SoC support

M:	Carlo Caione <carlo@caione.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

N:	meson[x68]



ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES

M:	Andrew Victor <linux@maxim.org.za>

M:	Nicolas Ferre <nicolas.ferre@atmel.com>
@@ -872,10 +878,9 @@ S: Maintained 
F:	arch/arm/mach-highbank/



ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT

M:	Anton Vorontsov <anton@enomsg.org>

M:	Krzysztof Halasa <khalasa@piap.pl>

S:	Maintained

F:	arch/arm/mach-cns3xxx/

T:	git git://git.infradead.org/users/cbou/linux-cns3xxx.git



ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE

M:	Alexander Shiyan <shc_work@mail.ru>
@@ -975,7 +980,7 @@ F: arch/arm/include/asm/hardware/dec21285.h 
F:	arch/arm/mach-footbridge/



ARM/FREESCALE IMX / MXC ARM ARCHITECTURE

M:	Shawn Guo <shawn.guo@freescale.com>

M:	Shawn Guo <shawn.guo@linaro.org>

M:	Sascha Hauer <kernel@pengutronix.de>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained
@@ -1060,7 +1065,7 @@ S: Maintained 


ARM/INTEL IXP4XX ARM ARCHITECTURE

M:	Imre Kaloz <kaloz@openwrt.org>

M:	Krzysztof Halasa <khc@pm.waw.pl>

M:	Krzysztof Halasa <khalasa@piap.pl>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-ixp4xx/
@@ -1156,6 +1161,16 @@ W: http://www.digriz.org.uk/ts78xx/kernel 
S:	Maintained

F:	arch/arm/mach-orion5x/ts78xx-*



ARM/Mediatek SoC support

M:	Matthias Brugger <matthias.bgg@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/boot/dts/mt6*

F:	arch/arm/boot/dts/mt8*

F:	arch/arm/mach-mediatek/

N:	mtk

K:	mediatek



ARM/MICREL KS8695 ARCHITECTURE

M:	Greg Ungerer <gerg@uclinux.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1367,7 +1382,6 @@ F: arch/arm/boot/dts/sh* 
F:	arch/arm/configs/ape6evm_defconfig

F:	arch/arm/configs/armadillo800eva_defconfig

F:	arch/arm/configs/bockw_defconfig

F:	arch/arm/configs/genmai_defconfig

F:	arch/arm/configs/koelsch_defconfig

F:	arch/arm/configs/kzm9g_defconfig

F:	arch/arm/configs/lager_defconfig
@@ -2021,6 +2035,7 @@ F: drivers/net/ethernet/broadcom/bnx2x/ 
BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE

M:	Christian Daudt <bcm@fixthebug.org>

M:	Matt Porter <mporter@linaro.org>

M:	Florian Fainelli <f.fainelli@gmail.com>

L:	bcm-kernel-feedback-list@broadcom.com

T:	git git://github.com/broadcom/mach-bcm

S:	Maintained
@@ -4796,7 +4811,7 @@ S: Odd fixes 
F:	drivers/dma/iop-adma.c



INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT

M:	Krzysztof Halasa <khc@pm.waw.pl>

M:	Krzysztof Halasa <khalasa@piap.pl>

S:	Maintained

F:	arch/arm/mach-ixp4xx/include/mach/qmgr.h

F:	arch/arm/mach-ixp4xx/include/mach/npe.h
@@ -7322,12 +7337,12 @@ F: drivers/video/backlight/pwm_bl.c 
F:	include/linux/pwm_backlight.h



PXA2xx/PXA3xx SUPPORT

M:	Eric Miao <eric.y.miao@gmail.com>

M:	Russell King <linux@arm.linux.org.uk>

M:	Daniel Mack <daniel@zonque.org>

M:	Haojian Zhuang <haojian.zhuang@gmail.com>

M:	Robert Jarzmik <robert.jarzmik@free.fr>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://github.com/hzhuang1/linux.git

T:	git git://git.linaro.org/people/ycmiao/pxa-linux.git

T:	git git://github.com/rjarzmik/linux.git

S:	Maintained

F:	arch/arm/mach-pxa/

F:	drivers/pcmcia/pxa2xx*
@@ -9044,17 +9059,13 @@ F: drivers/media/rc/ttusbir.c 
TEGRA ARCHITECTURE SUPPORT

M:	Stephen Warren <swarren@wwwdotorg.org>

M:	Thierry Reding <thierry.reding@gmail.com>

M:	Alexandre Courbot <gnurou@gmail.com>

L:	linux-tegra@vger.kernel.org

Q:	http://patchwork.ozlabs.org/project/linux-tegra/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git

S:	Supported

N:	[^a-z]tegra



TEGRA ASOC DRIVER

M:	Stephen Warren <swarren@wwwdotorg.org>

S:	Supported

F:	sound/soc/tegra/



TEGRA CLOCK DRIVER

M:	Peter De Schrijver <pdeschrijver@nvidia.com>

M:	Prashant Gaikwad <pgaikwad@nvidia.com>
@@ -9066,11 +9077,6 @@ M: Laxman Dewangan <ldewangan@nvidia.com> 
S:	Supported

F:	drivers/dma/tegra20-apb-dma.c



TEGRA GPIO DRIVER

M:	Stephen Warren <swarren@wwwdotorg.org>

S:	Supported

F:	drivers/gpio/gpio-tegra.c



TEGRA I2C DRIVER

M:	Laxman Dewangan <ldewangan@nvidia.com>

S:	Supported
@@ -9087,11 +9093,6 @@ M: Laxman Dewangan <ldewangan@nvidia.com> 
S:	Supported

F:	drivers/input/keyboard/tegra-kbc.c



TEGRA PINCTRL DRIVER

M:	Stephen Warren <swarren@wwwdotorg.org>

S:	Supported

F:	drivers/pinctrl/pinctrl-tegra*



TEGRA PWM DRIVER

M:	Thierry Reding <thierry.reding@gmail.com>

S:	Supported

arch/arm/Kconfig.debug

+4 −3
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ choice 
	config DEBUG_CNS3XXX

		bool "Kernel Kernel low-level debugging on Cavium Networks CNS3xxx"

		depends on ARCH_CNS3XXX

		select DEBUG_UART_PL01X

		select DEBUG_UART_8250

		help

		  Say Y here if you want the debug print routines to direct

                  their output to the CNS3xxx UART0.
@@ -1068,7 +1068,7 @@ config DEBUG_UART_PHYS 
	default 0x02530c00 if DEBUG_KEYSTONE_UART0

	default 0x02531000 if DEBUG_KEYSTONE_UART1

	default 0x03010fe0 if ARCH_RPC

	default 0x10009000 if DEBUG_REALVIEW_STD_PORT || DEBUG_CNS3XXX || \

	default 0x10009000 if DEBUG_REALVIEW_STD_PORT || \

				DEBUG_VEXPRESS_UART0_CA9

	default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT

	default 0x10124000 if DEBUG_RK3X_UART0
@@ -1094,6 +1094,7 @@ config DEBUG_UART_PHYS 
	default 0x50008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \

				DEBUG_S3C2410_UART2)

	default 0x7c0003f8 if FOOTBRIDGE

	default 0x78000000 if DEBUG_CNS3XXX

	default 0x80070000 if DEBUG_IMX23_UART

	default 0x80074000 if DEBUG_IMX28_UART

	default 0x80230000 if DEBUG_PICOXCELL_UART
@@ -1133,7 +1134,6 @@ config DEBUG_UART_VIRT 
	default 0xe0010fe0 if ARCH_RPC

	default 0xe1000000 if DEBUG_MSM_UART

	default 0xf0000be0 if ARCH_EBSA110

	default 0xf0009000 if DEBUG_CNS3XXX

	default 0xf01fb000 if DEBUG_NOMADIK_UART

	default 0xf0201000 if DEBUG_BCM2835

	default 0xf1000300 if DEBUG_BCM_5301X
@@ -1155,6 +1155,7 @@ config DEBUG_UART_VIRT 
	default 0xf8009000 if DEBUG_VEXPRESS_UART0_CA9

	default 0xf8090000 if DEBUG_VEXPRESS_UART0_RS1

	default 0xfa71e000 if DEBUG_QCOM_UARTDM

	default 0xfb002000 if DEBUG_CNS3XXX

	default 0xfb009000 if DEBUG_REALVIEW_STD_PORT

	default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT

	default 0xfd000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX

arch/arm/boot/dts/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -144,8 +144,8 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood-b3.dtb \ 
	kirkwood-openrd-client.dtb \

	kirkwood-openrd-ultimate.dtb \

	kirkwood-rd88f6192.dtb \

	kirkwood-rd88f6281-a0.dtb \

	kirkwood-rd88f6281-a1.dtb \

	kirkwood-rd88f6281-z0.dtb \

	kirkwood-rd88f6281-a.dtb \

	kirkwood-rs212.dtb \

	kirkwood-rs409.dtb \

	kirkwood-rs411.dtb \

arch/arm/boot/dts/am335x-bone-common.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -7,9 +7,6 @@ 
 */



/ {

	model = "TI AM335x BeagleBone";

	compatible = "ti,am335x-bone", "ti,am33xx";



	cpus {

		cpu@0 {

			cpu0-supply = <&dcdc2_reg>;

arch/arm/boot/dts/am335x-bone.dts

+5 −0
Original line number Diff line number Diff line
@@ -10,6 +10,11 @@ 
#include "am33xx.dtsi"

#include "am335x-bone-common.dtsi"



/ {

	model = "TI AM335x BeagleBone";

	compatible = "ti,am335x-bone", "ti,am33xx";

};



&ldo3_reg {

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <3300000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE