diff options
| author | Stijn Segers <foss@volatilesystems.org> | 2018-06-29 22:29:06 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-07-02 07:06:23 +0200 |
| commit | ab7cabd09df542cf3558725573c2ef2cf1c7cdff (patch) | |
| tree | 791b3f74b7c5e60f1409836871287337f4cf0e38 /target/linux/mediatek/patches-4.14/0118-soc-mediatek-pwrap-add-pwrap_write32-for-writing-in-.patch | |
| parent | c96b344466fc80cb5815eeab87c6ca9a29fb9207 (diff) | |
| download | upstream-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.tar.gz upstream-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.tar.bz2 upstream-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.zip | |
kernel: bump 4.14 to 4.14.52 for 18.06
Compile-tested on: ramips/mt7621, x86/64.
Run-tested on: ramips/mt7621.
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/mediatek/patches-4.14/0118-soc-mediatek-pwrap-add-pwrap_write32-for-writing-in-.patch')
| -rw-r--r-- | target/linux/mediatek/patches-4.14/0118-soc-mediatek-pwrap-add-pwrap_write32-for-writing-in-.patch | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/mediatek/patches-4.14/0118-soc-mediatek-pwrap-add-pwrap_write32-for-writing-in-.patch b/target/linux/mediatek/patches-4.14/0118-soc-mediatek-pwrap-add-pwrap_write32-for-writing-in-.patch index 6048d6e40b..0fb60f37bb 100644 --- a/target/linux/mediatek/patches-4.14/0118-soc-mediatek-pwrap-add-pwrap_write32-for-writing-in-.patch +++ b/target/linux/mediatek/patches-4.14/0118-soc-mediatek-pwrap-add-pwrap_write32-for-writing-in-.patch @@ -18,8 +18,6 @@ Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> drivers/soc/mediatek/mtk-pmic-wrap.c | 70 +++++++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 16 deletions(-) -diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c -index 06930e2ebe4c..2d3a8faae124 100644 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c @@ -507,6 +507,7 @@ struct pwrap_slv_type { @@ -30,7 +28,7 @@ index 06930e2ebe4c..2d3a8faae124 100644 }; struct pmic_wrapper { -@@ -601,22 +602,6 @@ static int pwrap_wait_for_state(struct pmic_wrapper *wrp, +@@ -601,22 +602,6 @@ static int pwrap_wait_for_state(struct p } while (1); } @@ -53,7 +51,7 @@ index 06930e2ebe4c..2d3a8faae124 100644 static int pwrap_read16(struct pmic_wrapper *wrp, u32 adr, u32 *rdata) { int ret; -@@ -673,6 +658,56 @@ static int pwrap_read(struct pmic_wrapper *wrp, u32 adr, u32 *rdata) +@@ -673,6 +658,56 @@ static int pwrap_read(struct pmic_wrappe return wrp->slave->pwrap_read(wrp, adr, rdata); } @@ -110,7 +108,7 @@ index 06930e2ebe4c..2d3a8faae124 100644 static int pwrap_regmap_read(void *context, u32 adr, u32 *rdata) { return pwrap_read(context, adr, rdata); -@@ -1082,18 +1117,21 @@ static const struct pwrap_slv_type pmic_mt6323 = { +@@ -1082,18 +1117,21 @@ static const struct pwrap_slv_type pmic_ .dew_regs = mt6323_regs, .type = PMIC_MT6323, .pwrap_read = pwrap_read16, @@ -132,6 +130,3 @@ index 06930e2ebe4c..2d3a8faae124 100644 }; static const struct of_device_id of_slave_match_tbl[] = { --- -2.11.0 - |