diff options
| author | Magnus Kroken <mkroken@gmail.com> | 2018-03-03 01:12:07 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-03 12:58:55 +0100 |
| commit | 5af85dab22a2ae78194d54d30c33fc2c1fb0f4e5 (patch) | |
| tree | 66905f7c20499cbef087e0a3ce39676883381650 /target/linux/sunxi | |
| parent | 45ae5c2de3491ed5db9695d21faebf95b3b41c56 (diff) | |
| download | upstream-5af85dab22a2ae78194d54d30c33fc2c1fb0f4e5.tar.gz upstream-5af85dab22a2ae78194d54d30c33fc2c1fb0f4e5.tar.bz2 upstream-5af85dab22a2ae78194d54d30c33fc2c1fb0f4e5.zip | |
kernel: bump 4.9 to 4.9.85
Signed-off-by: Magnus Kroken <mkroken@gmail.com>
Diffstat (limited to 'target/linux/sunxi')
3 files changed, 2 insertions, 41 deletions
diff --git a/target/linux/sunxi/patches-4.9/0001-arm64-sunxi-always-enable-reset-controller.patch b/target/linux/sunxi/patches-4.9/0001-arm64-sunxi-always-enable-reset-controller.patch deleted file mode 100644 index e23475218b..0000000000 --- a/target/linux/sunxi/patches-4.9/0001-arm64-sunxi-always-enable-reset-controller.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 900a9020af7a023f9b64c919fddf8a7486108962 Mon Sep 17 00:00:00 2001 -From: Arnd Bergmann <arnd@arndb.de> -Date: Tue, 18 Apr 2017 15:55:51 +0200 -Subject: arm64: sunxi: always enable reset controller - -The sunxi clk driver causes a link error when the reset controller -subsystem is disabled: - -drivers/clk/built-in.o: In function `sun4i_ve_clk_setup': -:(.init.text+0xd040): undefined reference to `reset_controller_register' -drivers/clk/built-in.o: In function `sun4i_a10_display_init': -:(.init.text+0xe5e0): undefined reference to `reset_controller_register' -drivers/clk/built-in.o: In function `sunxi_usb_clk_setup': -:(.init.text+0x10074): undefined reference to `reset_controller_register' - -We already force it to be enabled on arm32 and some other arm64 platforms, -but not on arm64/sunxi. This adds the respective Kconfig statements to -also select it here. - -Signed-off-by: Arnd Bergmann <arnd@arndb.de> -Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> ---- - arch/arm64/Kconfig.platforms | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/arch/arm64/Kconfig.platforms -+++ b/arch/arm64/Kconfig.platforms -@@ -2,9 +2,11 @@ menu "Platform selection" - - config ARCH_SUNXI - bool "Allwinner sunxi 64-bit SoC Family" -+ select ARCH_HAS_RESET_CONTROLLER - select GENERIC_IRQ_CHIP - select PINCTRL - select PINCTRL_SUN50I_A64 -+ select RESET_CONTROLLER - help - This enables support for Allwinner sunxi based SoCs like the A64. - diff --git a/target/linux/sunxi/patches-4.9/0003-clk-sunxi-ng-Remove-the-use-of-rational-computations.patch b/target/linux/sunxi/patches-4.9/0003-clk-sunxi-ng-Remove-the-use-of-rational-computations.patch index 6b8f46eae0..9146a2bb42 100644 --- a/target/linux/sunxi/patches-4.9/0003-clk-sunxi-ng-Remove-the-use-of-rational-computations.patch +++ b/target/linux/sunxi/patches-4.9/0003-clk-sunxi-ng-Remove-the-use-of-rational-computations.patch @@ -19,7 +19,7 @@ Acked-by: Chen-Yu Tsai <wens@csie.org> --- a/drivers/clk/sunxi-ng/Kconfig +++ b/drivers/clk/sunxi-ng/Kconfig -@@ -35,17 +35,14 @@ config SUNXI_CCU_NK +@@ -36,17 +36,14 @@ config SUNXI_CCU_NK config SUNXI_CCU_NKM bool diff --git a/target/linux/sunxi/patches-4.9/0007-clk-sunxi-ng-Add-A64-clocks.patch b/target/linux/sunxi/patches-4.9/0007-clk-sunxi-ng-Add-A64-clocks.patch index fa0bae92b4..1039a83b41 100644 --- a/target/linux/sunxi/patches-4.9/0007-clk-sunxi-ng-Add-A64-clocks.patch +++ b/target/linux/sunxi/patches-4.9/0007-clk-sunxi-ng-Add-A64-clocks.patch @@ -34,7 +34,7 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> - clocks: phandle to the oscillators feeding the CCU. Two are needed: --- a/drivers/clk/sunxi-ng/Kconfig +++ b/drivers/clk/sunxi-ng/Kconfig -@@ -53,6 +53,17 @@ config SUNXI_CCU_MP +@@ -54,6 +54,17 @@ config SUNXI_CCU_MP # SoC Drivers |