Commit 3b9672ff authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next 

Updates from Scott:
  "This contains a couple device tree updates, and a fix for a missing
   prototype warning."
parents e9013785 b6ae3550

arch/powerpc/boot/dts/fsl/t2080rdb.dts

+2 −2
Original line number Diff line number Diff line
@@ -77,12 +77,12 @@ 
		};



		ethernet@f0000 {

			phy-handle = <&xg_cs4315_phy1>;

			phy-handle = <&xg_cs4315_phy2>;

			phy-connection-type = "xgmii";

		};



		ethernet@f2000 {

			phy-handle = <&xg_cs4315_phy2>;

			phy-handle = <&xg_cs4315_phy1>;

			phy-connection-type = "xgmii";

		};

arch/powerpc/boot/dts/mpc885ads.dts

+12 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
		#address-cells = <1>;

		#size-cells = <1>;

		device_type = "soc";

		ranges = <0x0 0xff000000 0x4000>;

		ranges = <0x0 0xff000000 0x28000>;

		bus-frequency = <0>;



		// Temporary -- will go away once kernel uses ranges for get_immrbase().
@@ -224,6 +224,17 @@ 
				#size-cells = <0>;

			};

		};



		crypto@20000 {

			compatible = "fsl,sec1.2", "fsl,sec1.0";

			reg = <0x20000 0x8000>;

			interrupts = <1 1>;

			interrupt-parent = <&PIC>;

			fsl,num-channels = <1>;

			fsl,channel-fifo-len = <24>;

			fsl,exec-units-mask = <0x4c>;

			fsl,descriptor-types-mask = <0x05000154>;

		};

	};



	chosen {

arch/powerpc/mm/8xx_mmu.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 */



#include <linux/memblock.h>

#include <linux/mmu_context.h>

#include <asm/fixmap.h>

#include <asm/code-patching.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE