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

Commit 7f1b9be1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM/arm64 SoC platform updates from Olof Johansson: "This branch
  contains platform updates for 32- and 64-bit ARM, including defconfig
  updates to enable new options, drivers and platforms. There are also a
  few fixes and cleanups for some existing vendors.

  Some of the things worth highlighting here are:

   - Enabling new crypt drivers on arm64 defconfig

   - QCOM IPQ8074 clocks and pinctrl drivers on arm64 defconfig

   - Debug support enabled for Renesas r8a7743

   - Various config updates for Renesas platforms (sound, USB, other
     drivers)

   - Platform support (including SMP) for TI dra762

   - OMAP cleanups: Move to use generic 8250 debug_ll, removal of stale
     DMA code"

* tag 'armsoc-platforms' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (109 commits)
  ARM: multi_v7_defconfig: make eSDHC driver built-in
  arm64: defconfig: enable rockchip graphics
  MAINTAINERS: Update Cavium ThunderX2 entry
  ARM: config: aspeed: Add I2C, VUART, LPC Snoop
  ARM: configs: aspeed: Update Aspeed G4 with VMSPLIT_2G
  ARM: s3c24xx: Fix NAND ECC mode for mini2440 board
  ARM: davinci_all_defconfig: enable tinydrm and ST7586
  arm64: defconfig: Enable QCOM IPQ8074 clock and pinctrl
  ARM: defconfig: tegra: Enable ChipIdea UDC driver
  ARM: configs: Add Tegra I2S interfaces to multi_v7_defconfig
  ARM: tegra: Add Tegra I2S interfaces to defconfig
  ARM: tegra: Update default configuration for v4.13-rc1
  MAINTAINERS: update ARM/ZTE entry
  soc: versatile: remove unnecessary static in realview_soc_probe()
  ARM: Convert to using %pOF instead of full_name
  ARM: hisi: Fix typo in comment
  ARM: multi_v7_defconfig: add CONFIG_BRCMSTB_THERMAL
  arm64: defconfig: add CONFIG_BRCMSTB_THERMAL
  arm64: defconfig: add recently added crypto drivers as modules
  arm64: defconfig: enable CONFIG_UNIPHIER_WATCHDOG
  ...
parents d719518d e9e3969f

Documentation/devicetree/bindings/arm/omap/omap.txt

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ SoCs: 
- OMAP5432

  compatible = "ti,omap5432", "ti,omap5"



- DRA762

  compatible = "ti,dra762", "ti,dra7"



- DRA742

  compatible = "ti,dra742", "ti,dra74", "ti,dra7"

MAINTAINERS

+24 −2
Original line number Diff line number Diff line
@@ -2101,17 +2101,38 @@ F: arch/arm/mach-pxa/include/mach/z2.h 
ARM/ZTE ARCHITECTURE

M:	Jun Nie <jun.nie@linaro.org>

M:	Baoyou Xie <baoyou.xie@linaro.org>

M:	Shawn Guo <shawnguo@kernel.org>

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

S:	Maintained

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

F:	arch/arm/mach-zx/

F:	arch/arm64/boot/dts/zte/

F:	drivers/clk/zte/

F:	drivers/dma/zx_dma.c

F:	drivers/gpio/gpio-zx.c

F:	drivers/i2c/busses/i2c-zx2967.c

F:	drivers/mmc/host/dw_mmc-zx.*

F:	drivers/pinctrl/zte/

F:	drivers/reset/reset-zx2967.c

F:	drivers/soc/zte/

F:	drivers/thermal/zx2967_thermal.c

F:	drivers/watchdog/zx2967_wdt.c

F:	Documentation/devicetree/bindings/arm/zte.txt

F:	Documentation/devicetree/bindings/clock/zx296702-clk.txt

F:	Documentation/devicetree/bindings/clock/zx2967*.txt

F:	Documentation/devicetree/bindings/dma/zxdma.txt

F:	Documentation/devicetree/bindings/gpio/zx296702-gpio.txt

F:	Documentation/devicetree/bindings/i2c/i2c-zx2967.txt

F:	Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt

F:	Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt

F:	Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt

F:	Documentation/devicetree/bindings/soc/zte/

