3 files changed, 37 insertions, 22 deletions

diff --git a/include/dt-bindings/power/owl-s500-powergate.h b/include/dt-bindings/power/owl-s500-powergate.h
new file mode 100644
index 000000000000..0a1c451865ea
--- /dev/null
+++ b/include/dt-bindings/power/owl-s500-powergate.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2017 Andreas Färber
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+ */
+#ifndef DT_BINDINGS_POWER_OWL_S500_POWERGATE_H
+#define DT_BINDINGS_POWER_OWL_S500_POWERGATE_H
+
+#define S500_PD_VDE     0
+#define S500_PD_VCE_SI  1
+#define S500_PD_USB2_1  2
+#define S500_PD_CPU2    3
+#define S500_PD_CPU3    4
+#define S500_PD_DMA     5
+#define S500_PD_DS      6
+#define S500_PD_USB3    7
+#define S500_PD_USB2_0  8
+
+#endif
diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h
index d36bc8d17e97..cdceb4d4ef9d 100644
--- a/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@ -7,9 +7,6 @@
 #ifndef __ATMEL_H__
 #define __ATMEL_H__
 
-#include <linux/mtd/nand.h>
-#include <linux/mtd/partitions.h>
-
  /* Compact Flash */
 struct at91_cf_data {
         int     irq_pin;                /* I/O IRQ */
@@ -22,26 +19,14 @@ struct at91_cf_data {
 #define AT91_IDE_SWAP_A0_A2     0x02
 };
 
- /* NAND / SmartMedia */
-struct atmel_nand_data {
-        int             enable_pin;             /* chip enable */
-        int             det_pin;                /* card detect */
-        int             rdy_pin;                /* ready/busy */
-        u8              rdy_pin_active_low;     /* rdy_pin value is inverted */
-        u8              ale;                    /* address line number connected to ALE */
-        u8              cle;                    /* address line number connected to CLE */
-        u8              bus_width_16;           /* buswidth is 16 bit */
-        u8              ecc_mode;               /* ecc mode */
-        u8              on_flash_bbt;           /* bbt on flash */
-        struct mtd_partition *parts;
-        unsigned int    num_parts;
-        bool            has_dma;                /* support dma transfer */
-
-        /* default is false, only for at32ap7000 chip is true */
-        bool            need_reset_workaround;
-};
-
 /* FIXME: this needs a better location, but gets stuff building again */
+#ifdef CONFIG_ATMEL_PM
 extern int at91_suspend_entering_slow_clock(void);
+#else
+static inline int at91_suspend_entering_slow_clock(void)
+{
+        return 0;
+}
+#endif
 
 #endif /* __ATMEL_H__ */
diff --git a/include/linux/soc/actions/owl-sps.h b/include/linux/soc/actions/owl-sps.h
new file mode 100644
index 000000000000..33d0dbeceb55
--- /dev/null
+++ b/include/linux/soc/actions/owl-sps.h
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2017 Andreas Färber
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+#ifndef SOC_ACTIONS_OWL_SPS_H
+#define SOC_ACTIONS_OWL_SPS_H
+
+int owl_sps_set_pg(void __iomem *base, u32 pwr_mask, u32 ack_mask, bool enable);
+
+#endif