diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-08-05 13:55:14 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-08-05 13:55:14 +0000 |
| commit | caa73eb95c490e850d517cb558e4161c2f06d86f (patch) | |
| tree | 615a1a64e1cfaaf0220f5c9ae49d465ee8566168 /target/linux/mxs | |
| parent | 0b15f91ed6d556aafcd56ffabb9da7ba83b317f5 (diff) | |
| download | master-31e0f0ae-caa73eb95c490e850d517cb558e4161c2f06d86f.tar.gz master-31e0f0ae-caa73eb95c490e850d517cb558e4161c2f06d86f.tar.bz2 master-31e0f0ae-caa73eb95c490e850d517cb558e4161c2f06d86f.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>
SVN-Revision: 46560
Diffstat (limited to 'target/linux/mxs')
5 files changed, 4 insertions, 24 deletions
diff --git a/target/linux/mxs/patches-4.1/100-mxs-select-syscon.patch b/target/linux/mxs/patches-4.1/100-mxs-select-syscon.patch index 96173c12fb..81ebec4774 100644 --- a/target/linux/mxs/patches-4.1/100-mxs-select-syscon.patch +++ b/target/linux/mxs/patches-4.1/100-mxs-select-syscon.patch @@ -1,5 +1,3 @@ -diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig -index 8479413..bf04d38 100644 --- a/arch/arm/mach-mxs/Kconfig +++ b/arch/arm/mach-mxs/Kconfig @@ -17,6 +17,7 @@ config ARCH_MXS diff --git a/target/linux/mxs/patches-4.1/101-mxs-add-mxs_power.patch b/target/linux/mxs/patches-4.1/101-mxs-add-mxs_power.patch index 8c087dcb98..104736c7c0 100644 --- a/target/linux/mxs/patches-4.1/101-mxs-add-mxs_power.patch +++ b/target/linux/mxs/patches-4.1/101-mxs-add-mxs_power.patch @@ -1,5 +1,3 @@ -diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig -index 4091fb0..0fcc158 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -43,6 +43,14 @@ config MAX8925_POWER @@ -17,11 +15,9 @@ index 4091fb0..0fcc158 100644 config WM831X_BACKUP tristate "WM831X backup battery charger support" depends on MFD_WM831X -diff --git a/drivers/power/Makefile b/drivers/power/Makefile -index b7b0181..8edcad7 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile -@@ -10,6 +10,7 @@ obj-$(CONFIG_GENERIC_ADC_BATTERY) += generic-adc-battery.o +@@ -10,6 +10,7 @@ obj-$(CONFIG_GENERIC_ADC_BATTERY) += gen obj-$(CONFIG_PDA_POWER) += pda_power.o obj-$(CONFIG_APM_POWER) += apm_power.o obj-$(CONFIG_MAX8925_POWER) += max8925_power.o @@ -29,9 +25,6 @@ index b7b0181..8edcad7 100644 obj-$(CONFIG_WM831X_BACKUP) += wm831x_backup.o obj-$(CONFIG_WM831X_POWER) += wm831x_power.o obj-$(CONFIG_WM8350_POWER) += wm8350_power.o -diff --git a/drivers/power/mxs_power.c b/drivers/power/mxs_power.c -new file mode 100644 -index 0000000..669bfb1 --- /dev/null +++ b/drivers/power/mxs_power.c @@ -0,0 +1,136 @@ 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 @@ diff --git a/target/linux/mxs/patches-4.1/103-dt-enable-regulator.patch b/target/linux/mxs/patches-4.1/103-dt-enable-regulator.patch index 3fed18257d..bfcf247f85 100644 --- a/target/linux/mxs/patches-4.1/103-dt-enable-regulator.patch +++ b/target/linux/mxs/patches-4.1/103-dt-enable-regulator.patch @@ -1,5 +1,3 @@ -diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi -index bbcfb5a..efdd702 100644 --- a/arch/arm/boot/dts/imx23.dtsi +++ b/arch/arm/boot/dts/imx23.dtsi @@ -404,8 +404,46 @@ @@ -50,8 +48,6 @@ index bbcfb5a..efdd702 100644 }; saif1: saif@80046000 { -diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi -index 25e25f8..378b1f2 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -1035,8 +1035,46 @@ diff --git a/target/linux/mxs/patches-4.1/120-dt-add-i2c.patch b/target/linux/mxs/patches-4.1/120-dt-add-i2c.patch index 2aa7250584..79c162aece 100644 --- a/target/linux/mxs/patches-4.1/120-dt-add-i2c.patch +++ b/target/linux/mxs/patches-4.1/120-dt-add-i2c.patch @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/imx23.dtsi +++ b/arch/arm/boot/dts/imx23.dtsi -@@ -146,6 +146,39 @@ +@@ -147,6 +147,39 @@ fsl,pull-up = <MXS_PULL_DISABLE>; }; @@ -40,7 +40,7 @@ auart0_pins_a: auart0@0 { reg = <0>; fsl,pinmux-ids = < -@@ -444,7 +477,12 @@ +@@ -484,7 +517,12 @@ }; i2c@80058000 { |