v4.4-3408-g6799060

2016-01-13 16:27:14 -06:00 · 2016-01-13 16:27:14 -06:00 · 6236659f01
commit 6236659f01
parent 21c9cae290
28 changed files with 68 additions and 1934 deletions
--- a/0001-device-property-always-check-for-fwnode-type.patch
+++ b/0001-device-property-always-check-for-fwnode-type.patch
@ -1,51 +0,0 @@
 From e3f9e299bf94298ddd8beb63c0786a4d7766dc86 Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Mon, 30 Nov 2015 17:11:29 +0200
 Subject: [PATCH 01/16] device property: always check for fwnode type
 Currently the property accessors unconditionally fall back to built-in property
 set as a last resort. Make this strict and return an error in case the type of
 fwnode is unknown.
 This is actually a follow up to the commit 4fa7508e9f1c (device property:
 Return -ENXIO if there is no suitable FW interface).
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 drivers/base/property.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
 diff --git a/drivers/base/property.c b/drivers/base/property.c
 index 1325ff2..09e488d 100644
 --- a/drivers/base/property.c
 +++ b/drivers/base/property.c
@@ -135,8 +135,9 @@ bool fwnode_property_present(struct fwnode_handle *fwnode, const char *propname)
 		return of_property_read_bool(to_of_node(fwnode), propname);
 	else if (is_acpi_node(fwnode))
 		return !acpi_node_prop_get(fwnode, propname, NULL);
 -
 -	return !!pset_prop_get(to_pset(fwnode), propname);
 +	else if (is_pset(fwnode))
 +		return !!pset_prop_get(to_pset(fwnode), propname);
 +	return false;
 }
 EXPORT_SYMBOL_GPL(fwnode_property_present);
@@ -494,9 +495,10 @@ int fwnode_property_read_string(struct fwnode_handle *fwnode,
 	else if (is_acpi_node(fwnode))
 		return acpi_node_prop_read(fwnode, propname, DEV_PROP_STRING,
 					   val, 1);
 -
 -	return pset_prop_read_array(to_pset(fwnode), propname,
 -				    DEV_PROP_STRING, val, 1);
 +	else if (is_pset(fwnode))
 +		return pset_prop_read_array(to_pset(fwnode), propname,
 +					    DEV_PROP_STRING, val, 1);
 +	return -ENXIO;
 }
 EXPORT_SYMBOL_GPL(fwnode_property_read_string);
 -- 
 2.5.0
--- a/0002-device-property-rename-helper-functions.patch
+++ b/0002-device-property-rename-helper-functions.patch
@ -1,87 +0,0 @@
 From 61f5e294b89a90e8520c9eaf9a4af787db8911ea Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Mon, 30 Nov 2015 17:11:30 +0200
 Subject: [PATCH 02/16] device property: rename helper functions
 To be in align with the rest of fwnode types we rename the built-in property
 set ones, i.e.
 	is_pset() -> is_pset_node()
 	to_pset() -> to_pset_node()
 There is no functional change.
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 drivers/base/property.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
 diff --git a/drivers/base/property.c b/drivers/base/property.c
 index 09e488d..2e01f3f 100644
 --- a/drivers/base/property.c
 +++ b/drivers/base/property.c
@@ -37,14 +37,14 @@ void device_add_property_set(struct device *dev, struct property_set *pset)
 }
 EXPORT_SYMBOL_GPL(device_add_property_set);
 -static inline bool is_pset(struct fwnode_handle *fwnode)
 +static inline bool is_pset_node(struct fwnode_handle *fwnode)
 {
 	return fwnode && fwnode->type == FWNODE_PDATA;
 }
 -static inline struct property_set *to_pset(struct fwnode_handle *fwnode)
 +static inline struct property_set *to_pset_node(struct fwnode_handle *fwnode)
 {
 -	return is_pset(fwnode) ?
 +	return is_pset_node(fwnode) ?
 		container_of(fwnode, struct property_set, fwnode) : NULL;
 }
@@ -135,8 +135,8 @@ bool fwnode_property_present(struct fwnode_handle *fwnode, const char *propname)
 		return of_property_read_bool(to_of_node(fwnode), propname);
 	else if (is_acpi_node(fwnode))
 		return !acpi_node_prop_get(fwnode, propname, NULL);
 -	else if (is_pset(fwnode))
 -		return !!pset_prop_get(to_pset(fwnode), propname);
 +	else if (is_pset_node(fwnode))
 +		return !!pset_prop_get(to_pset_node(fwnode), propname);
 	return false;
 }
 EXPORT_SYMBOL_GPL(fwnode_property_present);
