WIP: update sunxi64 branch to 4.11

config/kernel/linux-sun50i-dev.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.10.0 Kernel Configuration
+# Linux/arm64 4.11.0 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -231,6 +231,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
@@ -315,6 +316,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_MSDOS_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_BLOCK_COMPAT=y
+CONFIG_BLK_MQ_VIRTIO=y
 
 #
 # IO Schedulers
@@ -328,13 +330,6 @@ CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_NONE=y
-# CONFIG_DEFAULT_SQ_DEADLINE is not set
-CONFIG_DEFAULT_SQ_NONE=y
-CONFIG_DEFAULT_SQ_IOSCHED="none"
-# CONFIG_DEFAULT_MQ_DEADLINE is not set
-CONFIG_DEFAULT_MQ_NONE=y
-CONFIG_DEFAULT_MQ_IOSCHED="none"
 CONFIG_PADATA=y
 CONFIG_ASN1=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
@@ -388,6 +383,10 @@ CONFIG_ARCH_SUNXI=y
 # CONFIG_PCI_DOMAINS_GENERIC is not set
 # CONFIG_PCI_SYSCALL is not set
 
+#
+# DesignWare PCI Core Support
+#
+
 #
 # Kernel Features
 #
@@ -407,6 +406,7 @@ CONFIG_ARM64_ERRATUM_843419=y
 # CONFIG_CAVIUM_ERRATUM_27456 is not set
 # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set
 # CONFIG_QCOM_FALKOR_ERRATUM_1009 is not set
+# CONFIG_QCOM_QDF2400_ERRATUM_0065 is not set
 CONFIG_ARM64_4K_PAGES=y
 # CONFIG_ARM64_16K_PAGES is not set
 # CONFIG_ARM64_64K_PAGES is not set
@@ -519,6 +519,7 @@ CONFIG_BINFMT_MISC=y
 CONFIG_COREDUMP=y
 CONFIG_COMPAT=y
 CONFIG_SYSVIPC_COMPAT=y
+CONFIG_KEYS_COMPAT=y
 
 #
 # Power management options
@@ -2160,7 +2161,6 @@ CONFIG_PINCTRL_SUNXI=y
 # CONFIG_PINCTRL_SUN4I_A10 is not set
 # CONFIG_PINCTRL_SUN5I is not set
 # CONFIG_PINCTRL_SUN6I_A31 is not set
-# CONFIG_PINCTRL_SUN6I_A31S is not set
 # CONFIG_PINCTRL_SUN6I_A31_R is not set
 # CONFIG_PINCTRL_SUN7I_A20 is not set
 # CONFIG_PINCTRL_SUN8I_A23 is not set
@@ -2175,7 +2175,6 @@ CONFIG_PINCTRL_SUN8I_H3_R=y
 CONFIG_PINCTRL_SUN50I_A64=y
 CONFIG_PINCTRL_SUN50I_A64_R=y
 CONFIG_PINCTRL_SUN50I_H5=y
-# CONFIG_PINCTRL_TI_IODELAY is not set
 CONFIG_GPIOLIB=y
 CONFIG_OF_GPIO=y
 # CONFIG_DEBUG_GPIO is not set
@@ -2443,7 +2442,6 @@ CONFIG_THERMAL_EMULATION=y
 #
 # ACPI INT340X thermal drivers
 #
-CONFIG_SUN8I_THS=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -2625,13 +2623,77 @@ CONFIG_REGULATOR_QCOM_SPMI=y
 # CONFIG_REGULATOR_S2MPA01 is not set
 CONFIG_REGULATOR_S2MPS11=y
 # CONFIG_REGULATOR_S5M8767 is not set
-CONFIG_REGULATOR_SY8106A=y
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
 # CONFIG_REGULATOR_TPS6524X is not set
-# CONFIG_MEDIA_SUPPORT is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+# CONFIG_MEDIA_CAMERA_SUPPORT is not set
+# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
+# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
+# CONFIG_MEDIA_RADIO_SUPPORT is not set
+# CONFIG_MEDIA_SDR_SUPPORT is not set
+CONFIG_MEDIA_RC_SUPPORT=y
+# CONFIG_MEDIA_CEC_SUPPORT is not set
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_TTPCI_EEPROM is not set
+
+#
+# Media drivers
+#
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_RC_DEVICES=y
+# CONFIG_RC_ATI_REMOTE is not set
+# CONFIG_IR_HIX5HD2 is not set
+# CONFIG_IR_IMON is not set
+# CONFIG_IR_MCEUSB is not set
+# CONFIG_IR_REDRAT3 is not set
+# CONFIG_IR_SPI is not set
+# CONFIG_IR_STREAMZAP is not set
+# CONFIG_IR_IGORPLUGUSB is not set
+# CONFIG_IR_IGUANA is not set
+# CONFIG_IR_TTUSBIR is not set
+# CONFIG_RC_LOOPBACK is not set
+# CONFIG_IR_GPIO_CIR is not set
+CONFIG_IR_SUNXI=m
+# CONFIG_IR_SERIAL is not set
+# CONFIG_MEDIA_USB_SUPPORT is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+# CONFIG_CYPRESS_FIRMWARE is not set
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
+#
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Tools to develop new frontends
+#
 
 #
 # Graphics support
@@ -2830,7 +2892,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_ES8328 is not set
+# CONFIG_SND_SOC_ES8328_I2C is not set
+# CONFIG_SND_SOC_ES8328_SPI is not set
 # CONFIG_SND_SOC_GTM601 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98504 is not set
@@ -3549,7 +3612,7 @@ CONFIG_SUN50I_A64_CCU=y
 # CONFIG_SUN6I_A31_CCU is not set
 # CONFIG_SUN8I_A23_CCU is not set
 # CONFIG_SUN8I_A33_CCU is not set
-CONFIG_SUNXI_H3_H5_CCU=y
+CONFIG_SUN8I_H3_CCU=y
 # CONFIG_SUN8I_V3S_CCU is not set
 # CONFIG_SUN9I_A80_CCU is not set
 CONFIG_SUN8I_R_CCU=y
@@ -3566,7 +3629,9 @@ CONFIG_CLKSRC_PROBE=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
 CONFIG_FSL_ERRATUM_A008585=y
+# CONFIG_HISILICON_ERRATUM_161010101 is not set
 CONFIG_ARM_TIMER_SP804=y
 # CONFIG_ATMEL_PIT is not set
 # CONFIG_SH_TIMER_CMT is not set
@@ -4028,6 +4093,7 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_PAGE_POISONING is not set
+# CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
@@ -4064,7 +4130,6 @@ CONFIG_SCHED_INFO=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_SCHED_STACK_END_CHECK is not set
 # CONFIG_DEBUG_TIMEKEEPING is not set
-# CONFIG_TIMER_STATS is not set
 
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
@@ -4348,7 +4413,6 @@ CONFIG_CRYPTO_USER_API_AEAD=y
 #
 # Certificates for signature checking
 #
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA256_ARM64=y
 CONFIG_CRYPTO_SHA512_ARM64=y
@@ -4426,6 +4490,8 @@ CONFIG_RADIX_TREE_MULTIORDER=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_DMA=y
+# CONFIG_DMA_NOOP_OPS is not set
+# CONFIG_DMA_VIRT_OPS is not set
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_GLOB=y
@@ -4446,5 +4512,3 @@ CONFIG_FONT_8x16=y
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_SBITMAP=y
-# CONFIG_PARMAN is not set
-CONFIG_PRIME_NUMBERS=m

config/sources/sunxi64_common.inc

@@ -13,9 +13,10 @@ case $BRANCH in
 	BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
 
 	KERNELSOURCE='https://github.com/Icenowy/linux/'
-	KERNELBRANCH='branch:sunxi64-next-20170216'
+	KERNELBRANCH='branch:sunxi64-4.11.y'
 	KERNELDIR='linux-sun50i-dev'
 	KERNEL_USE_GCC='> 6.1'
 	LINUXCONFIG='linux-sun50i-dev'
+	KERNELPATCHDIR='sun50i-dev'
 	;;
 esac

patch/kernel/sun50iw1-dev/add_sun50i_a64_rccu.patch

