Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66f2c6d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC platform updates from Arnd Bergmann:
 "These are updates for platform specific code on 32-bit ARM machines,
  essentially anything that can not (yet) be expressed using DT files.

  Noteworthy changes include:

   - We get support for running in big-endian mode on two platforms:
     sunxi (Allwinner) and s3c24xx (old Samsung).

   - The recently added Uniphier platform now uses standard PSCI methods
     for SMP booting and we remove support for old bootloader versions
     that did not support it yet.

   - In sunxi, we gain support for the "Nextthing GR8" SoC, which is a
     close relative of the Allwinner A13 and R8 chips.

   - PXA completes its move over to the generic dmaengine framework and
     removes its old private API

   - mach-bcm gains support for BCM47189/BCM53573, their first ARM SoC
     with integrated 802.11ac wireless networking"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
  ARM: imx legacy: pca100: move peripheral initialization to .init_late
  ARM: imx legacy: mx27ads: move peripheral initialization to .init_late
  ARM: imx legacy: mx21ads: move peripheral initialization to .init_late
  ARM: imx legacy: pcm043: move peripheral initialization to .init_late
  ARM: imx legacy: mx35-3ds: move peripheral initialization to .init_late
  ARM: imx legacy: mx27-3ds: move peripheral initialization to .init_late
  ARM: imx legacy: imx27-visstrim-m10: move peripheral initialization to .init_late
  ARM: imx legacy: vpr200: move peripheral initialization to .init_late
  ARM: imx legacy: mx31moboard: move peripheral initialization to .init_late
  ARM: imx legacy: armadillo5x0: move peripheral initialization to .init_late
  ARM: imx legacy: qong: move peripheral initialization to .init_late
  ARM: imx legacy: mx31-3ds: move peripheral initialization to .init_late
  ARM: imx legacy: pcm037: move peripheral initialization to .init_late
  ARM: imx legacy: mx31lilly: move peripheral initialization to .init_late
  ARM: imx legacy: mx31ads: move peripheral initialization to .init_late
  ARM: imx legacy: mx31lite: move peripheral initialization to .init_late
  ARM: imx legacy: kzm: move peripheral initialization to .init_late
  MAINTAINERS: update list of Oxnas maintainers
  ARM: orion5x: remove extraneous NO_IRQ
  ARM: orion: simplify orion_ge00_switch_init
  ...
parents a771151a e40454d3

Documentation/arm/sunxi/README

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ SunXi family 
        + User Manual

          http://dl.linux-sunxi.org/A13/A13%20User%20Manual%20-%20v1.2%20%282013-01-08%29.pdf



      - Next Thing Co GR8 (sun5i)



    * Dual ARM Cortex-A7 based SoCs

      - Allwinner A20 (sun7i)

        + User Manual

Documentation/devicetree/bindings/arm/sunxi.txt

+1 −0
Original line number Diff line number Diff line
@@ -14,3 +14,4 @@ using one of the following compatible strings: 
  allwinner,sun8i-a83t

  allwinner,sun8i-h3

  allwinner,sun9i-a80

  nextthing,gr8

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -1003,6 +1003,7 @@ M: Chen-Yu Tsai <wens@csie.org> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

N:	sun[x456789]i

F:	arch/arm/boot/dts/ntc-gr8*



ARM/Allwinner SoC Clock Support

M:	Emilio López <emilio@elopez.com.ar>
@@ -1459,6 +1460,7 @@ F: arch/arm/mach-orion5x/ts78xx-* 
ARM/OXNAS platform support

M:	Neil Armstrong <narmstrong@baylibre.com>

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

L:	linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-oxnas/

F:	arch/arm/boot/dts/oxnas*
@@ -2596,6 +2598,13 @@ F: arch/arm/mach-bcm/bcm_5301x.c 
F:	arch/arm/boot/dts/bcm5301x*.dtsi

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



BROADCOM BCM53573 ARM ARCHITECTURE

M:	Rafał Miłecki <rafal@milecki.pl>

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

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

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



BROADCOM BCM63XX ARM ARCHITECTURE

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

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

arch/arm/Kconfig.debug

