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

Commit c85f9235 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt-4.4-1' of git://git.infradead.org/linux-mvebu into next/dt 

Merge "mvebu dt for 4.4 (part 1)" from Gregory CLEMENT:

Update dts to use the new crypto driver on mvebu SoCs

* tag 'mvebu-dt-4.4-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: modify Orion and Kirkwoord crypto compatible strings
  ARM: mvebu: use new bindings for existing crypto devices
  ARM: mvebu: define crypto SRAM ranges for all armada-38x boards
  ARM: mvebu: add crypto related nodes to armada 38x dtsi
  ARM: mvebu: define crypto SRAM ranges in armada-375-db.dts
  ARM: mvebu: add crypto related nodes to armada 375 dtsi
  ARM: mvebu: define crypto SRAM ranges for all armada-370 boards
  ARM: mvebu: add crypto related nodes to armada 370 dtsi
  ARM: mvebu: define crypto SRAM ranges for all armada-xp boards
  ARM: mvebu: add crypto related nodes to armada-xp.dtsi
  ARM: mvebu: add CPU config registers in the Armada 370/XP Device Tree
parents d749d94b 9b24a35c

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

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ 


	soc {

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

			  MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;

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

			  MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000>;



		internal-regs {

			serial@12000 {

arch/arm/boot/dts/armada-370-dlink-dns327l.dts

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ 


	soc {

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

			MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;

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

			MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000>;



		pcie-controller {

			status = "okay";

arch/arm/boot/dts/armada-370-mirabox.dts

+6 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ 


	soc {

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

			  MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;

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

			  MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000>;



		pcie-controller {

			status = "okay";
@@ -138,6 +139,10 @@ 
				phy-mode = "rgmii-id";

			};



			crypto@90000 {

				status = "okay";

			};



			mvsdio@d4000 {

				pinctrl-0 = <&sdio_pins3>;

				pinctrl-names = "default";

arch/arm/boot/dts/armada-370-netgear-rn102.dts

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ 


	soc {

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

			  MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;

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

			  MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000>;



		pcie-controller {

			status = "okay";

arch/arm/boot/dts/armada-370-netgear-rn104.dts

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ 


	soc {

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

			  MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;

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

			  MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000>;



		pcie-controller {

			status = "okay";