F:	include/dt-bindings/soc/zx*.h

F:	Documentation/devicetree/bindings/sound/zte,*.txt

F:	Documentation/devicetree/bindings/thermal/zx2967-thermal.txt

F:	Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt

F:	include/dt-bindings/clock/zx2967*.h

F:	include/dt-bindings/soc/zte,*.h

F:	sound/soc/codecs/zx_aud96p22.c

F:	sound/soc/zte/



ARM/ZYNQ ARCHITECTURE

M:	Michal Simek <michal.simek@xilinx.com>
@@ -3175,6 +3196,7 @@ S: Supported 
F:	drivers/crypto/cavium/cpt/



CAVIUM THUNDERX2 ARM64 SOC

M:	Robert Richter <rrichter@cavium.com>

M:	Jayachandran C <jnair@caviumnetworks.com>

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

S:	Maintained

arch/arm/Kconfig.debug

+38 −15
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ choice 
	config DEBUG_OMAP2UART1

		bool "OMAP2/3/4 UART1 (omap2/3 sdp boards and some omap3 boards)"

		depends on ARCH_OMAP2PLUS

		select DEBUG_OMAP2PLUS_UART

		select DEBUG_UART_8250

		help

		  This covers at least h4, 2430sdp, 3430sdp, 3630sdp,

		  omap3 torpedo and 3530 lv som.
@@ -654,17 +654,17 @@ choice 
	config DEBUG_OMAP2UART2

		bool "Kernel low-level debugging messages via OMAP2/3/4 UART2"

		depends on ARCH_OMAP2PLUS

		select DEBUG_OMAP2PLUS_UART

		select DEBUG_UART_8250



	config DEBUG_OMAP2UART3

		bool "Kernel low-level debugging messages via OMAP2 UART3 (n8x0)"

		depends on ARCH_OMAP2PLUS

		select DEBUG_OMAP2PLUS_UART

		select DEBUG_UART_8250



	config DEBUG_OMAP3UART3

		bool "Kernel low-level debugging messages via OMAP3 UART3 (most omap3 boards)"

		depends on ARCH_OMAP2PLUS

		select DEBUG_OMAP2PLUS_UART

		select DEBUG_UART_8250

		help

		  This covers at least cm_t3x, beagle, crane, devkit8000,

		  igep00x0, ldp, n900, n9(50), pandora, overo, touchbook,
@@ -673,17 +673,17 @@ choice 
	config DEBUG_OMAP4UART3

		bool "Kernel low-level debugging messages via OMAP4/5 UART3 (omap4 blaze, panda, omap5 sevm)"

		depends on ARCH_OMAP2PLUS

		select DEBUG_OMAP2PLUS_UART

		select DEBUG_UART_8250



	config DEBUG_OMAP3UART4

		bool "Kernel low-level debugging messages via OMAP36XX UART4"

		depends on ARCH_OMAP2PLUS

		select DEBUG_OMAP2PLUS_UART

		select DEBUG_UART_8250



	config DEBUG_OMAP4UART4

		bool "Kernel low-level debugging messages via OMAP4/5 UART4"

		depends on ARCH_OMAP2PLUS

		select DEBUG_OMAP2PLUS_UART

		select DEBUG_UART_8250



	config DEBUG_OMAP7XXUART1

		bool "Kernel low-level debugging via OMAP730 UART1"
@@ -712,22 +712,22 @@ choice 
	config DEBUG_TI81XXUART1

		bool "Kernel low-level debugging messages via TI81XX UART1 (ti8148evm)"

		depends on ARCH_OMAP2PLUS

		select DEBUG_OMAP2PLUS_UART

		select DEBUG_UART_8250



	config DEBUG_TI81XXUART2

		bool "Kernel low-level debugging messages via TI81XX UART2"

		depends on ARCH_OMAP2PLUS

		select DEBUG_OMAP2PLUS_UART

		select DEBUG_UART_8250



	config DEBUG_TI81XXUART3

		bool "Kernel low-level debugging messages via TI81XX UART3 (ti8168evm)"

		depends on ARCH_OMAP2PLUS

		select DEBUG_OMAP2PLUS_UART

		select DEBUG_UART_8250



	config DEBUG_AM33XXUART1

		bool "Kernel low-level debugging messages via AM33XX UART1"

		depends on ARCH_OMAP2PLUS

		select DEBUG_OMAP2PLUS_UART

		select DEBUG_UART_8250



	config DEBUG_ZOOM_UART

		bool "Kernel low-level debugging messages via Zoom2/3 UART"
