aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mxs/patches-4.1/102-mxs-add-regulator-driver.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-08-05 13:55:14 +0000
committerJonas Gorski <jogo@openwrt.org>2015-08-05 13:55:14 +0000
commit6afe475aba0d3c7cbf6b88f9d06fce1961de52f4 (patch)
tree0205a1bbe0f2e29a62e0c85e9ccc3469419c3c63 /target/linux/mxs/patches-4.1/102-mxs-add-regulator-driver.patch
parent554bdf8130a518481e26fb22123e42b6ba48343e (diff)
downloadmaster-187ad058-6afe475aba0d3c7cbf6b88f9d06fce1961de52f4.tar.gz
master-187ad058-6afe475aba0d3c7cbf6b88f9d06fce1961de52f4.tar.bz2
master-187ad058-6afe475aba0d3c7cbf6b88f9d06fce1961de52f4.zip
kernel: update 4.1 to 4.1.4
Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.4 Signed-off-by: Daniel Golle <daniel@makrotopia.org> [jogo: fix brcm2708 patches, refresh target patches] Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46560 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mxs/patches-4.1/102-mxs-add-regulator-driver.patch')
-rw-r--r--target/linux/mxs/patches-4.1/102-mxs-add-regulator-driver.patch9
1 files changed, 1 insertions, 8 deletions
diff --git a/target/linux/mxs/patches-4.1/102-mxs-add-regulator-driver.patch b/target/linux/mxs/patches-4.1/102-mxs-add-regulator-driver.patch
index 7ca14f114c..4690b3c6d4 100644
--- a/target/linux/mxs/patches-4.1/102-mxs-add-regulator-driver.patch
+++ b/target/linux/mxs/patches-4.1/102-mxs-add-regulator-driver.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
-index a6f116a..7b525f5 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -450,6 +450,14 @@ config REGULATOR_MT6397
@@ -17,11 +15,9 @@ index a6f116a..7b525f5 100644
config REGULATOR_PALMAS
tristate "TI Palmas PMIC Regulators"
depends on MFD_PALMAS
-diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
-index 2c4da15..a3ebf23 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
-@@ -60,6 +60,7 @@ obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
+@@ -60,6 +60,7 @@ obj-$(CONFIG_REGULATOR_MC13783) += mc137
obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
obj-$(CONFIG_REGULATOR_MC13XXX_CORE) += mc13xxx-regulator-core.o
obj-$(CONFIG_REGULATOR_MT6397) += mt6397-regulator.o
@@ -29,9 +25,6 @@ index 2c4da15..a3ebf23 100644
obj-$(CONFIG_REGULATOR_QCOM_RPM) += qcom_rpm-regulator.o
obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o
-diff --git a/drivers/regulator/mxs-regulator.c b/drivers/regulator/mxs-regulator.c
-new file mode 100644
-index 0000000..e53707b
--- /dev/null
+++ b/drivers/regulator/mxs-regulator.c
@@ -0,0 +1,540 @@