+11 −11
Original line number Diff line number Diff line
@@ -186,10 +186,11 @@ choice 
	config DEBUG_BRCMSTB_UART

		bool "Use BRCMSTB UART for low-level debug"

		depends on ARCH_BRCMSTB

		select DEBUG_UART_8250

		help

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

		  their output to the first serial port on these devices.

		  their output to the first serial port on these devices. The

		  UART physical and virtual address is automatically provided

		  based on the chip identification register value.



		  If you have a Broadcom STB chip and would like early print

		  messages to appear over the UART, select this option.
@@ -861,12 +862,12 @@ choice 
		  via SCIF2 on Renesas R-Car H1 (R8A7779).



	config DEBUG_RCAR_GEN2_SCIF0

		bool "Kernel low-level debugging messages via SCIF0 on R8A7790/R8A7791/R8A7793"

		depends on ARCH_R8A7790 || ARCH_R8A7791 || ARCH_R8A7793

		bool "Kernel low-level debugging messages via SCIF0 on R8A7790/R8A7791/R8A7792/R8A7793"

		depends on ARCH_R8A7790 || ARCH_R8A7791 || ARCH_R8A7792 || ARCH_R8A7793

		help

		  Say Y here if you want kernel low-level debugging support

		  via SCIF0 on Renesas R-Car H2 (R8A7790), M2-W (R8A7791), or

		  M2-N (R8A7793).

		  via SCIF0 on Renesas R-Car H2 (R8A7790), M2-W (R8A7791), V2H

		  (R8A7792), or M2-N (R8A7793).



	config DEBUG_RCAR_GEN2_SCIF2

		bool "Kernel low-level debugging messages via SCIF2 on R8A7794"
@@ -1430,6 +1431,7 @@ config DEBUG_LL_INCLUDE 
	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1

	default "debug/bcm63xx.S" if DEBUG_BCM63XX_UART

	default "debug/digicolor.S" if DEBUG_DIGICOLOR_UA0

	default "debug/brcmstb.S" if DEBUG_BRCMSTB_UART

	default "mach/debug-macro.S"



# Compatibility options for PL01x
@@ -1520,7 +1522,6 @@ config DEBUG_UART_PHYS 
	default 0xe6e60000 if DEBUG_RCAR_GEN2_SCIF0

	default 0xe8008000 if DEBUG_R7S72100_SCIF2

	default 0xf0000be0 if ARCH_EBSA110

	default 0xf040ab00 if DEBUG_BRCMSTB_UART

	default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE

	default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE

	default 0xf7fc9000 if DEBUG_BERLIN_UART
@@ -1604,7 +1605,6 @@ config DEBUG_UART_VIRT 
	default 0xfb009000 if DEBUG_REALVIEW_STD_PORT

	default 0xfb00c000 if DEBUG_AT91_SAMA5D4_USART3

	default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT

	default 0xfc40ab00 if DEBUG_BRCMSTB_UART

	default 0xfc705000 if DEBUG_ZTE_ZX

	default 0xfcfe8600 if DEBUG_BCM63XX_UART

	default 0xfd000000 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX
@@ -1677,8 +1677,7 @@ config DEBUG_UART_8250_WORD 
		DEBUG_ALPINE_UART0 || \

		DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \

		DEBUG_DAVINCI_DA8XX_UART2 || \

		DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2 || \

		DEBUG_BRCMSTB_UART

		DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2



config DEBUG_UART_8250_PALMCHIP

	bool "8250 UART is Palmchip BK-310x"
@@ -1697,7 +1696,8 @@ config DEBUG_UNCOMPRESS 
	bool

	depends on ARCH_MULTIPLATFORM || PLAT_SAMSUNG || ARM_SINGLE_ARMV7M

	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \

		     (!DEBUG_TEGRA_UART || !ZBOOT_ROM)

		     (!DEBUG_TEGRA_UART || !ZBOOT_ROM) && \

		     !DEBUG_BRCMSTB_UART

	help

	  This option influences the normal decompressor output for

	  multiplatform kernels.  Normally, multiplatform kernels disable

arch/arm/configs/colibri_pxa270_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m 
CONFIG_BLK_DEV_NBD=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=8

CONFIG_IDE=y

CONFIG_NETDEVICES=y

CONFIG_PHYLIB=y

CONFIG_NET_ETHERNET=y