diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-21 13:47:18 +0900 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-21 13:47:18 +0900 |
commit | c70f89547cac11b251c24a61e71015cdbb65b6b5 (patch) | |
tree | 4bea5e0fc573013eb87d2dd9882811c916646d34 | |
parent | 19563b6b90945e0d33a3a02657285fef2287ef6b (diff) | |
download | ltsi-kernel-c70f89547cac11b251c24a61e71015cdbb65b6b5.tar.gz |
Update KERNEL_VERSION to 4.1.22
4 files changed, 15 insertions, 31 deletions
diff --git a/KERNEL_VERSION b/KERNEL_VERSION index 73274fd69d9f3..566261e131f1d 100644 --- a/KERNEL_VERSION +++ b/KERNEL_VERSION @@ -1 +1 @@ -4.1.17 +4.1.22 diff --git a/patches.altera/0009-ARM-socfpga-Add-support-for-UART1-debug-uart-for-ear.patch b/patches.altera/0009-ARM-socfpga-Add-support-for-UART1-debug-uart-for-ear.patch index 733fb745b9454..bffee87696a9d 100644 --- a/patches.altera/0009-ARM-socfpga-Add-support-for-UART1-debug-uart-for-ear.patch +++ b/patches.altera/0009-ARM-socfpga-Add-support-for-UART1-debug-uart-for-ear.patch @@ -10,14 +10,12 @@ Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> (cherry picked from commit de73c162fc2e91e19b7716fc9c0150f759be2567) Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> --- - arch/arm/Kconfig.debug | 26 +++++++++++++++++++------- + arch/arm/Kconfig.debug | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) -diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug -index 0c12ffb155a2..7ed976a719b3 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug -@@ -908,13 +908,22 @@ choice +@@ -907,13 +907,22 @@ choice on SA-11x0 UART ports. The kernel will check for the first enabled UART in a sequence 3-1-2. @@ -43,7 +41,7 @@ index 0c12ffb155a2..7ed976a719b3 100644 config DEBUG_SUN9I_UART0 bool "Kernel low-level debugging messages via sun9i UART0" -@@ -1407,7 +1416,8 @@ config DEBUG_UART_PHYS +@@ -1402,7 +1411,8 @@ config DEBUG_UART_PHYS default 0xfd883000 if DEBUG_ALPINE_UART0 default 0xfe800000 if ARCH_IOP32X default 0xff690000 if DEBUG_RK32_UART2 @@ -53,7 +51,7 @@ index 0c12ffb155a2..7ed976a719b3 100644 default 0xffd82340 if ARCH_IOP13XX default 0xffe40000 if DEBUG_RCAR_GEN1_SCIF0 default 0xffe42000 if DEBUG_RCAR_GEN1_SCIF2 -@@ -1485,7 +1495,8 @@ config DEBUG_UART_VIRT +@@ -1480,7 +1490,8 @@ config DEBUG_UART_VIRT default 0xfeb26000 if DEBUG_RK3X_UART1 default 0xfeb30c00 if DEBUG_KEYSTONE_UART0 default 0xfeb31000 if DEBUG_KEYSTONE_UART1 @@ -63,7 +61,7 @@ index 0c12ffb155a2..7ed976a719b3 100644 default 0xfec12000 if DEBUG_MVEBU_UART0 || DEBUG_MVEBU_UART0_ALTERNATE default 0xfec12100 if DEBUG_MVEBU_UART1_ALTERNATE default 0xfec10000 if DEBUG_SIRFATLAS7_UART0 -@@ -1530,8 +1541,9 @@ config DEBUG_UART_8250_WORD +@@ -1525,8 +1536,9 @@ config DEBUG_UART_8250_WORD bool "Use 32-bit accesses for 8250 UART" depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250 depends on DEBUG_UART_8250_SHIFT >= 2 @@ -75,6 +73,3 @@ index 0c12ffb155a2..7ed976a719b3 100644 DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \ DEBUG_DAVINCI_DA8XX_UART2 || \ DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2 || \ --- -2.6.2 - diff --git a/patches.ltsi/ltsi-makefile-addition.patch b/patches.ltsi/ltsi-makefile-addition.patch index c816ad80a4287..9054001828caa 100644 --- a/patches.ltsi/ltsi-makefile-addition.patch +++ b/patches.ltsi/ltsi-makefile-addition.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> @@ -1,7 +1,7 @@ VERSION = 4 PATCHLEVEL = 1 - SUBLEVEL = 17 + SUBLEVEL = 22 -EXTRAVERSION = +EXTRAVERSION = -ltsi NAME = Series 4800 diff --git a/patches.renesas/0056-phy-core-Check-requested-PHY-status-in-_of_phy_get.patch b/patches.renesas/0056-phy-core-Check-requested-PHY-status-in-_of_phy_get.patch index 51c5ff766e736..5916b99d884f3 100644 --- a/patches.renesas/0056-phy-core-Check-requested-PHY-status-in-_of_phy_get.patch +++ b/patches.renesas/0056-phy-core-Check-requested-PHY-status-in-_of_phy_get.patch @@ -12,17 +12,15 @@ Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> (cherry picked from commit 33f434d283a27116fb358ae5bc3b42967c12f85a) Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- - drivers/phy/phy-core.c | 12 ++++++++++-- - drivers/phy/phy-miphy28lp.c | 5 ----- - drivers/phy/phy-miphy365x.c | 5 ----- - drivers/phy/phy-rcar-gen2.c | 5 ----- + drivers/phy/phy-core.c | 12 ++++++++++-- + drivers/phy/phy-miphy28lp.c | 5 ----- + drivers/phy/phy-miphy365x.c | 5 ----- + drivers/phy/phy-rcar-gen2.c | 5 ----- 4 files changed, 10 insertions(+), 17 deletions(-) -diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c -index 63bc12d7a73e..313a18aea858 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c -@@ -367,13 +367,21 @@ static struct phy *_of_phy_get(struct device_node *np, int index) +@@ -369,13 +369,21 @@ static struct phy *_of_phy_get(struct de phy_provider = of_phy_provider_lookup(args.np); if (IS_ERR(phy_provider) || !try_module_get(phy_provider->owner)) { phy = ERR_PTR(-EPROBE_DEFER); @@ -46,11 +44,9 @@ index 63bc12d7a73e..313a18aea858 100644 mutex_unlock(&phy_provider_mutex); of_node_put(args.np); -diff --git a/drivers/phy/phy-miphy28lp.c b/drivers/phy/phy-miphy28lp.c -index c4cc11dcb2a2..e95b91407b57 100644 --- a/drivers/phy/phy-miphy28lp.c +++ b/drivers/phy/phy-miphy28lp.c -@@ -1107,11 +1107,6 @@ static struct phy *miphy28lp_xlate(struct device *dev, +@@ -1107,11 +1107,6 @@ static struct phy *miphy28lp_xlate(struc struct device_node *phynode = args->np; int ret, index = 0; @@ -62,11 +58,9 @@ index c4cc11dcb2a2..e95b91407b57 100644 if (args->args_count != 1) { dev_err(dev, "Invalid number of cells in 'phy' property\n"); return ERR_PTR(-EINVAL); -diff --git a/drivers/phy/phy-miphy365x.c b/drivers/phy/phy-miphy365x.c -index 019c2d75344e..d5b9a7b6f87a 100644 --- a/drivers/phy/phy-miphy365x.c +++ b/drivers/phy/phy-miphy365x.c -@@ -476,11 +476,6 @@ static struct phy *miphy365x_xlate(struct device *dev, +@@ -476,11 +476,6 @@ static struct phy *miphy365x_xlate(struc struct device_node *phynode = args->np; int ret, index; @@ -78,11 +72,9 @@ index 019c2d75344e..d5b9a7b6f87a 100644 if (args->args_count != 1) { dev_err(dev, "Invalid number of cells in 'phy' property\n"); return ERR_PTR(-EINVAL); -diff --git a/drivers/phy/phy-rcar-gen2.c b/drivers/phy/phy-rcar-gen2.c -index 97d45f47d1ad..0da62d45486a 100644 --- a/drivers/phy/phy-rcar-gen2.c +++ b/drivers/phy/phy-rcar-gen2.c -@@ -206,11 +206,6 @@ static struct phy *rcar_gen2_phy_xlate(struct device *dev, +@@ -206,11 +206,6 @@ static struct phy *rcar_gen2_phy_xlate(s struct device_node *np = args->np; int i; @@ -94,6 +86,3 @@ index 97d45f47d1ad..0da62d45486a 100644 drv = dev_get_drvdata(dev); if (!drv) return ERR_PTR(-EINVAL); --- -2.6.2 - |