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

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

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

Pull ARM SoC fixes from Arnd Bergmann:
 "Most of the changes this time are for incorrect device nodes in
  various ways, on on imx, berlin, exynos, ux500, uniphier, omap and
  meson.

  Chen-Yu Tsai now co-maintains mach-sunxi (Allwinner).

  Other bug fixes include
   - a partial revert of a broken tegra gpio patch
   - irq affinity for arm ccn
   - suspend on one Armada 385 machine
   - enable ZONE_DMA to avoid an OMAP crash for over 2GB RAM
   - turning on a regulator on beagleboard-x15 for HDMI
   - making the omap gpmc debug code visible
   - setup of orion network switch
   - a rare build regression for pxa"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (22 commits)
  ARM: OMAP2+: Fix imprecise external abort caused by bogus SRAM init
  thermal: exynos: Fix register read in TMU
  ARM: OMAP2+: Fix oops with LPAE and more than 2GB of memory
  ARM: tegra: Comment out gpio-ranges properties
  ARM: dts: uniphier: fix IRQ number for devices on PH1-LD6b ref board
  drivers/perf: arm_pmu: avoid CPU device_node reference leak
  bus: arm-ccn: Fix irq affinity setting on CPU migration
  bus: arm-ccn: Handle correctly no-more-cpus case
  ARM: mvebu: correct a385-db-ap compatible string
  ARM: meson6: DTS: Fix wrong reg mapping and IRQ numbers
  MAINTAINERS: Update Allwinner entry and add new maintainer
  ARM: ux500: modify initial levelshifter status
  ARM: pxa: fix pxa3xx DFI lockup hack
  Documentation: ARM: List new omap MMC requirements
  memory: omap-gpmc: dump "before" state before first modification
  memory: omap-gpmc: Fix unselectable debug option for GPMC
  ARM: dts: am57xx-beagle-x15: set VDD_SD to always-on
  ARM: dts: Fix audio card detection on Peach boards
  ARM: EXYNOS: Fix double of_node_put() when parsing child power domains
  ARM: orion: Fix DSA platform device after mvmdio conversion
  ...
parents 2c44f4f0 55f41297

Documentation/arm/OMAP/README

0 → 100644
+7 −0
Original line number Original line Diff line number Diff line 
This file contains documentation for running mainline

kernel on omaps.



KERNEL		NEW DEPENDENCIES

v4.3+		Update is needed for custom .config files to make sure

		CONFIG_REGULATOR_PBIAS is enabled for MMC1 to work

		properly.

MAINTAINERS

+3 −2
Original line number Original line Diff line number Diff line
@@ -894,11 +894,12 @@ M: Lennert Buytenhek <kernel@wantstofly.org> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

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

S:	Maintained

S:	Maintained





ARM/Allwinner A1X SoC support

ARM/Allwinner sunXi SoC support

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

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

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

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

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

S:	Maintained

S:	Maintained

N:	sun[x4567]i

N:	sun[x456789]i





ARM/Allwinner SoC Clock Support

ARM/Allwinner SoC Clock Support

M:	Emilio López <emilio@elopez.com.ar>

M:	Emilio López <emilio@elopez.com.ar>

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -402,11 +402,12 @@ 
				/* SMPS9 unused */

				/* SMPS9 unused */





				ldo1_reg: ldo1 {

				ldo1_reg: ldo1 {

					/* VDD_SD  */

					/* VDD_SD / VDDSHV8  */

					regulator-name = "ldo1";

					regulator-name = "ldo1";

					regulator-min-microvolt = <1800000>;

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-boot-on;

					regulator-boot-on;

					regulator-always-on;

				};

				};





				ldo2_reg: ldo2 {

				ldo2_reg: ldo2 {

arch/arm/boot/dts/armada-385-db-ap.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ 




/ {

/ {

	model = "Marvell Armada 385 Access Point Development Board";

	model = "Marvell Armada 385 Access Point Development Board";

	compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada38x";

	compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada380";





	chosen {

	chosen {

		stdout-path = "serial1:115200n8";

		stdout-path = "serial1:115200n8";

arch/arm/boot/dts/berlin2q.dtsi

+3 −3
Original line number Original line Diff line number Diff line
@@ -152,7 +152,7 @@ 
		};

		};





		usb_phy2: phy@a2f400 {

		usb_phy2: phy@a2f400 {

			compatible = "marvell,berlin2-usb-phy";

			compatible = "marvell,berlin2cd-usb-phy";

			reg = <0xa2f400 0x128>;

			reg = <0xa2f400 0x128>;

			#phy-cells = <0>;

			#phy-cells = <0>;

			resets = <&chip_rst 0x104 14>;

			resets = <&chip_rst 0x104 14>;
@@ -170,7 +170,7 @@ 
		};

		};





		usb_phy0: phy@b74000 {

		usb_phy0: phy@b74000 {

			compatible = "marvell,berlin2-usb-phy";

			compatible = "marvell,berlin2cd-usb-phy";

			reg = <0xb74000 0x128>;

			reg = <0xb74000 0x128>;

			#phy-cells = <0>;

			#phy-cells = <0>;

			resets = <&chip_rst 0x104 12>;

			resets = <&chip_rst 0x104 12>;
@@ -178,7 +178,7 @@ 
		};

		};





		usb_phy1: phy@b78000 {

		usb_phy1: phy@b78000 {

			compatible = "marvell,berlin2-usb-phy";

			compatible = "marvell,berlin2cd-usb-phy";

			reg = <0xb78000 0x128>;

			reg = <0xb78000 0x128>;

			#phy-cells = <0>;

			#phy-cells = <0>;

			resets = <&chip_rst 0x104 13>;

			resets = <&chip_rst 0x104 13>;