---

yaml --- r: 330366 b: refs/heads/master c: fca8264 h: refs/heads/master v: v3
git-mirror · Sep 9, 2012 · a8b4e82 · a8b4e82
1 parent 1eea5e7
commit a8b4e82
Show file tree

Hide file tree

Showing 281 changed files with 4,012 additions and 6,495 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caa1d631fc99940f866480c2bb88a6f5a235e7a2
+refs/heads/master: fca826460e55d4e8f2deceb09f22f9340a0db24c
diff --git a/trunk/Documentation/devicetree/bindings/powerpc/fsl/ifc.txt b/trunk/Documentation/devicetree/bindings/powerpc/fsl/ifc.txt
@@ -12,12 +12,9 @@ Properties:
 - #size-cells : Either one or two, depending on how large each chipselect
                 can be.
 - reg : Offset and length of the register set for the device
-- interrupts: IFC may have one or two interrupts.  If two interrupt
-              specifiers are present, the first is the "common"
-              interrupt (CM_EVTER_STAT), and the second is the NAND
-              interrupt (NAND_EVTER_STAT).  If there is only one,
-              that interrupt reports both types of event.
-
+- interrupts : IFC has two interrupts. The first one is the "common"
+               interrupt(CM_EVTER_STAT), and second is the NAND interrupt
+               (NAND_EVTER_STAT).
 
 - ranges : Each range corresponds to a single chipselect, and covers
            the entire access window as configured.

diff --git a/trunk/arch/arm/mach-tegra/pcie.c b/trunk/arch/arm/mach-tegra/pcie.c
@@ -367,7 +367,17 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NVIDIA, 0x0bf1, tegra_pcie_fixup_class);
 /* Tegra PCIE requires relaxed ordering */
 static void __devinit tegra_pcie_relax_enable(struct pci_dev *dev)
 {
-	pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_RELAX_EN);
+	u16 val16;
+	int pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
+
+	if (pos <= 0) {
+		dev_err(&dev->dev, "skipping relaxed ordering fixup\n");
+		return;
+	}
+
+	pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &val16);
+	val16 |= PCI_EXP_DEVCTL_RELAX_EN;
+	pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, val16);
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, tegra_pcie_relax_enable);
 

diff --git a/trunk/arch/mips/pci/pci-octeon.c b/trunk/arch/mips/pci/pci-octeon.c
@@ -117,11 +117,16 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
 	}
 
 	/* Enable the PCIe normal error reporting */
-	config = PCI_EXP_DEVCTL_CERE; /* Correctable Error Reporting */
-	config |= PCI_EXP_DEVCTL_NFERE; /* Non-Fatal Error Reporting */
-	config |= PCI_EXP_DEVCTL_FERE;  /* Fatal Error Reporting */
-	config |= PCI_EXP_DEVCTL_URRE;  /* Unsupported Request */
-	pcie_capability_set_word(dev, PCI_EXP_DEVCTL, config);
+	pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
+	if (pos) {
+		/* Update Device Control */
+		pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &config);
+		config |= PCI_EXP_DEVCTL_CERE; /* Correctable Error Reporting */
+		config |= PCI_EXP_DEVCTL_NFERE; /* Non-Fatal Error Reporting */
+		config |= PCI_EXP_DEVCTL_FERE;  /* Fatal Error Reporting */
+		config |= PCI_EXP_DEVCTL_URRE;  /* Unsupported Request */
+		pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, config);
+	}
 
 	/* Find the Advanced Error Reporting capability */
 	pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);

diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
@@ -215,8 +215,7 @@ config ARCH_HIBERNATION_POSSIBLE
 config ARCH_SUSPEND_POSSIBLE
 	def_bool y
 	depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 || PPC_83xx || \
-		   (PPC_85xx && !PPC_E500MC) || PPC_86xx || PPC_PSERIES \
-		   || 44x || 40x
+		   (PPC_85xx && !SMP) || PPC_86xx || PPC_PSERIES || 44x || 40x
 
 config PPC_DCR_NATIVE
 	bool
@@ -240,9 +239,6 @@ config PPC_OF_PLATFORM_PCI
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
 	def_bool y
 
-config ARCH_SUPPORTS_UPROBES
-	def_bool y
-
 config PPC_ADV_DEBUG_REGS
 	bool
 	depends on 40x || BOOKE
@@ -329,8 +325,7 @@ config SWIOTLB
 
 config HOTPLUG_CPU
 	bool "Support for enabling/disabling CPUs"
