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

Commit 2a4fb270 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:
 "Two more fixes for 4.5:

   - One is a fix for OMAP that is urgently needed to avoid DRA7xx chips
     from premature aging, by always keeping the Ethernet clock enabled.

   - The other solves a I/O memory layout issue on Armada, where SROM
     and PCI memory windows were conflicting in some configurations"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: mvebu: fix overlap of Crypto SRAM with PCIe memory window
  ARM: dts: dra7: do not gate cpsw clock due to errata i877
  ARM: OMAP2+: hwmod: Introduce ti,no-idle dt property
parents 95f41fb2 d7d5a43c

Documentation/devicetree/bindings/arm/omap/omap.txt

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Optional properties: 
  during suspend.

- ti,no-reset-on-init: When present, the module should not be reset at init

- ti,no-idle-on-init: When present, the module should not be idled at init

- ti,no-idle: When present, the module is never allowed to idle.



Example:

arch/arm/boot/dts/armada-xp-axpwifiap.dts

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

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

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

			  MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000

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

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

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



		pcie-controller {

			status = "okay";

arch/arm/boot/dts/armada-xp-db.dts

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ 
		ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000

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

			  MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000

			  MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000

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

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

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



		devbus-bootcs {

			status = "okay";

arch/arm/boot/dts/armada-xp-gp.dts

+2 −2
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ 
		ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000

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

			  MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000

			  MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000

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

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

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



		devbus-bootcs {

			status = "okay";

arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts

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

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

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

			MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000

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

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

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



		pcie-controller {

			status = "okay";