5 files changed, 50 insertions, 1 deletions

diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 47536197ffdd..e287863ac053 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -43,6 +43,8 @@ extern int sched_create_sysfs_power_savings_entries(struct sysdev_class *cls);
 
 #ifdef CONFIG_HOTPLUG_CPU
 extern void unregister_cpu(struct cpu *cpu);
+extern ssize_t arch_cpu_probe(const char *, size_t);
+extern ssize_t arch_cpu_release(const char *, size_t);
 #endif
 struct notifier_block;
 
@@ -115,6 +117,19 @@ extern void put_online_cpus(void);
 #define unregister_hotcpu_notifier(nb)  unregister_cpu_notifier(nb)
 int cpu_down(unsigned int cpu);
 
+#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE
+extern void cpu_hotplug_driver_lock(void);
+extern void cpu_hotplug_driver_unlock(void);
+#else
+static inline void cpu_hotplug_driver_lock(void)
+{
+}
+
+static inline void cpu_hotplug_driver_unlock(void)
+{
+}
+#endif
+
 #else           /* CONFIG_HOTPLUG_CPU */
 
 #define get_online_cpus()       do { } while (0)
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index 43fc95d822d5..28e33fea5107 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -74,7 +74,12 @@ struct spi_device;
 struct fsl_spi_platform_data {
         u32     initial_spmode; /* initial SPMODE value */
         s16     bus_num;
-        bool    qe_mode;
+        unsigned int flags;
+#define SPI_QE_CPU_MODE         (1 << 0) /* QE CPU ("PIO") mode */
+#define SPI_CPM_MODE            (1 << 1) /* CPM/QE ("DMA") mode */
+#define SPI_CPM1                (1 << 2) /* SPI unit is in CPM1 block */
+#define SPI_CPM2                (1 << 3) /* SPI unit is in CPM2 block */
+#define SPI_QE                  (1 << 4) /* SPI unit is in QE block */
         /* board specific information */
         u16     max_chipselect;
         void    (*cs_control)(struct spi_device *spi, bool on);
@@ -90,6 +95,10 @@ struct mpc8xx_pcmcia_ops {
  * lead to a deep sleep (i.e. power removed from the core,
  * instead of just the clock).
  */
+#if defined(CONFIG_PPC_83xx) && defined(CONFIG_SUSPEND)
 int fsl_deep_sleep(void);
+#else
+static inline int fsl_deep_sleep(void) { return 0; }
+#endif
 
 #endif /* _FSL_DEVICE_H_ */
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 2d241da07236..a24de0b1858e 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -496,6 +496,7 @@ struct kvm_ioeventfd {
 #define KVM_CAP_VCPU_EVENTS 41
 #endif
 #define KVM_CAP_S390_PSW 42
+#define KVM_CAP_PPC_SEGSTATE 43
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index cabf074b4324..4013b656ba7c 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2293,6 +2293,20 @@
 #define PCI_DEVICE_ID_MPC8536           0x0051
 #define PCI_DEVICE_ID_P2020E            0x0070
 #define PCI_DEVICE_ID_P2020             0x0071
+#define PCI_DEVICE_ID_P2010E            0x0078
+#define PCI_DEVICE_ID_P2010             0x0079
+#define PCI_DEVICE_ID_P1020E            0x0100
+#define PCI_DEVICE_ID_P1020             0x0101
+#define PCI_DEVICE_ID_P1011E            0x0108
+#define PCI_DEVICE_ID_P1011             0x0109
+#define PCI_DEVICE_ID_P1022E            0x0110
+#define PCI_DEVICE_ID_P1022             0x0111
+#define PCI_DEVICE_ID_P1013E            0x0118
+#define PCI_DEVICE_ID_P1013             0x0119
+#define PCI_DEVICE_ID_P4080E            0x0400
+#define PCI_DEVICE_ID_P4080             0x0401
+#define PCI_DEVICE_ID_P4040E            0x0408
+#define PCI_DEVICE_ID_P4040             0x0409
 #define PCI_DEVICE_ID_MPC8641           0x7010
 #define PCI_DEVICE_ID_MPC8641D          0x7011
 #define PCI_DEVICE_ID_MPC8610           0x7018
diff --git a/include/linux/spi/mpc52xx_spi.h b/include/linux/spi/mpc52xx_spi.h
new file mode 100644
index 000000000000..d1004cf09241
--- /dev/null
+++ b/include/linux/spi/mpc52xx_spi.h
@@ -0,0 +1,10 @@
+
+#ifndef INCLUDE_MPC5200_SPI_H
+#define INCLUDE_MPC5200_SPI_H
+
+extern void mpc52xx_spi_set_premessage_hook(struct spi_master *master,
+                                            void (*hook)(struct spi_message *m,
+                                                         void *context),
+                                            void *hook_context);
+
+#endif