Commit 347f56fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "A set of fixes that we've merged late, but for the most part that have
  been sitting in -next for a while through platform maintainer trees:

   - Fixes to suspend/resume on Tegra, caused by the added features this
     merge window

   - Cleanups and minor fixes to TI additions this merge window

   - Tee fixes queued up late before the merge window, included here.

   - A handful of other fixlets

  There's also a refresh of the shareed config files (multi_v* on
  32-bit, and defconfig on 64-bit), to avoid conflicts when we get new
  contributions"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (32 commits)
  ARM: multi_v7_defconfig: Restore debugfs support
  ARM: defconfig: re-run savedefconfig on multi_v* configs
  arm64: defconfig: re-run savedefconfig
  ARM: pxa: Fix resource properties
  soc: mediatek: cmdq: fixup wrong input order of write api
  soc: aspeed: Fix snoop_file_poll()'s return type
  MAINTAINERS: Switch to Marvell addresses
  MAINTAINERS: update Cavium ThunderX drivers
  Revert "arm64: dts: juno: add dma-ranges property"
  MAINTAINERS: Make Nicolas Saenz Julienne the new bcm2835 maintainer
  firmware: arm_scmi: Avoid double free in error flow
  arm64: dts: juno: Fix UART frequency
  ARM: dts: Fix sgx sysconfig register for omap4
  arm: socfpga: execute cold reboot by default
  ARM: dts: Fix vcsi regulator to be always-on for droid4 to prevent hangs
  ARM: dts: dra7: fix cpsw mdio fck clock
  ARM: dts: am57xx-beagle-x15: Update pinmux name to ddr_3_3v
  ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity
  soc/tegra: pmc: Add reset sources and levels on Tegra194
  soc/tegra: pmc: Add missing IRQ callbacks on Tegra194
  ...
parents 98884281 30f55eae

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -105,6 +105,9 @@ James E Wilson <wilson@specifix.com> 
James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>

James Hogan <jhogan@kernel.org> <james@albanarts.com>

James Ketrenos <jketreno@io.(none)>

Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com>

Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>

Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>

Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>

MAINTAINERS

+17 −23
Original line number Diff line number Diff line
@@ -1584,8 +1584,8 @@ S: Maintained 
F:	arch/arm/mach-cns3xxx/









ARM/CAVIUM THUNDER NETWORK DRIVER









M:	Sunil Goutham <sgoutham@cavium.com>









M:	Robert Richter <rric@kernel.org>









M:	Sunil Goutham <sgoutham@marvell.com>









M:	Robert Richter <rrichter@marvell.com>









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









S:	Supported









F:	drivers/net/ethernet/cavium/thunder/








@@ -3228,8 +3228,7 @@ N:	kona







F:	arch/arm/mach-bcm/

















BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE









M:	Eric Anholt <eric@anholt.net>









M:	Stefan Wahren <wahrenst@gmx.net>









M:	Nicolas Saenz Julienne <nsaenzjulienne@suse.de>









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









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









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








@@ -3742,9 +3741,8 @@ S:	Maintained







F:	drivers/net/wireless/ath/carl9170/

















CAVIUM I2C DRIVER









M:	Jan Glauber <jglauber@cavium.com>









M:	David Daney <david.daney@cavium.com>









W:	http://www.cavium.com









M:	Robert Richter <rrichter@marvell.com>









W:	http://www.marvell.com









S:	Supported









F:	drivers/i2c/busses/i2c-octeon*









F:	drivers/i2c/busses/i2c-thunderx*








@@ -3754,27 +3752,25 @@ M:	Derek Chickles <dchickles@marvell.com>







M:	Satanand Burla <sburla@marvell.com>









M:	Felix Manlunas <fmanlunas@marvell.com>









L:	netdev@vger.kernel.org









W:	http://www.cavium.com









W:	http://www.marvell.com









S:	Supported









F:	drivers/net/ethernet/cavium/liquidio/

















CAVIUM MMC DRIVER









M:	Jan Glauber <jglauber@cavium.com>









M:	David Daney <david.daney@cavium.com>









M:	Steven J. Hill <Steven.Hill@cavium.com>









W:	http://www.cavium.com









M:	Robert Richter <rrichter@marvell.com>









W:	http://www.marvell.com









S:	Supported









F:	drivers/mmc/host/cavium*

















CAVIUM OCTEON-TX CRYPTO DRIVER









