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

Commit d6624832 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Pull net into net-next to get the synchronize_net() bug fix in
bonding.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8facd5fb da241efc

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

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
		};



		mvsdio@d00d4000 {

			pinctrl-0 = <&sdio_pins2>;

			pinctrl-0 = <&sdio_pins3>;

			pinctrl-names = "default";

			status = "okay";

			/*

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

+6 −0
Original line number Diff line number Diff line
@@ -59,6 +59,12 @@ 
					     "mpp50", "mpp51", "mpp52";

			      marvell,function = "sd0";

			};



			sdio_pins3: sdio-pins3 {

			      marvell,pins = "mpp48", "mpp49", "mpp50",

					     "mpp51", "mpp52", "mpp53";

			      marvell,function = "sd0";

			};

	        };



		gpio0: gpio@d0018100 {

arch/arm/boot/dts/dbx5x0.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -191,8 +191,8 @@ 


		prcmu: prcmu@80157000 {

			compatible = "stericsson,db8500-prcmu";

			reg = <0x80157000 0x1000>;

			reg-names = "prcmu";

			reg = <0x80157000 0x1000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;

			reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";

			interrupts = <0 47 0x4>;

			#address-cells = <1>;

			#size-cells = <1>;

arch/arm/boot/dts/kirkwood-goflexnet.dts

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
		};



		nand@3000000 {

			chip-delay = <40>;

			status = "okay";



			partition@0 {

arch/arm/boot/dts/orion5x.dtsi

+7 −2
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 
	compatible = "marvell,orion5x";

	interrupt-parent = <&intc>;



	aliases {

		gpio0 = &gpio0;

	};

	intc: interrupt-controller {

		compatible = "marvell,orion-intc", "marvell,intc";

		interrupt-controller;
@@ -32,7 +35,9 @@ 
			#gpio-cells = <2>;

			gpio-controller;

			reg = <0x10100 0x40>;

			ngpio = <32>;

			ngpios = <32>;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupts = <6>, <7>, <8>, <9>;

		};
@@ -91,7 +96,7 @@ 
			reg = <0x90000 0x10000>,

			      <0xf2200000 0x800>;

			reg-names = "regs", "sram";

			interrupts = <22>;

			interrupts = <28>;

			status = "okay";

		};

	};