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

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

Merge tag 'mvebu_fixes_for_v3.9' of git://git.infradead.org/users/jcooper/linux into fixes 

mvebu fixes for v3.9 from Jason Cooper <jason@lakedaemon.net>:

The first four patches:

  89c58c19 rtc: rtc-mv: Add support for clk to avoid lockups
  de88747f gpio: mvebu: Add clk support to prevent lockup
  7bf5b408 ARM: kirkwood: fix to retain gbe MAC addresses for DT kernels
  93fff4ce ARM: kirkwood: of_serial: fix clock gating by removing clock-frequency

are Cc'd to stable since they were held over from the previous merge window.

The rest are a small collection of fixes and a couple of devicetree conversion
catchups.

* tag 'mvebu_fixes_for_v3.9' of git://git.infradead.org/users/jcooper/linux

:
  arm: mach-orion5x: fix typo in compatible string of a .dts file
  arm: mvebu: fix address-cells in mpic DT node
  arm: plat-orion: fix address decoding when > 4GB is used
  arm: mvebu: Reduce reg-io-width with UARTs
  ARM: Dove: add RTC device node
  arm: mvebu: enable the USB ports on Armada 370 Reference Design board
  ARM: dove: drop "select COMMON_CLK_DOVE"
  rtc: rtc-mv: Add support for clk to avoid lockups
  gpio: mvebu: Add clk support to prevent lockup
  ARM: kirkwood: fix to retain gbe MAC addresses for DT kernels
  ARM: kirkwood: of_serial: fix clock gating by removing clock-frequency

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 769aca03 b2d57222

arch/arm/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -556,7 +556,6 @@ config ARCH_IXP4XX 
config ARCH_DOVE

config ARCH_DOVE

	bool "Marvell Dove"

	bool "Marvell Dove"

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLK_DOVE

	select CPU_V7

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_PCI

	select MIGHT_HAVE_PCI

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -64,5 +64,13 @@ 
			status = "okay";

			status = "okay";

			/* No CD or WP GPIOs */

			/* No CD or WP GPIOs */

		};

		};



		usb@d0050000 {

			status = "okay";

		};



		usb@d0051000 {

			status = "okay";

		};

	};

	};

};
 
};

arch/arm/boot/dts/armada-370-xp.dtsi

+2 −3
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ 
	mpic: interrupt-controller@d0020000 {

	mpic: interrupt-controller@d0020000 {

	      compatible = "marvell,mpic";

	      compatible = "marvell,mpic";

	      #interrupt-cells = <1>;

	      #interrupt-cells = <1>;

	      #address-cells = <1>;

	      #size-cells = <1>;

	      #size-cells = <1>;

	      interrupt-controller;

	      interrupt-controller;

	};

	};
@@ -54,7 +53,7 @@ 
				reg = <0xd0012000 0x100>;

				reg = <0xd0012000 0x100>;

				reg-shift = <2>;

				reg-shift = <2>;

				interrupts = <41>;

				interrupts = <41>;

				reg-io-width = <4>;

				reg-io-width = <1>;

				status = "disabled";

				status = "disabled";

		};

		};

		serial@d0012100 {

		serial@d0012100 {
@@ -62,7 +61,7 @@ 
				reg = <0xd0012100 0x100>;

				reg = <0xd0012100 0x100>;

				reg-shift = <2>;

				reg-shift = <2>;

				interrupts = <42>;

				interrupts = <42>;

				reg-io-width = <4>;

				reg-io-width = <1>;

				status = "disabled";

				status = "disabled";

		};

		};

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ 
				reg = <0xd0012200 0x100>;

				reg = <0xd0012200 0x100>;

				reg-shift = <2>;

				reg-shift = <2>;

				interrupts = <43>;

				interrupts = <43>;

				reg-io-width = <4>;

				reg-io-width = <1>;

				status = "disabled";

				status = "disabled";

		};

		};

		serial@d0012300 {

		serial@d0012300 {
@@ -54,7 +54,7 @@ 
				reg = <0xd0012300 0x100>;

				reg = <0xd0012300 0x100>;

				reg-shift = <2>;

				reg-shift = <2>;

				interrupts = <44>;

				interrupts = <44>;

				reg-io-width = <4>;

				reg-io-width = <1>;

				status = "disabled";

				status = "disabled";

		};

		};

arch/arm/boot/dts/dove.dtsi

+5 −0
Original line number Original line Diff line number Diff line
@@ -197,6 +197,11 @@ 
			status = "disabled";

			status = "disabled";

		};

		};





		rtc@d8500 {

			compatible = "marvell,orion-rtc";

			reg = <0xd8500 0x20>;

		};



		crypto: crypto@30000 {

		crypto: crypto@30000 {

			compatible = "marvell,orion-crypto";

			compatible = "marvell,orion-crypto";

			reg = <0x30000 0x10000>,

			reg = <0x30000 0x10000>,