@@ -1,404 +0,0 @@
-diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig
-index 8af8f4be8e3b..fbd3f8cd5c22 100644
---- a/drivers/clk/sunxi-ng/Kconfig
-+++ b/drivers/clk/sunxi-ng/Kconfig
-@@ -151,4 +151,10 @@  config SUN9I_A80_CCU
- 	default MACH_SUN9I
- 	depends on MACH_SUN9I || COMPILE_TEST
- 
-+config SUN8I_R_CCU
-+	bool "Support for Allwinner SoCs' PRCM CCUs"
-+	select SUNXI_CCU_DIV
-+	select SUNXI_CCU_GATE
-+	default MACH_SUN8I || (ARCH_SUNXI && ARM64)
-+
- endif
-diff --git a/drivers/clk/sunxi-ng/Makefile b/drivers/clk/sunxi-ng/Makefile
-index 6feaac0c5600..0ec02fe14c50 100644
---- a/drivers/clk/sunxi-ng/Makefile
-+++ b/drivers/clk/sunxi-ng/Makefile
-@@ -25,6 +25,7 @@  obj-$(CONFIG_SUN8I_A23_CCU)	+= ccu-sun8i-a23.o
- obj-$(CONFIG_SUN8I_A33_CCU)	+= ccu-sun8i-a33.o
- obj-$(CONFIG_SUN8I_H3_CCU)	+= ccu-sun8i-h3.o
- obj-$(CONFIG_SUN8I_V3S_CCU)	+= ccu-sun8i-v3s.o
-+obj-$(CONFIG_SUN8I_R_CCU)	+= ccu-sun8i-r.o
- obj-$(CONFIG_SUN9I_A80_CCU)	+= ccu-sun9i-a80.o
- obj-$(CONFIG_SUN9I_A80_CCU)	+= ccu-sun9i-a80-de.o
- obj-$(CONFIG_SUN9I_A80_CCU)	+= ccu-sun9i-a80-usb.o
-diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-r.c b/drivers/clk/sunxi-ng/ccu-sun8i-r.c
-new file mode 100644
-index 000000000000..0d027d53dbdf
---- /dev/null
-+++ b/drivers/clk/sunxi-ng/ccu-sun8i-r.c
-@@ -0,0 +1,213 @@ 
-+/*
-+ * Copyright (c) 2016 Icenowy Zheng <icenowy@aosc.xyz>
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ */
-+
-+#include <linux/clk-provider.h>
-+#include <linux/of_address.h>
-+#include <linux/platform_device.h>
-+
-+#include "ccu_common.h"
-+#include "ccu_reset.h"
-+
-+#include "ccu_div.h"
-+#include "ccu_gate.h"
-+#include "ccu_mp.h"
-+#include "ccu_nm.h"
-+
-+#include "ccu-sun8i-r.h"
-+
-+static const char * const ar100_parents[] = { "osc32k", "osc24M",
-+					     "pll-periph0", "iosc" };
-+
-+static struct ccu_div ar100_clk = {
-+	.div		= _SUNXI_CCU_DIV_FLAGS(4, 2, CLK_DIVIDER_POWER_OF_TWO),
-+
-+	.mux		= {
-+		.shift	= 16,
-+		.width	= 2,
-+
-+		.variable_prediv	= {
-+			.index	= 2,
-+			.shift	= 8,
-+			.width	= 5,
-+		},
-+	},
-+
-+	.common		= {
-+		.reg		= 0x00,
-+		.features	= CCU_FEATURE_VARIABLE_PREDIV,
-+		.hw.init	= CLK_HW_INIT_PARENTS("ar100",
-+						      ar100_parents,
-+						      &ccu_div_ops,
-+						      0),
-+	},
-+};
-+
-+static CLK_FIXED_FACTOR(ahb0_clk, "ahb0", "ar100", 1, 1, 0);
-+
-+static struct ccu_div apb0_clk = {
-+	.div		= _SUNXI_CCU_DIV_FLAGS(0, 2, CLK_DIVIDER_POWER_OF_TWO),
-+
-+	.common		= {
-+		.reg		= 0x0c,
-+		.hw.init	= CLK_HW_INIT("apb0",
-+					      "ahb0",
-+					      &ccu_div_ops,
-+					      0),
-+	},
-+};
-+
-+static SUNXI_CCU_GATE(apb0_pio_clk,	"apb0-pio",	"apb0",
-+		      0x28, BIT(0), 0);
-+static SUNXI_CCU_GATE(apb0_ir_clk,	"apb0-ir",	"apb0",
-+		      0x28, BIT(1), 0);
-+static SUNXI_CCU_GATE(apb0_timer_clk,	"apb0-timer",	"apb0",
-+		      0x28, BIT(2), 0);
-+static SUNXI_CCU_GATE(apb0_rsb_clk,	"apb0-rsb",	"apb0",
-+		      0x28, BIT(3), 0);
-+static SUNXI_CCU_GATE(apb0_uart_clk,	"apb0-uart",	"apb0",
-+		      0x28, BIT(4), 0);
-+static SUNXI_CCU_GATE(apb0_i2c_clk,	"apb0-i2c",	"apb0",
-+		      0x28, BIT(6), 0);
-+static SUNXI_CCU_GATE(apb0_twd_clk,	"apb0-twd",	"apb0",
-+		      0x28, BIT(7), 0);
-+
-+static const char * const r_mod0_default_parents[] = { "osc32K", "osc24M" };
-+static SUNXI_CCU_MP_WITH_MUX_GATE(ir_clk, "ir",
-+				  r_mod0_default_parents, 0x54,
-+				  0, 4,		/* M */
-+				  16, 2,	/* P */
-+				  24, 2,	/* mux */
-+				  BIT(31),	/* gate */
-+				  0);
-+
-+static struct ccu_common *sun8i_h3_r_ccu_clks[] = {
-+	&ar100_clk.common,
-+	&apb0_clk.common,
-+	&apb0_pio_clk.common,
-+	&apb0_ir_clk.common,
-+	&apb0_timer_clk.common,
-+	&apb0_uart_clk.common,
-+	&apb0_i2c_clk.common,
-+	&apb0_twd_clk.common,
-+	&ir_clk.common,
-+};
-+
-+static struct ccu_common *sun50i_a64_r_ccu_clks[] = {
-+	&ar100_clk.common,
-+	&apb0_clk.common,
-+	&apb0_pio_clk.common,
-+	&apb0_ir_clk.common,
-+	&apb0_timer_clk.common,
-+	&apb0_rsb_clk.common,
-+	&apb0_uart_clk.common,
-+	&apb0_i2c_clk.common,
-+	&apb0_twd_clk.common,
-+	&ir_clk.common,
-+};
-+
-+static struct clk_hw_onecell_data sun8i_h3_r_hw_clks = {
-+	.hws	= {
-+		[CLK_AR100]		= &ar100_clk.common.hw,
-+		[CLK_AHB0]		= &ahb0_clk.hw,
-+		[CLK_APB0]		= &apb0_clk.common.hw,
-+		[CLK_APB0_PIO]		= &apb0_pio_clk.common.hw,
-+		[CLK_APB0_IR]		= &apb0_ir_clk.common.hw,
-+		[CLK_APB0_TIMER]	= &apb0_timer_clk.common.hw,
-+		[CLK_APB0_UART]		= &apb0_uart_clk.common.hw,
-+		[CLK_APB0_I2C]		= &apb0_i2c_clk.common.hw,
-+		[CLK_APB0_TWD]		= &apb0_twd_clk.common.hw,
-+		[CLK_IR]		= &ir_clk.common.hw,
-+	},
-+	.num	= CLK_NUMBER,
-+};
-+
-+static struct clk_hw_onecell_data sun50i_a64_r_hw_clks = {
-+	.hws	= {
-+		[CLK_AR100]		= &ar100_clk.common.hw,
-+		[CLK_AHB0]		= &ahb0_clk.hw,
-+		[CLK_APB0]		= &apb0_clk.common.hw,
-+		[CLK_APB0_PIO]		= &apb0_pio_clk.common.hw,
-+		[CLK_APB0_IR]		= &apb0_ir_clk.common.hw,
-+		[CLK_APB0_TIMER]	= &apb0_timer_clk.common.hw,
-+		[CLK_APB0_RSB]		= &apb0_rsb_clk.common.hw,
-+		[CLK_APB0_UART]		= &apb0_uart_clk.common.hw,
-+		[CLK_APB0_I2C]		= &apb0_i2c_clk.common.hw,
-+		[CLK_APB0_TWD]		= &apb0_twd_clk.common.hw,
-+		[CLK_IR]		= &ir_clk.common.hw,
-+	},
-+	.num	= CLK_NUMBER,
-+};
-+
-+static struct ccu_reset_map sun8i_h3_r_ccu_resets[] = {
-+	[RST_APB0_IR]		=  { 0xb0, BIT(1) },
-+	[RST_APB0_TIMER]	=  { 0xb0, BIT(2) },
-+	[RST_APB0_UART]		=  { 0xb0, BIT(4) },
-+	[RST_APB0_I2C]		=  { 0xb0, BIT(6) },
-+};
-+
-+static struct ccu_reset_map sun50i_a64_r_ccu_resets[] = {
-+	[RST_APB0_IR]		=  { 0xb0, BIT(1) },
-+	[RST_APB0_TIMER]	=  { 0xb0, BIT(2) },
-+	[RST_APB0_RSB]		=  { 0xb0, BIT(3) },
-+	[RST_APB0_UART]		=  { 0xb0, BIT(4) },
-+	[RST_APB0_I2C]		=  { 0xb0, BIT(6) },
-+};
-+
-+static const struct sunxi_ccu_desc sun8i_h3_r_ccu_desc = {
-+	.ccu_clks	= sun8i_h3_r_ccu_clks,
-+	.num_ccu_clks	= ARRAY_SIZE(sun8i_h3_r_ccu_clks),
-+
-+	.hw_clks	= &sun8i_h3_r_hw_clks,
-+
-+	.resets		= sun8i_h3_r_ccu_resets,
-+	.num_resets	= ARRAY_SIZE(sun8i_h3_r_ccu_resets),
-+};
-+
-+static const struct sunxi_ccu_desc sun50i_a64_r_ccu_desc = {
-+	.ccu_clks	= sun50i_a64_r_ccu_clks,
-+	.num_ccu_clks	= ARRAY_SIZE(sun50i_a64_r_ccu_clks),
-+
-+	.hw_clks	= &sun50i_a64_r_hw_clks,
-+
-+	.resets		= sun50i_a64_r_ccu_resets,
-+	.num_resets	= ARRAY_SIZE(sun50i_a64_r_ccu_resets),
-+};
-+
-+static void __init sunxi_r_ccu_init(struct device_node *node,
-+				    const struct sunxi_ccu_desc *desc)
-+{
-+	void __iomem *reg;
-+
-+	reg = of_io_request_and_map(node, 0, of_node_full_name(node));
-+	if (IS_ERR(reg)) {
-+		pr_err("%s: Could not map the clock registers\n",
-+		       of_node_full_name(node));
-+		return;
-+	}
-+
-+	sunxi_ccu_probe(node, reg, desc);
-+}
-+
-+static void __init sun8i_h3_r_ccu_setup(struct device_node *node)
-+{
-+	sunxi_r_ccu_init(node, &sun8i_h3_r_ccu_desc);
-+}
-+CLK_OF_DECLARE(sun8i_h3_r_ccu, "allwinner,sun8i-h3-r-ccu",
-+	       sun8i_h3_r_ccu_setup);
-+
-+static void __init sun50i_a64_r_ccu_setup(struct device_node *node)
-+{
-+	sunxi_r_ccu_init(node, &sun50i_a64_r_ccu_desc);
-+}
-+CLK_OF_DECLARE(sun50i_a64_r_ccu, "allwinner,sun50i-a64-r-ccu",
-+	       sun50i_a64_r_ccu_setup);
-diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-r.h b/drivers/clk/sunxi-ng/ccu-sun8i-r.h
-new file mode 100644
-index 000000000000..eaa431fd1d8f
---- /dev/null
-+++ b/drivers/clk/sunxi-ng/ccu-sun8i-r.h
-@@ -0,0 +1,27 @@ 
-+/*
-+ * Copyright 2016 Icenowy <icenowy@aosc.xyz>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ */
-+
-+#ifndef _CCU_SUN8I_R_H
-+#define _CCU_SUN8I_R_H_
-+
-+#include <dt-bindings/clock/sun8i-r-ccu.h>
-+#include <dt-bindings/reset/sun8i-r-ccu.h>
-+
-+/* AHB/APB bus clocks are not exported */
-+#define CLK_AHB0	1
-+#define CLK_APB0	2
-+
-+#define CLK_NUMBER	(CLK_APB0_TWD + 1)
-+
-+#endif /* _CCU_SUN8I_R_H */
-diff --git a/include/dt-bindings/clock/sun8i-r-ccu.h b/include/dt-bindings/clock/sun8i-r-ccu.h
-new file mode 100644
-index 000000000000..779d20aa0d05
---- /dev/null
-+++ b/include/dt-bindings/clock/sun8i-r-ccu.h
-@@ -0,0 +1,59 @@ 
-+/*
-+ * Copyright (c) 2016 Icenowy Zheng <icenowy@aosc.xyz>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This file is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This file is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef _DT_BINDINGS_CLK_SUN8I_R_CCU_H_
-+#define _DT_BINDINGS_CLK_SUN8I_R_CCU_H_
-+
-+#define CLK_AR100		0
-+
-+#define CLK_APB0_PIO		3
-+#define CLK_APB0_IR		4
-+#define CLK_APB0_TIMER		5
-+#define CLK_APB0_RSB		6
-+#define CLK_APB0_UART		7
-+/* 8 is reserved for CLK_APB0_W1 on A31 */
-+#define CLK_APB0_I2C		9
-+#define CLK_APB0_TWD		10
-+
-+#define CLK_IR			11
-+
-+#endif /* _DT_BINDINGS_CLK_SUN8I_R_CCU_H_ */
-diff --git a/include/dt-bindings/reset/sun8i-r-ccu.h b/include/dt-bindings/reset/sun8i-r-ccu.h
-new file mode 100644
-index 000000000000..4ba64f3d6fc9
---- /dev/null
-+++ b/include/dt-bindings/reset/sun8i-r-ccu.h
-@@ -0,0 +1,53 @@ 
-+/*
-+ * Copyright (C) 2016 Icenowy Zheng <icenowy@aosc.xyz>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This file is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This file is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef _DT_BINDINGS_RST_SUN8I_R_CCU_H_
-+#define _DT_BINDINGS_RST_SUN8I_R_CCU_H_
-+
-+#define RST_APB0_IR		0
-+#define RST_APB0_TIMER		1
-+#define RST_APB0_RSB		2
-+#define RST_APB0_UART		3
-+/* 4 is reserved for RST_APB0_W1 on A31 */
-+#define RST_APB0_I2C		5
-+
-+#endif /* _DT_BINDINGS_RST_SUN8I_R_CCU_H_ */
-

patch/kernel/sun50iw1-dev/add_sun50i_a64_rpio.patch

