Merge branch 'topic/devnode' of https://git.kernel.org/pub/scm/linux/kernel/git/broon...

diff --combined include/linux/regmap.h
index f4917efed5c3f2e2531c3f78e32e3e2ed322ca7d,e2c22c0f3b9a30fff8ad9b66a9d0a87931772093..e3817c097791df3a481311fd84070566f356d7b1
--- 1/include/linux/regmap.h
--- 2/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@@ -18,6 -18,7 +18,7 @@@
  #include <linux/bug.h>
  #include <linux/lockdep.h>
  #include <linux/iopoll.h>
+ #include <linux/fwnode.h>
  
  struct module;
  struct clk;
@@@ -80,6 -81,36 +81,6 @@@ struct reg_sequence 
                                }
  #define REG_SEQ0(_reg, _def)  REG_SEQ(_reg, _def, 0)
  
 -#define       regmap_update_bits(map, reg, mask, val) \
 -      regmap_update_bits_base(map, reg, mask, val, NULL, false, false)
 -#define       regmap_update_bits_async(map, reg, mask, val)\
 -      regmap_update_bits_base(map, reg, mask, val, NULL, true, false)
 -#define       regmap_update_bits_check(map, reg, mask, val, change)\
 -      regmap_update_bits_base(map, reg, mask, val, change, false, false)
 -#define       regmap_update_bits_check_async(map, reg, mask, val, change)\
 -      regmap_update_bits_base(map, reg, mask, val, change, true, false)
 -
 -#define       regmap_write_bits(map, reg, mask, val) \
 -      regmap_update_bits_base(map, reg, mask, val, NULL, false, true)
 -
 -#define       regmap_field_write(field, val) \
 -      regmap_field_update_bits_base(field, ~0, val, NULL, false, false)
 -#define       regmap_field_force_write(field, val) \
 -      regmap_field_update_bits_base(field, ~0, val, NULL, false, true)
 -#define       regmap_field_update_bits(field, mask, val)\
 -      regmap_field_update_bits_base(field, mask, val, NULL, false, false)
 -#define       regmap_field_force_update_bits(field, mask, val) \
 -      regmap_field_update_bits_base(field, mask, val, NULL, false, true)
 -
 -#define       regmap_fields_write(field, id, val) \
 -      regmap_fields_update_bits_base(field, id, ~0, val, NULL, false, false)
 -#define       regmap_fields_force_write(field, id, val) \
 -      regmap_fields_update_bits_base(field, id, ~0, val, NULL, false, true)
 -#define       regmap_fields_update_bits(field, id, mask, val)\
 -      regmap_fields_update_bits_base(field, id, mask, val, NULL, false, false)
 -#define       regmap_fields_force_update_bits(field, id, mask, val) \
 -      regmap_fields_update_bits_base(field, id, mask, val, NULL, false, true)
 -
  /**
   * regmap_read_poll_timeout - Poll until a condition is met or a timeout occurs
   *
@@@ -1024,42 -1055,6 +1025,42 @@@ int regmap_bulk_read(struct regmap *map
  int regmap_update_bits_base(struct regmap *map, unsigned int reg,
                            unsigned int mask, unsigned int val,
                            bool *change, bool async, bool force);
 +
 +static inline int regmap_update_bits(struct regmap *map, unsigned int reg,
 +                                   unsigned int mask, unsigned int val)
 +{
 +      return regmap_update_bits_base(map, reg, mask, val, NULL, false, false);
 +}
 +
 +static inline int regmap_update_bits_async(struct regmap *map, unsigned int reg,
 +                                         unsigned int mask, unsigned int val)
 +{
 +      return regmap_update_bits_base(map, reg, mask, val, NULL, true, false);
 +}
 +
 +static inline int regmap_update_bits_check(struct regmap *map, unsigned int reg,
 +                                         unsigned int mask, unsigned int val,
 +                                         bool *change)
 +{
 +      return regmap_update_bits_base(map, reg, mask, val,
 +                                     change, false, false);
 +}
 +
 +static inline int
 +regmap_update_bits_check_async(struct regmap *map, unsigned int reg,
 +                             unsigned int mask, unsigned int val,
 +                             bool *change)
 +{
 +      return regmap_update_bits_base(map, reg, mask, val,
 +                                     change, true, false);
 +}
 +
 +static inline int regmap_write_bits(struct regmap *map, unsigned int reg,
 +                                  unsigned int mask, unsigned int val)
 +{
 +      return regmap_update_bits_base(map, reg, mask, val, NULL, false, true);
 +}
 +
  int regmap_get_val_bytes(struct regmap *map);
  int regmap_get_max_register(struct regmap *map);
  int regmap_get_reg_stride(struct regmap *map);
@@@ -1158,65 -1153,6 +1159,65 @@@ int regmap_fields_read(struct regmap_fi
  int regmap_fields_update_bits_base(struct regmap_field *field,  unsigned int id,
                                   unsigned int mask, unsigned int val,
                                   bool *change, bool async, bool force);
 +
 +static inline int regmap_field_write(struct regmap_field *field,
 +                                   unsigned int val)
 +{
 +      return regmap_field_update_bits_base(field, ~0, val,
 +                                           NULL, false, false);
 +}
 +
 +static inline int regmap_field_force_write(struct regmap_field *field,
 +                                         unsigned int val)
 +{
 +      return regmap_field_update_bits_base(field, ~0, val, NULL, false, true);
 +}
 +
 +static inline int regmap_field_update_bits(struct regmap_field *field,
 +                                         unsigned int mask, unsigned int val)
 +{
 +      return regmap_field_update_bits_base(field, mask, val,
 +                                           NULL, false, false);
 +}
 +
 +static inline int
 +regmap_field_force_update_bits(struct regmap_field *field,
 +                             unsigned int mask, unsigned int val)
 +{
 +      return regmap_field_update_bits_base(field, mask, val,
 +                                           NULL, false, true);
 +}
 +
 +static inline int regmap_fields_write(struct regmap_field *field,
 +                                    unsigned int id, unsigned int val)
 +{
 +      return regmap_fields_update_bits_base(field, id, ~0, val,
 +                                            NULL, false, false);
 +}
 +
 +static inline int regmap_fields_force_write(struct regmap_field *field,
 +                                          unsigned int id, unsigned int val)
 +{
 +      return regmap_fields_update_bits_base(field, id, ~0, val,
 +                                            NULL, false, true);
 +}
 +
 +static inline int
 +regmap_fields_update_bits(struct regmap_field *field, unsigned int id,
 +                        unsigned int mask, unsigned int val)
 +{
 +      return regmap_fields_update_bits_base(field, id, mask, val,
 +                                            NULL, false, false);
 +}
 +
 +static inline int
 +regmap_fields_force_update_bits(struct regmap_field *field, unsigned int id,
 +                              unsigned int mask, unsigned int val)
 +{
 +      return regmap_fields_update_bits_base(field, id, mask, val,
 +                                            NULL, false, true);
 +}
 +
  /**
   * struct regmap_irq_type - IRQ type definitions.
   *
@@@ -1376,21 -1312,23 +1377,23 @@@ struct regmap_irq_chip_data
  int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
                        int irq_base, const struct regmap_irq_chip *chip,
                        struct regmap_irq_chip_data **data);
- int regmap_add_irq_chip_np(struct device_node *np, struct regmap *map, int irq,
-                          int irq_flags, int irq_base,
-                          const struct regmap_irq_chip *chip,
-                          struct regmap_irq_chip_data **data);
+ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
+                              struct regmap *map, int irq,
+                              int irq_flags, int irq_base,
+                              const struct regmap_irq_chip *chip,
+                              struct regmap_irq_chip_data **data);
  void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *data);
  
  int devm_regmap_add_irq_chip(struct device *dev, struct regmap *map, int irq,
                             int irq_flags, int irq_base,
                             const struct regmap_irq_chip *chip,
                             struct regmap_irq_chip_data **data);
- int devm_regmap_add_irq_chip_np(struct device *dev, struct device_node *np,
-                               struct regmap *map, int irq, int irq_flags,
-                               int irq_base,
-                               const struct regmap_irq_chip *chip,
-                               struct regmap_irq_chip_data **data);
+ int devm_regmap_add_irq_chip_fwnode(struct device *dev,
+                                   struct fwnode_handle *fwnode,
+                                   struct regmap *map, int irq,
+                                   int irq_flags, int irq_base,
+                                   const struct regmap_irq_chip *chip,
+                                   struct regmap_irq_chip_data **data);
  void devm_regmap_del_irq_chip(struct device *dev, int irq,
                              struct regmap_irq_chip_data *data);
  
@@@ -1523,103 -1461,6 +1526,103 @@@ static inline int regmap_fields_update_
        return -EINVAL;
  }
  
 +static inline int regmap_update_bits(struct regmap *map, unsigned int reg,
 +                                   unsigned int mask, unsigned int val)
 +{
 +      WARN_ONCE(1, "regmap API is disabled");
 +      return -EINVAL;
 +}
 +
 +static inline int regmap_update_bits_async(struct regmap *map, unsigned int reg,
 +                                         unsigned int mask, unsigned int val)
 +{
 +      WARN_ONCE(1, "regmap API is disabled");
 +      return -EINVAL;
 +}
 +
 +static inline int regmap_update_bits_check(struct regmap *map, unsigned int reg,
 +                                         unsigned int mask, unsigned int val,
 +                                         bool *change)
 +{
 +      WARN_ONCE(1, "regmap API is disabled");
 +      return -EINVAL;
 +}
 +
 +static inline int
 +regmap_update_bits_check_async(struct regmap *map, unsigned int reg,
 +                             unsigned int mask, unsigned int val,
 +                             bool *change)
 +{
 +      WARN_ONCE(1, "regmap API is disabled");
 +      return -EINVAL;
 +}
 +
 +static inline int regmap_write_bits(struct regmap *map, unsigned int reg,
 +                                  unsigned int mask, unsigned int val)
 +{
 +      WARN_ONCE(1, "regmap API is disabled");
 +      return -EINVAL;
 +}
 +
 +static inline int regmap_field_write(struct regmap_field *field,
 +                                   unsigned int val)
 +{
 +      WARN_ONCE(1, "regmap API is disabled");
 +      return -EINVAL;
 +}
 +
 +static inline int regmap_field_force_write(struct regmap_field *field,
 +                                         unsigned int val)
 +{
 +      WARN_ONCE(1, "regmap API is disabled");
 +      return -EINVAL;
 +}
 +
 +static inline int regmap_field_update_bits(struct regmap_field *field,
 +                                         unsigned int mask, unsigned int val)
 +{
 +      WARN_ONCE(1, "regmap API is disabled");
 +      return -EINVAL;
 +}
 +
 +static inline int
 +regmap_field_force_update_bits(struct regmap_field *field,
 +                             unsigned int mask, unsigned int val)
 +{
 +      WARN_ONCE(1, "regmap API is disabled");
 +      return -EINVAL;
 +}
 +
 +static inline int regmap_fields_write(struct regmap_field *field,
 +                                    unsigned int id, unsigned int val)
 +{
 +      WARN_ONCE(1, "regmap API is disabled");
 +      return -EINVAL;
 +}
 +
 +static inline int regmap_fields_force_write(struct regmap_field *field,
 +                                          unsigned int id, unsigned int val)
 +{
 +      WARN_ONCE(1, "regmap API is disabled");
 +      return -EINVAL;
 +}
 +
 +static inline int
 +regmap_fields_update_bits(struct regmap_field *field, unsigned int id,
 +                        unsigned int mask, unsigned int val)
 +{
 +      WARN_ONCE(1, "regmap API is disabled");
 +      return -EINVAL;
 +}
 +
 +static inline int
 +regmap_fields_force_update_bits(struct regmap_field *field, unsigned int id,
 +                              unsigned int mask, unsigned int val)
 +{
 +      WARN_ONCE(1, "regmap API is disabled");
 +      return -EINVAL;
 +}
 +
  static inline int regmap_get_val_bytes(struct regmap *map)
  {
        WARN_ONCE(1, "regmap API is disabled");