Commit 616d8cf0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "Here are are a couple of last-minute fixes for 4.16, mostly for
  regressions. As usual, the majory are device tree changes:

   - USB 3 support on rk3399 didn't work and is being reverted for now

   - One fix for an old suspend/resume bug on rk3399

   - A few regulator related fixes on Banana Pi M2, and on imx7d-sdb

   - A boot regression fix for all Aspeed SoCs failing to find their
     memory

   - One more dtc warning fix

  The other changes are:

   - A few updates to the MAINTAINERS file

   - A revert for an incorrect orion5x cleanup

   - Two power management fixes for OMAP"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: OMAP: Fix SRAM W+X mapping
  ARM: dts: aspeed: Add default memory node
  mailmap: Update email address for Gregory CLEMENT
  ARM: davinci: fix the GPIO lookup for omapl138-hawk
  MAINTAINERS: Update Tegra IOMMU maintainer
  ARM: dts: imx7d-sdb: Fix regulator-usb-otg2-vbus node name
  ARM: ux500: Fix PMU IRQ regression
  ARM: dts: rockchip: Add missing #sound-dai-cells on rk3288
  Revert "arm64: dts: rockchip: add usb3-phy otg-port support for rk3399"
  arm64: dts: rockchip: Fix rk3399-gru-* s2r (pinctrl hogs, wifi reset)
  ARM: OMAP: Fix dmtimer init for omap1
  MAINTAINERS: update email address for Maxime Ripard
  ARM: dts: sun6i: a31s: bpi-m2: add missing regulators
  ARM: dts: sun6i: a31s: bpi-m2: improve pmic properties
parents d2b35e00 bbad2093

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ Frank Zago <fzago@systemfabricworks.com> 
Greg Kroah-Hartman <greg@echidna.(none)>

Greg Kroah-Hartman <gregkh@suse.de>

Greg Kroah-Hartman <greg@kroah.com>

Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>

Henk Vergonet <Henk.Vergonet@gmail.com>

Henrik Kretzschmar <henne@nachtwindheim.de>

Henrik Rydberg <rydberg@bitmath.org>

MAINTAINERS

+4 −3
Original line number Diff line number Diff line
@@ -1152,7 +1152,7 @@ S: Maintained 
F:	drivers/clk/sunxi/



ARM/Allwinner sunXi SoC support

M:	Maxime Ripard <maxime.ripard@free-electrons.com>

M:	Maxime Ripard <maxime.ripard@bootlin.com>

M:	Chen-Yu Tsai <wens@csie.org>

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

S:	Maintained
@@ -4626,7 +4626,7 @@ F: include/uapi/drm/drm* 
F:	include/linux/vga*



DRM DRIVERS FOR ALLWINNER A10

M:	Maxime Ripard  <maxime.ripard@free-electrons.com>

M:	Maxime Ripard  <maxime.ripard@bootlin.com>

L:	dri-devel@lists.freedesktop.org

S:	Supported

F:	drivers/gpu/drm/sun4i/
@@ -13644,7 +13644,8 @@ S: Supported 
F:	drivers/i2c/busses/i2c-tegra.c



TEGRA IOMMU DRIVERS

M:	Hiroshi Doyu <hdoyu@nvidia.com>

M:	Thierry Reding <thierry.reding@gmail.com>

L:	linux-tegra@vger.kernel.org

S:	Supported

F:	drivers/iommu/tegra*

arch/arm/boot/dts/aspeed-g4.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -42,6 +42,11 @@ 
		};

	};



	memory@40000000 {

		device_type = "memory";

		reg = <0x40000000 0>;

	};



	ahb {

		compatible = "simple-bus";

		#address-cells = <1>;

arch/arm/boot/dts/aspeed-g5.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -42,6 +42,11 @@ 
		};

	};



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0>;

	};



	ahb {

		compatible = "simple-bus";

		#address-cells = <1>;

arch/arm/boot/dts/imx7d-sdb.dts

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
		enable-active-high;

	};



	reg_usb_otg2_vbus: regulator-usb-otg1-vbus {

	reg_usb_otg2_vbus: regulator-usb-otg2-vbus {

		compatible = "regulator-fixed";

		regulator-name = "usb_otg2_vbus";

		regulator-min-microvolt = <5000000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE