From 6be2305da83471c442dab83366c25be4dfb38793 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Fri, 14 Aug 2015 13:06:33 +0000 Subject: kernel: update 4.1 to 4.1.5 Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5 Signed-off-by: Jonas Gorski SVN-Revision: 46598 --- target/linux/sunxi/patches-4.1/142-arm-add-sunxi-h3.patch | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'target/linux/sunxi/patches-4.1/142-arm-add-sunxi-h3.patch') diff --git a/target/linux/sunxi/patches-4.1/142-arm-add-sunxi-h3.patch b/target/linux/sunxi/patches-4.1/142-arm-add-sunxi-h3.patch index 3199cd9e82..2545f8aacb 100644 --- a/target/linux/sunxi/patches-4.1/142-arm-add-sunxi-h3.patch +++ b/target/linux/sunxi/patches-4.1/142-arm-add-sunxi-h3.patch @@ -9,18 +9,14 @@ to other sun8i family SoCs like the A23. Signed-off-by: Jens Kuske Signed-off-by: Maxime Ripard -diff --git a/Documentation/devicetree/bindings/arm/sunxi.txt b/Documentation/devicetree/bindings/arm/sunxi.txt -index 42941fd..3cb4b94 100644 --- a/Documentation/devicetree/bindings/arm/sunxi.txt +++ b/Documentation/devicetree/bindings/arm/sunxi.txt -@@ -9,4 +9,5 @@ using one of the following compatible strings: +@@ -9,4 +9,5 @@ using one of the following compatible st allwinner,sun6i-a31 allwinner,sun7i-a20 allwinner,sun8i-a23 + allwinner,sun8i-h3 allwinner,sun9i-a80 -diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig -index 81502b9..4efe2d4 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -35,7 +35,7 @@ config MACH_SUN7I @@ -32,8 +28,6 @@ index 81502b9..4efe2d4 100644 default ARCH_SUNXI select ARM_GIC select MFD_SUN6I_PRCM -diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c -index 1bc811a..8270902 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c @@ -67,10 +67,12 @@ MACHINE_END @@ -50,6 +44,3 @@ index 1bc811a..8270902 100644 .dt_compat = sun8i_board_dt_compat, .init_late = sunxi_dt_cpufreq_init, MACHINE_END --- -cgit v0.10.2 - -- cgit v1.2.3