@@ -1,227 +0,0 @@
-diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
-index 81f0d61..18ff031 100644
---- a/arch/arm64/Kconfig.platforms
-+++ b/arch/arm64/Kconfig.platforms
-@@ -5,6 +5,7 @@ config ARCH_SUNXI
- 	select GENERIC_IRQ_CHIP
- 	select PINCTRL
- 	select PINCTRL_SUN50I_A64
-+	select PINCTRL_SUN50I_A64_R
- 	select PINCTRL_SUN50I_H5
- 	select PINCTRL_SUN8I_H3_R
- 	help
-diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
-index a84bfa7f3c05..a0c419ac2a3b 100644
---- a/drivers/pinctrl/sunxi/Kconfig
-+++ b/drivers/pinctrl/sunxi/Kconfig
-@@ -68,6 +68,10 @@  config PINCTRL_SUN50I_A64
- 	def_bool ARM64 && ARCH_SUNXI
- 	select PINCTRL_SUNXI
- 
-+config PINCTRL_SUN50I_A64_R
-+	def_bool ARM64 && ARCH_SUNXI
-+	select PINCTRL_SUNXI
-+
- config PINCTRL_SUN50I_H5
- 	def_bool ARM64 && ARCH_SUNXI
- 	select PINCTRL_SUNXI
-diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile
-index 04ccb88ebd5f..df4ccd6cd44c 100644
---- a/drivers/pinctrl/sunxi/Makefile
-+++ b/drivers/pinctrl/sunxi/Makefile
-@@ -11,6 +11,7 @@  obj-$(CONFIG_PINCTRL_SUN8I_A23)		+= pinctrl-sun8i-a23.o
- obj-$(CONFIG_PINCTRL_SUN8I_A23_R)	+= pinctrl-sun8i-a23-r.o
- obj-$(CONFIG_PINCTRL_SUN8I_A33)		+= pinctrl-sun8i-a33.o
- obj-$(CONFIG_PINCTRL_SUN50I_A64)	+= pinctrl-sun50i-a64.o
-+obj-$(CONFIG_PINCTRL_SUN50I_A64_R)	+= pinctrl-sun50i-a64-r.o
- obj-$(CONFIG_PINCTRL_SUN8I_A83T)	+= pinctrl-sun8i-a83t.o
- obj-$(CONFIG_PINCTRL_SUN8I_H3)		+= pinctrl-sun8i-h3.o
- obj-$(CONFIG_PINCTRL_SUN8I_H3_R)	+= pinctrl-sun8i-h3-r.o
-diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
-new file mode 100644
-index 000000000000..415870e82cbf
---- /dev/null
-+++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
-@@ -0,0 +1,125 @@ 
-+/*
-+ * Allwinner A64 SoCs special pins pinctrl driver.
-+ *
-+ * Based on pinctrl-sun8i-a23-r.c
-+ *
-+ * Copyright (C) 2016 Icenowy Zheng
-+ * Icenowy Zheng <icenowy@aosc.xyz>
-+ *
-+ * Copyright (C) 2014 Chen-Yu Tsai
-+ * Chen-Yu Tsai <wens@csie.org>
-+ *
-+ * Copyright (C) 2014 Boris Brezillon
-+ * Boris Brezillon <boris.brezillon@free-electrons.com>
-+ *
-+ * Copyright (C) 2014 Maxime Ripard
-+ * Maxime Ripard <maxime.ripard@free-electrons.com>
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2.  This program is licensed "as is" without any
-+ * warranty of any kind, whether express or implied.
-+ */
-+
-+#include <linux/of.h>
-+#include <linux/of_device.h>
-+#include <linux/pinctrl/pinctrl.h>
-+#include <linux/platform_device.h>
-+#include <linux/reset.h>
-+
-+#include "pinctrl-sunxi.h"
-+
-+static const struct sunxi_desc_pin sun50i_a64_r_pins[] = {
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 0),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_rsb"),		/* SCK */
-+		  SUNXI_FUNCTION(0x3, "s_i2c"),		/* SCK */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 0)),	/* PL_EINT0 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_rsb"),		/* SDA */
-+		  SUNXI_FUNCTION(0x3, "s_i2c"),		/* SDA */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 1)),	/* PL_EINT1 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_uart"),	/* TX */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 2)),	/* PL_EINT2 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 3),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_uart"),	/* RX */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 3)),	/* PL_EINT3 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 4),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_jtag"),	/* MS */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 4)),	/* PL_EINT4 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 5),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_jtag"),	/* CK */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 5)),	/* PL_EINT5 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 6),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_jtag"),	/* DO */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 6)),	/* PL_EINT6 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 7),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_jtag"),	/* DI */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 7)),	/* PL_EINT7 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 8),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_i2c"),		/* SCK */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 8)),	/* PL_EINT8 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 9),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_i2c"),		/* SDA */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 9)),	/* PL_EINT9 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 10),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_pwm"),
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 10)),	/* PL_EINT10 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 11),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_cir_rx"),
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 11)),	/* PL_EINT11 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 12),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 12)),	/* PL_EINT12 */
-+};
-+
-+static const struct sunxi_pinctrl_desc sun50i_a64_r_pinctrl_data = {
-+	.pins = sun50i_a64_r_pins,
-+	.npins = ARRAY_SIZE(sun50i_a64_r_pins),
-+	.pin_base = PL_BASE,
-+	.irq_banks = 1,
-+};
-+
-+static int sun50i_a64_r_pinctrl_probe(struct platform_device *pdev)
-+{
-+	return sunxi_pinctrl_init(pdev,
-+				  &sun50i_a64_r_pinctrl_data);
-+}
-+
-+static const struct of_device_id sun50i_a64_r_pinctrl_match[] = {
-+	{ .compatible = "allwinner,sun50i-a64-r-pinctrl", },
-+	{}
-+};
-+
-+static struct platform_driver sun50i_a64_r_pinctrl_driver = {
-+	.probe	= sun50i_a64_r_pinctrl_probe,
-+	.driver	= {
-+		.name		= "sun50i-a64-r-pinctrl",
-+		.of_match_table	= sun50i_a64_r_pinctrl_match,
-+	},
-+};
-+builtin_platform_driver(sun50i_a64_r_pinctrl_driver);
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-index 02c0385..c0773d8 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-@@ -43,8 +43,10 @@
-  */
- 
- #include <dt-bindings/clock/sun50i-a64-ccu.h>
-+#include <dt-bindings/clock/sun8i-r-ccu.h>
- #include <dt-bindings/interrupt-controller/arm-gic.h>
- #include <dt-bindings/reset/sun50i-a64-ccu.h>
-+#include <dt-bindings/reset/sun8i-r-ccu.h>
- 
- / {
- 	interrupt-parent = <&gic>;
-@@ -98,6 +100,13 @@
- 		clock-output-names = "osc32k";
- 	};
- 
-+	osc32000: osc32000_clk {
-+		#clock-cells = <0>;
-+		compatible = "fixed-clock";
-+		clock-frequency = <32000>;
-+		clock-output-names = "osc32000";
-+	};
-+
- 	psci {
- 		compatible = "arm,psci-0.2";
- 		method = "smc";
-@@ -306,6 +315,27 @@
- 			};
- 		};
- 
-+		r_ccu: clock@1f01400 {
-+			compatible = "allwinner,sun50i-a64-r-ccu";
-+			reg = <0x01f01400 0x100>;
-+			clocks = <&osc24M>, <&osc32k>, <&osc32000>;
-+			clock-names = "hosc", "losc", "iosc";
-+			#clock-cells = <1>;
-+			#reset-cells = <1>;
-+		};
-+
-+		r_pio: pinctrl@1f02c00 {
-+			compatible = "allwinner,sun50i-a64-r-pinctrl";
-+			reg = <0x01f02c00 0x400>;
-+			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&r_ccu CLK_APB0_PIO>, <&osc24M>, <&osc32k>;
-+			clock-names = "apb", "hosc", "losc";
-+			gpio-controller;
-+			#gpio-cells = <3>;
-+			interrupt-controller;
-+			#interrupt-cells = <3>;
-+		};
-+
- 		uart0: serial@1c28000 {
- 			compatible = "snps,dw-apb-uart";
- 			reg = <0x01c28000 0x400>;

patch/kernel/sun50iw1-dev/packaging-4.x-DEV-with-postinstall-scripts.patch

@@ -1,180 +0,0 @@
-diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index 8ea9fd2b..9f17b825 100755
---- a/scripts/package/builddeb
-+++ b/scripts/package/builddeb
-@@ -29,6 +29,28 @@ create_package() {
- 	# in case we are in a restrictive umask environment like 0077
- 	chmod -R a+rX "$pdir"
- 
-+	# Create preinstall and post install script to remove dtb
-+	if [[ "$1" == *dtb* ]]; then
-+		echo "if [ -d /boot/dtb-$version ]; then mv /boot/dtb-$version /boot/dtb-$version.old; fi" >> $pdir/DEBIAN/preinst
-+		echo "if [ -d /boot/dtb.old ]; then rm -rf /boot/dtb.old; fi" >> $pdir/DEBIAN/preinst
-+		echo "if [ -d /dtb ]; then mv /dtb /dtb.old; fi" >> $pdir/DEBIAN/preinst
-+		echo "if [ -d /boot/dtb ]; then mv /boot/dtb /boot/dtb.old; fi" >> $pdir/DEBIAN/preinst
-+		echo "exit 0" >> $pdir/DEBIAN/preinst
-+		chmod 775 $pdir/DEBIAN/preinst
-+		#
-+		echo "if [ -d /boot/dtb-$version.old ]; then rm -rf /boot/dtb-$version.old; fi" >> $pdir/DEBIAN/postinst
-+		echo "ln -sf dtb-$version /boot/dtb > /dev/null 2>&1 || mv /boot/dtb-$version /boot/dtb" >> $pdir/DEBIAN/postinst
-+		echo "exit 0" >> $pdir/DEBIAN/postinst
-+		chmod 775 $pdir/DEBIAN/postinst
-+	fi
-+	
-+	# Create postinstall script for headers
-+	if [[ "$1" == *headers* ]]; then
-+		echo "cd /usr/src/linux-headers-$version; echo \"Compiling headers - please wait ...\"; make -s scripts >/dev/null 2>&1" >> $pdir/DEBIAN/postinst
-+		echo "exit 0" >> $pdir/DEBIAN/postinst
-+		chmod 775 $pdir/DEBIAN/postinst
-+	fi
-+	
- 	# Create the package
- 	dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch}" -p$pname -P"$pdir"
- 	dpkg --build "$pdir" ..
-@@ -95,11 +117,13 @@ tmpdir="$objtree/debian/tmp"
- fwdir="$objtree/debian/fwtmp"
- kernel_headers_dir="$objtree/debian/hdrtmp"
- libc_headers_dir="$objtree/debian/headertmp"
-+dtb_dir="$objtree/debian/dtbtmp"
- dbg_dir="$objtree/debian/dbgtmp"
--packagename=linux-image-$version
--fwpackagename=linux-firmware-image-$version
--kernel_headers_packagename=linux-headers-$version
--libc_headers_packagename=linux-libc-dev
-+packagename=linux-image-dev"$LOCALVERSION"
-+fwpackagename=linux-firmware-image-dev"$LOCALVERSION"
-+kernel_headers_packagename=linux-headers-dev"$LOCALVERSION"
-+dtb_packagename=linux-dtb-dev"$LOCALVERSION"
-+libc_headers_packagename=linux-libc-dev-dev"$LOCALVERSION"
- dbg_packagename=$packagename-dbg
- debarch=
- forcearch=
-@@ -119,6 +143,9 @@ um)
- parisc|mips|powerpc)
- 	installed_image_path="boot/vmlinux-$version"
- 	;;
-+arm64)
-+	installed_image_path="boot/Image-$version"
-+	;;
- *)
- 	installed_image_path="boot/vmlinuz-$version"
- esac
-@@ -126,7 +153,9 @@ esac
- BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
- 
- # Setup the directory structure
--rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
-+rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" "$dtb_dir" $objtree/debian/files
-+mkdir -m 755 -p "$dtb_dir/DEBIAN"
-+mkdir -p "$dtb_dir/boot/dtb-$version" "$dtb_dir/usr/share/doc/$dtb_packagename"
- mkdir -m 755 -p "$tmpdir/DEBIAN"
- mkdir -p "$tmpdir/lib" "$tmpdir/boot"
- mkdir -p "$fwdir/lib/firmware/$version/"
-@@ -143,12 +172,7 @@ else
- 	cp System.map "$tmpdir/boot/System.map-$version"
- 	cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
- fi
--# Not all arches include the boot path in KBUILD_IMAGE
--if [ -e $KBUILD_IMAGE ]; then
--	cp $KBUILD_IMAGE "$tmpdir/$installed_image_path"
--else
--	cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
--fi
-+cp arch/$ARCH/boot/Image "$tmpdir/$installed_image_path"
- 
- if grep -q "^CONFIG_OF=y" $KCONFIG_CONFIG ; then
- 	# Only some architectures with OF support have this target
-@@ -185,6 +209,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
- 	fi
- fi
- 
-+if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG ; then
-+	#mkdir -p "$tmpdir/boot/dtb"
-+	INSTALL_DTBS_PATH="$dtb_dir/boot/dtb-$version" $MAKE KBUILD_SRC= dtbs_install
-+fi
-+
- if [ "$ARCH" != "um" ]; then
- 	$MAKE headers_check KBUILD_SRC=
- 	$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
-@@ -209,9 +238,11 @@ for script in postinst postrm preinst prerm ; do
- set -e
- 
- # Pass maintainer script parameters to hook scripts
-+
- export DEB_MAINT_PARAMS="\$*"
- 
- # Tell initramfs builder whether it's wanted
-+
- export INITRD=$want_initrd
- 
- test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d
-@@ -220,6 +251,17 @@ EOF
- 	chmod 755 "$tmpdir/DEBIAN/$script"
- done
- 
-+##
-+## Create sym link to kernel image
-+##
-+sed -e "s/set -e//g" -i $tmpdir/DEBIAN/postinst
-+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
-+cat >> $tmpdir/DEBIAN/postinst <<EOT 
-+ln -sf $(basename $installed_image_path) /boot/Image > /dev/null 2>&1 || mv /$installed_image_path /boot/Image
-+touch /boot/.next
-+exit 0
-+EOT
-+
- # Try to determine maintainer and email values
- if [ -n "$DEBEMAIL" ]; then
-        email=$DEBEMAIL
-@@ -337,16 +379,24 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then
- fi
- destdir=$kernel_headers_dir/usr/src/linux-headers-$version
- mkdir -p "$destdir"
-+######################## headers patch
-+ZACNI=$(pwd)
-+cd $destdir
-+patch -p1 < /tmp/headers-debian-byteshift.patch
-+cd $ZACNI
-+######################## headers patch
- (cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
- (cd $objtree; tar -c -f - -T -) < "$objtree/debian/hdrobjfiles" | (cd $destdir; tar -xf -)
- (cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
- ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
- rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
- 
-+(cd "$destdir"; make M=scripts clean)
-+
- cat <<EOF >> debian/control
- 
- Package: $kernel_headers_packagename
--Provides: linux-headers, linux-headers-2.6
-+Provides: linux-headers
- Architecture: any
- Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
-  This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
-@@ -372,6 +422,16 @@ fi
- 
- cat <<EOF >> debian/control
- 
-+Package: $dtb_packagename
-+Architecture: any
-+Description: Linux DTB, version $version
-+ This package contains device blobs from the Linux kernel, version $version.
-+EOF
-+
-+create_package "$dtb_packagename" "$dtb_dir"
-+
-+cat <<EOF >> debian/control
-+
- Package: $libc_headers_packagename
- Section: devel
- Provides: linux-kernel-headers
-@@ -383,7 +443,7 @@ EOF
- 
- if [ "$ARCH" != "um" ]; then
- 	create_package "$kernel_headers_packagename" "$kernel_headers_dir"
--	create_package "$libc_headers_packagename" "$libc_headers_dir"
-+#	create_package "$libc_headers_packagename" "$libc_headers_dir"
- fi
- 
- create_package "$packagename" "$tmpdir"

patch/kernel/sun50iw1-dev/remove-localversion.patch

@@ -1,7 +0,0 @@
-diff --git a/localversion-next b/localversion-next
-deleted file mode 100644
-index 299f8119..00000000
---- a/localversion-next
-+++ /dev/null
-@@ -1 +0,0 @@
---next-20170216

patch/kernel/sun50iw1-dev/scripts-dtc-Update-to-version-with-overlays.patch

@@ -1,16 +0,0 @@
-diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index ddf83d0..a0fb9e3 100644
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -275,7 +275,11 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \
-
- # DTC
- # ---------------------------------------------------------------------------
-+ifeq ($(CONFIG_OF_CONFIGFS),y)
-+DTC ?= $(objtree)/scripts/dtc/dtc -@
-+else
- DTC ?= $(objtree)/scripts/dtc/dtc
-+endif
-
- # Generate an assembly file to wrap the output of the device tree compiler
- quiet_cmd_dt_S_dtb= DTB     $@

patch/kernel/sun50iw2-dev/add-h5-a64-simplefb.patch

@@ -1,54 +0,0 @@
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
-index 495edf5f..c0edd5c2 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
-@@ -45,6 +45,22 @@
- / {
- 	interrupt-parent = <&gic>;
- 
-+        chosen {
-+                #address-cells = <1>;
-+                #size-cells = <1>;
-+                ranges;
-+
-+                simplefb_hdmi: framebuffer@0 {
-+                        compatible = "allwinner,simple-framebuffer",
-+                                     "simple-framebuffer";
-+                        allwinner,pipeline = "de0-lcd0-hdmi";
-+                        clocks = <&ccu CLK_BUS_TCON0>, <&ccu CLK_BUS_DE>,
-+                                 <&ccu CLK_BUS_HDMI>, <&ccu CLK_DE>,
-+                                 <&ccu CLK_TCON0>, <&ccu CLK_HDMI>;
-+                        status = "disabled";
-+                };
-+        };
-+
- 	cpus {
- 		#address-cells = <1>;
- 		#size-cells = <0>;
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-index 100e9b49..e208e005 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-@@ -52,6 +52,22 @@
- 	#address-cells = <1>;
- 	#size-cells = <1>;
- 
-+        chosen {
-+                #address-cells = <1>;
-+                #size-cells = <1>;
-+                ranges;
-+
-+                simplefb_hdmi: framebuffer@0 {
-+                        compatible = "allwinner,simple-framebuffer",
-+                                     "simple-framebuffer";
-+                        allwinner,pipeline = "de0-lcd0-hdmi";
-+                        clocks = <&ccu CLK_BUS_TCON1>, <&ccu CLK_BUS_DE>,
-+                                 <&ccu CLK_BUS_HDMI>, <&ccu CLK_DE>,
-+                                 <&ccu CLK_TCON1>, <&ccu CLK_HDMI>;
-+                        status = "disabled";
-+                };
-+        };
-+
- 	cpus {
- 		#address-cells = <1>;
- 		#size-cells = <0>;

patch/kernel/sun50iw2-dev/add-overlay-compilation-support.patch

@@ -1,123 +0,0 @@
-diff --git a/arch/arm/Makefile b/arch/arm/Makefile
-index ab30cc63..cc176797 100644
---- a/arch/arm/Makefile
-+++ b/arch/arm/Makefile
-@@ -339,6 +339,12 @@ $(INSTALL_TARGETS):
- %.dtb: | scripts
- 	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
- 
-+%.dtbo: | scripts
-+	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
-+
-+%.scr: | scripts
-+	$(Q)$(MAKE) $(build)=$(boot)/dts ARCH=$(ARCH) $(boot)/dts/$@
-+
- PHONY += dtbs dtbs_install
- 
- dtbs: prepare scripts
-diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore
-index 3c79f859..eaaeb17e 100644
---- a/arch/arm/boot/.gitignore
-+++ b/arch/arm/boot/.gitignore
-@@ -3,4 +3,5 @@ zImage
- xipImage
- bootpImage
- uImage
--*.dtb
-+*.dtb*
-+*.scr
-diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
-index b9a4a934..54e3c38d 100644
---- a/arch/arm64/Makefile
-+++ b/arch/arm64/Makefile
-@@ -119,6 +119,12 @@ zinstall install:
- %.dtb: scripts
- 	$(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
- 
-+%.dtbo: | scripts
-+	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
-+
-+%.scr: | scripts
-+	$(Q)$(MAKE) $(build)=$(boot)/dts ARCH=$(ARCH) $(boot)/dts/$@
-+
- PHONY += dtbs dtbs_install
- 
- dtbs: prepare scripts
-diff --git a/arch/arm64/boot/dts/.gitignore b/arch/arm64/boot/dts/.gitignore
-index b60ed208..5d65b54b 100644
---- a/arch/arm64/boot/dts/.gitignore
-+++ b/arch/arm64/boot/dts/.gitignore
-@@ -1 +1,2 @@
--*.dtb
-+*.dtb*
-+*.scr
-diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
-index a1be75d0..ad8dc1c9 100644
---- a/scripts/Makefile.dtbinst
-+++ b/scripts/Makefile.dtbinst
-@@ -27,6 +27,9 @@ ifeq ("$(dtbinst-root)", "$(obj)")
- endif
- 
- dtbinst-files	:= $(dtb-y)
-+dtboinst-files	:= $(dtbo-y)
-+script-files	:= $(scr-y)
-+readme-files	:= $(dtbotxt-y)
- dtbinst-dirs	:= $(dts-dirs)
- 
- # Helper targets for Installing DTBs into the boot directory
-@@ -35,15 +38,24 @@ quiet_cmd_dtb_install =	INSTALL $<
- 
- install-dir = $(patsubst $(dtbinst-root)%,$(INSTALL_DTBS_PATH)%,$(obj))
- 
--$(dtbinst-files) $(dtbinst-dirs): | __dtbs_install_prep
-+$(dtbinst-files) $(dtboinst-files) $(readme-files) $(script-files) $(dtbinst-dirs): | __dtbs_install_prep
- 
- $(dtbinst-files): %.dtb: $(obj)/%.dtb
- 	$(call cmd,dtb_install,$(install-dir))
- 
-+$(dtboinst-files): %.dtbo: $(obj)/%.dtbo
-+	$(call cmd,dtb_install,$(install-dir))
-+
-+$(script-files): %.scr: $(obj)/%.scr
-+	$(call cmd,dtb_install,$(install-dir))
-+
-+$(readme-files): %: $(src)/%
-+	$(call cmd,dtb_install,$(install-dir))
-+
- $(dtbinst-dirs):
- 	$(Q)$(MAKE) $(dtbinst)=$(obj)/$@
- 
--PHONY += $(dtbinst-files) $(dtbinst-dirs)
--__dtbs_install: $(dtbinst-files) $(dtbinst-dirs)
-+PHONY += $(dtbinst-files) $(dtboinst-files) $(script-files) $(readme-files) $(dtbinst-dirs)
-+__dtbs_install: $(dtbinst-files) $(dtboinst-files) $(script-files) $(readme-files) $(dtbinst-dirs)
- 
- .PHONY: $(PHONY)
-diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index 0a07f901..5ccd3490 100644
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -312,6 +312,23 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
- $(obj)/%.dtb: $(src)/%.dts FORCE
- 	$(call if_changed_dep,dtc)
- 
-+quiet_cmd_dtco = DTCO    $@
-+cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \
-+	$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
-+	$(DTC) -O dtb -o $@ -b 0 \
-+		-i $(dir $<) $(DTC_FLAGS) \
-+		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
-+	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
-+
-+$(obj)/%.dtbo: $(src)/%.dts FORCE
-+	$(call if_changed_dep,dtco)
-+
-+quiet_cmd_scr = MKIMAGE $@
-+cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@
-+
-+$(obj)/%.scr: $(src)/%.scr-cmd FORCE
-+	$(call if_changed,scr)
-+
- dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
- 
- # Bzip2

patch/kernel/sun50iw2-dev/add_BergMicro_flashes_to_SPI-NOR.patch

@@ -1,18 +0,0 @@
-diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
-index d0fc165..4510c2d 100644
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -809,6 +809,13 @@ static const struct flash_info spi_nor_ids[] = {
- 
- 	{ "at45db081d", INFO(0x1f2500, 0, 64 * 1024, 16, SECT_4K) },
- 
-+	/* BergMicro Flashes */
-+	{ "bg25q80", INFO(0xe04014, 0, 64 * 1024,  16, SECT_4K) },
-+	{ "bg25q16", INFO(0xe04015, 0, 64 * 1024,  32, SECT_4K) },
-+	{ "bg25q32", INFO(0xe04016, 0, 64 * 1024,  64, SECT_4K) },
-+	{ "bg25q64", INFO(0xe04017, 0, 64 * 1024, 128, SECT_4K) },
-+	{ "bg25q128", INFO(0xe04018, 0, 64 * 1024, 256, SECT_4K) },
-+
- 	/* EON -- en25xxx */
- 	{ "en25f32",    INFO(0x1c3116, 0, 64 * 1024,   64, SECT_4K) },
- 	{ "en25p32",    INFO(0x1c2016, 0, 64 * 1024,   64, 0) },

patch/kernel/sun50iw2-dev/add_configfs_overlay_for_v4.10.x.patch

@@ -1,360 +0,0 @@
-diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
-index bc07ad3..e9da9cf 100644
---- a/drivers/of/Kconfig
-+++ b/drivers/of/Kconfig
-@@ -113,6 +113,13 @@ config OF_OVERLAY
- 	  While this option is selected automatically when needed, you can
- 	  enable it manually to improve device tree unit test coverage.
- 
-+config OF_CONFIGFS
-+        bool "Device Tree Overlay ConfigFS interface"
-+        select CONFIGFS_FS
-+        depends on OF_OVERLAY
-+        help
-+          Enable a simple user-space driven DT overlay interface.
-+
- config OF_NUMA
- 	bool
- 
-diff --git a/drivers/of/Makefile b/drivers/of/Makefile
-index d7efd9d..a06cc35 100644
---- a/drivers/of/Makefile
-+++ b/drivers/of/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_OF_PCI_IRQ)  += of_pci_irq.o
- obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
- obj-$(CONFIG_OF_RESOLVE)  += resolver.o
- obj-$(CONFIG_OF_OVERLAY) += overlay.o
-+obj-$(CONFIG_OF_CONFIGFS) += configfs.o
- obj-$(CONFIG_OF_NUMA) += of_numa.o
- 
- obj-$(CONFIG_OF_UNITTEST) += unittest-data/
-diff --git a/drivers/of/configfs.c b/drivers/of/configfs.c
-new file mode 100644
-index 0000000..68f889d
---- /dev/null
-+++ b/drivers/of/configfs.c
-@@ -0,0 +1,311 @@
-+/*
-+ * Configfs entries for device-tree
-+ *
-+ * Copyright (C) 2013 - Pantelis Antoniou <panto@antoniou-consulting.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+#include <linux/ctype.h>
-+#include <linux/cpu.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/of_fdt.h>
-+#include <linux/spinlock.h>
-+#include <linux/slab.h>
-+#include <linux/proc_fs.h>
-+#include <linux/configfs.h>
-+#include <linux/types.h>
-+#include <linux/stat.h>
-+#include <linux/limits.h>
-+#include <linux/file.h>
-+#include <linux/vmalloc.h>
-+#include <linux/firmware.h>
-+#include <linux/sizes.h>
-+
-+#include "of_private.h"
-+
-+struct cfs_overlay_item {
-+	struct config_item	item;
-+
-+	char			path[PATH_MAX];
-+
-+	const struct firmware	*fw;
-+	struct device_node	*overlay;
-+	int			ov_id;
-+
-+	void			*dtbo;
-+	int			dtbo_size;
-+};
-+
-+static int create_overlay(struct cfs_overlay_item *overlay, void *blob)
-+{
-+	int err;
-+
-+	/* unflatten the tree */
-+	of_fdt_unflatten_tree(blob, NULL, &overlay->overlay);
-+	if (overlay->overlay == NULL) {
-+		pr_err("%s: failed to unflatten tree\n", __func__);
-+		err = -EINVAL;
-+		goto out_err;
-+	}
-+	pr_debug("%s: unflattened OK\n", __func__);
-+
-+	/* mark it as detached */
-+	of_node_set_flag(overlay->overlay, OF_DETACHED);
-+
-+	/* perform resolution */
-+	err = of_resolve_phandles(overlay->overlay);
-+	if (err != 0) {
-+		pr_err("%s: Failed to resolve tree\n", __func__);
-+		goto out_err;
-+	}
-+	pr_debug("%s: resolved OK\n", __func__);
-+
-+	err = of_overlay_create(overlay->overlay);
-+	if (err < 0) {
-+		pr_err("%s: Failed to create overlay (err=%d)\n",
-+				__func__, err);
-+		goto out_err;
-+	}
-+	overlay->ov_id = err;
-+
-+out_err:
-+	return err;
-+}
-+
-+static inline struct cfs_overlay_item *to_cfs_overlay_item(
-+		struct config_item *item)
-+{
-+	return item ? container_of(item, struct cfs_overlay_item, item) : NULL;
-+}
-+
-+static ssize_t cfs_overlay_item_path_show(struct config_item *item,
-+		char *page)
-+{
-+	struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
-+	return sprintf(page, "%s\n", overlay->path);
-+}
-+
-+static ssize_t cfs_overlay_item_path_store(struct config_item *item,
-+		const char *page, size_t count)
-+{
-+	struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
-+	const char *p = page;
-+	char *s;
-+	int err;
-+
-+	/* if it's set do not allow changes */
-+	if (overlay->path[0] != '\0' || overlay->dtbo_size > 0)
-+		return -EPERM;
-+
-+	/* copy to path buffer (and make sure it's always zero terminated */
-+	count = snprintf(overlay->path, sizeof(overlay->path) - 1, "%s", p);
-+	overlay->path[sizeof(overlay->path) - 1] = '\0';
-+
-+	/* strip trailing newlines */
-+	s = overlay->path + strlen(overlay->path);
-+	while (s > overlay->path && *--s == '\n')
-+		*s = '\0';
-+
-+	pr_debug("%s: path is '%s'\n", __func__, overlay->path);
-+
-+	err = request_firmware(&overlay->fw, overlay->path, NULL);
-+	if (err != 0)
-+		goto out_err;
-+
-+	err = create_overlay(overlay, (void *)overlay->fw->data);
-+	if (err != 0)
-+		goto out_err;
-+
-+	return count;
-+
-+out_err:
-+
-+	release_firmware(overlay->fw);
-+	overlay->fw = NULL;
-+
-+	overlay->path[0] = '\0';
-+	return err;
-+}
-+
-+static ssize_t cfs_overlay_item_status_show(struct config_item *item,
-+		char *page)
-+{
-+	struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
-+
-+	return sprintf(page, "%s\n",
-+			overlay->ov_id >= 0 ? "applied" : "unapplied");
-+}
-+
-+CONFIGFS_ATTR(cfs_overlay_item_, path);
-+CONFIGFS_ATTR_RO(cfs_overlay_item_, status);
-+
-+static struct configfs_attribute *cfs_overlay_attrs[] = {
-+	&cfs_overlay_item_attr_path,
-+	&cfs_overlay_item_attr_status,
-+	NULL,
-+};
-+
-+ssize_t cfs_overlay_item_dtbo_read(struct config_item *item,
-+		void *buf, size_t max_count)
-+{
-+	struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
-+
-+	pr_debug("%s: buf=%p max_count=%zu\n", __func__,
-+			buf, max_count);
-+
-+	if (overlay->dtbo == NULL)
-+		return 0;
-+
-+	/* copy if buffer provided */
-+	if (buf != NULL) {
-+		/* the buffer must be large enough */
-+		if (overlay->dtbo_size > max_count)
-+			return -ENOSPC;
-+
-+		memcpy(buf, overlay->dtbo, overlay->dtbo_size);
-+	}
-+
-+	return overlay->dtbo_size;
-+}
-+
-+ssize_t cfs_overlay_item_dtbo_write(struct config_item *item,
-+		const void *buf, size_t count)
-+{
-+	struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
-+	int err;
-+
-+	/* if it's set do not allow changes */
-+	if (overlay->path[0] != '\0' || overlay->dtbo_size > 0)
-+		return -EPERM;
-+
-+	/* copy the contents */
-+	overlay->dtbo = kmemdup(buf, count, GFP_KERNEL);
-+	if (overlay->dtbo == NULL)
-+		return -ENOMEM;
-+
-+	overlay->dtbo_size = count;
-+
-+	err = create_overlay(overlay, overlay->dtbo);
-+	if (err != 0)
-+		goto out_err;
-+
-+	return count;
-+
-+out_err:
-+	kfree(overlay->dtbo);
-+	overlay->dtbo = NULL;
-+	overlay->dtbo_size = 0;
-+
-+	return err;
-+}
-+
-+CONFIGFS_BIN_ATTR(cfs_overlay_item_, dtbo, NULL, SZ_1M);
-+
-+static struct configfs_bin_attribute *cfs_overlay_bin_attrs[] = {
-+	&cfs_overlay_item_attr_dtbo,
-+	NULL,
-+};
-+
-+static void cfs_overlay_release(struct config_item *item)
-+{
-+	struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
-+
-+	if (overlay->ov_id >= 0)
-+		of_overlay_destroy(overlay->ov_id);
-+	if (overlay->fw)
-+		release_firmware(overlay->fw);
-+	/* kfree with NULL is safe */
-+	kfree(overlay->dtbo);
-+	kfree(overlay);
-+}
-+
-+static struct configfs_item_operations cfs_overlay_item_ops = {
-+	.release	= cfs_overlay_release,
-+};
-+
-+static struct config_item_type cfs_overlay_type = {
-+	.ct_item_ops	= &cfs_overlay_item_ops,
-+	.ct_attrs	= cfs_overlay_attrs,
-+	.ct_bin_attrs	= cfs_overlay_bin_attrs,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct config_item *cfs_overlay_group_make_item(
-+		struct config_group *group, const char *name)
-+{
-+	struct cfs_overlay_item *overlay;
-+
-+	overlay = kzalloc(sizeof(*overlay), GFP_KERNEL);
-+	if (!overlay)
-+		return ERR_PTR(-ENOMEM);
-+	overlay->ov_id = -1;
-+
-+	config_item_init_type_name(&overlay->item, name, &cfs_overlay_type);
-+	return &overlay->item;
-+}
-+
-+static void cfs_overlay_group_drop_item(struct config_group *group,
-+		struct config_item *item)
-+{
-+	struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
-+
-+	config_item_put(&overlay->item);
-+}
-+
-+static struct configfs_group_operations overlays_ops = {
-+	.make_item	= cfs_overlay_group_make_item,
-+	.drop_item	= cfs_overlay_group_drop_item,
-+};
-+
-+static struct config_item_type overlays_type = {
-+	.ct_group_ops   = &overlays_ops,
-+	.ct_owner       = THIS_MODULE,
-+};
-+
-+static struct configfs_group_operations of_cfs_ops = {
-+	/* empty - we don't allow anything to be created */
-+};
-+
-+static struct config_item_type of_cfs_type = {
-+	.ct_group_ops   = &of_cfs_ops,
-+	.ct_owner       = THIS_MODULE,
-+};
-+
-+struct config_group of_cfs_overlay_group;
-+
-+static struct configfs_subsystem of_cfs_subsys = {
-+	.su_group = {
-+		.cg_item = {
-+			.ci_namebuf = "device-tree",
-+			.ci_type = &of_cfs_type,
-+		},
-+	},
-+	.su_mutex = __MUTEX_INITIALIZER(of_cfs_subsys.su_mutex),
-+};
-+
-+static int __init of_cfs_init(void)
-+{
-+	int ret;
-+
-+	pr_info("%s\n", __func__);
-+
-+	config_group_init(&of_cfs_subsys.su_group);
-+	config_group_init_type_name(&of_cfs_overlay_group, "overlays",
-+			&overlays_type);
-+	configfs_add_default_group(&of_cfs_overlay_group,
-+			&of_cfs_subsys.su_group);
-+
-+	ret = configfs_register_subsystem(&of_cfs_subsys);
-+	if (ret != 0) {
-+		pr_err("%s: failed to register subsys\n", __func__);
-+		goto out;
-+	}
-+	pr_info("%s: OK\n", __func__);
-+out:
-+	return ret;
-+}
-+late_initcall(of_cfs_init);
-diff --git a/drivers/of/fdt_address.c b/drivers/of/fdt_address.c
-index dca8f9b..ec7e167 100644
---- a/drivers/of/fdt_address.c
-+++ b/drivers/of/fdt_address.c
-@@ -161,7 +161,7 @@ static int __init fdt_translate_one(const void *blob, int parent,
-  * that can be mapped to a cpu physical address). This is not really specified
-  * that way, but this is traditionally the way IBM at least do things
-  */
--static u64 __init fdt_translate_address(const void *blob, int node_offset)
-+u64 __init fdt_translate_address(const void *blob, int node_offset)
- {
- 	int parent, len;
- 	const struct of_bus *bus, *pbus;

patch/kernel/sun50iw2-dev/add_proc_cpuinfo_entries_for_v4.9.x.patch

@@ -1,13 +0,0 @@
-diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
-index b3d5b3e..9520280 100644
---- a/arch/arm64/kernel/cpuinfo.c
-+++ b/arch/arm64/kernel/cpuinfo.c
-@@ -118,6 +118,8 @@ static int c_show(struct seq_file *m, void *v)
- 		 * "processor".  Give glibc what it expects.
- 		 */
- 		seq_printf(m, "processor\t: %d\n", i);
-+                seq_printf(m, "Processor\t: AArch64 Processor rev %d (aarch64)\n", MIDR_REVISION(midr));
-+                seq_printf(m, "Hardware\t: sun50iw1p1\n");
- 		if (compat)
- 			seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n",
- 				   MIDR_REVISION(midr), COMPAT_ELF_PLATFORM);

patch/kernel/sun50iw2-dev/add_sun50i_a64_rccu.patch

@@ -1,404 +0,0 @@
-diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig
-index 8af8f4be8e3b..fbd3f8cd5c22 100644
---- a/drivers/clk/sunxi-ng/Kconfig
-+++ b/drivers/clk/sunxi-ng/Kconfig
-@@ -151,4 +151,10 @@  config SUN9I_A80_CCU
- 	default MACH_SUN9I
- 	depends on MACH_SUN9I || COMPILE_TEST
- 
-+config SUN8I_R_CCU
-+	bool "Support for Allwinner SoCs' PRCM CCUs"
-+	select SUNXI_CCU_DIV
-+	select SUNXI_CCU_GATE
-+	default MACH_SUN8I || (ARCH_SUNXI && ARM64)
-+
- endif
-diff --git a/drivers/clk/sunxi-ng/Makefile b/drivers/clk/sunxi-ng/Makefile
-index 6feaac0c5600..0ec02fe14c50 100644
---- a/drivers/clk/sunxi-ng/Makefile
-+++ b/drivers/clk/sunxi-ng/Makefile
-@@ -25,6 +25,7 @@  obj-$(CONFIG_SUN8I_A23_CCU)	+= ccu-sun8i-a23.o
- obj-$(CONFIG_SUN8I_A33_CCU)	+= ccu-sun8i-a33.o
- obj-$(CONFIG_SUN8I_H3_CCU)	+= ccu-sun8i-h3.o
- obj-$(CONFIG_SUN8I_V3S_CCU)	+= ccu-sun8i-v3s.o
-+obj-$(CONFIG_SUN8I_R_CCU)	+= ccu-sun8i-r.o
- obj-$(CONFIG_SUN9I_A80_CCU)	+= ccu-sun9i-a80.o
- obj-$(CONFIG_SUN9I_A80_CCU)	+= ccu-sun9i-a80-de.o
- obj-$(CONFIG_SUN9I_A80_CCU)	+= ccu-sun9i-a80-usb.o
-diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-r.c b/drivers/clk/sunxi-ng/ccu-sun8i-r.c
-new file mode 100644
-index 000000000000..0d027d53dbdf
---- /dev/null
-+++ b/drivers/clk/sunxi-ng/ccu-sun8i-r.c
-@@ -0,0 +1,213 @@ 
-+/*
-+ * Copyright (c) 2016 Icenowy Zheng <icenowy@aosc.xyz>
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ */
-+
-+#include <linux/clk-provider.h>
-+#include <linux/of_address.h>
-+#include <linux/platform_device.h>
-+
-+#include "ccu_common.h"
-+#include "ccu_reset.h"
-+
-+#include "ccu_div.h"
-+#include "ccu_gate.h"
-+#include "ccu_mp.h"
-+#include "ccu_nm.h"
-+
-+#include "ccu-sun8i-r.h"
-+
-+static const char * const ar100_parents[] = { "osc32K", "osc24M",
-+					     "pll-periph0", "iosc" };
-+
-+static struct ccu_div ar100_clk = {
-+	.div		= _SUNXI_CCU_DIV_FLAGS(4, 2, CLK_DIVIDER_POWER_OF_TWO),
-+
-+	.mux		= {
-+		.shift	= 16,
-+		.width	= 2,
-+
-+		.variable_prediv	= {
-+			.index	= 2,
-+			.shift	= 8,
-+			.width	= 5,
-+		},
-+	},
-+
-+	.common		= {
-+		.reg		= 0x00,
-+		.features	= CCU_FEATURE_VARIABLE_PREDIV,
-+		.hw.init	= CLK_HW_INIT_PARENTS("ar100",
-+						      ar100_parents,
-+						      &ccu_div_ops,
-+						      0),
-+	},
-+};
-+
-+static CLK_FIXED_FACTOR(ahb0_clk, "ahb0", "ar100", 1, 1, 0);
-+
-+static struct ccu_div apb0_clk = {
-+	.div		= _SUNXI_CCU_DIV_FLAGS(0, 2, CLK_DIVIDER_POWER_OF_TWO),
-+
-+	.common		= {
-+		.reg		= 0x0c,
-+		.hw.init	= CLK_HW_INIT("apb0",
-+					      "ahb0",
-+					      &ccu_div_ops,
-+					      0),
-+	},
-+};
-+
-+static SUNXI_CCU_GATE(apb0_pio_clk,	"apb0-pio",	"apb0",
-+		      0x28, BIT(0), 0);
-+static SUNXI_CCU_GATE(apb0_ir_clk,	"apb0-ir",	"apb0",
-+		      0x28, BIT(1), 0);
-+static SUNXI_CCU_GATE(apb0_timer_clk,	"apb0-timer",	"apb0",
-+		      0x28, BIT(2), 0);
-+static SUNXI_CCU_GATE(apb0_rsb_clk,	"apb0-rsb",	"apb0",
-+		      0x28, BIT(3), 0);
-+static SUNXI_CCU_GATE(apb0_uart_clk,	"apb0-uart",	"apb0",
-+		      0x28, BIT(4), 0);
-+static SUNXI_CCU_GATE(apb0_i2c_clk,	"apb0-i2c",	"apb0",
-+		      0x28, BIT(6), 0);
-+static SUNXI_CCU_GATE(apb0_twd_clk,	"apb0-twd",	"apb0",
-+		      0x28, BIT(7), 0);
-+
-+static const char * const r_mod0_default_parents[] = { "osc32K", "osc24M" };
-+static SUNXI_CCU_MP_WITH_MUX_GATE(ir_clk, "ir",
-+				  r_mod0_default_parents, 0x54,
-+				  0, 4,		/* M */
-+				  16, 2,	/* P */
-+				  24, 2,	/* mux */
-+				  BIT(31),	/* gate */
-+				  0);
-+
-+static struct ccu_common *sun8i_h3_r_ccu_clks[] = {
-+	&ar100_clk.common,
-+	&apb0_clk.common,
-+	&apb0_pio_clk.common,
-+	&apb0_ir_clk.common,
-+	&apb0_timer_clk.common,
-+	&apb0_uart_clk.common,
-+	&apb0_i2c_clk.common,
-+	&apb0_twd_clk.common,
-+	&ir_clk.common,
-+};
-+
-+static struct ccu_common *sun50i_a64_r_ccu_clks[] = {
-+	&ar100_clk.common,
-+	&apb0_clk.common,
-+	&apb0_pio_clk.common,
-+	&apb0_ir_clk.common,
-+	&apb0_timer_clk.common,
-+	&apb0_rsb_clk.common,
-+	&apb0_uart_clk.common,
-+	&apb0_i2c_clk.common,
-+	&apb0_twd_clk.common,
-+	&ir_clk.common,
-+};
-+
-+static struct clk_hw_onecell_data sun8i_h3_r_hw_clks = {
-+	.hws	= {
-+		[CLK_AR100]		= &ar100_clk.common.hw,
-+		[CLK_AHB0]		= &ahb0_clk.hw,
-+		[CLK_APB0]		= &apb0_clk.common.hw,
-+		[CLK_APB0_PIO]		= &apb0_pio_clk.common.hw,
-+		[CLK_APB0_IR]		= &apb0_ir_clk.common.hw,
-+		[CLK_APB0_TIMER]	= &apb0_timer_clk.common.hw,
-+		[CLK_APB0_UART]		= &apb0_uart_clk.common.hw,
-+		[CLK_APB0_I2C]		= &apb0_i2c_clk.common.hw,
-+		[CLK_APB0_TWD]		= &apb0_twd_clk.common.hw,
-+		[CLK_IR]		= &ir_clk.common.hw,
-+	},
-+	.num	= CLK_NUMBER,
-+};
-+
-+static struct clk_hw_onecell_data sun50i_a64_r_hw_clks = {
-+	.hws	= {
-+		[CLK_AR100]		= &ar100_clk.common.hw,
-+		[CLK_AHB0]		= &ahb0_clk.hw,
-+		[CLK_APB0]		= &apb0_clk.common.hw,
-+		[CLK_APB0_PIO]		= &apb0_pio_clk.common.hw,
-+		[CLK_APB0_IR]		= &apb0_ir_clk.common.hw,
-+		[CLK_APB0_TIMER]	= &apb0_timer_clk.common.hw,
-+		[CLK_APB0_RSB]		= &apb0_rsb_clk.common.hw,
-+		[CLK_APB0_UART]		= &apb0_uart_clk.common.hw,
-+		[CLK_APB0_I2C]		= &apb0_i2c_clk.common.hw,
-+		[CLK_APB0_TWD]		= &apb0_twd_clk.common.hw,
-+		[CLK_IR]		= &ir_clk.common.hw,
-+	},
-+	.num	= CLK_NUMBER,
-+};
-+
-+static struct ccu_reset_map sun8i_h3_r_ccu_resets[] = {
-+	[RST_APB0_IR]		=  { 0xb0, BIT(1) },
-+	[RST_APB0_TIMER]	=  { 0xb0, BIT(2) },
-+	[RST_APB0_UART]		=  { 0xb0, BIT(4) },
-+	[RST_APB0_I2C]		=  { 0xb0, BIT(6) },
-+};
-+
-+static struct ccu_reset_map sun50i_a64_r_ccu_resets[] = {
-+	[RST_APB0_IR]		=  { 0xb0, BIT(1) },
-+	[RST_APB0_TIMER]	=  { 0xb0, BIT(2) },
-+	[RST_APB0_RSB]		=  { 0xb0, BIT(3) },
-+	[RST_APB0_UART]		=  { 0xb0, BIT(4) },
-+	[RST_APB0_I2C]		=  { 0xb0, BIT(6) },
-+};
-+
-+static const struct sunxi_ccu_desc sun8i_h3_r_ccu_desc = {
-+	.ccu_clks	= sun8i_h3_r_ccu_clks,
-+	.num_ccu_clks	= ARRAY_SIZE(sun8i_h3_r_ccu_clks),
-+
-+	.hw_clks	= &sun8i_h3_r_hw_clks,
-+
-+	.resets		= sun8i_h3_r_ccu_resets,
-+	.num_resets	= ARRAY_SIZE(sun8i_h3_r_ccu_resets),
-+};
-+
-+static const struct sunxi_ccu_desc sun50i_a64_r_ccu_desc = {
-+	.ccu_clks	= sun50i_a64_r_ccu_clks,
-+	.num_ccu_clks	= ARRAY_SIZE(sun50i_a64_r_ccu_clks),
-+
-+	.hw_clks	= &sun50i_a64_r_hw_clks,
-+
-+	.resets		= sun50i_a64_r_ccu_resets,
-+	.num_resets	= ARRAY_SIZE(sun50i_a64_r_ccu_resets),
-+};
-+
-+static void __init sunxi_r_ccu_init(struct device_node *node,
-+				    const struct sunxi_ccu_desc *desc)
-+{
-+	void __iomem *reg;
-+
-+	reg = of_io_request_and_map(node, 0, of_node_full_name(node));
-+	if (IS_ERR(reg)) {
-+		pr_err("%s: Could not map the clock registers\n",
-+		       of_node_full_name(node));
-+		return;
-+	}
-+
-+	sunxi_ccu_probe(node, reg, desc);
-+}
-+
-+static void __init sun8i_h3_r_ccu_setup(struct device_node *node)
-+{
-+	sunxi_r_ccu_init(node, &sun8i_h3_r_ccu_desc);
-+}
-+CLK_OF_DECLARE(sun8i_h3_r_ccu, "allwinner,sun8i-h3-r-ccu",
-+	       sun8i_h3_r_ccu_setup);
-+
-+static void __init sun50i_a64_r_ccu_setup(struct device_node *node)
-+{
-+	sunxi_r_ccu_init(node, &sun50i_a64_r_ccu_desc);
-+}
-+CLK_OF_DECLARE(sun50i_a64_r_ccu, "allwinner,sun50i-a64-r-ccu",
-+	       sun50i_a64_r_ccu_setup);
-diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-r.h b/drivers/clk/sunxi-ng/ccu-sun8i-r.h
-new file mode 100644
-index 000000000000..eaa431fd1d8f
---- /dev/null
-+++ b/drivers/clk/sunxi-ng/ccu-sun8i-r.h
-@@ -0,0 +1,27 @@ 
-+/*
-+ * Copyright 2016 Icenowy <icenowy@aosc.xyz>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ */
-+
-+#ifndef _CCU_SUN8I_R_H
-+#define _CCU_SUN8I_R_H_
-+
-+#include <dt-bindings/clock/sun8i-r-ccu.h>
-+#include <dt-bindings/reset/sun8i-r-ccu.h>
-+
-+/* AHB/APB bus clocks are not exported */
-+#define CLK_AHB0	1
-+#define CLK_APB0	2
-+
-+#define CLK_NUMBER	(CLK_IR + 1)
-+
-+#endif /* _CCU_SUN8I_R_H */
-diff --git a/include/dt-bindings/clock/sun8i-r-ccu.h b/include/dt-bindings/clock/sun8i-r-ccu.h
-new file mode 100644
-index 000000000000..779d20aa0d05
---- /dev/null
-+++ b/include/dt-bindings/clock/sun8i-r-ccu.h
-@@ -0,0 +1,59 @@ 
-+/*
-+ * Copyright (c) 2016 Icenowy Zheng <icenowy@aosc.xyz>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This file is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This file is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef _DT_BINDINGS_CLK_SUN8I_R_CCU_H_
-+#define _DT_BINDINGS_CLK_SUN8I_R_CCU_H_
-+
-+#define CLK_AR100		0
-+
-+#define CLK_APB0_PIO		3
-+#define CLK_APB0_IR		4
-+#define CLK_APB0_TIMER		5
-+#define CLK_APB0_RSB		6
-+#define CLK_APB0_UART		7
-+/* 8 is reserved for CLK_APB0_W1 on A31 */
-+#define CLK_APB0_I2C		9
-+#define CLK_APB0_TWD		10
-+
-+#define CLK_IR			11
-+
-+#endif /* _DT_BINDINGS_CLK_SUN8I_R_CCU_H_ */
-diff --git a/include/dt-bindings/reset/sun8i-r-ccu.h b/include/dt-bindings/reset/sun8i-r-ccu.h
-new file mode 100644
-index 000000000000..4ba64f3d6fc9
---- /dev/null
-+++ b/include/dt-bindings/reset/sun8i-r-ccu.h
-@@ -0,0 +1,53 @@ 
-+/*
-+ * Copyright (C) 2016 Icenowy Zheng <icenowy@aosc.xyz>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This file is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This file is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef _DT_BINDINGS_RST_SUN8I_R_CCU_H_
-+#define _DT_BINDINGS_RST_SUN8I_R_CCU_H_
-+
-+#define RST_APB0_IR		0
-+#define RST_APB0_TIMER		1
-+#define RST_APB0_RSB		2
-+#define RST_APB0_UART		3
-+/* 4 is reserved for RST_APB0_W1 on A31 */
-+#define RST_APB0_I2C		5
-+
-+#endif /* _DT_BINDINGS_RST_SUN8I_R_CCU_H_ */
-

patch/kernel/sun50iw2-dev/add_sun50i_a64_rpio.patch

@@ -1,227 +0,0 @@
-diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
-index 81f0d61..18ff031 100644
---- a/arch/arm64/Kconfig.platforms
-+++ b/arch/arm64/Kconfig.platforms
-@@ -5,6 +5,7 @@ config ARCH_SUNXI
- 	select GENERIC_IRQ_CHIP
- 	select PINCTRL
- 	select PINCTRL_SUN50I_A64
-+	select PINCTRL_SUN50I_A64_R
- 	select PINCTRL_SUN50I_H5
- 	select PINCTRL_SUN8I_H3_R
- 	help
-diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
-index a84bfa7f3c05..a0c419ac2a3b 100644
---- a/drivers/pinctrl/sunxi/Kconfig
-+++ b/drivers/pinctrl/sunxi/Kconfig
-@@ -68,6 +68,10 @@  config PINCTRL_SUN50I_A64
- 	def_bool ARM64 && ARCH_SUNXI
- 	select PINCTRL_SUNXI
- 
-+config PINCTRL_SUN50I_A64_R
-+	def_bool ARM64 && ARCH_SUNXI
-+	select PINCTRL_SUNXI
-+
- config PINCTRL_SUN50I_H5
- 	def_bool ARM64 && ARCH_SUNXI
- 	select PINCTRL_SUNXI
-diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile
-index 04ccb88ebd5f..df4ccd6cd44c 100644
---- a/drivers/pinctrl/sunxi/Makefile
-+++ b/drivers/pinctrl/sunxi/Makefile
-@@ -11,6 +11,7 @@  obj-$(CONFIG_PINCTRL_SUN8I_A23)		+= pinctrl-sun8i-a23.o
- obj-$(CONFIG_PINCTRL_SUN8I_A23_R)	+= pinctrl-sun8i-a23-r.o
- obj-$(CONFIG_PINCTRL_SUN8I_A33)		+= pinctrl-sun8i-a33.o
- obj-$(CONFIG_PINCTRL_SUN50I_A64)	+= pinctrl-sun50i-a64.o
-+obj-$(CONFIG_PINCTRL_SUN50I_A64_R)	+= pinctrl-sun50i-a64-r.o
- obj-$(CONFIG_PINCTRL_SUN8I_A83T)	+= pinctrl-sun8i-a83t.o
- obj-$(CONFIG_PINCTRL_SUN8I_H3)		+= pinctrl-sun8i-h3.o
- obj-$(CONFIG_PINCTRL_SUN8I_H3_R)	+= pinctrl-sun8i-h3-r.o
-diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
-new file mode 100644
-index 000000000000..415870e82cbf
---- /dev/null
-+++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
-@@ -0,0 +1,125 @@ 
-+/*
-+ * Allwinner A64 SoCs special pins pinctrl driver.
-+ *
-+ * Based on pinctrl-sun8i-a23-r.c
-+ *
-+ * Copyright (C) 2016 Icenowy Zheng
-+ * Icenowy Zheng <icenowy@aosc.xyz>
-+ *
-+ * Copyright (C) 2014 Chen-Yu Tsai
-+ * Chen-Yu Tsai <wens@csie.org>
-+ *
-+ * Copyright (C) 2014 Boris Brezillon
-+ * Boris Brezillon <boris.brezillon@free-electrons.com>
-+ *
-+ * Copyright (C) 2014 Maxime Ripard
-+ * Maxime Ripard <maxime.ripard@free-electrons.com>
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2.  This program is licensed "as is" without any
-+ * warranty of any kind, whether express or implied.
-+ */
-+
-+#include <linux/of.h>
-+#include <linux/of_device.h>
-+#include <linux/pinctrl/pinctrl.h>
-+#include <linux/platform_device.h>
-+#include <linux/reset.h>
-+
-+#include "pinctrl-sunxi.h"
-+
-+static const struct sunxi_desc_pin sun50i_a64_r_pins[] = {
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 0),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_rsb"),		/* SCK */
-+		  SUNXI_FUNCTION(0x3, "s_i2c"),		/* SCK */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 0)),	/* PL_EINT0 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_rsb"),		/* SDA */
-+		  SUNXI_FUNCTION(0x3, "s_i2c"),		/* SDA */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 1)),	/* PL_EINT1 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_uart"),	/* TX */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 2)),	/* PL_EINT2 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 3),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_uart"),	/* RX */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 3)),	/* PL_EINT3 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 4),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_jtag"),	/* MS */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 4)),	/* PL_EINT4 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 5),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_jtag"),	/* CK */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 5)),	/* PL_EINT5 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 6),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_jtag"),	/* DO */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 6)),	/* PL_EINT6 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 7),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_jtag"),	/* DI */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 7)),	/* PL_EINT7 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 8),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_i2c"),		/* SCK */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 8)),	/* PL_EINT8 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 9),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_i2c"),		/* SDA */
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 9)),	/* PL_EINT9 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 10),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_pwm"),
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 10)),	/* PL_EINT10 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 11),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION(0x2, "s_cir_rx"),
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 11)),	/* PL_EINT11 */
-+	SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 12),
-+		  SUNXI_FUNCTION(0x0, "gpio_in"),
-+		  SUNXI_FUNCTION(0x1, "gpio_out"),
-+		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 12)),	/* PL_EINT12 */
-+};
-+
-+static const struct sunxi_pinctrl_desc sun50i_a64_r_pinctrl_data = {
-+	.pins = sun50i_a64_r_pins,
-+	.npins = ARRAY_SIZE(sun50i_a64_r_pins),
-+	.pin_base = PL_BASE,
-+	.irq_banks = 1,
-+};
-+
-+static int sun50i_a64_r_pinctrl_probe(struct platform_device *pdev)
-+{
-+	return sunxi_pinctrl_init(pdev,
-+				  &sun50i_a64_r_pinctrl_data);
-+}
-+
-+static const struct of_device_id sun50i_a64_r_pinctrl_match[] = {
-+	{ .compatible = "allwinner,sun50i-a64-r-pinctrl", },
-+	{}
-+};
-+
-+static struct platform_driver sun50i_a64_r_pinctrl_driver = {
-+	.probe	= sun50i_a64_r_pinctrl_probe,
-+	.driver	= {
-+		.name		= "sun50i-a64-r-pinctrl",
-+		.of_match_table	= sun50i_a64_r_pinctrl_match,
-+	},
-+};
-+builtin_platform_driver(sun50i_a64_r_pinctrl_driver);
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-index 02c0385..c0773d8 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-@@ -43,8 +43,10 @@
-  */
- 
- #include <dt-bindings/clock/sun50i-a64-ccu.h>
-+#include <dt-bindings/clock/sun8i-r-ccu.h>
- #include <dt-bindings/interrupt-controller/arm-gic.h>
- #include <dt-bindings/reset/sun50i-a64-ccu.h>
-+#include <dt-bindings/reset/sun8i-r-ccu.h>
- 
- / {
- 	interrupt-parent = <&gic>;
-@@ -98,6 +100,13 @@
- 		clock-output-names = "osc32k";
- 	};
- 
-+	osc32000: osc32000_clk {
-+		#clock-cells = <0>;
-+		compatible = "fixed-clock";
-+		clock-frequency = <32000>;
-+		clock-output-names = "osc32000";
-+	};
-+
- 	psci {
- 		compatible = "arm,psci-0.2";
- 		method = "smc";
-@@ -306,6 +315,27 @@
- 			};
- 		};
- 
-+		r_ccu: clock@1f01400 {
-+			compatible = "allwinner,sun50i-a64-r-ccu";
-+			reg = <0x01f01400 0x100>;
-+			clocks = <&osc24M>, <&osc32k>, <&osc32000>;
-+			clock-names = "hosc", "losc", "iosc";
-+			#clock-cells = <1>;
-+			#reset-cells = <1>;
-+		};
-+
-+		r_pio: pinctrl@1f02c00 {
-+			compatible = "allwinner,sun50i-a64-r-pinctrl";
-+			reg = <0x01f02c00 0x400>;
-+			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&r_ccu CLK_APB0_PIO>, <&osc24M>, <&osc32k>;
-+			clock-names = "apb", "hosc", "losc";
-+			gpio-controller;
-+			#gpio-cells = <3>;
-+			interrupt-controller;
-+			#interrupt-cells = <3>;
-+		};
-+
- 		uart0: serial@1c28000 {
- 			compatible = "snps,dw-apb-uart";
- 			reg = <0x01c28000 0x400>;

patch/kernel/sun50iw2-dev/remove-localversion.patch

@@ -1,7 +0,0 @@
-diff --git a/localversion-next b/localversion-next
-deleted file mode 100644
-index 299f8119..00000000
---- a/localversion-next
-+++ /dev/null
-@@ -1 +0,0 @@
---next-20170216

patch/kernel/sun50iw2-dev/scripts-dtc-Update-to-version-with-overlays.patch

@@ -1,16 +0,0 @@
-diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index ddf83d0..a0fb9e3 100644
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -275,7 +275,11 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \
-
- # DTC
- # ---------------------------------------------------------------------------
-+ifeq ($(CONFIG_OF_CONFIGFS),y)
-+DTC ?= $(objtree)/scripts/dtc/dtc -@
-+else
- DTC ?= $(objtree)/scripts/dtc/dtc
-+endif
-
- # Generate an assembly file to wrap the output of the device tree compiler
- quiet_cmd_dt_S_dtb= DTB     $@

patch/kernel/sun50iw2-dev/spi-sun6i-allow-large-transfers.patch

@@ -1,190 +0,0 @@
-diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c
-index e3114832..03a773a9 100644
---- a/drivers/spi/spi-sun6i.c
-+++ b/drivers/spi/spi-sun6i.c
-@@ -46,13 +46,19 @@
- #define SUN6I_TFR_CTL_XCH			BIT(31)
- 
- #define SUN6I_INT_CTL_REG		0x10
-+#define SUN6I_INT_CTL_RF_RDY			BIT(0)
-+#define SUN6I_INT_CTL_TF_ERQ			BIT(4)
- #define SUN6I_INT_CTL_RF_OVF			BIT(8)
- #define SUN6I_INT_CTL_TC			BIT(12)
- 
- #define SUN6I_INT_STA_REG		0x14
- 
- #define SUN6I_FIFO_CTL_REG		0x18
-+#define SUN6I_FIFO_CTL_RF_RDY_TRIG_LEVEL_MASK	0xff
-+#define SUN6I_FIFO_CTL_RF_RDY_TRIG_LEVEL_BITS	0
- #define SUN6I_FIFO_CTL_RF_RST			BIT(15)
-+#define SUN6I_FIFO_CTL_TF_ERQ_TRIG_LEVEL_MASK	0xff
-+#define SUN6I_FIFO_CTL_TF_ERQ_TRIG_LEVEL_BITS	16
- #define SUN6I_FIFO_CTL_TF_RST			BIT(31)
- 
- #define SUN6I_FIFO_STA_REG		0x1c
-@@ -68,14 +74,16 @@
- #define SUN6I_CLK_CTL_CDR1(div)			(((div) & SUN6I_CLK_CTL_CDR1_MASK) << 8)
- #define SUN6I_CLK_CTL_DRS			BIT(12)
- 
-+#define SUN6I_MAX_XFER_SIZE		0xffffff
-+
- #define SUN6I_BURST_CNT_REG		0x30
--#define SUN6I_BURST_CNT(cnt)			((cnt) & 0xffffff)
-+#define SUN6I_BURST_CNT(cnt)			((cnt) & SUN6I_MAX_XFER_SIZE)
- 
- #define SUN6I_XMIT_CNT_REG		0x34
--#define SUN6I_XMIT_CNT(cnt)			((cnt) & 0xffffff)
-+#define SUN6I_XMIT_CNT(cnt)			((cnt) & SUN6I_MAX_XFER_SIZE)
- 
- #define SUN6I_BURST_CTL_CNT_REG		0x38
--#define SUN6I_BURST_CTL_CNT_STC(cnt)		((cnt) & 0xffffff)
-+#define SUN6I_BURST_CTL_CNT_STC(cnt)		((cnt) & SUN6I_MAX_XFER_SIZE)
- 
- #define SUN6I_TXDATA_REG		0x200
- #define SUN6I_RXDATA_REG		0x300
-@@ -105,6 +113,31 @@ static inline void sun6i_spi_write(struct sun6i_spi *sspi, u32 reg, u32 value)
- 	writel(value, sspi->base_addr + reg);
- }
- 
-+static inline u32 sun6i_spi_get_tx_fifo_count(struct sun6i_spi *sspi)
-+{
-+	u32 reg = sun6i_spi_read(sspi, SUN6I_FIFO_STA_REG);
-+
-+	reg >>= SUN6I_FIFO_STA_TF_CNT_BITS;
-+
-+	return reg & SUN6I_FIFO_STA_TF_CNT_MASK;
-+}
-+
-+static inline void sun6i_spi_enable_interrupt(struct sun6i_spi *sspi, u32 mask)
-+{
-+	u32 reg = sun6i_spi_read(sspi, SUN6I_INT_CTL_REG);
-+
-+	reg |= mask;
-+	sun6i_spi_write(sspi, SUN6I_INT_CTL_REG, reg);
-+}
-+
-+static inline void sun6i_spi_disable_interrupt(struct sun6i_spi *sspi, u32 mask)
-+{
-+	u32 reg = sun6i_spi_read(sspi, SUN6I_INT_CTL_REG);
-+
-+	reg &= ~mask;
-+	sun6i_spi_write(sspi, SUN6I_INT_CTL_REG, reg);
-+}
-+
- static inline void sun6i_spi_drain_fifo(struct sun6i_spi *sspi, int len)
- {
- 	u32 reg, cnt;
-@@ -127,10 +160,13 @@ static inline void sun6i_spi_drain_fifo(struct sun6i_spi *sspi, int len)
- 
- static inline void sun6i_spi_fill_fifo(struct sun6i_spi *sspi, int len)
- {
-+	u32 cnt;
- 	u8 byte;
- 
--	if (len > sspi->len)
--		len = sspi->len;
-+	/* See how much data we can fit */
-+	cnt = sspi->fifo_depth - sun6i_spi_get_tx_fifo_count(sspi);
-+
-+	len = min3(len, (int)cnt, sspi->len);
- 
- 	while (len--) {
- 		byte = sspi->tx_buf ? *sspi->tx_buf++ : 0;
-@@ -158,9 +194,7 @@ static void sun6i_spi_set_cs(struct spi_device *spi, bool enable)
- 
- static size_t sun6i_spi_max_transfer_size(struct spi_device *spi)
- {
--	struct sun6i_spi *sspi = spi_master_get_devdata(spi->master);
--
--	return sspi->fifo_depth - 1;
-+	return SUN6I_MAX_XFER_SIZE - 1;
- }
- 
- static int sun6i_spi_transfer_one(struct spi_master *master,
-@@ -170,12 +204,12 @@ static int sun6i_spi_transfer_one(struct spi_master *master,
- 	struct sun6i_spi *sspi = spi_master_get_devdata(master);
- 	unsigned int mclk_rate, div, timeout;
- 	unsigned int start, end, tx_time;
-+	unsigned int trig_level;
- 	unsigned int tx_len = 0;
- 	int ret = 0;
- 	u32 reg;
- 
--	/* We don't support transfer larger than the FIFO */
--	if (tfr->len > sspi->fifo_depth)
-+	if (tfr->len > SUN6I_MAX_XFER_SIZE)
- 		return -EINVAL;
- 
- 	reinit_completion(&sspi->done);
-@@ -191,6 +225,17 @@ static int sun6i_spi_transfer_one(struct spi_master *master,
- 			SUN6I_FIFO_CTL_RF_RST | SUN6I_FIFO_CTL_TF_RST);
- 
- 	/*
-+	 * Setup FIFO interrupt trigger level
-+	 * Here we choose 3/4 of the full fifo depth, as it's the hardcoded
-+	 * value used in old generation of Allwinner SPI controller.
-+	 * (See spi-sun4i.c)
-+	 */
-+	trig_level = sspi->fifo_depth / 4 * 3;
-+	sun6i_spi_write(sspi, SUN6I_FIFO_CTL_REG,
-+			(trig_level << SUN6I_FIFO_CTL_RF_RDY_TRIG_LEVEL_BITS) |
-+			(trig_level << SUN6I_FIFO_CTL_TF_ERQ_TRIG_LEVEL_BITS));
-+
-+	/*
- 	 * Setup the transfer control register: Chip Select,
- 	 * polarities, etc.
- 	 */
-@@ -274,6 +319,10 @@ static int sun6i_spi_transfer_one(struct spi_master *master,
- 
- 	/* Enable the interrupts */
- 	sun6i_spi_write(sspi, SUN6I_INT_CTL_REG, SUN6I_INT_CTL_TC);
-+	sun6i_spi_enable_interrupt(sspi, SUN6I_INT_CTL_TC |
-+					 SUN6I_INT_CTL_RF_RDY);
-+	if (tx_len > sspi->fifo_depth)
-+		sun6i_spi_enable_interrupt(sspi, SUN6I_INT_CTL_TF_ERQ);
- 
- 	/* Start the transfer */
- 	reg = sun6i_spi_read(sspi, SUN6I_TFR_CTL_REG);
-@@ -293,8 +342,6 @@ static int sun6i_spi_transfer_one(struct spi_master *master,
- 		goto out;
- 	}
- 
--	sun6i_spi_drain_fifo(sspi, sspi->fifo_depth);
--
- out:
- 	sun6i_spi_write(sspi, SUN6I_INT_CTL_REG, 0);
- 
-@@ -309,10 +356,33 @@ static irqreturn_t sun6i_spi_handler(int irq, void *dev_id)
- 	/* Transfer complete */
- 	if (status & SUN6I_INT_CTL_TC) {
- 		sun6i_spi_write(sspi, SUN6I_INT_STA_REG, SUN6I_INT_CTL_TC);
-+		sun6i_spi_drain_fifo(sspi, sspi->fifo_depth);
- 		complete(&sspi->done);
- 		return IRQ_HANDLED;
- 	}
- 
-+	/* Receive FIFO 3/4 full */
-+	if (status & SUN6I_INT_CTL_RF_RDY) {
-+		sun6i_spi_drain_fifo(sspi, SUN6I_FIFO_DEPTH);
-+		/* Only clear the interrupt _after_ draining the FIFO */
-+		sun6i_spi_write(sspi, SUN6I_INT_STA_REG, SUN6I_INT_CTL_RF_RDY);
-+		return IRQ_HANDLED;
-+	}
-+
-+	/* Transmit FIFO 3/4 empty */
-+	if (status & SUN6I_INT_CTL_TF_ERQ) {
-+		sun6i_spi_fill_fifo(sspi, SUN6I_FIFO_DEPTH);
-+
-+		if (!sspi->len)
-+			/* nothing left to transmit */
-+			sun6i_spi_disable_interrupt(sspi, SUN6I_INT_CTL_TF_ERQ);
-+
-+		/* Only clear the interrupt _after_ re-seeding the FIFO */
-+		sun6i_spi_write(sspi, SUN6I_INT_STA_REG, SUN6I_INT_CTL_TF_ERQ);
-+
-+		return IRQ_HANDLED;
-+	}
-+
- 	return IRQ_NONE;
- }
- 

patch/kernel/sun50iw2-dev/spidev-remove-warnings.patch

@@ -1,21 +0,0 @@
-diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
-index 9e2e099b..a065943d 100644
---- a/drivers/spi/spidev.c
-+++ b/drivers/spi/spidev.c
-@@ -749,13 +749,11 @@ static int spidev_probe(struct spi_device *spi)
- 
- 	/*
- 	 * spidev should never be referenced in DT without a specific
--	 * compatible string, it is a Linux implementation thing
--	 * rather than a description of the hardware.
-+	 * compatible string, but people don't care and use DT overlays
-+	 * to activate SPIdev on demand
- 	 */
- 	if (spi->dev.of_node && !of_match_device(spidev_dt_ids, &spi->dev)) {
--		dev_err(&spi->dev, "buggy DT: spidev listed directly in DT\n");
--		WARN_ON(spi->dev.of_node &&
--			!of_match_device(spidev_dt_ids, &spi->dev));
-+		dev_info(&spi->dev, "probing from DT");
- 	}
- 
- 	spidev_probe_acpi(spi);