Commit f97c81dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC late updates from Arnd Bergmann:
 "This is some material that we picked up into our tree late or that had
  complex inter-depondencies. The fact that there are these
  interdependencies tends to meant that these are often actually the
  most interesting new additions:

   - The new Aspeed AST2600 baseboard management controller is added,
     this is a Cortex-A7 based follow-up to the ARM11 based AST2500 and
     had some dependencies on other device drivers.

   - After many years, support for the MMP2 based OLPC XO-1.75 finally
     makes it into the kernel.

   - The Armada 3720 based Turris Mox open source router platform is a
     late addition and it follows some preparatory work across multiple
     branches.

   - The OMAP2+ platform had some large-scale cleanup involving driver
     changes and DT changes, here we finish it off, dropping a lot of
     the now-unused platform data.

   - The TI K3 platform that got added for 5.3 gains a lot more support
     for individual bits on the SoC, this part just came late for the
     merge window"

[ This pull request itself wasn't actually sent late at all by Arnd, but
  I waited on the branches that it used to be pulled first, so it ends
  up being merged much later than the other ARM SoC pull requests this
  merge window     - Linus ]

* tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (57 commits)
  ARM: dts: dir685: Drop spi-cpol from the display
  ARM: dts: aspeed: Add AST2600 pinmux nodes
  ARM: dts: aspeed: Add AST2600 and EVB
  ARM: exynos: Enable support for ARM architected timers
  ARM: samsung: Fix system restart on S3C6410
  ARM: dts: mmp2: add OLPC XO 1.75 machine
  ARM: dts: mmp2: rename the USB PHY node
  ARM: dts: mmp2: specify reg-shift for the UARTs
  ARM: dts: mmp2: add camera interfaces
  ARM: dts: mmp2: fix the SPI nodes
  ARM: dts: mmp2: trivial whitespace fix
  arm64: dts: marvell: add DTS for Turris Mox
  dt-bindings: marvell: document Turris Mox compatible
  arm64: dts: marvell: armada-37xx: add SPI CS1 pinctrl
  arm64: dts: ti: k3-j721e-main: Fix gic-its node unit-address
  arm64: dts: ti: k3-am65-main: Fix gic-its node unit-address
  arm64: dts: ti: k3-j721e-main: Add hwspinlock node
  arm64: dts: ti: k3-am65-main: Add hwspinlock node
  arm64: dts: k3-j721e: Add gpio-keys on common processor board
  dt-bindings: pinctrl: k3: Introduce pinmux definitions for J721E
  ...
parents a703d279 2a7326ca

Documentation/devicetree/bindings/arm/marvell/armada-37xx.txt

+8 −0
Original line number Diff line number Diff line
@@ -48,3 +48,11 @@ avs: avs@11500 { 
	compatible = "marvell,armada-3700-avs", "syscon";

	reg = <0x11500 0x40>;

}





CZ.NIC's Turris Mox SOHO router Device Tree Bindings

----------------------------------------------------



Required root node property:



 - compatible: must contain "cznic,turris-mox"

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -11867,6 +11867,7 @@ S: Maintained 
F:	arch/arm/mach-omap2/

F:	arch/arm/plat-omap/

F:	arch/arm/configs/omap2plus_defconfig

F:	drivers/bus/ti-sysc.c

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

F:	drivers/irqchip/irq-omap-intc.c

F:	drivers/mfd/*omap*.c
@@ -11887,6 +11888,7 @@ F: drivers/regulator/tps65910-regulator.c 
F:	drivers/regulator/twl-regulator.c

F:	drivers/regulator/twl6030-regulator.c

F:	include/linux/platform_data/i2c-omap.h

F:	include/linux/platform_data/ti-sysc.h















ONION OMEGA2+ BOARD















M:	Harvey Hunt <harveyhuntnexus@gmail.com>

































arch/arm/boot/dts/Makefile



+3
−1






























Original line number
Diff line number
Diff line








@@ -336,7 +336,8 @@ dtb-$(CONFIG_MACH_MESON8) += \













dtb-$(CONFIG_ARCH_MMP) += \















	pxa168-aspenite.dtb \















	pxa910-dkb.dtb \













	mmp2-brownstone.dtb













	mmp2-brownstone.dtb \













	mmp2-olpc-xo-1-75.dtb















dtb-$(CONFIG_ARCH_MPS2) += \















	mps2-an385.dtb \















	mps2-an399.dtb










@@ -1278,6 +1279,7 @@ dtb-$(CONFIG_ARCH_MILBEAUT) += milbeaut-m10v-evb.dtb













dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb















dtb-$(CONFIG_ARCH_ASPEED) += \















	aspeed-ast2500-evb.dtb \













	aspeed-ast2600-evb.dtb \















	aspeed-bmc-arm-centriq2400-rep.dtb \















	aspeed-bmc-arm-stardragon4800-rep2.dtb \















	aspeed-bmc-facebook-cmm.dtb \

































arch/arm/boot/dts/am33xx-l4.dtsi



+2
−2






























Original line number
Diff line number
Diff line








@@ -673,7 +673,6 @@





























		target-module@100000 {			/* 0x4a100000, ap 3 08.0 */















			compatible = "ti,sysc-omap4-simple", "ti,sysc";













			ti,hwmods = "cpgmac0";















			reg = <0x101200 0x4>,















			      <0x101208 0x4>,















			      <0x101204 0x4>;










@@ -719,9 +718,10 @@





























				davinci_mdio: mdio@1000 {















					compatible = "ti,cpsw-mdio","ti,davinci_mdio";













					clocks = <&cpsw_125mhz_clkctrl AM3_CPSW_125MHZ_CPGMAC0_CLKCTRL 0>;













					clock-names = "fck";















					#address-cells = <1>;















					#size-cells = <0>;













					ti,hwmods = "davinci_mdio";















					bus_freq = <1000000>;















					reg = <0x1000 0x100>;















					status = "disabled";

































arch/arm/boot/dts/am3517.dtsi



+24
−0






























Original line number
Diff line number
Diff line








@@ -88,6 +88,30 @@













			interrupts = <24>;















			clocks = <&hecc_ck>;















		};



























		/*













		 * On am3517 the OCP registers do not seem to be accessible













		 * similar to the omap34xx. Maybe SGX is permanently set to













		 * "OCP bypass mode", or maybe there is OCP_SYSCONFIG that is













		 * write-only at 0x50000e10. We detect SGX based on the SGX













		 * revision register instead of the unreadable OCP revision













		 * register.













		 */













		sgx_module: target-module@50000000 {













			compatible = "ti,sysc-omap2", "ti,sysc";













			reg = <0x50000014 0x4>;













			reg-names = "rev";













			clocks = <&sgx_fck>, <&sgx_ick>;













			clock-names = "fck", "ick";













			#address-cells = <1>;













			#size-cells = <1>;













			ranges = <0 0x50000000 0x4000>;



























			/*













			 * Closed source PowerVR driver, no child device













			 * binding or driver in mainline













			 */













		};















	};















};

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE