Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git (75d43b2d) · Commits · 戴 / test

Documentation/devicetree/bindings/pci/fsl,pci.txt

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		* Bus Enumeration by Freescale PCI-X Agent

		Typically any Freescale PCI-X bridge hardware strapped into Agent mode
		is prevented from enumerating the bus. The PrPMC form-factor requires
		all mezzanines to be PCI-X Agents, but one per system may still
		enumerate the bus.

		The property defined below will allow a PCI-X bridge to be used for bus
		enumeration despite being strapped into Agent mode.

		Required properties:
		- fsl,pci-agent-force-enum : There is no value associated with this
		property. The property itself is treated as a boolean.

		Example:

		/* PCI-X bridge known to be PrPMC Monarch */
		pci0: pci@ef008000 {
		fsl,pci-agent-force-enum;
		#interrupt-cells = <1>;
		#size-cells = <2>;
		#address-cells = <3>;
		compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
		device_type = "pci";
		...
		...
		};

arch/powerpc/Kconfig

+4 −0

Original line number	Diff line number	Diff line
		@@ -288,6 +288,10 @@ config PPC_EMULATE_SSTEP
		bool
		default y if KPROBES \|\| UPROBES \|\| XMON \|\| HAVE_HW_BREAKPOINT

		config ZONE_DMA32
		bool
		default y if PPC64

		source "init/Kconfig"

		source "kernel/Kconfig.freezer"

arch/powerpc/boot/dts/fsl/t2081si-post.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -410,7 +410,7 @@
		/include/ "qoriq-gpio-3.dtsi"
		/include/ "qoriq-usb2-mph-0.dtsi"
		usb0: usb@210000 {
		compatible = "fsl-usb2-mph-v2.4", "fsl-usb2-mph";
		compatible = "fsl-usb2-mph-v2.5", "fsl-usb2-mph";
		fsl,iommu-parent = <&pamu1>;
		fsl,liodn-reg = <&guts 0x520>; /* USB1LIODNR */
		phy_type = "utmi";
		@@ -418,7 +418,7 @@
		};
		/include/ "qoriq-usb2-dr-0.dtsi"
		usb1: usb@211000 {
		compatible = "fsl-usb2-dr-v2.4", "fsl-usb2-dr";
		compatible = "fsl-usb2-dr-v2.5", "fsl-usb2-dr";
		fsl,iommu-parent = <&pamu1>;
		fsl,liodn-reg = <&guts 0x524>; /* USB1LIODNR */
		dr_mode = "host";

arch/powerpc/boot/dts/fsl/t4240si-post.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -498,13 +498,13 @@
		/include/ "qoriq-gpio-3.dtsi"
		/include/ "qoriq-usb2-mph-0.dtsi"
		usb0: usb@210000 {
		compatible = "fsl-usb2-mph-v2.4", "fsl-usb2-mph";
		compatible = "fsl-usb2-mph-v2.5", "fsl-usb2-mph";
		phy_type = "utmi";
		port0;
		};
		/include/ "qoriq-usb2-dr-0.dtsi"
		usb1: usb@211000 {
		compatible = "fsl-usb2-dr-v2.4", "fsl-usb2-dr";
		compatible = "fsl-usb2-dr-v2.5", "fsl-usb2-dr";
		dr_mode = "host";
		phy_type = "utmi";
		};

arch/powerpc/boot/dts/t1040rdb.dts

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		/*
		* T1040RDB Device Tree Source
		*
		* Copyright 2014 Freescale Semiconductor Inc.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions are met:
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in the
		* documentation and/or other materials provided with the distribution.
		* * Neither the name of Freescale Semiconductor nor the
		* names of its contributors may be used to endorse or promote products
		* derived from this software without specific prior written permission.
		*
		*
		* ALTERNATIVELY, this software may be distributed under the terms of the
		* GNU General Public License ("GPL") as published by the Free Software
		* Foundation, either version 2 of that License or (at your option) any
		* later version.
		*
		* THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor "AS IS" AND ANY
		* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
		* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
		* DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
		* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
		* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
		* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
		* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
		* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*/

		/include/ "fsl/t104xsi-pre.dtsi"
		/include/ "t104xrdb.dtsi"

		/ {
		model = "fsl,T1040RDB";
		compatible = "fsl,T1040RDB";
		ifc: localbus@ffe124000 {
		cpld@3,0 {
		compatible = "fsl,t1040rdb-cpld";
		};
		};
		};

		/include/ "fsl/t1040si-post.dtsi"

Admin message