5 files changed, 38 insertions, 11 deletions

diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h
index 582a0ec0aa70..777814755fa6 100644
--- a/include/drm/drm_panel.h
+++ b/include/drm/drm_panel.h
@@ -89,7 +89,6 @@ struct drm_panel {
         struct drm_device *drm;
         struct drm_connector *connector;
         struct device *dev;
-        struct device_link *link;
 
         const struct drm_panel_funcs *funcs;
 
diff --git a/include/linux/mfd/rohm-bd718x7.h b/include/linux/mfd/rohm-bd718x7.h
index a528747f8aed..e8338e5dc10b 100644
--- a/include/linux/mfd/rohm-bd718x7.h
+++ b/include/linux/mfd/rohm-bd718x7.h
@@ -78,9 +78,9 @@ enum {
         BD71837_REG_TRANS_COND0        = 0x1F,
         BD71837_REG_TRANS_COND1        = 0x20,
         BD71837_REG_VRFAULTEN          = 0x21,
-        BD71837_REG_MVRFLTMASK0        = 0x22,
-        BD71837_REG_MVRFLTMASK1        = 0x23,
-        BD71837_REG_MVRFLTMASK2        = 0x24,
+        BD718XX_REG_MVRFLTMASK0        = 0x22,
+        BD718XX_REG_MVRFLTMASK1        = 0x23,
+        BD718XX_REG_MVRFLTMASK2        = 0x24,
         BD71837_REG_RCVCFG             = 0x25,
         BD71837_REG_RCVNUM             = 0x26,
         BD71837_REG_PWRONCONFIG0       = 0x27,
@@ -159,6 +159,33 @@ enum {
 #define BUCK8_MASK              0x3F
 #define BUCK8_DEFAULT           0x1E
 
+/* BD718XX Voltage monitoring masks */
+#define BD718XX_BUCK1_VRMON80           0x1
+#define BD718XX_BUCK1_VRMON130          0x2
+#define BD718XX_BUCK2_VRMON80           0x4
+#define BD718XX_BUCK2_VRMON130          0x8
+#define BD718XX_1ST_NODVS_BUCK_VRMON80  0x1
+#define BD718XX_1ST_NODVS_BUCK_VRMON130 0x2
+#define BD718XX_2ND_NODVS_BUCK_VRMON80  0x4
+#define BD718XX_2ND_NODVS_BUCK_VRMON130 0x8
+#define BD718XX_3RD_NODVS_BUCK_VRMON80  0x10
+#define BD718XX_3RD_NODVS_BUCK_VRMON130 0x20
+#define BD718XX_4TH_NODVS_BUCK_VRMON80  0x40
+#define BD718XX_4TH_NODVS_BUCK_VRMON130 0x80
+#define BD718XX_LDO1_VRMON80            0x1
+#define BD718XX_LDO2_VRMON80            0x2
+#define BD718XX_LDO3_VRMON80            0x4
+#define BD718XX_LDO4_VRMON80            0x8
+#define BD718XX_LDO5_VRMON80            0x10
+#define BD718XX_LDO6_VRMON80            0x20
+
+/* BD71837 specific voltage monitoring masks */
+#define BD71837_BUCK3_VRMON80           0x10
+#define BD71837_BUCK3_VRMON130          0x20
+#define BD71837_BUCK4_VRMON80           0x40
+#define BD71837_BUCK4_VRMON130          0x80
+#define BD71837_LDO7_VRMON80            0x40
+
 /* BD71837_REG_IRQ bits */
 #define IRQ_SWRST               0x40
 #define IRQ_PWRON_S             0x20
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index 3468703d663a..a459a5e973a7 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -48,9 +48,9 @@ struct regulator;
  * DISABLE_IN_SUSPEND   - turn off regulator in suspend states
  * ENABLE_IN_SUSPEND    - keep regulator on in suspend states
  */
-#define DO_NOTHING_IN_SUSPEND   (-1)
-#define DISABLE_IN_SUSPEND      0
-#define ENABLE_IN_SUSPEND       1
+#define DO_NOTHING_IN_SUSPEND   0
+#define DISABLE_IN_SUSPEND      1
+#define ENABLE_IN_SUSPEND       2
 
 /* Regulator active discharge flags */
 enum regulator_active_discharge {
diff --git a/include/linux/spi/spi-mem.h b/include/linux/spi/spi-mem.h
index b2bd4b4127c4..69ee30456864 100644
--- a/include/linux/spi/spi-mem.h
+++ b/include/linux/spi/spi-mem.h
@@ -81,8 +81,10 @@ enum spi_mem_data_dir {
  * @dummy.buswidth: number of IO lanes used to transmit the dummy bytes
  * @data.buswidth: number of IO lanes used to send/receive the data
  * @data.dir: direction of the transfer
- * @data.buf.in: input buffer
- * @data.buf.out: output buffer
+ * @data.nbytes: number of data bytes to send/receive. Can be zero if the
+ *               operation does not involve transferring data
+ * @data.buf.in: input buffer (must be DMA-able)
+ * @data.buf.out: output buffer (must be DMA-able)
  */
 struct spi_mem_op {
         struct {
@@ -105,7 +107,6 @@ struct spi_mem_op {
                 u8 buswidth;
                 enum spi_mem_data_dir dir;
                 unsigned int nbytes;
-                /* buf.{in,out} must be DMA-able. */
                 union {
                         void *in;
                         const void *out;
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 409c845d4cd3..422b1c01ee0d 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -172,7 +172,7 @@ size_t copy_from_iter_flushcache(void *addr, size_t bytes, struct iov_iter *i)
 static __always_inline __must_check
 size_t copy_to_iter_mcsafe(void *addr, size_t bytes, struct iov_iter *i)
 {
-        if (unlikely(!check_copy_size(addr, bytes, false)))
+        if (unlikely(!check_copy_size(addr, bytes, true)))
                 return 0;
         else
                 return _copy_to_iter_mcsafe(addr, bytes, i);