kernel: update 4.1 to 4.1.13
- two upstreamed patches removed - compile tested all targets using 4.1 - run tested ar71xx Signed-off-by: Roman Yeryomin <roman@advem.lv> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47694
This commit is contained in:
@@ -18,8 +18,6 @@ Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
|
||||
drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 10 ++--------
|
||||
2 files changed, 6 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8135.c b/drivers/pinctrl/mediatek/pinctrl-mt8135.c
|
||||
index f1e1e18..8e6abd5 100644
|
||||
--- a/drivers/pinctrl/mediatek/pinctrl-mt8135.c
|
||||
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8135.c
|
||||
@@ -32,12 +32,12 @@
|
||||
@@ -39,7 +37,7 @@ index f1e1e18..8e6abd5 100644
|
||||
unsigned char r1_bit;
|
||||
};
|
||||
|
||||
@@ -305,7 +305,6 @@ static const struct mtk_pinctrl_devdata mt8135_pinctrl_data = {
|
||||
@@ -305,7 +305,6 @@ static const struct mtk_pinctrl_devdata
|
||||
.pullen_offset = 0x0200,
|
||||
.smt_offset = 0x0300,
|
||||
.pullsel_offset = 0x0400,
|
||||
@@ -47,7 +45,7 @@ index f1e1e18..8e6abd5 100644
|
||||
.dout_offset = 0x0800,
|
||||
.din_offset = 0x0A00,
|
||||
.pinmux_offset = 0x0C00,
|
||||
@@ -314,7 +313,6 @@ static const struct mtk_pinctrl_devdata mt8135_pinctrl_data = {
|
||||
@@ -314,7 +313,6 @@ static const struct mtk_pinctrl_devdata
|
||||
.port_shf = 4,
|
||||
.port_mask = 0xf,
|
||||
.port_align = 4,
|
||||
@@ -55,8 +53,6 @@ index f1e1e18..8e6abd5 100644
|
||||
.eint_offsets = {
|
||||
.name = "mt8135_eint",
|
||||
.stat = 0x000,
|
||||
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
|
||||
index 375771d..1508849 100644
|
||||
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
|
||||
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
|
||||
@@ -19,8 +19,6 @@
|
||||
@@ -111,6 +107,3 @@ index 375771d..1508849 100644
|
||||
struct mtk_eint_offsets eint_offsets;
|
||||
unsigned int ap_num;
|
||||
unsigned int db_cnt;
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
Reference in New Issue
Block a user