Commit 0922275e 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 Olof Johansson:
 "SoC updates, mostly refactorings and cleanups of old legacy platforms,
  but also a few more things:

  New SoC support this release:
   - NXP/Freescale i.MX7ULP (1x Cortex-A7, Cortex-M4, graphics, etc)
   - Allwinner F1C100, older platform with an ARM926-EJS (ARMv5) core

  Cleanups of various platforms:
   - OMAP1 ams-delta does some GPIO cleanups
   - Davinci removes of at24 platform data
   - Samsung cleans up old wakeup, PM debug and secondary core boot code
   - Renesas moves around config options and PM code to drivers/soc for
     sharing with 64-bit and more consistency
   - i.MX, Broadcom and SoCFPGA all have tweaks to lowlevel debug
     console setups
   - SoCFPGA adds explicit selection of ARM errata and removes some
     unused code

  This also contains a few patches that I had queued up as fixes for
  4.20 but didn't send in before the release"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (68 commits)
  arm64: dts: renesas: draak: Fix CVBS input
  ARM: omap2: avoid section mismatch warning
  ARM: tegra: avoid section mismatch warning
  ARM: ks8695: fix section mismatch warning
  ARM: pxa: avoid section mismatch warning
  ARM: mmp: fix pxa168_device_usb_phy use on aspenite
  ARM: mmp: fix timer_init calls
  ARM: OMAP1: fix USB configuration for device-only setups
  ARM: OMAP1: add MMC configuration for Palm Tungsten E
  ARM: imx: fix dependencies on imx7ulp
  ARM: meson: select HAVE_ARM_TWD and ARM_GLOBAL_TIMER
  MAINTAINERS: add drivers/soc/amlogic/ to amlogic list
  ARM: imx: add initial support for imx7ulp
  ARM: debug-imx: only define DEBUG_IMX_UART_PORT if needed
  ARM: dts: Fix OMAP4430 SDP Ethernet startup
  ARM: dts: am335x-pdu001: Fix polarity of card detection input
  ARM: OMAP1: ams-delta: Fix audio permanently muted
  ARM: dts: omap5: Fix dual-role mode on Super-Speed port
  arm64: dts: rockchip: fix rk3399-rockpro64 regulator gpios
  ARM: davinci: da850-evm: remove unnecessary include
  ...
parents 495d714a cac1fc8f

Documentation/devicetree/bindings/arm/sunxi.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,4 +18,5 @@ using one of the following compatible strings: 
  allwinner,sun8i-v3s

  allwinner,sun9i-a80

  allwinner,sun50i-a64

  allwinner,suniv-f1c100s

  nextthing,gr8

Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
	"allwinner,sun4i-a10-wdt"

	"allwinner,sun6i-a31-wdt"

	"allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt"

	"allwinner,suniv-f1c100s-wdt", "allwinner,sun4i-a10-wdt"

- reg : Specifies base physical address and size of the registers.



Optional properties:

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1306,7 +1306,6 @@ F: include/dt-bindings/clock/gxbb* 
F:	Documentation/devicetree/bindings/clock/amlogic*



ARM/Amlogic Meson SoC support

M:	Carlo Caione <carlo@caione.org>

M:	Kevin Hilman <khilman@baylibre.com>

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

L:	linux-amlogic@lists.infradead.org
@@ -1317,6 +1316,7 @@ F: arch/arm/boot/dts/meson* 
F:	arch/arm64/boot/dts/amlogic/

F:	drivers/pinctrl/meson/

F:	drivers/mmc/host/meson*

F:	drivers/soc/amlogic/

N:	meson



ARM/Amlogic Meson SoC Sound Drivers

arch/arm/Kconfig.debug

+57 −21
Original line number Diff line number Diff line
@@ -1087,14 +1087,21 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on SOCFPGA(Cyclone 5 and Arria 5) based platforms.



	config DEBUG_SOCFPGA_UART1

	config DEBUG_SOCFPGA_ARRIA10_UART1

		depends on ARCH_SOCFPGA

		bool "Use SOCFPGA UART1 for low-level debug"

		bool "Use SOCFPGA Arria10 UART1 for low-level debug"

		select DEBUG_UART_8250

		help

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

		  on SOCFPGA(Arria 10) based platforms.



	config DEBUG_SOCFPGA_CYCLONE5_UART1

		depends on ARCH_SOCFPGA

		bool "Use SOCFPGA Cyclone 5 UART1 for low-level debug"

		select DEBUG_UART_8250

		help

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

		  on SOCFPGA(Cyclone 5 and Arria 5) based platforms.



	config DEBUG_SUN9I_UART0

		bool "Kernel low-level debugging messages via sun9i UART0"