@@ -896,12 +896,13 @@ 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/R8A7792/R8A7793"

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

		bool "Kernel low-level debugging messages via SCIF0 on R-Car Gen2 and RZ/G1"

		depends on ARCH_R8A7743 || 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), V2H

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

		  via SCIF0 on Renesas RZ/G1M (R8A7743), 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"
@@ -1523,6 +1524,17 @@ config DEBUG_UART_PHYS 
	default 0x40090000 if DEBUG_LPC32XX

	default 0x40100000 if DEBUG_PXA_UART1

	default 0x42000000 if DEBUG_GEMINI

	default 0x44e09000 if DEBUG_AM33XXUART1

	default 0x48020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1

	default 0x48022000 if DEBUG_TI81XXUART2

	default 0x48024000 if DEBUG_TI81XXUART3

	default 0x4806a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \

				DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1

	default 0x4806c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \

				DEBUG_OMAP4UART2 || DEBUG_OMAP5UART2

	default 0x4806e000 if DEBUG_OMAP2UART3 || DEBUG_OMAP4UART4

	default 0x49020000 if DEBUG_OMAP3UART3

	default 0x49042000 if DEBUG_OMAP3UART4

	default 0x50000000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART0 || \

				DEBUG_S3C2410_UART0)

	default 0x50004000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART1 || \
@@ -1641,10 +1653,21 @@ config DEBUG_UART_VIRT 
	default 0xf8090000 if DEBUG_VEXPRESS_UART0_RS1

	default 0xf8ffee00 if DEBUG_AT91_SAM9263_DBGU

	default 0xf8fff200 if DEBUG_AT91_RM9200_DBGU

	default 0xf9e09000 if DEBUG_AM33XXUART1

	default 0xfa020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1

	default 0xfa022000 if DEBUG_TI81XXUART2

	default 0xfa024000 if DEBUG_TI81XXUART3

	default 0xfa06a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \

				DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1

	default 0xfa06c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \

				DEBUG_OMAP4UART2 || DEBUG_OMAP5UART2

	default 0xfa06e000 if DEBUG_OMAP2UART3 || DEBUG_OMAP4UART4

	default 0xfa71e000 if DEBUG_QCOM_UARTDM

	default 0xfb002000 if DEBUG_CNS3XXX

	default 0xfb009000 if DEBUG_REALVIEW_STD_PORT

	default 0xfb00c000 if DEBUG_AT91_SAMA5D4_USART3

	default 0xfb020000 if DEBUG_OMAP3UART3

	default 0xfb042000 if DEBUG_OMAP3UART4

	default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT

	default 0xfc705000 if DEBUG_ZTE_ZX

	default 0xfcfe8600 if DEBUG_BCM63XX_UART

arch/arm/boot/dts/dra71-evm.dts

+2 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ 
		ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>;

		ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;

		ti,min-output-impedance;

		ti,dp83867-rxctrl-strap-quirk;

	};



	dp83867_1: ethernet-phy@3 {
@@ -199,6 +200,7 @@ 
		ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>;

		ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;

		ti,min-output-impedance;

		ti,dp83867-rxctrl-strap-quirk;

	};

};

arch/arm/boot/dts/dra72-evm-revc.dts

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 
		ti,min-output-impedance;

		interrupt-parent = <&gpio6>;

		interrupts = <16 IRQ_TYPE_EDGE_FALLING>;

		ti,dp83867-rxctrl-strap-quirk;

	};



	dp83867_1: ethernet-phy@3 {
@@ -80,5 +81,6 @@ 
		ti,min-output-impedance;

		interrupt-parent = <&gpio6>;

		interrupts = <16 IRQ_TYPE_EDGE_FALLING>;

		ti,dp83867-rxctrl-strap-quirk;

	};

};