@@ -323,8 +323,8 @@ EXPORT_SYMBOL_GPL(device_property_match_string);
 	else if (is_acpi_node(_fwnode_)) \
 		_ret_ = acpi_node_prop_read(_fwnode_, _propname_, _proptype_, \
 					    _val_, _nval_); \
 -	else if (is_pset(_fwnode_)) \
 -		_ret_ = pset_prop_read_array(to_pset(_fwnode_), _propname_, \
 +	else if (is_pset_node(_fwnode_)) 						\
 +		_ret_ = pset_prop_read_array(to_pset_node(_fwnode_), _propname_,	\
 					     _proptype_, _val_, _nval_); \
 	else \
 		_ret_ = -ENXIO; \
@@ -465,8 +465,8 @@ int fwnode_property_read_string_array(struct fwnode_handle *fwnode,
 	else if (is_acpi_node(fwnode))
 		return acpi_node_prop_read(fwnode, propname, DEV_PROP_STRING,
 					   val, nval);
 -	else if (is_pset(fwnode))
 -		return pset_prop_read_array(to_pset(fwnode), propname,
 +	else if (is_pset_node(fwnode))
 +		return pset_prop_read_array(to_pset_node(fwnode), propname,
 					    DEV_PROP_STRING, val, nval);
 	return -ENXIO;
 }
@@ -495,8 +495,8 @@ int fwnode_property_read_string(struct fwnode_handle *fwnode,
 	else if (is_acpi_node(fwnode))
 		return acpi_node_prop_read(fwnode, propname, DEV_PROP_STRING,
 					   val, 1);
 -	else if (is_pset(fwnode))
 -		return pset_prop_read_array(to_pset(fwnode), propname,
 +	else if (is_pset_node(fwnode))
 +		return pset_prop_read_array(to_pset_node(fwnode), propname,
 					    DEV_PROP_STRING, val, 1);
 	return -ENXIO;
 }
 -- 
 2.5.0
--- a/0003-device-property-refactor-built-in-properties-support.patch
+++ b/0003-device-property-refactor-built-in-properties-support.patch
@ -1,236 +0,0 @@
 From 318a1971826103ecf560875b17236dd4a93e8c88 Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Mon, 30 Nov 2015 17:11:31 +0200
 Subject: [PATCH 03/16] device property: refactor built-in properties support
 Instead of using the type and nval fields we will use length (in bytes) of the
 value. The sanity check is done in the accessors.
 The built-in property accessors are split in the same way such as device tree.
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 drivers/base/property.c  | 150 ++++++++++++++++++++++++++++++++++-------------
 include/linux/property.h |   8 +--
 2 files changed, 113 insertions(+), 45 deletions(-)
 diff --git a/drivers/base/property.c b/drivers/base/property.c
 index 2e01f3f..86834bd 100644
 --- a/drivers/base/property.c
 +++ b/drivers/base/property.c
@@ -63,45 +63,107 @@ static struct property_entry *pset_prop_get(struct property_set *pset,
 	return NULL;
 }
 -static int pset_prop_read_array(struct property_set *pset, const char *name,
 -				enum dev_prop_type type, void *val, size_t nval)
 +static void *pset_prop_find(struct property_set *pset, const char *propname,
 +			    size_t length)
 {
 	struct property_entry *prop;
 -	unsigned int item_size;
 +	void *pointer;
 -	prop = pset_prop_get(pset, name);
 +	prop = pset_prop_get(pset, propname);
 +	if (!prop)
 +		return ERR_PTR(-EINVAL);
 +	pointer = prop->value.raw_data;
 +	if (!pointer)
 +		return ERR_PTR(-ENODATA);
 +	if (length > prop->length)
 +		return ERR_PTR(-EOVERFLOW);
 +	return pointer;
 +}
 +
 +static int pset_prop_read_u8_array(struct property_set *pset,
 +				   const char *propname,
 +				   u8 *values, size_t nval)
 +{
 +	void *pointer;
 +	size_t length = nval * sizeof(*values);
 +
 +	pointer = pset_prop_find(pset, propname, length);
 +	if (IS_ERR(pointer))
 +		return PTR_ERR(pointer);
 +
 +	memcpy(values, pointer, length);
 +	return 0;
 +}
 +
 +static int pset_prop_read_u16_array(struct property_set *pset,
 +				    const char *propname,
 +				    u16 *values, size_t nval)
 +{
 +	void *pointer;
 +	size_t length = nval * sizeof(*values);
 +
 +	pointer = pset_prop_find(pset, propname, length);
 +	if (IS_ERR(pointer))
 +		return PTR_ERR(pointer);
 +
 +	memcpy(values, pointer, length);
 +	return 0;
 +}
 +
 +static int pset_prop_read_u32_array(struct property_set *pset,
 +				    const char *propname,
 +				    u32 *values, size_t nval)
 +{
 +	void *pointer;
 +	size_t length = nval * sizeof(*values);
 +
 +	pointer = pset_prop_find(pset, propname, length);
 +	if (IS_ERR(pointer))
 +		return PTR_ERR(pointer);
 +
 +	memcpy(values, pointer, length);
 +	return 0;
 +}
 +
 +static int pset_prop_read_u64_array(struct property_set *pset,
 +				    const char *propname,
 +				    u64 *values, size_t nval)
 +{
 +	void *pointer;
 +	size_t length = nval * sizeof(*values);
 +
 +	pointer = pset_prop_find(pset, propname, length);
 +	if (IS_ERR(pointer))
 +		return PTR_ERR(pointer);
 +
 +	memcpy(values, pointer, length);
 +	return 0;
 +}
 +
 +static int pset_prop_count_elems_of_size(struct property_set *pset,
 +					 const char *propname, size_t length)
 +{
 +	struct property_entry *prop;
 +
 +	prop = pset_prop_get(pset, propname);
 	if (!prop)
 -		return -ENODATA;
 -
 -	if (prop->type != type)
 -		return -EPROTO;
 -
 -	if (!val)
 -		return prop->nval;
 -
 -	if (prop->nval < nval)
 -		return -EOVERFLOW;
 -
 -	switch (type) {
 -	case DEV_PROP_U8:
 -		item_size = sizeof(u8);
 -		break;
 -	case DEV_PROP_U16:
 -		item_size = sizeof(u16);
 -		break;
 -	case DEV_PROP_U32:
 -		item_size = sizeof(u32);
 -		break;
 -	case DEV_PROP_U64:
 -		item_size = sizeof(u64);
 -		break;
 -	case DEV_PROP_STRING:
 -		item_size = sizeof(const char *);
 -		break;
 -	default:
 		return -EINVAL;
 -	}
 -	memcpy(val, prop->value.raw_data, nval * item_size);
 +
 +	return prop->length / length;
 +}
 +
 +static int pset_prop_read_string_array(struct property_set *pset,
 +				       const char *propname,
 +				       const char **strings, size_t nval)
 +{
 +	void *pointer;
 +	size_t length = nval * sizeof(*strings);
 +
 +	pointer = pset_prop_find(pset, propname, length);
 +	if (IS_ERR(pointer))
 +		return PTR_ERR(pointer);
 +
 +	memcpy(strings, pointer, length);
 	return 0;
 }
@@ -314,6 +376,10 @@ EXPORT_SYMBOL_GPL(device_property_match_string);
 	(val) ? of_property_read_##type##_array((node), (propname), (val), (nval)) \
 	      : of_property_count_elems_of_size((node), (propname), sizeof(type))
 +#define PSET_PROP_READ_ARRAY(node, propname, type, val, nval)				\
 +	(val) ? pset_prop_read_##type##_array((node), (propname), (val), (nval))	\
 +	      : pset_prop_count_elems_of_size((node), (propname), sizeof(type))
 +
 #define FWNODE_PROP_READ_ARRAY(_fwnode_, _propname_, _type_, _proptype_, _val_, _nval_) \
 ({ \
 	int _ret_; \
@@ -324,8 +390,8 @@ EXPORT_SYMBOL_GPL(device_property_match_string);
 		_ret_ = acpi_node_prop_read(_fwnode_, _propname_, _proptype_, \
 					    _val_, _nval_); \
 	else if (is_pset_node(_fwnode_)) 						\
 -		_ret_ = pset_prop_read_array(to_pset_node(_fwnode_), _propname_,	\
 -					     _proptype_, _val_, _nval_); \
 +		_ret_ = PSET_PROP_READ_ARRAY(to_pset_node(_fwnode_), _propname_,	\
 +					     _type_, _val_, _nval_);			\
 	else \
 		_ret_ = -ENXIO; \
 	_ret_; \
@@ -466,8 +532,12 @@ int fwnode_property_read_string_array(struct fwnode_handle *fwnode,
 		return acpi_node_prop_read(fwnode, propname, DEV_PROP_STRING,
 					   val, nval);
 	else if (is_pset_node(fwnode))
 -		return pset_prop_read_array(to_pset_node(fwnode), propname,
 -					    DEV_PROP_STRING, val, nval);
 +		return val ?
 +			pset_prop_read_string_array(to_pset_node(fwnode),
 +						    propname, val, nval) :
 +			pset_prop_count_elems_of_size(to_pset_node(fwnode),
 +						      propname,
 +						      sizeof(const char *));
 	return -ENXIO;
 }
 EXPORT_SYMBOL_GPL(fwnode_property_read_string_array);
@@ -496,8 +566,8 @@ int fwnode_property_read_string(struct fwnode_handle *fwnode,
 		return acpi_node_prop_read(fwnode, propname, DEV_PROP_STRING,
 					   val, 1);
 	else if (is_pset_node(fwnode))
 -		return pset_prop_read_array(to_pset_node(fwnode), propname,
 -					    DEV_PROP_STRING, val, 1);
 +		return pset_prop_read_string_array(to_pset_node(fwnode),
 +						   propname, val, 1);
 	return -ENXIO;
 }
 EXPORT_SYMBOL_GPL(fwnode_property_read_string);
 diff --git a/include/linux/property.h b/include/linux/property.h
 index 0a3705a..c29460a 100644
 --- a/include/linux/property.h
 +++ b/include/linux/property.h
@@ -144,14 +144,12 @@ static inline int fwnode_property_read_u64(struct fwnode_handle *fwnode,
 /**
  * struct property_entry - "Built-in" device property representation.
  * @name: Name of the property.
 - * @type: Type of the property.
 - * @nval: Number of items of type @type making up the value.
 - * @value: Value of the property (an array of @nval items of type @type).
 + * @length: Length of data making up the value.
 + * @value: Value of the property (an array of items of the given type).
  */
 struct property_entry {
 	const char *name;
 -	enum dev_prop_type type;
 -	size_t nval;
 +	size_t length;
 	union {
 		void *raw_data;
 		u8 *u8_data;
 -- 
 2.5.0
--- a/0004-device-property-keep-single-value-inplace.patch
+++ b/0004-device-property-keep-single-value-inplace.patch
@ -1,123 +0,0 @@
 From 66586baba56679baa2da1a10a96ccf15b1e96b95 Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Mon, 30 Nov 2015 17:11:32 +0200
 Subject: [PATCH 04/16] device property: keep single value inplace
 We may save a lot of lines of code and space by keeping single values inside
 the struct property_entry. Refactor the implementation to do so.
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 drivers/base/property.c  | 33 ++++++++++++++++++++++++++++++---
 include/linux/property.h | 31 +++++++++++++++++++++++--------
 2 files changed, 53 insertions(+), 11 deletions(-)
 diff --git a/drivers/base/property.c b/drivers/base/property.c
 index 86834bd..ad3cb09 100644
 --- a/drivers/base/property.c
 +++ b/drivers/base/property.c
@@ -72,7 +72,10 @@ static void *pset_prop_find(struct property_set *pset, const char *propname,
 	prop = pset_prop_get(pset, propname);
 	if (!prop)
 		return ERR_PTR(-EINVAL);
 -	pointer = prop->value.raw_data;
 +	if (prop->is_array)
 +		pointer = prop->pointer.raw_data;
 +	else
 +		pointer = &prop->value.raw_data;
 	if (!pointer)
 		return ERR_PTR(-ENODATA);
 	if (length > prop->length)
@@ -167,6 +170,31 @@ static int pset_prop_read_string_array(struct property_set *pset,
 	return 0;
 }
 +static int pset_prop_read_string(struct property_set *pset,
 +				 const char *propname, const char **strings)
 +{
 +	struct property_entry *prop;
 +	const char **pointer;
 +
 +	prop = pset_prop_get(pset, propname);
 +	if (!prop)
 +		return -EINVAL;
 +	if (!prop->is_string)
 +		return -EILSEQ;
 +	if (prop->is_array) {
 +		pointer = prop->pointer.str;
 +		if (!pointer)
 +			return -ENODATA;
 +	} else {
 +		pointer = &prop->value.str;
 +		if (*pointer && strnlen(*pointer, prop->length) >= prop->length)
 +			return -EILSEQ;
 +	}
 +
 +	*strings = *pointer;
 +	return 0;
 +}
 +
 static inline struct fwnode_handle *dev_fwnode(struct device *dev)
 {
 	return IS_ENABLED(CONFIG_OF) && dev->of_node ?
@@ -566,8 +594,7 @@ int fwnode_property_read_string(struct fwnode_handle *fwnode,
 		return acpi_node_prop_read(fwnode, propname, DEV_PROP_STRING,
 					   val, 1);
 	else if (is_pset_node(fwnode))
 -		return pset_prop_read_string_array(to_pset_node(fwnode),
 -						   propname, val, 1);
 +		return pset_prop_read_string(to_pset_node(fwnode), propname, val);
 	return -ENXIO;
 }
 EXPORT_SYMBOL_GPL(fwnode_property_read_string);
 diff --git a/include/linux/property.h b/include/linux/property.h
 index c29460a..69a8a08 100644
 --- a/include/linux/property.h
 +++ b/include/linux/property.h
@@ -145,19 +145,34 @@ static inline int fwnode_property_read_u64(struct fwnode_handle *fwnode,
  * struct property_entry - "Built-in" device property representation.
  * @name: Name of the property.
  * @length: Length of data making up the value.
 - * @value: Value of the property (an array of items of the given type).
 + * @is_array: True when the property is an array.
 + * @is_string: True when property is a string.
 + * @pointer: Pointer to the property (an array of items of the given type).
 + * @value: Value of the property (when it is a single item of the given type).
  */
 struct property_entry {
 	const char *name;
 	size_t length;
 +	bool is_array;
 +	bool is_string;
 	union {
 -		void *raw_data;
 -		u8 *u8_data;
 -		u16 *u16_data;
 -		u32 *u32_data;
 -		u64 *u64_data;
 -		const char **str;
 -	} value;
 +		union {
 +			void *raw_data;
 +			u8 *u8_data;
 +			u16 *u16_data;
 +			u32 *u32_data;
 +			u64 *u64_data;
 +			const char **str;
 +		} pointer;
 +		union {
 +			unsigned long long raw_data;
 +			u8 u8_data;
 +			u16 u16_data;
 +			u32 u32_data;
 +			u64 u64_data;
 +			const char *str;
 +		} value;
 +	};
 };
 /**
 -- 
 2.5.0
--- a/0005-device-property-helper-macros-for-property-entry-cre.patch
+++ b/0005-device-property-helper-macros-for-property-entry-cre.patch
@ -1,84 +0,0 @@
 From a85f420475334caed12b057ddcaa0b58e0b1ebb7 Mon Sep 17 00:00:00 2001
 From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
 Date: Mon, 30 Nov 2015 17:11:33 +0200
 Subject: [PATCH 05/16] device property: helper macros for property entry
 creation
 Marcos for easier creation of build-in property entries.
 Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 include/linux/property.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 diff --git a/include/linux/property.h b/include/linux/property.h
 index 69a8a08..e4f29d8 100644
 --- a/include/linux/property.h
 +++ b/include/linux/property.h
@@ -175,6 +175,61 @@ struct property_entry {
 	};
 };
 +#define PROPERTY_ENTRY_INTEGER_ARRAY(_name_, _type_, _val_)	\
 +{								\
 +	.name = _name_,						\
 +	.length = ARRAY_SIZE(_val_) * sizeof(_type_),		\
 +	.is_array = true,					\
 +	.pointer._type_##_data = _val_,				\
 +}
 +
 +#define PROPERTY_ENTRY_U8_ARRAY(_name_, _val_)			\
 +	PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u8, _val_)
 +#define PROPERTY_ENTRY_U16_ARRAY(_name_, _val_)			\
 +	PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u16, _val_)
 +#define PROPERTY_ENTRY_U32_ARRAY(_name_, _val_)			\
 +	PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u32, _val_)
 +#define PROPERTY_ENTRY_U64_ARRAY(_name_, _val_)			\
 +	PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u64, _val_)
 +
 +#define PROPERTY_ENTRY_STRING_ARRAY(_name_, _val_)		\
 +{								\
 +	.name = _name_,						\
 +	.length = ARRAY_SIZE(_val_) * sizeof(const char *),	\
 +	.is_array = true,					\
 +	.is_string = true,					\
 +	.pointer.str = _val_,					\
 +}
 +
 +#define PROPERTY_ENTRY_INTEGER(_name_, _type_, _val_)	\
 +{							\
 +	.name = _name_,					\
 +	.length = sizeof(_type_),			\
 +	.value._type_##_data = _val_,			\
 +}
 +
 +#define PROPERTY_ENTRY_U8(_name_, _val_)		\
 +	PROPERTY_ENTRY_INTEGER(_name_, u8, _val_)
 +#define PROPERTY_ENTRY_U16(_name_, _val_)		\
 +	PROPERTY_ENTRY_INTEGER(_name_, u16, _val_)
 +#define PROPERTY_ENTRY_U32(_name_, _val_)		\
 +	PROPERTY_ENTRY_INTEGER(_name_, u32, _val_)
 +#define PROPERTY_ENTRY_U64(_name_, _val_)		\
 +	PROPERTY_ENTRY_INTEGER(_name_, u64, _val_)
 +
 +#define PROPERTY_ENTRY_STRING(_name_, _val_)		\
 +{							\
 +	.name = _name_,					\
 +	.length = sizeof(_val_),			\
 +	.is_string = true,				\
 +	.value.str = _val_,				\
 +}
 +
 +#define PROPERTY_ENTRY_BOOL(_name_)		\
 +{						\
 +	.name = _name_,				\
 +}
 +
 /**
  * struct property_set - Collection of "built-in" device properties.
  * @fwnode: Handle to be pointed to by the fwnode field of struct device.
 -- 
 2.5.0
--- a/0006-device-property-improve-readability-of-macros.patch
+++ b/0006-device-property-improve-readability-of-macros.patch
@ -1,80 +0,0 @@
 From 1d656fb757c17e48a8a01bd576d14918701ba55c Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Mon, 30 Nov 2015 17:11:34 +0200
 Subject: [PATCH 06/16] device property: improve readability of macros
 There is no functional change.
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 drivers/base/property.c  | 28 ++++++++++++++--------------
 include/linux/property.h |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)
 diff --git a/drivers/base/property.c b/drivers/base/property.c
 index ad3cb09..a3538cb 100644
 --- a/drivers/base/property.c
 +++ b/drivers/base/property.c
@@ -400,29 +400,29 @@ int device_property_match_string(struct device *dev, const char *propname,
 }
 EXPORT_SYMBOL_GPL(device_property_match_string);
 -#define OF_DEV_PROP_READ_ARRAY(node, propname, type, val, nval) \
 -	(val) ? of_property_read_##type##_array((node), (propname), (val), (nval)) \
 +#define OF_DEV_PROP_READ_ARRAY(node, propname, type, val, nval)				\
 +	(val) ? of_property_read_##type##_array((node), (propname), (val), (nval))	\
 	      : of_property_count_elems_of_size((node), (propname), sizeof(type))
 #define PSET_PROP_READ_ARRAY(node, propname, type, val, nval)				\
 	(val) ? pset_prop_read_##type##_array((node), (propname), (val), (nval))	\
 	      : pset_prop_count_elems_of_size((node), (propname), sizeof(type))
 -#define FWNODE_PROP_READ_ARRAY(_fwnode_, _propname_, _type_, _proptype_, _val_, _nval_) \
 -({ \
 -	int _ret_; \
 -	if (is_of_node(_fwnode_)) \
 -		_ret_ = OF_DEV_PROP_READ_ARRAY(to_of_node(_fwnode_), _propname_, \
 -					       _type_, _val_, _nval_); \
 -	else if (is_acpi_node(_fwnode_)) \
 -		_ret_ = acpi_node_prop_read(_fwnode_, _propname_, _proptype_, \
 -					    _val_, _nval_); \
 +#define FWNODE_PROP_READ_ARRAY(_fwnode_, _propname_, _type_, _proptype_, _val_, _nval_)	\
 +({											\
 +	int _ret_;									\
 +	if (is_of_node(_fwnode_))							\
 +		_ret_ = OF_DEV_PROP_READ_ARRAY(to_of_node(_fwnode_), _propname_,	\
 +					       _type_, _val_, _nval_);			\
 +	else if (is_acpi_node(_fwnode_))						\
 +		_ret_ = acpi_node_prop_read(_fwnode_, _propname_, _proptype_,		\
 +					    _val_, _nval_);				\
 	else if (is_pset_node(_fwnode_)) 						\
 		_ret_ = PSET_PROP_READ_ARRAY(to_pset_node(_fwnode_), _propname_,	\
 					     _type_, _val_, _nval_);			\
 -	else \
 -		_ret_ = -ENXIO; \
 -	_ret_; \
 +	else										\
 +		_ret_ = -ENXIO;								\
 +	_ret_;										\
 })
 /**
 diff --git a/include/linux/property.h b/include/linux/property.h
 index e4f29d8..d1cf208 100644
 --- a/include/linux/property.h
 +++ b/include/linux/property.h
@@ -73,8 +73,8 @@ int fwnode_property_match_string(struct fwnode_handle *fwnode,
 struct fwnode_handle *device_get_next_child_node(struct device *dev,
 						 struct fwnode_handle *child);
 -#define device_for_each_child_node(dev, child) \
 -	for (child = device_get_next_child_node(dev, NULL); child; \
 +#define device_for_each_child_node(dev, child)				\
 +	for (child = device_get_next_child_node(dev, NULL); child;	\
 	     child = device_get_next_child_node(dev, child))
 void fwnode_handle_put(struct fwnode_handle *fwnode);
 -- 
 2.5.0
--- a/0007-device-property-return-EINVAL-when-property-isn-t-fo.patch
+++ b/0007-device-property-return-EINVAL-when-property-isn-t-fo.patch
@ -1,65 +0,0 @@
 From 3c60f1149a2fee9ac4ef3cc27bd830e3bd8d2654 Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Mon, 30 Nov 2015 17:11:35 +0200
 Subject: [PATCH 07/16] device property: return -EINVAL when property isn't
 found in ACPI
 Change return code to be in align with OF and built-in device properties error
 codes. In particular -EINVAL means property is not found.
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 drivers/acpi/property.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
 index 88f4306..2aee416 100644
 --- a/drivers/acpi/property.c
 +++ b/drivers/acpi/property.c
@@ -346,7 +346,7 @@ void acpi_free_properties(struct acpi_device *adev)
  *
  * Return: %0 if property with @name has been found (success),
  *         %-EINVAL if the arguments are invalid,
 - *         %-ENODATA if the property doesn't exist,
 + *         %-EINVAL if the property doesn't exist,
  *         %-EPROTO if the property value type doesn't match @type.
  */
 static int acpi_data_get_property(struct acpi_device_data *data,
@@ -360,7 +360,7 @@ static int acpi_data_get_property(struct acpi_device_data *data,
 		return -EINVAL;
 	if (!data->pointer || !data->properties)
 -		return -ENODATA;
 +		return -EINVAL;
 	properties = data->properties;
 	for (i = 0; i < properties->package.count; i++) {
@@ -375,13 +375,13 @@ static int acpi_data_get_property(struct acpi_device_data *data,
 		if (!strcmp(name, propname->string.pointer)) {
 			if (type != ACPI_TYPE_ANY && propvalue->type != type)
 				return -EPROTO;
 -			else if (obj)
 +			if (obj)
 				*obj = propvalue;
 			return 0;
 		}
 	}
 -	return -ENODATA;
 +	return -EINVAL;
 }
 /**
@@ -439,7 +439,7 @@ int acpi_node_prop_get(struct fwnode_handle *fwnode, const char *propname,
  *
  * Return: %0 if array property (package) with @name has been found (success),
  *         %-EINVAL if the arguments are invalid,
 - *         %-ENODATA if the property doesn't exist,
 + *         %-EINVAL if the property doesn't exist,
  *         %-EPROTO if the property is not a package or the type of its elements
  *           doesn't match @type.
  */
 -- 
 2.5.0
--- a/0008-device-property-Fallback-to-secondary-fwnode-if-prim.patch
+++ b/0008-device-property-Fallback-to-secondary-fwnode-if-prim.patch
@ -1,188 +0,0 @@
 From 362c0b30249e8639489b428ff5acc4a9d81c087f Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Mon, 30 Nov 2015 17:11:36 +0200
 Subject: [PATCH 08/16] device property: Fallback to secondary fwnode if
 primary misses the property
 The struct fwnode has notion of secondary fwnode. This is supposed to used
 as fallback if the primary firmware interface (DT, ACPI) does not have the
 property in question.
 However, the current implementation never checks the secondary node which
 prevents one to add default "built-in" properties to devices.
 This patch adds fallback to the secondary fwnode if the primary fwnode
 returns that the property does not exists.
 Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 drivers/base/property.c | 109 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 78 insertions(+), 31 deletions(-)
 diff --git a/drivers/base/property.c b/drivers/base/property.c
 index a3538cb..ebcbe34 100644
 --- a/drivers/base/property.c
 +++ b/drivers/base/property.c
@@ -214,12 +214,8 @@ bool device_property_present(struct device *dev, const char *propname)
 }
 EXPORT_SYMBOL_GPL(device_property_present);
 -/**
 - * fwnode_property_present - check if a property of a firmware node is present
 - * @fwnode: Firmware node whose property to check
 - * @propname: Name of the property
 - */
 -bool fwnode_property_present(struct fwnode_handle *fwnode, const char *propname)
 +static bool __fwnode_property_present(struct fwnode_handle *fwnode,
 +				      const char *propname)
 {
 	if (is_of_node(fwnode))
 		return of_property_read_bool(to_of_node(fwnode), propname);
@@ -229,6 +225,21 @@ bool fwnode_property_present(struct fwnode_handle *fwnode, const char *propname)
 		return !!pset_prop_get(to_pset_node(fwnode), propname);
 	return false;
 }
 +
 +/**
 + * fwnode_property_present - check if a property of a firmware node is present
 + * @fwnode: Firmware node whose property to check
 + * @propname: Name of the property
 + */
 +bool fwnode_property_present(struct fwnode_handle *fwnode, const char *propname)
 +{
 +	bool ret;
 +
 +	ret = __fwnode_property_present(fwnode, propname);
 +	if (ret == false && fwnode->secondary)
 +		ret = __fwnode_property_present(fwnode->secondary, propname);
 +	return ret;
 +}
 EXPORT_SYMBOL_GPL(fwnode_property_present);
 /**
@@ -408,7 +419,7 @@ EXPORT_SYMBOL_GPL(device_property_match_string);
 	(val) ? pset_prop_read_##type##_array((node), (propname), (val), (nval))	\
 	      : pset_prop_count_elems_of_size((node), (propname), sizeof(type))
 -#define FWNODE_PROP_READ_ARRAY(_fwnode_, _propname_, _type_, _proptype_, _val_, _nval_)	\
 +#define FWNODE_PROP_READ(_fwnode_, _propname_, _type_, _proptype_, _val_, _nval_)	\
 ({											\
 	int _ret_;									\
 	if (is_of_node(_fwnode_))							\
@@ -425,6 +436,17 @@ EXPORT_SYMBOL_GPL(device_property_match_string);
 	_ret_;										\
 })
 +#define FWNODE_PROP_READ_ARRAY(_fwnode_, _propname_, _type_, _proptype_, _val_, _nval_)	\
 +({											\
 +	int _ret_;									\
 +	_ret_ = FWNODE_PROP_READ(_fwnode_, _propname_, _type_, _proptype_,		\
 +				 _val_, _nval_);					\
 +	if (_ret_ == -EINVAL && _fwnode_->secondary)					\
 +		_ret_ = FWNODE_PROP_READ(_fwnode_->secondary, _propname_, _type_,	\
 +				_proptype_, _val_, _nval_);				\
 +	_ret_;										\
 +})
 +
 /**
  * fwnode_property_read_u8_array - return a u8 array property of firmware node
  * @fwnode: Firmware node to get the property of
@@ -529,6 +551,41 @@ int fwnode_property_read_u64_array(struct fwnode_handle *fwnode,
 }
 EXPORT_SYMBOL_GPL(fwnode_property_read_u64_array);
 +static int __fwnode_property_read_string_array(struct fwnode_handle *fwnode,
 +					       const char *propname,
 +					       const char **val, size_t nval)
 +{
 +	if (is_of_node(fwnode))
 +		return val ?
 +			of_property_read_string_array(to_of_node(fwnode),
 +						      propname, val, nval) :
 +			of_property_count_strings(to_of_node(fwnode), propname);
 +	else if (is_acpi_node(fwnode))
 +		return acpi_node_prop_read(fwnode, propname, DEV_PROP_STRING,
 +					   val, nval);
 +	else if (is_pset_node(fwnode))
 +		return val ?
 +			pset_prop_read_string_array(to_pset_node(fwnode),
 +						    propname, val, nval) :
 +			pset_prop_count_elems_of_size(to_pset_node(fwnode),
 +						      propname,
 +						      sizeof(const char *));
 +	return -ENXIO;
 +}
 +
 +static int __fwnode_property_read_string(struct fwnode_handle *fwnode,
 +					 const char *propname, const char **val)
 +{
 +	if (is_of_node(fwnode))
 +		return of_property_read_string(to_of_node(fwnode), propname, val);
 +	else if (is_acpi_node(fwnode))
 +		return acpi_node_prop_read(fwnode, propname, DEV_PROP_STRING,
 +					   val, 1);
 +	else if (is_pset_node(fwnode))
 +		return pset_prop_read_string(to_pset_node(fwnode), propname, val);
 +	return -ENXIO;
 +}
 +
 /**
  * fwnode_property_read_string_array - return string array property of a node
  * @fwnode: Firmware node to get the property of
@@ -551,22 +608,13 @@ int fwnode_property_read_string_array(struct fwnode_handle *fwnode,
 				      const char *propname, const char **val,
 				      size_t nval)
 {
 -	if (is_of_node(fwnode))
 -		return val ?
 -			of_property_read_string_array(to_of_node(fwnode),
 -						      propname, val, nval) :
 -			of_property_count_strings(to_of_node(fwnode), propname);
 -	else if (is_acpi_node(fwnode))
 -		return acpi_node_prop_read(fwnode, propname, DEV_PROP_STRING,
 -					   val, nval);
 -	else if (is_pset_node(fwnode))
 -		return val ?
 -			pset_prop_read_string_array(to_pset_node(fwnode),
 -						    propname, val, nval) :
 -			pset_prop_count_elems_of_size(to_pset_node(fwnode),
 -						      propname,
 -						      sizeof(const char *));
 -	return -ENXIO;
 +	int ret;
 +
 +	ret = __fwnode_property_read_string_array(fwnode, propname, val, nval);
 +	if (ret == -EINVAL && fwnode->secondary)
 +		ret = __fwnode_property_read_string_array(fwnode->secondary,
 +							  propname, val, nval);
 +	return ret;
 }
 EXPORT_SYMBOL_GPL(fwnode_property_read_string_array);
@@ -588,14 +636,13 @@ EXPORT_SYMBOL_GPL(fwnode_property_read_string_array);
 int fwnode_property_read_string(struct fwnode_handle *fwnode,
 				const char *propname, const char **val)
 {
 -	if (is_of_node(fwnode))
 -		return of_property_read_string(to_of_node(fwnode), propname, val);
 -	else if (is_acpi_node(fwnode))
 -		return acpi_node_prop_read(fwnode, propname, DEV_PROP_STRING,
 -					   val, 1);
 -	else if (is_pset_node(fwnode))
 -		return pset_prop_read_string(to_pset_node(fwnode), propname, val);
 -	return -ENXIO;
 +	int ret;
 +
 +	ret = __fwnode_property_read_string(fwnode, propname, val);
 +	if (ret == -EINVAL && fwnode->secondary)
 +		ret = __fwnode_property_read_string(fwnode->secondary,
 +						    propname, val);
 +	return ret;
 }
 EXPORT_SYMBOL_GPL(fwnode_property_read_string);
 -- 
 2.5.0
--- a/0009-device-property-Take-a-copy-of-the-property-set.patch
+++ b/0009-device-property-Take-a-copy-of-the-property-set.patch
@ -1,247 +0,0 @@
 From 13141e1cb842ad6286c1cfa9a6b7c1577478d03b Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Mon, 30 Nov 2015 17:11:37 +0200
 Subject: [PATCH 09/16] device property: Take a copy of the property set
 It is convenient if the property set associated with the device secondary
 firmware node is a copy of the original. This allows passing property set
 from a stack for example for devices created dynamically. This also ties
 the property set lifetime to the associated device.
 Because of that we provide new function device_remove_property_set() that
 is used to disassociate and release memory allocated for the property set.
 Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 drivers/base/property.c  | 191 ++++++++++++++++++++++++++++++++++++++++++-----
 include/linux/property.h |   3 +-
 2 files changed, 175 insertions(+), 19 deletions(-)
 diff --git a/drivers/base/property.c b/drivers/base/property.c
 index ebcbe34..0b22c8a 100644
 --- a/drivers/base/property.c
 +++ b/drivers/base/property.c
@@ -19,24 +19,6 @@
 #include <linux/etherdevice.h>
 #include <linux/phy.h>
 -/**
 - * device_add_property_set - Add a collection of properties to a device object.
 - * @dev: Device to add properties to.
 - * @pset: Collection of properties to add.
 - *
 - * Associate a collection of device properties represented by @pset with @dev
 - * as its secondary firmware node.
 - */
 -void device_add_property_set(struct device *dev, struct property_set *pset)
 -{
 -	if (!pset)
 -		return;
 -
 -	pset->fwnode.type = FWNODE_PDATA;
 -	set_secondary_fwnode(dev, &pset->fwnode);
 -}
 -EXPORT_SYMBOL_GPL(device_add_property_set);
 -
 static inline bool is_pset_node(struct fwnode_handle *fwnode)
 {
 	return fwnode && fwnode->type == FWNODE_PDATA;
@@ -693,6 +675,179 @@ out:
 EXPORT_SYMBOL_GPL(fwnode_property_match_string);
 /**
 + * pset_free_set - releases memory allocated for copied property set
 + * @pset: Property set to release
 + *
 + * Function takes previously copied property set and releases all the
 + * memory allocated to it.
 + */
 +static void pset_free_set(struct property_set *pset)
 +{
 +	const struct property_entry *prop;
 +	size_t i, nval;
 +
 +	if (!pset)
 +		return;
 +
 +	for (prop = pset->properties; prop->name; prop++) {
 +		if (prop->is_array) {
 +			if (prop->is_string && prop->pointer.str) {
 +				nval = prop->length / sizeof(const char *);
 +				for (i = 0; i < nval; i++)
 +					kfree(prop->pointer.str[i]);
 +			}
 +			kfree(prop->pointer.raw_data);
 +		} else if (prop->is_string) {
 +			kfree(prop->value.str);
 +		}
 +		kfree(prop->name);
 +	}
 +
 +	kfree(pset->properties);
 +	kfree(pset);
 +}
 +
 +static int pset_copy_entry(struct property_entry *dst,
 +			   const struct property_entry *src)
 +{
 +	const char **d, **s;
 +	size_t i, nval;
 +
 +	dst->name = kstrdup(src->name, GFP_KERNEL);
 +	if (!dst->name)
 +		return -ENOMEM;
 +
 +	if (src->is_array) {
 +		if (src->is_string) {
 +			nval = src->length / sizeof(const char *);
 +			dst->pointer.str = kcalloc(nval, sizeof(const char *),
 +						   GFP_KERNEL);
 +			if (!dst->pointer.str)
 +				return -ENOMEM;
 +
 +			d = dst->pointer.str;
 +			s = src->pointer.str;
 +			for (i = 0; i < nval; i++) {
 +				d[i] = kstrdup(s[i], GFP_KERNEL);
 +				if (!d[i] && s[i])
 +					return -ENOMEM;
 +			}
 +		} else {
 +			dst->pointer.raw_data = kmemdup(src->pointer.raw_data,
 +							src->length, GFP_KERNEL);
 +			if (!dst->pointer.raw_data)
 +				return -ENOMEM;
 +		}
 +	} else if (src->is_string) {
 +		dst->value.str = kstrdup(src->value.str, GFP_KERNEL);
 +		if (!dst->value.str && src->value.str)
 +			return -ENOMEM;
 +	} else {
 +		dst->value.raw_data = src->value.raw_data;
 +	}
 +
 +	dst->length = src->length;
 +	dst->is_array = src->is_array;
 +	dst->is_string = src->is_string;
 +
 +	return 0;
 +}
 +
 +/**
 + * pset_copy_set - copies property set
 + * @pset: Property set to copy
 + *
 + * This function takes a deep copy of the given property set and returns
 + * pointer to the copy. Call device_free_property_set() to free resources
 + * allocated in this function.
 + *
 + * Return: Pointer to the new property set or error pointer.
 + */
 +static struct property_set *pset_copy_set(const struct property_set *pset)
 +{
 +	const struct property_entry *entry;
 +	struct property_set *p;
 +	size_t i, n = 0;
 +
 +	p = kzalloc(sizeof(*p), GFP_KERNEL);
 +	if (!p)
 +		return ERR_PTR(-ENOMEM);
 +
 +	while (pset->properties[n].name)
 +		n++;
 +
 +	p->properties = kcalloc(n + 1, sizeof(*entry), GFP_KERNEL);
 +	if (!p->properties) {
 +		kfree(p);
 +		return ERR_PTR(-ENOMEM);
 +	}
 +
 +	for (i = 0; i < n; i++) {
 +		int ret = pset_copy_entry(&p->properties[i],
 +					  &pset->properties[i]);
 +		if (ret) {
 +			pset_free_set(p);
 +			return ERR_PTR(ret);
 +		}
 +	}
 +
 +	return p;
 +}
 +
 +/**
 + * device_remove_property_set - Remove properties from a device object.
 + * @dev: Device whose properties to remove.
 + *
 + * The function removes properties previously associated to the device
 + * secondary firmware node with device_add_property_set(). Memory allocated
 + * to the properties will also be released.
 + */
 +void device_remove_property_set(struct device *dev)
 +{
 +	struct fwnode_handle *fwnode;
 +
 +	fwnode = dev_fwnode(dev);
 +	if (!fwnode)
 +		return;
 +	/*
 +	 * Pick either primary or secondary node depending which one holds
 +	 * the pset. If there is no real firmware node (ACPI/DT) primary
 +	 * will hold the pset.
 +	 */
 +	if (!is_pset_node(fwnode))
 +		fwnode = fwnode->secondary;
 +	if (!IS_ERR(fwnode) && is_pset_node(fwnode))
 +		pset_free_set(to_pset_node(fwnode));
 +	set_secondary_fwnode(dev, NULL);
 +}
 +EXPORT_SYMBOL_GPL(device_remove_property_set);
 +
 +/**
 + * device_add_property_set - Add a collection of properties to a device object.
 + * @dev: Device to add properties to.
 + * @pset: Collection of properties to add.
 + *
 + * Associate a collection of device properties represented by @pset with @dev
 + * as its secondary firmware node. The function takes a copy of @pset.
 + */
 +int device_add_property_set(struct device *dev, const struct property_set *pset)
 +{
 +	struct property_set *p;
 +
 +	if (!pset)
 +		return -EINVAL;
 +
 +	p = pset_copy_set(pset);
 +	if (IS_ERR(p))
 +		return PTR_ERR(p);
 +
 +	p->fwnode.type = FWNODE_PDATA;
 +	set_secondary_fwnode(dev, &p->fwnode);
 +	return 0;
 +}
 +EXPORT_SYMBOL_GPL(device_add_property_set);
 +
 +/**
  * device_get_next_child_node - Return the next child node handle for a device
  * @dev: Device to find the next child node for.
  * @child: Handle to one of the device's child nodes or a null handle.
 diff --git a/include/linux/property.h b/include/linux/property.h
 index d1cf208..3a8c7d7 100644
 --- a/include/linux/property.h
 +++ b/include/linux/property.h
@@ -240,7 +240,8 @@ struct property_set {
 	struct property_entry *properties;
 };
 -void device_add_property_set(struct device *dev, struct property_set *pset);
 +int device_add_property_set(struct device *dev, const struct property_set *pset);
 +void device_remove_property_set(struct device *dev);
 bool device_dma_supported(struct device *dev);
 -- 
 2.5.0
--- a/0010-driver-core-platform-Add-support-for-built-in-device.patch
+++ b/0010-driver-core-platform-Add-support-for-built-in-device.patch
@ -1,112 +0,0 @@
 From 00bbc1d8e46a92ce7bd80622cf4b09c3b727a741 Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Mon, 30 Nov 2015 17:11:38 +0200
 Subject: [PATCH 10/16] driver core: platform: Add support for built-in device
 properties
 Make it possible to pass built-in device properties to platform device
 drivers. This is useful if the system does not have any firmware interface
 like Device Tree or ACPI which provides these.
 Properties associated with the platform device will be automatically
 released when the corresponding device is removed.
 Suggested-by: Arnd Bergmann <arnd@arndb.de>
 Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 drivers/base/platform.c         | 25 +++++++++++++++++++++++++
 include/linux/platform_device.h |  5 +++++
 2 files changed, 30 insertions(+)
 diff --git a/drivers/base/platform.c b/drivers/base/platform.c
 index 1dd6d3b..d77ed0c 100644
 --- a/drivers/base/platform.c
 +++ b/drivers/base/platform.c
@@ -26,6 +26,7 @@
 #include <linux/acpi.h>
 #include <linux/clk/clk-conf.h>
 #include <linux/limits.h>
 +#include <linux/property.h>
 #include "base.h"
 #include "power/power.h"
@@ -299,6 +300,22 @@ int platform_device_add_data(struct platform_device *pdev, const void *data,
 EXPORT_SYMBOL_GPL(platform_device_add_data);
 /**
 + * platform_device_add_properties - add built-in properties to a platform device
 + * @pdev: platform device to add properties to
 + * @pset: properties to add
 + *
 + * The function will take deep copy of the properties in @pset and attach
 + * the copy to the platform device. The memory associated with properties
 + * will be freed when the platform device is released.
 + */
 +int platform_device_add_properties(struct platform_device *pdev,
 +				   const struct property_set *pset)
 +{
 +	return device_add_property_set(&pdev->dev, pset);
 +}
 +EXPORT_SYMBOL_GPL(platform_device_add_properties);
 +
 +/**
  * platform_device_add - add a platform device to device hierarchy
  * @pdev: platform device we're adding
  *
@@ -409,6 +426,8 @@ void platform_device_del(struct platform_device *pdev)
 			if (r->parent)
 				release_resource(r);
 		}
 +
 +		device_remove_property_set(&pdev->dev);
 	}
 }
 EXPORT_SYMBOL_GPL(platform_device_del);
@@ -487,6 +506,12 @@ struct platform_device *platform_device_register_full(
 	if (ret)
 		goto err;
 +	if (pdevinfo->pset) {
 +		ret = platform_device_add_properties(pdev, pdevinfo->pset);
 +		if (ret)
 +			goto err;
 +	}
 +
 	ret = platform_device_add(pdev);
 	if (ret) {
 err:
 diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
 index dc777be..dba40b1 100644
 --- a/include/linux/platform_device.h
 +++ b/include/linux/platform_device.h
@@ -18,6 +18,7 @@
 #define PLATFORM_DEVID_AUTO	(-2)
 struct mfd_cell;
 +struct property_set;
 struct platform_device {
 	const char	*name;
@@ -70,6 +71,8 @@ struct platform_device_info {
 		const void *data;
 		size_t size_data;
 		u64 dma_mask;
 +
 +		const struct property_set *pset;
 };
 extern struct platform_device *platform_device_register_full(
 		const struct platform_device_info *pdevinfo);
@@ -167,6 +170,8 @@ extern int platform_device_add_resources(struct platform_device *pdev,
 					 unsigned int num);
 extern int platform_device_add_data(struct platform_device *pdev,
 				    const void *data, size_t size);
 +extern int platform_device_add_properties(struct platform_device *pdev,
 +					  const struct property_set *pset);
 extern int platform_device_add(struct platform_device *pdev);
 extern void platform_device_del(struct platform_device *pdev);
 extern void platform_device_put(struct platform_device *pdev);
 -- 
 2.5.0
--- a/0011-driver-core-Do-not-overwrite-secondary-fwnode-with-N.patch
+++ b/0011-driver-core-Do-not-overwrite-secondary-fwnode-with-N.patch
@ -1,47 +0,0 @@
 From 55f89a8a4538803195395bdf347cbba51dcb1906 Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Mon, 30 Nov 2015 17:11:39 +0200
 Subject: [PATCH 11/16] driver core: Do not overwrite secondary fwnode with
 NULL if it is set
 If multiple devices share single firmware node like it is case with MFD
 devices, the same firmware node (ACPI) is assigned to all of them. The
 function also modifies the shared firmware node in order to preserve
 secondary firmware node of the device in question.
 If the new device which is sharing the firmware node does not have
 secondary node it will be NULL which will be assigned to the secondary node
 of the shared firmware node losing all built-in properties.
 Prevent this by setting the secondary firmware node only if the replacement
 is non-NULL.
 Print also warning if someone tries to overwrite secondary node that has
 already been assigned.
 Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 drivers/base/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 diff --git a/drivers/base/core.c b/drivers/base/core.c
 index b7d56c5..0a8bdad 100644
 --- a/drivers/base/core.c
 +++ b/drivers/base/core.c
@@ -2261,7 +2261,10 @@ void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode)
 		if (fwnode_is_primary(fn))
 			fn = fn->secondary;
 -		fwnode->secondary = fn;
 +		if (fn) {
 +			WARN_ON(fwnode->secondary);
 +			fwnode->secondary = fn;
 +		}
 		dev->fwnode = fwnode;
 	} else {
 		dev->fwnode = fwnode_is_primary(dev->fwnode) ?
 -- 
 2.5.0
--- a/0012-mfd-core-propagate-device-properties-to-sub-devices-.patch
+++ b/0012-mfd-core-propagate-device-properties-to-sub-devices-.patch
@ -1,69 +0,0 @@
 From 4d215cabc784990df11fbcca7af70adf53c9ff17 Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Mon, 30 Nov 2015 17:11:40 +0200
 Subject: [PATCH 12/16] mfd: core: propagate device properties to sub devices
 drivers
 In the similar way like we do for the platform data we propagate the device
 properties. For example, in case of Intel LPSS drivers we may provide a
 specific property to tell the actual device driver an additional information
 such as platform name.
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 drivers/mfd/mfd-core.c   | 7 +++++++
 include/linux/mfd/core.h | 5 +++++
 2 files changed, 12 insertions(+)
 diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
 index 60b60dc..88bd1b1 100644
 --- a/drivers/mfd/mfd-core.c
 +++ b/drivers/mfd/mfd-core.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/acpi.h>
 +#include <linux/property.h>
 #include <linux/mfd/core.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
@@ -192,6 +193,12 @@ static int mfd_add_device(struct device *parent, int id,
 			goto fail_alias;
 	}
 +	if (cell->pset) {
 +		ret = platform_device_add_properties(pdev, cell->pset);
 +		if (ret)
 +			goto fail_alias;
 +	}
 +
 	ret = mfd_platform_add_cell(pdev, cell, usage_count);
 	if (ret)
 		goto fail_alias;
 diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
 index 27dac3f..bc6f7e0 100644
 --- a/include/linux/mfd/core.h
 +++ b/include/linux/mfd/core.h
@@ -17,6 +17,7 @@
 #include <linux/platform_device.h>
 struct irq_domain;
 +struct property_set;
 /* Matches ACPI PNP id, either _HID or _CID, or ACPI _ADR */
 struct mfd_cell_acpi_match {
@@ -44,6 +45,10 @@ struct mfd_cell {
 	/* platform data passed to the sub devices drivers */
 	void			*platform_data;
 	size_t			pdata_size;
 +
 +	/* device properties passed to the sub devices drivers */
 +	const struct property_set *pset;
 +
 	/*
 	 * Device Tree compatible string
 	 * See: Documentation/devicetree/usage-model.txt Chapter 2.2 for details
 -- 
 2.5.0
--- a/0013-mfd-intel-lpss-Add-support-for-passing-device-proper.patch
+++ b/0013-mfd-intel-lpss-Add-support-for-passing-device-proper.patch
@ -1,112 +0,0 @@
 From e15ad2154b6166804fc04487e0398c9aef9e7c97 Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Mon, 30 Nov 2015 17:11:41 +0200
 Subject: [PATCH 13/16] mfd: intel-lpss: Add support for passing device
 properties
 If the boot firmware does not support ACPI we need a way to pass device
 configuration information to the drivers. The unified device properties API
 already supports passing platform data via properties so let's take
 advantage of that and allow probe drivers to pass set of properties to the
 host controller driver.
 In order to do that we need to be able to modify the MFD cell corresponding
 the host controller, so make the core driver to take copy of the cell
 instead of using it directly. Then we can assign info->pset to the
 resulting copy of a cell and let the MFD core to assign that to the
 resulting device.
 Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 drivers/mfd/intel-lpss.c | 16 ++++++++++++----
 drivers/mfd/intel-lpss.h |  2 ++
 2 files changed, 14 insertions(+), 4 deletions(-)
 diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c
 index 6255513..1743788 100644
 --- a/drivers/mfd/intel-lpss.c
 +++ b/drivers/mfd/intel-lpss.c
@@ -24,6 +24,7 @@
 #include <linux/mfd/core.h>
 #include <linux/pm_qos.h>
 #include <linux/pm_runtime.h>
 +#include <linux/property.h>
 #include <linux/seq_file.h>
 #include <linux/io-64-nonatomic-lo-hi.h>
@@ -72,7 +73,7 @@ struct intel_lpss {
 	enum intel_lpss_dev_type type;
 	struct clk *clk;
 	struct clk_lookup *clock;
 -	const struct mfd_cell *cell;
 +	struct mfd_cell *cell;
 	struct device *dev;
 	void __iomem *priv;
 	int devid;
@@ -217,6 +218,7 @@ static void intel_lpss_ltr_hide(struct intel_lpss *lpss)
 static int intel_lpss_assign_devs(struct intel_lpss *lpss)
 {
 +	const struct mfd_cell *cell;
 	unsigned int type;
 	type = lpss->caps & LPSS_PRIV_CAPS_TYPE_MASK;
@@ -224,18 +226,22 @@ static int intel_lpss_assign_devs(struct intel_lpss *lpss)
 	switch (type) {
 	case LPSS_DEV_I2C:
 -		lpss->cell = &intel_lpss_i2c_cell;
 +		cell = &intel_lpss_i2c_cell;
 		break;
 	case LPSS_DEV_UART:
 -		lpss->cell = &intel_lpss_uart_cell;
 +		cell = &intel_lpss_uart_cell;
 		break;
 	case LPSS_DEV_SPI:
 -		lpss->cell = &intel_lpss_spi_cell;
 +		cell = &intel_lpss_spi_cell;
 		break;
 	default:
 		return -ENODEV;
 	}
 +	lpss->cell = devm_kmemdup(lpss->dev, cell, sizeof(*cell), GFP_KERNEL);
 +	if (!lpss->cell)
 +		return -ENOMEM;
 +
 	lpss->type = type;
 	return 0;
@@ -401,6 +407,8 @@ int intel_lpss_probe(struct device *dev,
 	if (ret)
 		return ret;
 +	lpss->cell->pset = info->pset;
 +
 	intel_lpss_init_dev(lpss);
 	lpss->devid = ida_simple_get(&intel_lpss_devid_ida, 0, 0, GFP_KERNEL);
 diff --git a/drivers/mfd/intel-lpss.h b/drivers/mfd/intel-lpss.h
 index 2c7f8d7..0dcea9e 100644
 --- a/drivers/mfd/intel-lpss.h
 +++ b/drivers/mfd/intel-lpss.h
@@ -16,12 +16,14 @@
 struct device;
 struct resource;
 +struct property_set;
 struct intel_lpss_platform_info {
 	struct resource *mem;
 	int irq;
 	unsigned long clk_rate;
 	const char *clk_con_id;
 +	struct property_set *pset;
 };
 int intel_lpss_probe(struct device *dev,
 -- 
 2.5.0
--- a/0014-mfd-intel-lpss-Pass-SDA-hold-time-to-I2C-host-contro.patch
+++ b/0014-mfd-intel-lpss-Pass-SDA-hold-time-to-I2C-host-contro.patch
@ -1,138 +0,0 @@
 From 028af5941dd870afd5eb6a95c39f25564dcca79a Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Mon, 30 Nov 2015 17:11:42 +0200
 Subject: [PATCH 14/16] mfd: intel-lpss: Pass SDA hold time to I2C host
 controller driver
 Intel Skylake the LPSS I2C pad circuit has internal delays that require
 programming non-zero SDA hold time for the I2C host controller. If this is
 not done communication to slave devices may fail with arbitration lost
 errors like the one seen below taken from Lenovo Yoga 900:
  i2c_hid i2c-SYNA2B29:00: Fetching the HID descriptor
  i2c_hid i2c-SYNA2B29:00: __i2c_hid_command: cmd=20 00
  i2c_designware i2c_designware.1: i2c_dw_handle_tx_abort: lost arbitration
 To fix this we follow what the Windows driver is doing and pass the default
 SDA hold time of 230 ns to all Intel Skylake host controllers. This still
 allows the platform to override these values by passing special ACPI
 methods SSCN and FMCN.
 Reported-by: Kevin Fenzi <kevin@scrye.com>
 Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 drivers/mfd/intel-lpss-acpi.c | 19 +++++++++++++++++--
 drivers/mfd/intel-lpss-pci.c  | 31 +++++++++++++++++++++++--------
 2 files changed, 40 insertions(+), 10 deletions(-)
 diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c
 index b6fd904..06f00d6 100644
 --- a/drivers/mfd/intel-lpss-acpi.c
 +++ b/drivers/mfd/intel-lpss-acpi.c
@@ -18,6 +18,7 @@
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
 #include <linux/platform_device.h>
 +#include <linux/property.h>
 #include "intel-lpss.h"
@@ -25,6 +26,20 @@ static const struct intel_lpss_platform_info spt_info = {
 	.clk_rate = 120000000,
 };
 +static struct property_entry spt_i2c_properties[] = {
 +	PROPERTY_ENTRY_U32("i2c-sda-hold-time-ns", 230),
 +	{ },
 +};
 +
 +static struct property_set spt_i2c_pset = {
 +	.properties = spt_i2c_properties,
 +};
 +
 +static const struct intel_lpss_platform_info spt_i2c_info = {
 +	.clk_rate = 120000000,
 +	.pset = &spt_i2c_pset,
 +};
 +
 static const struct intel_lpss_platform_info bxt_info = {
 	.clk_rate = 100000000,
 };
@@ -35,8 +50,8 @@ static const struct intel_lpss_platform_info bxt_i2c_info = {
 static const struct acpi_device_id intel_lpss_acpi_ids[] = {
 	/* SPT */
 -	{ "INT3446", (kernel_ulong_t)&spt_info },
 -	{ "INT3447", (kernel_ulong_t)&spt_info },
 +	{ "INT3446", (kernel_ulong_t)&spt_i2c_info },
 +	{ "INT3447", (kernel_ulong_t)&spt_i2c_info },
 	/* BXT */
 	{ "80860AAC", (kernel_ulong_t)&bxt_i2c_info },
 	{ "80860ABC", (kernel_ulong_t)&bxt_info },
 diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c
 index 5bfdfcc..a677480 100644
 --- a/drivers/mfd/intel-lpss-pci.c
 +++ b/drivers/mfd/intel-lpss-pci.c
@@ -17,6 +17,7 @@
 #include <linux/pci.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
 +#include <linux/property.h>
 #include "intel-lpss.h"
@@ -65,6 +66,20 @@ static const struct intel_lpss_platform_info spt_info = {
 	.clk_rate = 120000000,
 };
 +static struct property_entry spt_i2c_properties[] = {
 +	PROPERTY_ENTRY_U32("i2c-sda-hold-time-ns", 230),
 +	{ },
 +};
 +
 +static struct property_set spt_i2c_pset = {
 +	.properties = spt_i2c_properties,
 +};
 +
 +static const struct intel_lpss_platform_info spt_i2c_info = {
 +	.clk_rate = 120000000,
 +	.pset = &spt_i2c_pset,
 +};
 +
 static const struct intel_lpss_platform_info spt_uart_info = {
 	.clk_rate = 120000000,
 	.clk_con_id = "baudclk",
@@ -121,20 +136,20 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
 	{ PCI_VDEVICE(INTEL, 0x9d28), (kernel_ulong_t)&spt_uart_info },
 	{ PCI_VDEVICE(INTEL, 0x9d29), (kernel_ulong_t)&spt_info },
 	{ PCI_VDEVICE(INTEL, 0x9d2a), (kernel_ulong_t)&spt_info },
 -	{ PCI_VDEVICE(INTEL, 0x9d60), (kernel_ulong_t)&spt_info },
 -	{ PCI_VDEVICE(INTEL, 0x9d61), (kernel_ulong_t)&spt_info },
 -	{ PCI_VDEVICE(INTEL, 0x9d62), (kernel_ulong_t)&spt_info },
 -	{ PCI_VDEVICE(INTEL, 0x9d63), (kernel_ulong_t)&spt_info },
 -	{ PCI_VDEVICE(INTEL, 0x9d64), (kernel_ulong_t)&spt_info },
 -	{ PCI_VDEVICE(INTEL, 0x9d65), (kernel_ulong_t)&spt_info },
 +	{ PCI_VDEVICE(INTEL, 0x9d60), (kernel_ulong_t)&spt_i2c_info },
 +	{ PCI_VDEVICE(INTEL, 0x9d61), (kernel_ulong_t)&spt_i2c_info },
 +	{ PCI_VDEVICE(INTEL, 0x9d62), (kernel_ulong_t)&spt_i2c_info },
 +	{ PCI_VDEVICE(INTEL, 0x9d63), (kernel_ulong_t)&spt_i2c_info },
 +	{ PCI_VDEVICE(INTEL, 0x9d64), (kernel_ulong_t)&spt_i2c_info },
 +	{ PCI_VDEVICE(INTEL, 0x9d65), (kernel_ulong_t)&spt_i2c_info },
 	{ PCI_VDEVICE(INTEL, 0x9d66), (kernel_ulong_t)&spt_uart_info },
 	/* SPT-H */
 	{ PCI_VDEVICE(INTEL, 0xa127), (kernel_ulong_t)&spt_uart_info },
 	{ PCI_VDEVICE(INTEL, 0xa128), (kernel_ulong_t)&spt_uart_info },
 	{ PCI_VDEVICE(INTEL, 0xa129), (kernel_ulong_t)&spt_info },
 	{ PCI_VDEVICE(INTEL, 0xa12a), (kernel_ulong_t)&spt_info },
 -	{ PCI_VDEVICE(INTEL, 0xa160), (kernel_ulong_t)&spt_info },
 -	{ PCI_VDEVICE(INTEL, 0xa161), (kernel_ulong_t)&spt_info },
 +	{ PCI_VDEVICE(INTEL, 0xa160), (kernel_ulong_t)&spt_i2c_info },
 +	{ PCI_VDEVICE(INTEL, 0xa161), (kernel_ulong_t)&spt_i2c_info },
 	{ PCI_VDEVICE(INTEL, 0xa166), (kernel_ulong_t)&spt_uart_info },
 	{ }
 };
 -- 
 2.5.0
--- a/0015-mfd-intel-lpss-Pass-HSUART-configuration-via-propert.patch
+++ b/0015-mfd-intel-lpss-Pass-HSUART-configuration-via-propert.patch
@ -1,55 +0,0 @@
 From ec14c5395dfbc1d40a49c9f19d2bfde6739d89d5 Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Mon, 30 Nov 2015 17:11:43 +0200
 Subject: [PATCH 15/16] mfd: intel-lpss: Pass HSUART configuration via
 properties
 The HS-UART host controller driver needs to know certain properties like
 width of the register set if it cannot get that information from ACPI or
 DT. In order to support non-ACPI systems we pass this information to the
 driver via device properties.
 Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 drivers/mfd/intel-lpss-pci.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c
 index a677480..a7136c7 100644
 --- a/drivers/mfd/intel-lpss-pci.c
 +++ b/drivers/mfd/intel-lpss-pci.c
@@ -80,9 +80,21 @@ static const struct intel_lpss_platform_info spt_i2c_info = {
 	.pset = &spt_i2c_pset,
 };
 +static struct property_entry uart_properties[] = {
 +	PROPERTY_ENTRY_U32("reg-io-width", 4),
 +	PROPERTY_ENTRY_U32("reg-shift", 2),
 +	PROPERTY_ENTRY_BOOL("snps,uart-16550-compatible"),
 +	{ },
 +};
 +
 +static struct property_set uart_pset = {
 +	.properties = uart_properties,
 +};
 +
 static const struct intel_lpss_platform_info spt_uart_info = {
 	.clk_rate = 120000000,
 	.clk_con_id = "baudclk",
 +	.pset = &uart_pset,
 };
 static const struct intel_lpss_platform_info bxt_info = {
@@ -92,6 +104,7 @@ static const struct intel_lpss_platform_info bxt_info = {
 static const struct intel_lpss_platform_info bxt_uart_info = {
 	.clk_rate = 100000000,
 	.clk_con_id = "baudclk",
 +	.pset = &uart_pset,
 };
 static const struct intel_lpss_platform_info bxt_i2c_info = {
 -- 
 2.5.0
--- a/0016-i2c-designware-Convert-to-use-unified-device-propert.patch
+++ b/0016-i2c-designware-Convert-to-use-unified-device-propert.patch
@ -1,106 +0,0 @@
 From 4c5301abbf81f4351416cec1e8a02647d96e6fd1 Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Mon, 30 Nov 2015 17:11:44 +0200
 Subject: [PATCH 16/16] i2c: designware: Convert to use unified device property
 API
 With ACPI _DSD (introduced in ACPI v5.1) it is now possible to pass device
 configuration information from ACPI in addition to DT. In order to support
 this, convert the driver to use the unified device property accessors
 instead of DT specific.
 Change to ordering a bit so that we first try platform data and if that's
 not available look from device properties. ACPI *CNT methods are then used
 as last resort to override everything else.
 Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
 Acked-by: Wolfram Sang <wsa@the-dreams.de>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 drivers/i2c/busses/i2c-designware-platdrv.c | 50 +++++++++++++----------------
 1 file changed, 23 insertions(+), 27 deletions(-)
 diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
 index 809579e..06061b5 100644
 --- a/drivers/i2c/busses/i2c-designware-platdrv.c
 +++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -36,6 +36,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
 +#include <linux/property.h>
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/acpi.h>
@@ -129,10 +130,10 @@ static inline int dw_i2c_acpi_configure(struct platform_device *pdev)
 static int dw_i2c_plat_probe(struct platform_device *pdev)
 {
 +	struct dw_i2c_platform_data *pdata = dev_get_platdata(&pdev->dev);
 	struct dw_i2c_dev *dev;
 	struct i2c_adapter *adap;
 	struct resource *mem;
 -	struct dw_i2c_platform_data *pdata;
 	int irq, r;
 	u32 clk_freq, ht = 0;
@@ -156,33 +157,28 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
 	/* fast mode by default because of legacy reasons */
 	clk_freq = 400000;
 -	if (has_acpi_companion(&pdev->dev)) {
 -		dw_i2c_acpi_configure(pdev);
 -	} else if (pdev->dev.of_node) {
 -		of_property_read_u32(pdev->dev.of_node,
 -					"i2c-sda-hold-time-ns", &ht);
 -
 -		of_property_read_u32(pdev->dev.of_node,
 -				     "i2c-sda-falling-time-ns",
 -				     &dev->sda_falling_time);
 -		of_property_read_u32(pdev->dev.of_node,
 -				     "i2c-scl-falling-time-ns",
 -				     &dev->scl_falling_time);
 -
 -		of_property_read_u32(pdev->dev.of_node, "clock-frequency",
 -				     &clk_freq);
 -
 -		/* Only standard mode at 100kHz and fast mode at 400kHz
 -		 * are supported.
 -		 */
 -		if (clk_freq != 100000 && clk_freq != 400000) {
 -			dev_err(&pdev->dev, "Only 100kHz and 400kHz supported");
 -			return -EINVAL;
 -		}
 +	if (pdata) {
 +		clk_freq = pdata->i2c_scl_freq;
 	} else {
 -		pdata = dev_get_platdata(&pdev->dev);
 -		if (pdata)
 -			clk_freq = pdata->i2c_scl_freq;
 +		device_property_read_u32(&pdev->dev, "i2c-sda-hold-time-ns",
 +					 &ht);
 +		device_property_read_u32(&pdev->dev, "i2c-sda-falling-time-ns",
 +					 &dev->sda_falling_time);
 +		device_property_read_u32(&pdev->dev, "i2c-scl-falling-time-ns",
 +					 &dev->scl_falling_time);
 +		device_property_read_u32(&pdev->dev, "clock-frequency",
 +					 &clk_freq);
 +	}
 +
 +	if (has_acpi_companion(&pdev->dev))
 +		dw_i2c_acpi_configure(pdev);
 +
 +	/*
 +	 * Only standard mode at 100kHz and fast mode at 400kHz are supported.
 +	 */
 +	if (clk_freq != 100000 && clk_freq != 400000) {
 +		dev_err(&pdev->dev, "Only 100kHz and 400kHz supported");
 +		return -EINVAL;
 	}
 	r = i2c_dw_eval_lock_support(dev);
 -- 
 2.5.0
--- a/PNP-Add-Broadwell-to-Intel-MCH-size-workaround.patch
+++ b/PNP-Add-Broadwell-to-Intel-MCH-size-workaround.patch
@ -1,101 +0,0 @@
 From 61feb31b0dfecfd7949e672a54ac7256f4dd2c3d Mon Sep 17 00:00:00 2001
 From: Christophe Le Roy <christophe.fish@gmail.com>
 Date: Fri, 11 Dec 2015 09:13:42 +0100
 Subject: [PATCH] PNP: Add Broadwell to Intel MCH size workaround
 Add device ID 0x1604 for Broadwell to commit cb171f7abb9a ("PNP:
 Work around BIOS defects in Intel MCH area reporting").
 >From a Lenovo ThinkPad T550:
  system 00:01: [io  0x1800-0x189f] could not be reserved
  system 00:01: [io  0x0800-0x087f] has been reserved
  system 00:01: [io  0x0880-0x08ff] has been reserved
  system 00:01: [io  0x0900-0x097f] has been reserved
  system 00:01: [io  0x0980-0x09ff] has been reserved
  system 00:01: [io  0x0a00-0x0a7f] has been reserved
  system 00:01: [io  0x0a80-0x0aff] has been reserved
  system 00:01: [io  0x0b00-0x0b7f] has been reserved
  system 00:01: [io  0x0b80-0x0bff] has been reserved
  system 00:01: [io  0x15e0-0x15ef] has been reserved
  system 00:01: [io  0x1600-0x167f] has been reserved
  system 00:01: [io  0x1640-0x165f] has been reserved
  system 00:01: [mem 0xf8000000-0xfbffffff] could not be reserved
  system 00:01: [mem 0xfed1c000-0xfed1ffff] has been reserved
  system 00:01: [mem 0xfed10000-0xfed13fff] has been reserved
  system 00:01: [mem 0xfed18000-0xfed18fff] has been reserved
  system 00:01: [mem 0xfed19000-0xfed19fff] has been reserved
  system 00:01: [mem 0xfed45000-0xfed4bfff] has been reserved
  system 00:01: Plug and Play ACPI device, IDs PNP0c02 (active)
  [...]
  resource sanity check: requesting [mem 0xfed10000-0xfed15fff], which spans more than pnp 00:01 [mem 0xfed10000-0xfed13fff]
  ------------[ cut here ]------------
  WARNING: CPU: 2 PID: 1 at /build/linux-CrHvZ_/linux-4.2.6/arch/x86/mm/ioremap.c:198 __ioremap_caller+0x2ee/0x360()
  Info: mapping multiple BARs. Your kernel is fine.
  Modules linked in:
  CPU: 2 PID: 1 Comm: swapper/0 Not tainted 4.2.0-1-amd64 #1 Debian 4.2.6-1
  Hardware name: LENOVO 20CKCTO1WW/20CKCTO1WW, BIOS N11ET34W (1.10 ) 08/20/2015
   0000000000000000 ffffffff817e6868 ffffffff8154e2f6 ffff8802241efbf8
   ffffffff8106e5b1 ffffc90000e98000 0000000000006000 ffffc90000e98000
   0000000000006000 0000000000000000 ffffffff8106e62a ffffffff817e68c8
  Call Trace:
   [<ffffffff8154e2f6>] ? dump_stack+0x40/0x50
   [<ffffffff8106e5b1>] ? warn_slowpath_common+0x81/0xb0
   [<ffffffff8106e62a>] ? warn_slowpath_fmt+0x4a/0x50
   [<ffffffff810742a3>] ? iomem_map_sanity_check+0xb3/0xc0
   [<ffffffff8105dade>] ? __ioremap_caller+0x2ee/0x360
   [<ffffffff81036ae6>] ? snb_uncore_imc_init_box+0x66/0x90
   [<ffffffff810351a8>] ? uncore_pci_probe+0xc8/0x1a0
   [<ffffffff81302d7f>] ? local_pci_probe+0x3f/0xa0
   [<ffffffff81303ea4>] ? pci_device_probe+0xc4/0x110
   [<ffffffff813d9b1e>] ? driver_probe_device+0x1ee/0x450
   [<ffffffff813d9dfb>] ? __driver_attach+0x7b/0x80
   [<ffffffff813d9d80>] ? driver_probe_device+0x450/0x450
   [<ffffffff813d796a>] ? bus_for_each_dev+0x5a/0x90
   [<ffffffff813d9091>] ? bus_add_driver+0x1f1/0x290
   [<ffffffff81b37fa8>] ? uncore_cpu_setup+0xc/0xc
   [<ffffffff813da73f>] ? driver_register+0x5f/0xe0
   [<ffffffff81b38074>] ? intel_uncore_init+0xcc/0x2b0
   [<ffffffff81b37fa8>] ? uncore_cpu_setup+0xc/0xc
   [<ffffffff8100213e>] ? do_one_initcall+0xce/0x200
   [<ffffffff8108a100>] ? parse_args+0x140/0x4e0
   [<ffffffff81b2b0cb>] ? kernel_init_freeable+0x162/0x1e8
   [<ffffffff815443f0>] ? rest_init+0x80/0x80
   [<ffffffff815443fe>] ? kernel_init+0xe/0xf0
   [<ffffffff81553e5f>] ? ret_from_fork+0x3f/0x70
   [<ffffffff815443f0>] ? rest_init+0x80/0x80
  ---[ end trace 472e7959536abf12 ]---
  00:00.0 Host bridge: Intel Corporation Broadwell-U Host Bridge -OPI (rev 09)
          Subsystem: Lenovo Device 2223
          Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
          Status: Cap+ 66MHz- UDF- FastB2B+ ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort+ >SERR- <PERR- INTx-
          Latency: 0
          Capabilities: [e0] Vendor Specific Information: Len=0c <?>
          Kernel driver in use: bdw_uncore
  00: 86 80 04 16 06 00 90 20 09 00 00 06 00 00 00 00
  10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
  20: 00 00 00 00 00 00 00 00 00 00 00 00 aa 17 23 22
  30: 00 00 00 00 e0 00 00 00 00 00 00 00 00 00 00 00
 Signed-off-by: Christophe Le Roy <christophe.fish@gmail.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 ---
 drivers/pnp/quirks.c | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
 index 943c1cb9566c..f700723ca5d6 100644
 --- a/drivers/pnp/quirks.c
 +++ b/drivers/pnp/quirks.c
@@ -343,6 +343,7 @@ static void quirk_amd_mmconfig_area(struct pnp_dev *dev)
 static const unsigned int mch_quirk_devices[] = {
 	0x0154,	/* Ivy Bridge */
 	0x0c00,	/* Haswell */
 +	0x1604, /* Broadwell */
 };
 static struct pci_dev *get_intel_host(void)
 -- 
 2.5.0
--- a/11
+++ b/11
@ -123,9 +123,20 @@ CONFIG_SND_SOC_ROCKCHIP_RT5645=m
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 CONFIG_REGULATOR_ACT8865=m
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 # Tegra
 # CONFIG_TEGRA_AHB is not set
 #
 # Virt
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_EFI=y
 CONFIG_EFI_VARS=y
 CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
 # Power management / thermal / cpu scaling
 # CONFIG_ARM_CPUIDLE is not set
--- a/5
+++ b/5
@ -71,11 +71,6 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 # CONFIG_SYS_HYPERVISOR is not set
 CONFIG_EFI=y
 CONFIG_EFI_VARS=y
 CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
 CONFIG_RTC_DRV_EFI=y
 CONFIG_ACPI=y
--- a/2
+++ b/2
@ -108,8 +108,6 @@ CONFIG_COMMON_CLK_PALMAS=m
 CONFIG_INPUT_PALMAS_PWRBUTTON=m
 CONFIG_WL_TI=y
 CONFIG_WLCORE_SDIO=m
 CONFIG_WLCORE_SPI=m
 CONFIG_WL18XX=m
 CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_MFD_WL1273_CORE=m
--- a/1
+++ b/1
@ -19,6 +19,7 @@ CONFIG_ARM_UNWIND=y
 CONFIG_ARM_THUMB=y
 CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_ASM_UNIFIED=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_SWP_EMULATE=y
--- a/44
+++ b/44
@ -759,6 +759,8 @@ CONFIG_NETLINK_DIAG=m
 CONFIG_BPF_JIT=y
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y
@ -1088,6 +1090,9 @@ CONFIG_NFT_REDIR_IPV4=m
 CONFIG_NFT_REDIR_IPV6=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NF_TABLES_IPV4=m
 CONFIG_NF_DUP_IPV4=m
@ -1496,6 +1501,7 @@ CONFIG_I40E=m
 CONFIG_I40E_VXLAN=y
 # CONFIG_I40E_DCB is not set
 # CONFIG_I40E_FCOE is not set
 CONFIG_I40E_GENEVE=y
 CONFIG_I40EVF=m
 CONFIG_FM10K=m
 # CONFIG_FM10K_VXLAN is not set
@ -1525,6 +1531,10 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_NETRONOME=y
 CONFIG_NFP_NETVF=m
 CONFIG_NFP_NET_DEBUG=n
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@ -1751,7 +1761,9 @@ CONFIG_MAC80211_DEBUGFS=y
 # CONFIG_WIMAX is not set
 # CONFIG_WLAN_VENDOR_ADMTEK is not set
 # CONFIG_ADM8211 is not set
 CONFIG_WLAN_VENDOR_ATH=y
 CONFIG_ATH_COMMON=m
 CONFIG_ATH_CARDS=m
 CONFIG_ATH5K=m
@ -1770,6 +1782,7 @@ CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_DEBUGFS=y
 CONFIG_ATH9K_HTC=m
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_HWRNG is not set
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 # CONFIG_ATH9K_STATION_STATISTICS is not set
 # CONFIG_ATH9K_WOW is not set
@ -1791,9 +1804,13 @@ CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 # CONFIG_CARL9170_HWRNG is not set
 CONFIG_AT76C50X_USB=m
 # CONFIG_WLAN_VENDOR_CISCO is not set
 # CONFIG_AIRO is not set
 # CONFIG_AIRO_CS is not set
 # CONFIG_WLAN_VENDOR_ATMEL is not set
 # CONFIG_ATMEL is not set
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_WLAN_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B43=m
 CONFIG_B43_PCMCIA=y
@ -1830,6 +1847,7 @@ CONFIG_PCMCIA_HERMES=m
 CONFIG_ORINOCO_USB=m
 # CONFIG_TMD_HERMES is not set
 # CONFIG_PCMCIA_SPECTRUM is not set
 CONFIG_WLAN_VENDOR_ST=y
 CONFIG_CW1200=m
 CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
@ -1839,6 +1857,7 @@ CONFIG_CW1200_WLAN_SPI=m
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
@ -1850,6 +1869,7 @@ CONFIG_LIBERTAS_MESH=y
 CONFIG_BNXT=m
 CONFIG_BNXT_SRIOV=y
 CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_IWLWIFI=m
 CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
@ -1874,6 +1894,7 @@ CONFIG_P54_PCI=m
 CONFIG_MWL8K=m
 # CONFIG_PRISM54 is not set
 # CONFIG_PCMCIA_WL3501 is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
 CONFIG_RSI_SDIO=m
@ -1882,7 +1903,9 @@ CONFIG_RT2X00=m
 CONFIG_RT2X00_LIB_DEBUGFS=y
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_WL_MEDIATEK=y
 CONFIG_WLAN_VENDOR_MEDIATEK=y
 CONFIG_MT7601U=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2400PCI=m
 CONFIG_RT2500PCI=m
 CONFIG_RT61PCI=m
@ -1902,6 +1925,7 @@ CONFIG_RT2800PCI_RT53XX=y
 CONFIG_RT73USB=m
 CONFIG_RTL8180=m
 CONFIG_RTL8187=m
 CONFIG_WLAN_VENDOR_ZYDAS=y
 # CONFIG_USB_ZD1201 is not set
 # CONFIG_USB_NET_SR9800 is not set
 CONFIG_USB_NET_RNDIS_WLAN=m
@ -1913,13 +1937,20 @@ CONFIG_USB_NET_CH9200=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_WLAN_VENDOR_TI=y
 CONFIG_WL12XX=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
 CONFIG_WL18XX=m
 CONFIG_WLCORE_SDIO=m
 CONFIG_WLCORE_SPI=m
 CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_RTL_CARDS=m
 CONFIG_WLAN_VENDOR_REALTEK=y
 CONFIG_RTLWIFI=m
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
@ -1947,6 +1978,7 @@ CONFIG_IEEE802154_FAKELB=m
 CONFIG_IEEE802154_ATUSB=m
 CONFIG_IEEE802154_CC2520=m
 # CONFIG_IEEE802154_AT86RF230 is not set
 # CONFIG_IEEE802154_ADF7242 is not set
 # CONFIG_IEEE802154_MRF24J40 is not set
 # CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
 # CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
@ -1967,7 +1999,13 @@ CONFIG_6LOWPAN_NHC_IPV6=m
 CONFIG_6LOWPAN_NHC_MOBILITY=m
 CONFIG_6LOWPAN_NHC_ROUTING=m
 CONFIG_6LOWPAN_NHC_UDP=m
-
+CONFIG_6LOWPAN_DEBUGFS=y
 CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
 CONFIG_6LOWPAN_GHC_UDP=m
 CONFIG_6LOWPAN_GHC_ICMPV6=m
 CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
 CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
 CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
 #
 # Token Ring devices
@ -2068,11 +2106,14 @@ CONFIG_NFC_ST21NFCA=m
 CONFIG_NFC_ST21NFCA_I2C=m
 # CONFIG_NFC_ST21NFCB is not set
 # CONFIG_NFC_ST21NFCB_I2C is not set
 # CONFIG_NFC_ST95HF is not set
 # CONFIG_NFC_NXP_NCI is not set
 # CONFIG_NFC_NCI_SPI is not set
 # CONFIG_NFC_NCI_UART is not set
 # CONFIG_NFC_ST_NCI is not set
 # CONFIG_NFC_ST_NCI_I2C is not set
 # CONFIG_NFC_S3FWRN5_I2C is not set
 # CONFIG_NFC_ST_NCI_SPI is not set
 # CONFIG_NFC_FDP is not set
 # CONFIG_NFC_MRVL_I2C is not set
 # CONFIG_NFC_MRVL_SPI is not set
@ -4413,6 +4454,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
 CONFIG_QUOTACTL=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
 CONFIG_DNOTIFY=y
 # Autofsv3 is obsolete.
 # systemd is dependant upon AUTOFS, so build it in.
--- a/1
+++ b/1
@ -352,6 +352,7 @@ CONFIG_I2C_MPC=m
 # CONFIG_IBM_EMAC is not set
 # CONFIG_NET_VENDOR_PASEMI is not set
 # CONFIG_NET_VENDOR_TOSHIBA is not set
 CONFIG_IBMVNIC=m
 CONFIG_MDIO_OCTEON=m
--- a/5
+++ b/5
@ -138,6 +138,10 @@ CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
 CONFIG_CRYPTO_DEV_QAT_C3XXX=m
 CONFIG_CRYPTO_DEV_QAT_C62X=m
 CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_GENERIC_ISA_DMA=y
@ -175,6 +179,7 @@ CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m
 CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
 #rhbz 997149
 # CONFIG_DELL_RBU is not set
--- a/2
+++ b/2
@ -1 +1 @@
-03891f9c853d5c4473224478a1e03ea00d70ff8d
+67990608c8b95d2b8ccc29932376ae73d5818727
--- a/kbuild-AFTER_LINK.patch
+++ b/kbuild-AFTER_LINK.patch
@ -111,7 +111,7 @@ index dacf71a..72cbefd 100755
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh
@@ -65,6 +65,10 @@ vmlinux_link()
- 			-lutil -lrt ${1}
+ 			-lutil -lrt -lpthread ${1}
 		rm -f linux
 	fi
 +	if [ -n "${AFTER_LINK}" ]; then
--- a/kernel.spec
+++ b/kernel.spec
@ -67,7 +67,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@ -600,30 +600,9 @@ Patch603: ptrace-being-capable-wrt-a-process-requires-mapped-u.patch
 Patch604: drm-i915-shut-up-gen8-SDE-irq-dmesg-noise-again.patch
 #rhbz 1275718
 Patch605: 0001-device-property-always-check-for-fwnode-type.patch
 Patch606: 0002-device-property-rename-helper-functions.patch
 Patch607: 0003-device-property-refactor-built-in-properties-support.patch
 Patch608: 0004-device-property-keep-single-value-inplace.patch
 Patch609: 0005-device-property-helper-macros-for-property-entry-cre.patch
 Patch610: 0006-device-property-improve-readability-of-macros.patch
 Patch611: 0007-device-property-return-EINVAL-when-property-isn-t-fo.patch
 Patch612: 0008-device-property-Fallback-to-secondary-fwnode-if-prim.patch
 Patch613: 0009-device-property-Take-a-copy-of-the-property-set.patch
 Patch614: 0010-driver-core-platform-Add-support-for-built-in-device.patch
 Patch615: 0011-driver-core-Do-not-overwrite-secondary-fwnode-with-N.patch
 Patch616: 0012-mfd-core-propagate-device-properties-to-sub-devices-.patch
 Patch617: 0013-mfd-intel-lpss-Add-support-for-passing-device-proper.patch
 Patch618: 0014-mfd-intel-lpss-Pass-SDA-hold-time-to-I2C-host-contro.patch
 Patch619: 0015-mfd-intel-lpss-Pass-HSUART-configuration-via-propert.patch
 Patch620: 0016-i2c-designware-Convert-to-use-unified-device-propert.patch
 #rhbz 1295646
 Patch621: drm-udl-Use-unlocked-gem-unreferencing.patch
 #rhbz 1083853
 Patch622: PNP-Add-Broadwell-to-Intel-MCH-size-workaround.patch
 #CVE-2015-7566 rhbz 1296466 1297517
 Patch623: usb-serial-visor-fix-crash-on-detecting-device-witho.patch
@ -2072,6 +2051,9 @@ fi
 #
 # 
 %changelog
 * Wed Jan 13 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc0.git2.1
 - Linux v4.4-3408-g6799060
 * Tue Jan 12 2016 Justin M. Forbes <jforbes@fedoraproject.org>
 - drop i915 patch to turn off wc mmaps
--- a/2
+++ b/2
@ -1,3 +1,3 @@
 9a78fa2eb6c68ca5a40ed5af08142599  linux-4.4.tar.xz
 dcbc8fe378a676d5d0dd208cf524e144  perf-man-4.4.tar.gz
-b54922aeee0ed906b2b19bf4a57d5def  patch-4.4-git1.xz
+08dc24ebd126ceb03241c15a29c298a1  patch-4.4-git2.xz
`@ -1 +1 @@`
	`03891f9c853d5c4473224478a1e03ea00d70ff8d`	`67990608c8b95d2b8ccc29932376ae73d5818727`