M:	George Cherian <george.cherian@cavium.com>









M:	George Cherian <gcherian@marvell.com>









L:	linux-crypto@vger.kernel.org









W:	http://www.cavium.com









W:	http://www.marvell.com









S:	Supported









F:	drivers/crypto/cavium/cpt/

















CAVIUM THUNDERX2 ARM64 SOC









M:	Robert Richter <rrichter@cavium.com>









M:	Robert Richter <rrichter@marvell.com>









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









S:	Maintained









F:	arch/arm64/boot/dts/cavium/thunder2-99xx*








@@ -5892,15 +5888,14 @@ F:	drivers/edac/highbank*















EDAC-CAVIUM OCTEON









M:	Ralf Baechle <ralf@linux-mips.org>









M:	David Daney <david.daney@cavium.com>









M:	Robert Richter <rrichter@marvell.com>









L:	linux-edac@vger.kernel.org









L:	linux-mips@vger.kernel.org









S:	Supported









F:	drivers/edac/octeon_edac*

















EDAC-CAVIUM THUNDERX









M:	David Daney <david.daney@cavium.com>









M:	Jan Glauber <jglauber@cavium.com>









M:	Robert Richter <rrichter@marvell.com>









L:	linux-edac@vger.kernel.org









S:	Supported









F:	drivers/edac/thunderx_edac*








@@ -12799,7 +12794,7 @@ F:	Documentation/devicetree/bindings/pci/axis,artpec*







F:	drivers/pci/controller/dwc/*artpec*

















PCIE DRIVER FOR CAVIUM THUNDERX









M:	David Daney <david.daney@cavium.com>









M:	Robert Richter <rrichter@marvell.com>









L:	linux-pci@vger.kernel.org









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









S:	Supported








@@ -16372,7 +16367,7 @@ S:	Maintained







F:	drivers/net/thunderbolt.c

















THUNDERX GPIO DRIVER









M:	David Daney <david.daney@cavium.com>









M:	Robert Richter <rrichter@marvell.com>









S:	Maintained









F:	drivers/gpio/gpio-thunderx.c
















@@ -18177,10 +18172,9 @@ S:	Supported







F:	drivers/char/xillybus/

















XLP9XX I2C DRIVER









M:	George Cherian <george.cherian@cavium.com>









M:	Jan Glauber <jglauber@cavium.com>









M:	George Cherian <gcherian@marvell.com>









L:	linux-i2c@vger.kernel.org









W:	http://www.cavium.com









W:	http://www.marvell.com









S:	Supported









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









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

























arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts



+1
−1






























Original line number
Diff line number
Diff line







@@ -24,7 +24,7 @@







};



















&mmc2 {









	pinctrl-names = "default", "hs", "ddr_1_8v";









	pinctrl-names = "default", "hs", "ddr_3_3v";









	pinctrl-0 = <&mmc2_pins_default>;









	pinctrl-1 = <&mmc2_pins_hs>;









	pinctrl-2 = <&mmc2_pins_ddr_3_3v_rev11 &mmc2_iodelay_ddr_3_3v_rev11_conf>;
































arch/arm/boot/dts/am57xx-beagle-x15-revc.dts



+1
−1






























Original line number
Diff line number
Diff line







@@ -24,7 +24,7 @@







};



















&mmc2 {









	pinctrl-names = "default", "hs", "ddr_1_8v";









	pinctrl-names = "default", "hs", "ddr_3_3v";









	pinctrl-0 = <&mmc2_pins_default>;









	pinctrl-1 = <&mmc2_pins_hs>;









	pinctrl-2 = <&mmc2_pins_ddr_rev20>;
































arch/arm/boot/dts/bcm2711-rpi-4-b.dts



+17
−0






























Original line number
Diff line number
Diff line







@@ -19,6 +19,10 @@







		reg = <0 0 0>;









	};



















	aliases {









		ethernet0 = &genet;









	};



















	leds {









		act {









			gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;








@@ -97,6 +101,19 @@







	status = "okay";









};



















&genet {









	phy-handle = <&phy1>;









	phy-mode = "rgmii-rxid";









	status = "okay";









};



















&genet_mdio {









	phy1: ethernet-phy@1 {









		/* No PHY interrupt */









		reg = <0x1>;









	};









};



















/* uart0 communicates with the BT module */









&uart0 {









	pinctrl-names = "default";