-	depends on SMP && HOTPLUG && EXPERIMENTAL && (PPC_PSERIES || \
-	PPC_PMAC || PPC_POWERNV || (PPC_85xx && !PPC_E500MC))
+	depends on SMP && HOTPLUG && EXPERIMENTAL && (PPC_PSERIES || PPC_PMAC || PPC_POWERNV)
 	---help---
 	  Say Y here to be able to disable and re-enable individual
 	  CPUs at runtime on SMP machines.
@@ -562,14 +557,6 @@ config SCHED_SMT
 	  when dealing with POWER5 cpus at a cost of slightly increased
 	  overhead in some places. If unsure say N here.
 
-config PPC_DENORMALISATION
-	bool "PowerPC denormalisation exception handling"
-	depends on PPC_BOOK3S_64
-	default "n"
-	---help---
-	  Add support for handling denormalisation of single precision
-	  values.  Useful for bare metal only.  If unsure say Y here.
-
 config CMDLINE_BOOL
 	bool "Default bootloader kernel arguments"
 

diff --git a/trunk/arch/powerpc/boot/Makefile b/trunk/arch/powerpc/boot/Makefile
@@ -107,7 +107,6 @@ src-boot := $(addprefix $(obj)/, $(src-boot))
 obj-boot := $(addsuffix .o, $(basename $(src-boot)))
 obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib))))
 obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat))))
-obj-plat: $(libfdt)
 
 quiet_cmd_copy_zlib = COPY    $@
       cmd_copy_zlib = sed "s@__used@@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@

diff --git a/trunk/arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi b/trunk/arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi
diff --git a/trunk/arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi b/trunk/arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi
diff --git a/trunk/arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi b/trunk/arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi
diff --git a/trunk/arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi b/trunk/arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi
@@ -33,9 +33,6 @@
  */
 
 /dts-v1/;
-
-/include/ "e500v2_power_isa.dtsi"
-
 / {
 	compatible = "fsl,MPC8536";
 	#address-cells = <2>;

diff --git a/trunk/arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi b/trunk/arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi
@@ -33,9 +33,6 @@
  */
 
 /dts-v1/;
-
-/include/ "e500v2_power_isa.dtsi"
-
 / {
 	compatible = "fsl,MPC8544";
 	#address-cells = <2>;

diff --git a/trunk/arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi b/trunk/arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi
@@ -33,9 +33,6 @@
  */
 
 /dts-v1/;
-
-/include/ "e500v2_power_isa.dtsi"
-
 / {
 	compatible = "fsl,MPC8548";
 	#address-cells = <2>;

diff --git a/trunk/arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi b/trunk/arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi
@@ -33,9 +33,6 @@
  */
 
 /dts-v1/;
-
-/include/ "e500v2_power_isa.dtsi"
-
 / {
 	compatible = "fsl,MPC8568";
 	#address-cells = <2>;

diff --git a/trunk/arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi b/trunk/arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi
@@ -33,9 +33,6 @@
  */
 
 /dts-v1/;
-
-/include/ "e500v2_power_isa.dtsi"
-
 / {
 	compatible = "fsl,MPC8569";
 	#address-cells = <2>;

diff --git a/trunk/arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi b/trunk/arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi
@@ -33,9 +33,6 @@
  */
 
 /dts-v1/;
-
-/include/ "e500v2_power_isa.dtsi"
-
 / {
 	compatible = "fsl,MPC8572";
 	#address-cells = <2>;

diff --git a/trunk/arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi b/trunk/arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi
@@ -33,9 +33,6 @@
  */
 
 /dts-v1/;
-
-/include/ "e500v2_power_isa.dtsi"
-
 / {
 	compatible = "fsl,P1010";
 	#address-cells = <2>;

diff --git a/trunk/arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi b/trunk/arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi
@@ -33,9 +33,6 @@
  */
 
 /dts-v1/;
-
-/include/ "e500v2_power_isa.dtsi"
-
 / {
 	compatible = "fsl,P1020";
 	#address-cells = <2>;

diff --git a/trunk/arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi b/trunk/arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi
@@ -33,9 +33,6 @@
  */
 
 /dts-v1/;
-
-/include/ "e500v2_power_isa.dtsi"
-
 / {
 	compatible = "fsl,P1021";
 	#address-cells = <2>;

diff --git a/trunk/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi b/trunk/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi
@@ -33,9 +33,6 @@
  */
 
 /dts-v1/;
-
-/include/ "e500v2_power_isa.dtsi"
-
 / {
 	compatible = "fsl,P1022";
 	#address-cells = <2>;

diff --git a/trunk/arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi b/trunk/arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi
@@ -33,9 +33,6 @@
  */
 
 /dts-v1/;
-
-/include/ "e500v2_power_isa.dtsi"
-
 / {
 	compatible = "fsl,P1023";
 	#address-cells = <2>;