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

Commit 0de085bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc 

* 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc: (25 commits)
  [POWERPC] 85xx: Added needed MPC85xx PCI device IDs
  [POWERPC] Add Freescale PCI VENDOR ID and 8641 device IDs
  [POWERPC] 85xxCDS: MPC8548 DTS cleanup.
  [POWERPC] 85xxCDS: Misc 8548 PCI Corrections.
  [POWERPC] 85xxCDS: Delay 8259 cascade hookup.
  [POWERPC] 85xxCDS: Make sure restart resets the PCI bus.
  [POWERPC] 85xxCDS: Allow 8259 cascade to share an MPIC interrupt line.
  [POWERPC] FSL: Add support for PCI-X controllers
  [POWERPC] Make sure virtual P2P bridge registers are setup on PCIe PHB
  [POWERPC] Provide ability to setup P2P bridge registers from struct resource
  [POWERPC] Add basic PCI/PCI Express support for 8544DS board
  [POWERPC] Make endianess of cfg_addr for indirect pci ops runtime
  [POWERPC] Removed setup_indirect_pci_nomap
  [POWERPC] 85xx: Add quirk to ignore bogus FPGA on CDS
  [POWERPC] 85xx: Added 8568 PCIe support
  [POWERPC] Fixup resources on pci_bus for PCIe PHB when no device is connected
  [POWERPC] Add basic PCI node for mpc8568mds board
  [POWERPC] Use Freescale pci/pcie common code for 85xx boards
  [POWERPC] Update PCI nodes in the 83xx/85xx boards device tree
  [POWERPC] Add 8548 CDS PCI express controller node and PCI-X device node
  ...
parents 3836df6b e5871211

arch/powerpc/Kconfig

+4 −5
Original line number Diff line number Diff line
@@ -411,11 +411,6 @@ config PPC_INDIRECT_PCI 
	default y if 40x || 44x

	default n



config PPC_INDIRECT_PCI_BE

	bool

	depends PPC_INDIRECT_PCI

	default n



config EISA

	bool
@@ -425,6 +420,10 @@ config SBUS 
config FSL_SOC

	bool



config FSL_PCI

 	bool

	select PPC_INDIRECT_PCI



# Yes MCA RS/6000s exist but Linux-PPC does not currently support any

config MCA

	bool

arch/powerpc/boot/dts/mpc8313erdb.dts

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ 
			#size-cells = <2>;

			#address-cells = <3>;

			reg = <8500 100>;

			compatible = "83xx";

			compatible = "fsl,mpc8349-pci";

			device_type = "pci";

		};

arch/powerpc/boot/dts/mpc832x_mds.dts

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ 
			#size-cells = <2>;

			#address-cells = <3>;

			reg = <8500 100>;

			compatible = "83xx";

			compatible = "fsl,mpc8349-pci";

			device_type = "pci";

		};

arch/powerpc/boot/dts/mpc832x_rdb.dts

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ 
			#size-cells = <2>;

			#address-cells = <3>;

			reg = <8500 100>;

			compatible = "83xx";

			compatible = "fsl,mpc8349-pci";

			device_type = "pci";

		};

arch/powerpc/boot/dts/mpc8349emitx.dts

+2 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ 
			#size-cells = <2>;

			#address-cells = <3>;

			reg = <8500 100>;

			compatible = "83xx";

			compatible = "fsl,mpc8349-pci";

			device_type = "pci";

		};
@@ -222,7 +222,7 @@ 
			#size-cells = <2>;

			#address-cells = <3>;

			reg = <8600 100>;

			compatible = "83xx";

			compatible = "fsl,mpc8349-pci";

			device_type = "pci";

		};