Commit 7825e0c4 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 Olof Johansson:
 "A handful of fixes before final release:

  Marvell Armada:
   - One to fix a typo in the devicetree specifying memory ranges for
     the crypto engine
   - Two to deal with marking PCI and device-memory as strongly ordered
     to avoid hardware deadlocks, in particular when enabling above
     crypto driver.
   - Compile fix for PM

  Allwinner:
   - DT clock fixes to deal with u-boot-enabled framebuffer (simplefb).
   - Make R8 (C.H.I.P. SoC) inherit system compatibility from A13 to
     make clocks register proper.

  Tegra:
   - Fix SD card voltage setting on the Tegra3 Beaver dev board

  Misc:
   - Two maintainers updates for STM32 and STi platforms"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: tegra: beaver: Allow SD card voltage to be changed
  MAINTAINERS: update STi maintainer list
  MAINTAINERS: update STM32 maintainers list
  ARM: mvebu: compile pm code conditionally
  ARM: dts: sun7i: Fix pll3x2 and pll7x2 not having a parent clock
  ARM: dts: sunxi: Add pll3 to simplefb nodes clocks lists
  ARM: dts: armada-38x: fix MBUS_ID for crypto SRAM on Armada 385 Linksys
  ARM: mvebu: map PCI I/O regions strongly ordered
  ARM: mvebu: fix HW I/O coherency related deadlocks
  ARM: sunxi/dt: make the CHIP inherit from allwinner,sun5i-a13
parents 48d4ca56 5eb49534

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -1694,8 +1694,6 @@ S: Maintained 
F:	drivers/edac/altera_edac.



ARM/STI ARCHITECTURE

M:	Srinivas Kandagatla <srinivas.kandagatla@gmail.com>

M:	Maxime Coquelin <maxime.coquelin@st.com>

M:	Patrice Chotard <patrice.chotard@st.com>

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

L:	kernel@stlinux.com
@@ -1728,6 +1726,7 @@ F: drivers/ata/ahci_st.c 


ARM/STM32 ARCHITECTURE

M:	Maxime Coquelin <mcoquelin.stm32@gmail.com>

M:	Alexandre Torgue <alexandre.torgue@st.com>

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

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git

arch/arm/boot/dts/armada-385-linksys.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ 
	soc {

		ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000

			  MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000

			  MBUS_ID(0x09, 0x09) 0 0xf1100000 0x10000

			  MBUS_ID(0x09, 0x05) 0 0xf1110000 0x10000>;

			  MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000

			  MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;



		internal-regs {

arch/arm/boot/dts/sun4i-a10.dtsi

+12 −9
Original line number Diff line number Diff line
@@ -65,8 +65,9 @@ 
			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

			allwinner,pipeline = "de_be0-lcd0-hdmi";

			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,

				 <&ahb_gates 44>, <&dram_gates 26>;

			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,

				 <&ahb_gates 43>, <&ahb_gates 44>,

				 <&dram_gates 26>;

			status = "disabled";

		};
@@ -74,8 +75,9 @@ 
			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

			allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi";

			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,

				 <&ahb_gates 44>, <&ahb_gates 46>,

			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,

				 <&ahb_gates 43>, <&ahb_gates 44>,

				 <&ahb_gates 46>,

				 <&dram_gates 25>, <&dram_gates 26>;

			status = "disabled";

		};
@@ -84,9 +86,9 @@ 
			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

			allwinner,pipeline = "de_fe0-de_be0-lcd0";

			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>,

				 <&ahb_gates 46>, <&dram_gates 25>,

				 <&dram_gates 26>;

			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,

				 <&ahb_gates 44>, <&ahb_gates 46>,

				 <&dram_gates 25>, <&dram_gates 26>;

			status = "disabled";

		};
@@ -94,8 +96,9 @@ 
			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

			allwinner,pipeline = "de_fe0-de_be0-lcd0-tve0";

			clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>,

				 <&ahb_gates 44>, <&ahb_gates 46>,

			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 34>,

				 <&ahb_gates 36>, <&ahb_gates 44>,

				 <&ahb_gates 46>,

				 <&dram_gates 5>, <&dram_gates 25>, <&dram_gates 26>;

			status = "disabled";

		};

arch/arm/boot/dts/sun5i-a10s.dtsi

+6 −5
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ 
			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

			allwinner,pipeline = "de_be0-lcd0-hdmi";

			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,

				 <&ahb_gates 44>;

			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,

				 <&ahb_gates 43>, <&ahb_gates 44>;

			status = "disabled";

		};
@@ -74,7 +74,8 @@ 
			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

			allwinner,pipeline = "de_be0-lcd0";

			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>;

			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,

				 <&ahb_gates 44>;

			status = "disabled";

		};
@@ -82,8 +83,8 @@ 
			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

			allwinner,pipeline = "de_be0-lcd0-tve0";

			clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>,

				 <&ahb_gates 44>;

			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 34>,

				 <&ahb_gates 36>, <&ahb_gates 44>;

			status = "disabled";

		};

	};

arch/arm/boot/dts/sun5i-r8-chip.dts

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


/ {

	model = "NextThing C.H.I.P.";

	compatible = "nextthing,chip", "allwinner,sun5i-r8";

	compatible = "nextthing,chip", "allwinner,sun5i-r8", "allwinner,sun5i-a13";



	aliases {

		i2c0 = &i2c0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE