After discussion with Mark Brown in an unrelated thread about ADC lookups, it came to my knowledge that the ability to pass a struct device * in the regulator consumers is just a historical artifact, and not really recommended. Since there are no in-kernel users of these pointers, we just kill them right now, before someone starts to use them.
Showing the changes to include/linux/pinctrl (1 of 6 files). Show all
Unified · Split
| @@ -17,22 +17,16 @@ · 16 unmodified lines | |||
| 17 | * @name: the name of this specific map entry for the particular machine. | 17 | * @name: the name of this specific map entry for the particular machine. |
| 18 | * This is the second parameter passed to pinmux_get() when you want | 18 | * This is the second parameter passed to pinmux_get() when you want |
| 19 | * to have several mappings to the same device | 19 | * to have several mappings to the same device |
| 20 | * @ctrl_dev: the pin control device to be used by this mapping, may be NULL | ||
| 21 | * if you provide .ctrl_dev_name instead (this is more common) | ||
| 22 | * @ctrl_dev_name: the name of the device controlling this specific mapping, | 20 | * @ctrl_dev_name: the name of the device controlling this specific mapping, |
| 23 | * the name must be the same as in your struct device*, may be NULL if | 21 | * the name must be the same as in your struct device* |
| 24 | * you provide .ctrl_dev instead | ||
| 25 | * @function: a function in the driver to use for this mapping, the driver | 22 | * @function: a function in the driver to use for this mapping, the driver |
| 26 | * will lookup the function referenced by this ID on the specified | 23 | * will lookup the function referenced by this ID on the specified |
| 27 | * pin control device | 24 | * pin control device |
| 28 | * @group: sometimes a function can map to different pin groups, so this | 25 | * @group: sometimes a function can map to different pin groups, so this |
| 29 | * selects a certain specific pin group to activate for the function, if | 26 | * selects a certain specific pin group to activate for the function, if |
| 30 | * left as NULL, the first applicable group will be used | 27 | * left as NULL, the first applicable group will be used |
| 31 | * @dev: the device using this specific mapping, may be NULL if you provide | ||
| 32 | * .dev_name instead (this is more common) | ||
| 33 | * @dev_name: the name of the device using this specific mapping, the name | 28 | * @dev_name: the name of the device using this specific mapping, the name |
| 34 | * must be the same as in your struct device*, may be NULL if you | 29 | * must be the same as in your struct device* |
| 35 | * provide .dev instead | ||
| 36 | * @hog_on_boot: if this is set to true, the pin control subsystem will itself | 30 | * @hog_on_boot: if this is set to true, the pin control subsystem will itself |
| 37 | * hog the mappings as the pinmux device drivers are attached, so this is | 31 | * hog the mappings as the pinmux device drivers are attached, so this is |
| 38 | * typically used with system maps (mux mappings without an assigned | 32 | * typically used with system maps (mux mappings without an assigned |
| @@ -42,11 +36,9 @@ · 3 unmodified lines | |||
| 42 | */ | 36 | */ |
| 43 | struct pinmux_map { | 37 | struct pinmux_map { |
| 44 | const char *name; | 38 | const char *name; |
| 45 | struct device *ctrl_dev; | ||
| 46 | const char *ctrl_dev_name; | 39 | const char *ctrl_dev_name; |
| 47 | const char *function; | 40 | const char *function; |
| 48 | const char *group; | 41 | const char *group; |
| 49 | struct device *dev; | ||
| 50 | const char *dev_name; | 42 | const char *dev_name; |
| 51 | bool hog_on_boot; | 43 | bool hog_on_boot; |
| 52 | }; | 44 | }; |