pinctrl: pinconf-generic: loose DT dependence

New pin controllers such as ACPI-based may also have custom properties to parse, and should be able to use generic pin config. Let's make the code compile on !OF systems and rename members a bit to underscore it is custom parameters and not necessarily DT parameters. This fixes a build regression for x86_64 on the zeroday kernel builds.

Linus Walleij committed 11 years ago

Commit f684e4a1 parent 7382b625 files · +41 −33Browse files

Showing the changes to include/linux/pinctrl (2 of 5 files). Show all

Unified · Split

2 files

include/linux/pinctrl/pinconf-generic.h +1 −1
include/linux/pinctrl/pinctrl.h +10 −7

include/linux/pinctrl/pinconf-generic.h+1−1

@@ -162,7 +162,7 @@ static inline unsigned long pinconf_to_config_packed(enum pin_config_param param · 161 unmodified lines
162	struct pinctrl_dev;	162	struct pinctrl_dev;
163	struct pinctrl_map;	163	struct pinctrl_map;
164		164
165	struct pinconf_generic_dt_params {	165	struct pinconf_generic_params {
166	const char * const property;	166	const char * const property;
167	enum pin_config_param param;	167	enum pin_config_param param;
168	u32 default_value;	168	u32 default_value;

include/linux/pinctrl/pinctrl.h+10−7

  * @confops: pin config operations vtable, if you support pin configuration in
  *	your driver
  * @owner: module providing the pin controller, used for refcounting
- * @num_dt_params: Number of driver-specific DT parameters
+ * @num_custom_params: Number of driver-specific custom parameters to be parsed
- * @params: List of DT parameters
+ *	from the hardware description
- * @conf_items: Information how to print @params in debugfs
+ * @custom_params: List of driver_specific custom parameters to be parsed from
+ *	the hardware description
+ * @custom_conf_items: Information how to print @params in debugfs, must be
+ *	the same size as the @custom_params, i.e. @num_custom_params
  */
 struct pinctrl_desc {
 	const char *name;
 	const struct pinmux_ops *pmxops;
 	const struct pinconf_ops *confops;
 	struct module *owner;
-#if defined(CONFIG_GENERIC_PINCONF) && defined(CONFIG_OF)
+#ifdef CONFIG_GENERIC_PINCONF
-	unsigned int num_dt_params;
+	unsigned int num_custom_params;
-	const struct pinconf_generic_dt_params *params;
+	const struct pinconf_generic_params *custom_params;
-	const struct pin_config_item *conf_items;
+	const struct pin_config_item *custom_conf_items;
 #endif
 };