aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches/0006-soc-mediatek-Add-infracfg-misc-driver-support.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-12-02 21:52:41 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-12-02 21:52:41 +0000
commitf0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0 (patch)
treef4e3850683bbb922227f58993e41a4784a670932 /target/linux/mediatek/patches/0006-soc-mediatek-Add-infracfg-misc-driver-support.patch
parent40a09b93d274737c704165f687149b4956fbd45c (diff)
downloadupstream-f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0.tar.gz
upstream-f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0.tar.bz2
upstream-f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0.zip
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
Diffstat (limited to 'target/linux/mediatek/patches/0006-soc-mediatek-Add-infracfg-misc-driver-support.patch')
-rw-r--r--target/linux/mediatek/patches/0006-soc-mediatek-Add-infracfg-misc-driver-support.patch13
1 files changed, 0 insertions, 13 deletions
diff --git a/target/linux/mediatek/patches/0006-soc-mediatek-Add-infracfg-misc-driver-support.patch b/target/linux/mediatek/patches/0006-soc-mediatek-Add-infracfg-misc-driver-support.patch
index f47c19373e..96652d4998 100644
--- a/target/linux/mediatek/patches/0006-soc-mediatek-Add-infracfg-misc-driver-support.patch
+++ b/target/linux/mediatek/patches/0006-soc-mediatek-Add-infracfg-misc-driver-support.patch
@@ -18,8 +18,6 @@ Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
create mode 100644 drivers/soc/mediatek/mtk-infracfg.c
create mode 100644 include/linux/soc/mediatek/infracfg.h
-diff --git a/drivers/soc/mediatek/Kconfig b/drivers/soc/mediatek/Kconfig
-index 3c18503..09da41e 100644
--- a/drivers/soc/mediatek/Kconfig
+++ b/drivers/soc/mediatek/Kconfig
@@ -1,6 +1,15 @@
@@ -38,16 +36,11 @@ index 3c18503..09da41e 100644
config MTK_PMIC_WRAP
tristate "MediaTek PMIC Wrapper Support"
depends on ARCH_MEDIATEK
-diff --git a/drivers/soc/mediatek/Makefile b/drivers/soc/mediatek/Makefile
-index ecaf4de..3fa940f 100644
--- a/drivers/soc/mediatek/Makefile
+++ b/drivers/soc/mediatek/Makefile
@@ -1 +1,2 @@
+obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o
obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o
-diff --git a/drivers/soc/mediatek/mtk-infracfg.c b/drivers/soc/mediatek/mtk-infracfg.c
-new file mode 100644
-index 0000000..ca786e0
--- /dev/null
+++ b/drivers/soc/mediatek/mtk-infracfg.c
@@ -0,0 +1,91 @@
@@ -142,9 +135,6 @@ index 0000000..ca786e0
+
+ return 0;
+}
-diff --git a/include/linux/soc/mediatek/infracfg.h b/include/linux/soc/mediatek/infracfg.h
-new file mode 100644
-index 0000000..a5714e9
--- /dev/null
+++ b/include/linux/soc/mediatek/infracfg.h
@@ -0,0 +1,26 @@
@@ -174,6 +164,3 @@ index 0000000..a5714e9
+int mtk_infracfg_clear_bus_protection(struct regmap *infracfg, u32 mask);
+
+#endif /* __SOC_MEDIATEK_INFRACFG_H */
---
-1.7.10.4
-