aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches-4.14/0161-pwm-mediatek-Add-MT2712-MT7622-support.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-05-29 00:10:44 +0300
committerStijn Tintel <stijn@linux-ipv6.be>2018-05-29 00:53:15 +0300
commit64b53247c494898eaa78090fbc0a0727fce055d2 (patch)
tree097f1bf24fd6593244f9de7125751d802a2ef3e2 /target/linux/mediatek/patches-4.14/0161-pwm-mediatek-Add-MT2712-MT7622-support.patch
parentf4a639a3d7d40b4f63c431c2d554c479fbcc6b74 (diff)
downloadupstream-64b53247c494898eaa78090fbc0a0727fce055d2.tar.gz
upstream-64b53247c494898eaa78090fbc0a0727fce055d2.tar.bz2
upstream-64b53247c494898eaa78090fbc0a0727fce055d2.zip
kernel: bump 4.14 to 4.14.44
Refresh patches. Remove upstreamed patch: generic/pending/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch Update patches that no longer applies: generic/hack/901-debloat_sock_diag.patch Compile-tested on: x86/64. Runtime-tested on: x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/mediatek/patches-4.14/0161-pwm-mediatek-Add-MT2712-MT7622-support.patch')
-rw-r--r--target/linux/mediatek/patches-4.14/0161-pwm-mediatek-Add-MT2712-MT7622-support.patch15
1 files changed, 5 insertions, 10 deletions
diff --git a/target/linux/mediatek/patches-4.14/0161-pwm-mediatek-Add-MT2712-MT7622-support.patch b/target/linux/mediatek/patches-4.14/0161-pwm-mediatek-Add-MT2712-MT7622-support.patch
index 2d91ab98a9..bca6ed5bbb 100644
--- a/target/linux/mediatek/patches-4.14/0161-pwm-mediatek-Add-MT2712-MT7622-support.patch
+++ b/target/linux/mediatek/patches-4.14/0161-pwm-mediatek-Add-MT2712-MT7622-support.patch
@@ -15,8 +15,6 @@ Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
drivers/pwm/pwm-mediatek.c | 53 ++++++++++++++++++++++++++++++++++++++--------
1 file changed, 44 insertions(+), 9 deletions(-)
-diff --git a/drivers/pwm/pwm-mediatek.c b/drivers/pwm/pwm-mediatek.c
-index b52f3afb2ba1..f5d97e0ad52b 100644
--- a/drivers/pwm/pwm-mediatek.c
+++ b/drivers/pwm/pwm-mediatek.c
@@ -16,6 +16,7 @@
@@ -60,7 +58,7 @@ index b52f3afb2ba1..f5d97e0ad52b 100644
static inline struct mtk_pwm_chip *to_mtk_pwm_chip(struct pwm_chip *chip)
{
return container_of(chip, struct mtk_pwm_chip, chip);
-@@ -103,14 +116,14 @@ static void mtk_pwm_clk_disable(struct pwm_chip *chip, struct pwm_device *pwm)
+@@ -103,14 +116,14 @@ static void mtk_pwm_clk_disable(struct p
static inline u32 mtk_pwm_readl(struct mtk_pwm_chip *chip, unsigned int num,
unsigned int offset)
{
@@ -77,7 +75,7 @@ index b52f3afb2ba1..f5d97e0ad52b 100644
}
static int mtk_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
-@@ -185,6 +198,7 @@ static const struct pwm_ops mtk_pwm_ops = {
+@@ -185,6 +198,7 @@ static const struct pwm_ops mtk_pwm_ops
static int mtk_pwm_probe(struct platform_device *pdev)
{
@@ -85,7 +83,7 @@ index b52f3afb2ba1..f5d97e0ad52b 100644
struct mtk_pwm_chip *pc;
struct resource *res;
unsigned int i;
-@@ -194,15 +208,22 @@ static int mtk_pwm_probe(struct platform_device *pdev)
+@@ -194,15 +208,22 @@ static int mtk_pwm_probe(struct platform
if (!pc)
return -ENOMEM;
@@ -110,7 +108,7 @@ index b52f3afb2ba1..f5d97e0ad52b 100644
}
platform_set_drvdata(pdev, pc);
-@@ -210,7 +231,7 @@ static int mtk_pwm_probe(struct platform_device *pdev)
+@@ -210,7 +231,7 @@ static int mtk_pwm_probe(struct platform
pc->chip.dev = &pdev->dev;
pc->chip.ops = &mtk_pwm_ops;
pc->chip.base = -1;
@@ -119,7 +117,7 @@ index b52f3afb2ba1..f5d97e0ad52b 100644
ret = pwmchip_add(&pc->chip);
if (ret < 0) {
-@@ -228,9 +249,23 @@ static int mtk_pwm_remove(struct platform_device *pdev)
+@@ -228,9 +249,23 @@ static int mtk_pwm_remove(struct platfor
return pwmchip_remove(&pc->chip);
}
@@ -145,6 +143,3 @@ index b52f3afb2ba1..f5d97e0ad52b 100644
};
MODULE_DEVICE_TABLE(of, mtk_pwm_of_match);
---
-2.11.0
-