diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2014-02-13 13:27:14 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2014-02-13 13:27:14 +0000 |
commit | 2aeabcb857e32494bdb8385a2fb5c8c529fe35be (patch) | |
tree | 7a8f6420d307615cbedc82fbc6ad2e498a5a1ca8 /target/linux/sunxi/patches-3.13/201-reset-add-of_reset_control_get.patch | |
parent | 87573f9583f900bc82fe435ebbcff8dd72c88205 (diff) | |
download | upstream-2aeabcb857e32494bdb8385a2fb5c8c529fe35be.tar.gz upstream-2aeabcb857e32494bdb8385a2fb5c8c529fe35be.tar.bz2 upstream-2aeabcb857e32494bdb8385a2fb5c8c529fe35be.zip |
upgrade 3.13 targets to 3.13.2, refresh patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39582 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-3.13/201-reset-add-of_reset_control_get.patch')
-rw-r--r-- | target/linux/sunxi/patches-3.13/201-reset-add-of_reset_control_get.patch | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/target/linux/sunxi/patches-3.13/201-reset-add-of_reset_control_get.patch b/target/linux/sunxi/patches-3.13/201-reset-add-of_reset_control_get.patch index 73ecca10f7..2ff47a785e 100644 --- a/target/linux/sunxi/patches-3.13/201-reset-add-of_reset_control_get.patch +++ b/target/linux/sunxi/patches-3.13/201-reset-add-of_reset_control_get.patch @@ -15,11 +15,9 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> include/linux/reset.h | 4 ++++ 2 files changed, 34 insertions(+), 9 deletions(-) -diff --git a/drivers/reset/core.c b/drivers/reset/core.c -index d1b6089..4f3dda7 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c -@@ -127,15 +127,16 @@ int reset_control_deassert(struct reset_control *rstc) +@@ -127,15 +127,16 @@ int reset_control_deassert(struct reset_ EXPORT_SYMBOL_GPL(reset_control_deassert); /** @@ -39,7 +37,7 @@ index d1b6089..4f3dda7 100644 { struct reset_control *rstc = ERR_PTR(-EPROBE_DEFER); struct reset_controller_dev *r, *rcdev; -@@ -144,13 +145,10 @@ struct reset_control *reset_control_get(struct device *dev, const char *id) +@@ -144,13 +145,10 @@ struct reset_control *reset_control_get( int rstc_id; int ret; @@ -55,7 +53,7 @@ index d1b6089..4f3dda7 100644 index, &args); if (ret) return ERR_PTR(ret); -@@ -185,12 +183,35 @@ struct reset_control *reset_control_get(struct device *dev, const char *id) +@@ -185,12 +183,35 @@ struct reset_control *reset_control_get( return ERR_PTR(-ENOMEM); } @@ -92,8 +90,6 @@ index d1b6089..4f3dda7 100644 EXPORT_SYMBOL_GPL(reset_control_get); /** -diff --git a/include/linux/reset.h b/include/linux/reset.h -index 6082247..a398025 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h @@ -1,6 +1,8 @@ @@ -105,7 +101,7 @@ index 6082247..a398025 100644 struct device; struct reset_control; -@@ -8,6 +10,8 @@ +@@ -8,6 +10,8 @@ int reset_control_reset(struct reset_con int reset_control_assert(struct reset_control *rstc); int reset_control_deassert(struct reset_control *rstc); @@ -114,6 +110,3 @@ index 6082247..a398025 100644 struct reset_control *reset_control_get(struct device *dev, const char *id); void reset_control_put(struct reset_control *rstc); struct reset_control *devm_reset_control_get(struct device *dev, const char *id); --- -1.8.5.1 - |