Changeset 652 for GPL/branches/uniaud32-next/lib32/internal.h

Timestamp:

Jan 24, 2021, 8:40:08 AM (5 years ago)

Author:

Paul Smedley

Message:

Update regmap & regcache to 5.10.10 kernel code

File:

• GPL/branches/uniaud32-next/lib32/internal.h (modified) (11 diffs)

GPL/branches/uniaud32-next/lib32/internal.h

@@ +1 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Register map access API internal header
@@ -5 +6 @@
  *
  * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
-/* from 4.19.163 */
+
+/* from 5.10.10 */
 
 #ifndef _REGMAP_INTERNAL_H
@@ -20 +18 @@
 #include <linux/list.h>
 #include <linux/wait.h>
-#include <linux/timer.h>
-#include <linux/bitops.h>
-#include <linux/bitmap.h>
 
 struct regmap;
@@ -99 +94 @@
         bool (*volatile_reg)(struct device *dev, unsigned int reg);
         bool (*precious_reg)(struct device *dev, unsigned int reg);
+        bool (*writeable_noinc_reg)(struct device *dev, unsigned int reg);
         bool (*readable_noinc_reg)(struct device *dev, unsigned int reg);
         const struct regmap_access_table *wr_table;
@@ -104 +100 @@
         const struct regmap_access_table *volatile_table;
         const struct regmap_access_table *precious_table;
+        const struct regmap_access_table *wr_noinc_table;
         const struct regmap_access_table *rd_noinc_table;
 
@@ -154 +151 @@
         /* if set, converts bulk read to single read */
         bool use_single_read;
-        /* if set, converts bulk read to single read */
+        /* if set, converts bulk write to single write */
         bool use_single_write;
         /* if set, the device supports multi write mode */
@@ -167 +164 @@
 
         struct hwspinlock *hwlock;
+
+        /* if set, the regmap core can sleep */
+        bool can_sleep;
 };
 
@@ -188 +188 @@
 bool regmap_volatile(struct regmap *map, unsigned int reg);
 bool regmap_precious(struct regmap *map, unsigned int reg);
+bool regmap_writeable_noinc(struct regmap *map, unsigned int reg);
 bool regmap_readable_noinc(struct regmap *map, unsigned int reg);
 
@@ -222 +223 @@
 #ifdef CONFIG_DEBUG_FS
 extern void regmap_debugfs_initcall(void);
-extern void regmap_debugfs_init(struct regmap *map, const char *name);
+extern void regmap_debugfs_init(struct regmap *map);
 extern void regmap_debugfs_exit(struct regmap *map);
 
@@ -232 +233 @@
 #else
 static inline void regmap_debugfs_initcall(void) { }
-static inline void regmap_debugfs_init(struct regmap *map, const char *name) { }
+static inline void regmap_debugfs_init(struct regmap *map) { }
 static inline void regmap_debugfs_exit(struct regmap *map) { }
 static inline void regmap_debugfs_disable(struct regmap *map) { }
@@ -264 +265 @@
 
 int _regmap_raw_write(struct regmap *map, unsigned int reg,
-                      const void *val, size_t val_len);
+                      const void *val, size_t val_len, bool noinc);
 
 void regmap_async_complete_cb(struct regmap_async *async, int ret);