diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:50:41 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:50:41 +0000 |
commit | ba3a749f9b29b40784bb576651142c601d4a7211 (patch) | |
tree | 5adb2f84ad87b100b0a0bde6f1e0407aa32203e1 /target/linux/sunxi/patches-4.4/140-reset-add-of_reset_control_get_by_index.patch | |
parent | bd99318c820c47af63c30dcf12fb3f929c257180 (diff) | |
download | master-31e0f0ae-ba3a749f9b29b40784bb576651142c601d4a7211.tar.gz master-31e0f0ae-ba3a749f9b29b40784bb576651142c601d4a7211.tar.bz2 master-31e0f0ae-ba3a749f9b29b40784bb576651142c601d4a7211.zip |
kernel: refresh patches for kernel 4.4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 48222
Diffstat (limited to 'target/linux/sunxi/patches-4.4/140-reset-add-of_reset_control_get_by_index.patch')
-rw-r--r-- | target/linux/sunxi/patches-4.4/140-reset-add-of_reset_control_get_by_index.patch | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/sunxi/patches-4.4/140-reset-add-of_reset_control_get_by_index.patch b/target/linux/sunxi/patches-4.4/140-reset-add-of_reset_control_get_by_index.patch index 1a48d7c23f..c7e0e2bf64 100644 --- a/target/linux/sunxi/patches-4.4/140-reset-add-of_reset_control_get_by_index.patch +++ b/target/linux/sunxi/patches-4.4/140-reset-add-of_reset_control_get_by_index.patch @@ -16,11 +16,9 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> include/linux/reset.h | 9 +++++++++ 2 files changed, 38 insertions(+), 11 deletions(-) -diff --git a/drivers/reset/core.c b/drivers/reset/core.c -index 7955e00..81ae17d 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c -@@ -141,27 +141,24 @@ int reset_control_status(struct reset_control *rstc) +@@ -141,27 +141,24 @@ int reset_control_status(struct reset_co EXPORT_SYMBOL_GPL(reset_control_status); /** @@ -56,7 +54,7 @@ index 7955e00..81ae17d 100644 ret = of_parse_phandle_with_args(node, "resets", "#reset-cells", index, &args); if (ret) -@@ -202,6 +199,27 @@ struct reset_control *of_reset_control_get(struct device_node *node, +@@ -202,6 +199,27 @@ struct reset_control *of_reset_control_g return rstc; } @@ -84,11 +82,9 @@ index 7955e00..81ae17d 100644 EXPORT_SYMBOL_GPL(of_reset_control_get); /** -diff --git a/include/linux/reset.h b/include/linux/reset.h -index 7f65f9c..6db74ad 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h -@@ -38,6 +38,9 @@ static inline struct reset_control *devm_reset_control_get_optional( +@@ -38,6 +38,9 @@ static inline struct reset_control *devm struct reset_control *of_reset_control_get(struct device_node *node, const char *id); @@ -98,7 +94,7 @@ index 7f65f9c..6db74ad 100644 #else static inline int reset_control_reset(struct reset_control *rstc) -@@ -106,6 +109,12 @@ static inline struct reset_control *of_reset_control_get( +@@ -106,6 +109,12 @@ static inline struct reset_control *of_r return ERR_PTR(-ENOSYS); } |