@@ -1192,6 +1199,28 @@ choice 


		  If unsure, say N.



	config STM32F4_DEBUG_UART

		bool "Use STM32F4 UART for low-level debug"

		depends on ARCH_STM32

		select DEBUG_STM32_UART

		help

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

		  on STM32F4 based platforms, which default UART is wired on

		  USART1.



		  If unsure, say N.



	config STM32F7_DEBUG_UART

		bool "Use STM32F7 UART for low-level debug"

		depends on ARCH_STM32

		select DEBUG_STM32_UART

		help

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

		  on STM32F7 based platforms, which default UART is wired on

		  USART1.



		  If unsure, say N.



	config TEGRA_DEBUG_UART_AUTO_ODMDATA

		bool "Kernel low-level debugging messages via Tegra UART via ODMDATA"

		depends on ARCH_TEGRA
@@ -1440,7 +1469,8 @@ config DEBUG_OMAP2PLUS_UART 
	depends on ARCH_OMAP2PLUS



config DEBUG_IMX_UART_PORT

	int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \

	int "i.MX Debug UART Port Selection"

	depends on DEBUG_IMX1_UART || \

		   DEBUG_IMX25_UART || \

		   DEBUG_IMX21_IMX27_UART || \

		   DEBUG_IMX31_UART || \
@@ -1454,7 +1484,6 @@ config DEBUG_IMX_UART_PORT 
		   DEBUG_IMX6UL_UART || \

		   DEBUG_IMX7D_UART

	default 1

	depends on ARCH_MXC

	help

	  Choose UART port on which kernel low-level debug messages

	  should be output.
@@ -1476,6 +1505,10 @@ config DEBUG_STI_UART 
	bool

	depends on ARCH_STI



config DEBUG_STM32_UART

	bool

	depends on ARCH_STM32



config DEBUG_SIRFSOC_UART

	bool

	depends on ARCH_SIRF
@@ -1525,6 +1558,7 @@ config DEBUG_LL_INCLUDE 
	default "debug/s5pv210.S" if DEBUG_S5PV210_UART

	default "debug/sirf.S" if DEBUG_SIRFSOC_UART

	default "debug/sti.S" if DEBUG_STI_UART

	default "debug/stm32.S" if DEBUG_STM32_UART

	default "debug/tegra.S" if DEBUG_TEGRA_UART

	default "debug/ux500.S" if DEBUG_UX500_UART

	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT
@@ -1655,7 +1689,8 @@ config DEBUG_UART_PHYS 
	default 0xfe800000 if ARCH_IOP32X

	default 0xff690000 if DEBUG_RK32_UART2

	default 0xffc02000 if DEBUG_SOCFPGA_UART0

	default 0xffc02100 if DEBUG_SOCFPGA_UART1

	default 0xffc02100 if DEBUG_SOCFPGA_ARRIA10_UART1

	default 0xffc03000 if DEBUG_SOCFPGA_CYCLONE5_UART1

	default 0xffd82340 if ARCH_IOP13XX

	default 0xffe40000 if DEBUG_RCAR_GEN1_SCIF0

	default 0xffe42000 if DEBUG_RCAR_GEN1_SCIF2
@@ -1762,7 +1797,8 @@ config DEBUG_UART_VIRT 
	default 0xfeb30c00 if DEBUG_KEYSTONE_UART0

	default 0xfeb31000 if DEBUG_KEYSTONE_UART1

	default 0xfec02000 if DEBUG_SOCFPGA_UART0

	default 0xfec02100 if DEBUG_SOCFPGA_UART1

	default 0xfec02100 if DEBUG_SOCFPGA_ARRIA10_UART1

	default 0xfec03000 if DEBUG_SOCFPGA_CYCLONE5_UART1

	default 0xfec12000 if (DEBUG_MVEBU_UART0 || DEBUG_MVEBU_UART0_ALTERNATE) && ARCH_MVEBU

	default 0xfec12100 if DEBUG_MVEBU_UART1_ALTERNATE

	default 0xfec10000 if DEBUG_SIRFATLAS7_UART0
@@ -1811,9 +1847,9 @@ config DEBUG_UART_8250_WORD 
	depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250

	depends on DEBUG_UART_8250_SHIFT >= 2

	default y if DEBUG_PICOXCELL_UART || \

		DEBUG_SOCFPGA_UART0 || DEBUG_SOCFPGA_UART1 || \

		DEBUG_KEYSTONE_UART0 || DEBUG_KEYSTONE_UART1 || \

		DEBUG_ALPINE_UART0 || \

		DEBUG_SOCFPGA_UART0 || DEBUG_SOCFPGA_ARRIA10_UART1 || \

		DEBUG_SOCFPGA_CYCLONE5_UART1 || DEBUG_KEYSTONE_UART0 || \

		DEBUG_KEYSTONE_UART1 || DEBUG_ALPINE_UART0 || \

		DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \

		DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_BCM_IPROC_UART3 || \

		DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2

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

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ 
	bus-width = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins>;

	cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;

	cd-gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;

};



&sham {

CRA Git | Maintained and supported by SUSTech CRA and CCSE