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

Commit 138a0764 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

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

Freescale updates from Scott:

"Contains include 86xx fixes, minor device tree fixes, an erratum
workaround, and a kconfig dependency fix."
parents 1d4e89cf 1eef33be

arch/powerpc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -797,7 +797,6 @@ config 4xx_SOC 


config FSL_LBC

	bool "Freescale Local Bus support"

	depends on FSL_SOC

	help

	  Enables reporting of errors from the Freescale local bus

	  controller.  Also contains some common code used by

arch/powerpc/boot/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -362,9 +362,6 @@ $(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) 
$(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)

	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb)



$(obj)/cuImage.%: vmlinux $(obj)/fsl/%.dtb $(wrapperbits)

	$(call if_changed,wrap,cuboot-$*,,$(obj)/fsl/$*.dtb)



$(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)

	$(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
@@ -381,6 +378,9 @@ $(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) 
$(obj)/%.dtb: $(src)/dts/%.dts FORCE

	$(call if_changed_dep,dtc)



$(obj)/%.dtb: $(src)/dts/fsl/%.dts FORCE

	$(call if_changed_dep,dtc)



# If there isn't a platform selected then just strip the vmlinux.

ifeq (,$(image-y))

image-y := vmlinux.strip

arch/powerpc/boot/dts/fsl/gef_ppc9a.dts

+4 −0
Original line number Diff line number Diff line
@@ -211,6 +211,10 @@ 
				  0x0 0x00400000>;

		};

	};



	pci1: pcie@fef09000 {

		status = "disabled";

	};

};



/include/ "mpc8641si-post.dtsi"

arch/powerpc/boot/dts/fsl/gef_sbc310.dts

+0 −22
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ 
	model = "GEF_SBC310";

	compatible = "gef,sbc310";



	aliases {

		pci1 = &pci1;

	};



	memory {

		device_type = "memory";

		reg = <0x0 0x40000000>;	// set by uboot
@@ -223,29 +219,11 @@ 
	};



	pci1: pcie@fef09000 {

		compatible = "fsl,mpc8641-pcie";

		device_type = "pci";

		#size-cells = <2>;

		#address-cells = <3>;

		reg = <0xfef09000 0x1000>;

		bus-range = <0x0 0xff>;

		ranges = <0x02000000 0x0 0xc0000000 0xc0000000 0x0 0x20000000

			  0x01000000 0x0 0x00000000 0xfe400000 0x0 0x00400000>;

		clock-frequency = <100000000>;

		interrupts = <0x19 0x2 0 0>;

		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

		interrupt-map = <

			0x0000 0x0 0x0 0x1 &mpic 0x4 0x2

			0x0000 0x0 0x0 0x2 &mpic 0x5 0x2

			0x0000 0x0 0x0 0x3 &mpic 0x6 0x2

			0x0000 0x0 0x0 0x4 &mpic 0x7 0x2

			>;



		pcie@0 {

			reg = <0 0 0 0 0>;

			#size-cells = <2>;

			#address-cells = <3>;

			device_type = "pci";

			ranges = <0x02000000 0x0 0xc0000000

				  0x02000000 0x0 0xc0000000

				  0x0 0x20000000

arch/powerpc/boot/dts/fsl/gef_sbc610.dts

+4 −0
Original line number Diff line number Diff line
@@ -209,6 +209,10 @@ 
				  0x0 0x00400000>;

		};

	};



	pci1: pcie@fef09000 {

		status = "disabled";

	};

};



/include/ "mpc8641si-post.dtsi"