aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mxs/patches-4.4
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-02-25 21:54:39 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2016-02-25 21:54:39 +0000
commitcb04b8d58201f6aa35f99b76ee8b3435beb7a01e (patch)
treef6b54298f21d3ba2166fd1621f86390e5c554f1a /target/linux/mxs/patches-4.4
parent53814290e7f58f205c74ad1c2f8cedb7e1c2b5ef (diff)
downloadupstream-cb04b8d58201f6aa35f99b76ee8b3435beb7a01e.tar.gz
upstream-cb04b8d58201f6aa35f99b76ee8b3435beb7a01e.tar.bz2
upstream-cb04b8d58201f6aa35f99b76ee8b3435beb7a01e.zip
kernel: update kernel 4.4 to version 4.4.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 48783
Diffstat (limited to 'target/linux/mxs/patches-4.4')
-rw-r--r--target/linux/mxs/patches-4.4/101-mxs-add-mxs_power.patch4
-rw-r--r--target/linux/mxs/patches-4.4/102-mxs-add-regulator-driver.patch10
-rw-r--r--target/linux/mxs/patches-4.4/103-dt-enable-regulator.patch4
-rw-r--r--target/linux/mxs/patches-4.4/110-crypto-mxsdcp-provide-importexport.patch10
4 files changed, 11 insertions, 17 deletions
diff --git a/target/linux/mxs/patches-4.4/101-mxs-add-mxs_power.patch b/target/linux/mxs/patches-4.4/101-mxs-add-mxs_power.patch
index 104736c7c0..ed25042f95 100644
--- a/target/linux/mxs/patches-4.4/101-mxs-add-mxs_power.patch
+++ b/target/linux/mxs/patches-4.4/101-mxs-add-mxs_power.patch
@@ -17,9 +17,9 @@
depends on MFD_WM831X
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
-@@ -10,6 +10,7 @@ obj-$(CONFIG_GENERIC_ADC_BATTERY) += gen
- obj-$(CONFIG_PDA_POWER) += pda_power.o
+@@ -11,6 +11,7 @@ obj-$(CONFIG_PDA_POWER) += pda_power.o
obj-$(CONFIG_APM_POWER) += apm_power.o
+ obj-$(CONFIG_AXP20X_POWER) += axp20x_usb_power.o
obj-$(CONFIG_MAX8925_POWER) += max8925_power.o
+obj-$(CONFIG_MXS_POWER) += mxs_power.o
obj-$(CONFIG_WM831X_BACKUP) += wm831x_backup.o
diff --git a/target/linux/mxs/patches-4.4/102-mxs-add-regulator-driver.patch b/target/linux/mxs/patches-4.4/102-mxs-add-regulator-driver.patch
index 4690b3c6d4..cb658c9aee 100644
--- a/target/linux/mxs/patches-4.4/102-mxs-add-regulator-driver.patch
+++ b/target/linux/mxs/patches-4.4/102-mxs-add-regulator-driver.patch
@@ -1,6 +1,6 @@
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
-@@ -450,6 +450,14 @@ config REGULATOR_MT6397
+@@ -461,6 +461,14 @@ config REGULATOR_MT6397
This driver supports the control of different power rails of device
through regulator interface.
@@ -17,14 +17,14 @@
depends on MFD_PALMAS
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
-@@ -60,6 +60,7 @@ obj-$(CONFIG_REGULATOR_MC13783) += mc137
- obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
+@@ -61,6 +61,7 @@ obj-$(CONFIG_REGULATOR_MC13892) += mc138
obj-$(CONFIG_REGULATOR_MC13XXX_CORE) += mc13xxx-regulator-core.o
+ obj-$(CONFIG_REGULATOR_MT6311) += mt6311-regulator.o
obj-$(CONFIG_REGULATOR_MT6397) += mt6397-regulator.o
+obj-$(CONFIG_REGULATOR_MXS) += mxs-regulator.o
obj-$(CONFIG_REGULATOR_QCOM_RPM) += qcom_rpm-regulator.o
- obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
- obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o
+ obj-$(CONFIG_REGULATOR_QCOM_SMD_RPM) += qcom_smd-regulator.o
+ obj-$(CONFIG_REGULATOR_QCOM_SPMI) += qcom_spmi-regulator.o
--- /dev/null
+++ b/drivers/regulator/mxs-regulator.c
@@ -0,0 +1,540 @@
diff --git a/target/linux/mxs/patches-4.4/103-dt-enable-regulator.patch b/target/linux/mxs/patches-4.4/103-dt-enable-regulator.patch
index bfcf247f85..39ea0350f3 100644
--- a/target/linux/mxs/patches-4.4/103-dt-enable-regulator.patch
+++ b/target/linux/mxs/patches-4.4/103-dt-enable-regulator.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
-@@ -404,8 +404,46 @@
+@@ -439,8 +439,46 @@
};
power@80044000 {
@@ -50,7 +50,7 @@
saif1: saif@80046000 {
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
-@@ -1035,8 +1035,46 @@
+@@ -1037,8 +1037,46 @@
};
power: power@80044000 {
diff --git a/target/linux/mxs/patches-4.4/110-crypto-mxsdcp-provide-importexport.patch b/target/linux/mxs/patches-4.4/110-crypto-mxsdcp-provide-importexport.patch
index 5aa3d7dc36..d23e7c8569 100644
--- a/target/linux/mxs/patches-4.4/110-crypto-mxsdcp-provide-importexport.patch
+++ b/target/linux/mxs/patches-4.4/110-crypto-mxsdcp-provide-importexport.patch
@@ -21,11 +21,9 @@ Changes since v2:
drivers/crypto/mxs-dcp.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
-diff --git a/drivers/crypto/mxs-dcp.c b/drivers/crypto/mxs-dcp.c
-index 59ed54e..1e2017f 100644
--- a/drivers/crypto/mxs-dcp.c
+++ b/drivers/crypto/mxs-dcp.c
-@@ -775,6 +775,24 @@ static void dcp_sha_cra_exit(struct crypto_tfm *tfm)
+@@ -775,6 +775,24 @@ static void dcp_sha_cra_exit(struct cryp
{
}
@@ -62,7 +60,7 @@ index 59ed54e..1e2017f 100644
.base = {
.cra_name = "sha1",
.cra_driver_name = "sha1-dcp",
-@@ -858,8 +879,11 @@ static struct ahash_alg dcp_sha256_alg = {
+@@ -858,8 +879,11 @@ static struct ahash_alg dcp_sha256_alg =
.final = dcp_sha_final,
.finup = dcp_sha_finup,
.digest = dcp_sha_digest,
@@ -74,7 +72,3 @@ index 59ed54e..1e2017f 100644
.base = {
.cra_name = "sha256",
.cra_driver_name = "sha256-dcp",
---
-1.9.1
-
---