Merge remote-tracking branch 'pinctrl/for-next'

[deliverable/linux.git] / drivers / pinctrl / meson / pinctrl-meson.h

diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
index d89442ea4a4d9ebe0acf4b37c4f0e7ac0f924d0b..98b5080650c1ac3c6ad1d16ea7298d5a0b2feb07 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson.h
+++ b/drivers/pinctrl/meson/pinctrl-meson.h
@@ -95,54 +95,17 @@ struct meson_bank {
        struct meson_reg_desc regs[NUM_REG];
 };
 
-/**
- * struct meson_domain_data - domain platform data
- *
- * @name:      name of the domain
- * @banks:     set of banks belonging to the domain
- * @num_banks: number of banks in the domain
- */
-struct meson_domain_data {
-       const char *name;
-       struct meson_bank *banks;
-       unsigned int num_banks;
-       unsigned int pin_base;
-       unsigned int num_pins;
-};
-
-/**
- * struct meson_domain
- *
- * @reg_mux:   registers for mux settings
- * @reg_pullen:        registers for pull-enable settings
- * @reg_pull:  registers for pull settings
- * @reg_gpio:  registers for gpio settings
- * @chip:      gpio chip associated with the domain
- * @data;      platform data for the domain
- * @node:      device tree node for the domain
- *
- * A domain represents a set of banks controlled by the same set of
- * registers.
- */
-struct meson_domain {
-       struct regmap *reg_mux;
-       struct regmap *reg_pullen;
-       struct regmap *reg_pull;
-       struct regmap *reg_gpio;
-
-       struct gpio_chip chip;
-       struct meson_domain_data *data;
-       struct device_node *of_node;
-};
-
 struct meson_pinctrl_data {
+       const char *name;
        const struct pinctrl_pin_desc *pins;
        struct meson_pmx_group *groups;
        struct meson_pmx_func *funcs;
-       struct meson_domain_data *domain_data;
+       unsigned int pin_base;
        unsigned int num_pins;
        unsigned int num_groups;
        unsigned int num_funcs;
+       struct meson_bank *banks;
+       unsigned int num_banks;
 };
 
 struct meson_pinctrl {
@@ -150,7 +113,12 @@ struct meson_pinctrl {
        struct pinctrl_dev *pcdev;
        struct pinctrl_desc desc;
        struct meson_pinctrl_data *data;
-       struct meson_domain *domain;
+       struct regmap *reg_mux;
+       struct regmap *reg_pullen;
+       struct regmap *reg_pull;
+       struct regmap *reg_gpio;
+       struct gpio_chip chip;
+       struct device_node *of_node;
 };
 
 #define PIN(x, b)      (b + x)