From 95627665cbcb03c20a4356df3123b19285f5c083 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 15 Oct 2017 19:06:08 +0200 Subject: [PATCH] at91: update to kernel 4.9 This brings the at91 target to kernel 4.9. Signed-off-by: Hauke Mehrtens Tested-by: Ben Whitten --- target/linux/at91/Makefile | 2 +- target/linux/at91/{config-4.4 => config-4.9} | 24 +++++++++---------- .../files/arch/arm/boot/dts/at91-q5xr5.dts | 2 +- .../at91/files/arch/arm/boot/dts/lmu5000.dts | 2 +- .../100-ARM-at91-build-dtb-for-LMU5000.patch | 2 +- .../101-ARM-at91-build-dtb-for-q5xr5.patch | 2 +- .../102-ARM-at91-build-dtb-for-wb45n.patch | 2 +- .../103-ARM-at91-build-dtb-for-wb50n.patch | 10 ++++---- target/linux/at91/sama5/config-default | 3 +++ 9 files changed, 26 insertions(+), 23 deletions(-) rename target/linux/at91/{config-4.4 => config-4.9} (95%) rename target/linux/at91/{patches-4.4 => patches-4.9}/100-ARM-at91-build-dtb-for-LMU5000.patch (80%) rename target/linux/at91/{patches-4.4 => patches-4.9}/101-ARM-at91-build-dtb-for-q5xr5.patch (81%) rename target/linux/at91/{patches-4.4 => patches-4.9}/102-ARM-at91-build-dtb-for-wb45n.patch (84%) rename target/linux/at91/{patches-4.4 => patches-4.9}/103-ARM-at91-build-dtb-for-wb50n.patch (57%) diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index c4de685d104..cae3c6278b5 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -13,7 +13,7 @@ BOARDNAME:=Microchip (Atmel AT91) FEATURES:=ext4 squashfs targz usb usbgadget ubifs SUBTARGETS:=sama5 legacy -KERNEL_PATCHVER:=4.4 +KERNEL_PATCHVER:=4.9 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/at91/config-4.4 b/target/linux/at91/config-4.9 similarity index 95% rename from target/linux/at91/config-4.4 rename to target/linux/at91/config-4.9 index d90f0e71768..c0151a59169 100644 --- a/target/linux/at91/config-4.4 +++ b/target/linux/at91/config-4.9 @@ -1,6 +1,6 @@ CONFIG_ALIGNMENT_TRAP=y CONFIG_ARCH_AT91=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y CONFIG_ARCH_HAS_SG_CHAIN=y @@ -14,7 +14,6 @@ CONFIG_ARCH_MULTI_CPU_AUTO=y CONFIG_ARCH_MULTI_V4_V5=y CONFIG_ARCH_MULTI_V5=y CONFIG_ARCH_NR_GPIO=0 -CONFIG_ARCH_REQUIRE_GPIOLIB=y # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y @@ -24,7 +23,6 @@ CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_ARM=y CONFIG_ARM_APPENDED_DTB=y # CONFIG_ARM_ATAG_DTB_COMPAT is not set @@ -36,6 +34,7 @@ CONFIG_ARM_THUMB=y CONFIG_AT91SAM9X_WATCHDOG=y CONFIG_ATAGS=y CONFIG_ATMEL_AIC_IRQ=y +CONFIG_ATMEL_EBI=y CONFIG_ATMEL_PIT=y CONFIG_ATMEL_SDRAMC=y # CONFIG_ATMEL_TCLIB is not set @@ -44,7 +43,6 @@ CONFIG_AT_HDMAC=y CONFIG_AUTO_ZRELADDR=y # CONFIG_BLK_DEV_INITRD is not set # CONFIG_CACHE_L2X0 is not set -CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_OF=y CONFIG_CLKSRC_PROBE=y @@ -77,7 +75,6 @@ CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" # CONFIG_DEBUG_UART_8250 is not set # CONFIG_DEBUG_USER is not set -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y @@ -85,6 +82,7 @@ CONFIG_DTC=y CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_EXT4_FS=y +CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FRAME_POINTER=y CONFIG_FS_MBCACHE=y @@ -92,6 +90,7 @@ CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_IDLE_POLL_SETUP=y CONFIG_GENERIC_IO=y CONFIG_GENERIC_IRQ_CHIP=y @@ -104,7 +103,6 @@ CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y -CONFIG_GPIO_DEVRES=y CONFIG_GPIO_SYSFS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDIRQS_SW_RESEND=y @@ -123,7 +121,7 @@ CONFIG_HAVE_AT91_SMD=y CONFIG_HAVE_AT91_USB_CLK=y CONFIG_HAVE_AT91_UTMI=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_BPF_JIT=y +CONFIG_HAVE_CBPF_JIT=y CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y @@ -131,7 +129,6 @@ CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FB_ATMEL=y @@ -140,7 +137,6 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_HAVE_NET_DSA=y @@ -171,6 +167,7 @@ CONFIG_LZO_DECOMPRESS=y CONFIG_MACB=y CONFIG_MDIO_BOARDINFO=y CONFIG_MEMORY=y +CONFIG_MFD_SYSCON=y CONFIG_MICREL_PHY=y CONFIG_MIGHT_HAVE_PCI=y CONFIG_MMC=y @@ -203,13 +200,11 @@ CONFIG_OF_FLATTREE=y CONFIG_OF_GPIO=y CONFIG_OF_IRQ=y CONFIG_OF_MDIO=y -CONFIG_OF_MTD=y CONFIG_OF_NET=y CONFIG_OF_RESERVED_MEM=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_PAGE_OFFSET=0xC0000000 -# CONFIG_PCI is not set # CONFIG_PCI_DOMAINS_GENERIC is not set # CONFIG_PCI_SYSCALL is not set CONFIG_PERF_USE_VMALLOC=y @@ -222,13 +217,18 @@ CONFIG_PINCTRL_AT91=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_AT91_POWEROFF=y CONFIG_POWER_RESET_AT91_RESET=y +# CONFIG_POWER_RESET_AT91_SAMA5D2_SHDWC is not set CONFIG_POWER_SUPPLY=y CONFIG_RATIONAL=y # CONFIG_RCU_STALL_COMMON is not set +CONFIG_REGMAP=y +CONFIG_REGMAP_MMIO=y +CONFIG_REGMAP_SPI=y CONFIG_RTC_CLASS=y # CONFIG_RTC_DRV_AT91RM9200 is not set # CONFIG_RTC_DRV_AT91SAM9 is not set # CONFIG_RTC_DRV_CMOS is not set +CONFIG_RTC_I2C_AND_SPI=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_SAMA5D4_WATCHDOG is not set # CONFIG_SCHED_INFO is not set @@ -251,6 +251,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=999999 CONFIG_SRCU=y # CONFIG_STAGING is not set CONFIG_SWIOTLB=y +CONFIG_SWPHY=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_UBIFS_FS=y @@ -270,4 +271,3 @@ CONFIG_ZBOOT_ROM_BSS=0 CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_INFLATE=y -CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/at91/files/arch/arm/boot/dts/at91-q5xr5.dts b/target/linux/at91/files/arch/arm/boot/dts/at91-q5xr5.dts index 2aa04ca6f6c..728553bce0b 100644 --- a/target/linux/at91/files/arch/arm/boot/dts/at91-q5xr5.dts +++ b/target/linux/at91/files/arch/arm/boot/dts/at91-q5xr5.dts @@ -168,7 +168,7 @@ }; }; - usb0: ohci@00500000 { + usb0: ohci@500000 { num-ports = <2>; status = "okay"; }; diff --git a/target/linux/at91/files/arch/arm/boot/dts/lmu5000.dts b/target/linux/at91/files/arch/arm/boot/dts/lmu5000.dts index 921d44beec4..fb3dd565a31 100644 --- a/target/linux/at91/files/arch/arm/boot/dts/lmu5000.dts +++ b/target/linux/at91/files/arch/arm/boot/dts/lmu5000.dts @@ -117,7 +117,7 @@ }; }; - usb0: ohci@00500000 { + usb0: ohci@500000 { num-ports = <2>; status = "okay"; }; diff --git a/target/linux/at91/patches-4.4/100-ARM-at91-build-dtb-for-LMU5000.patch b/target/linux/at91/patches-4.9/100-ARM-at91-build-dtb-for-LMU5000.patch similarity index 80% rename from target/linux/at91/patches-4.4/100-ARM-at91-build-dtb-for-LMU5000.patch rename to target/linux/at91/patches-4.9/100-ARM-at91-build-dtb-for-LMU5000.patch index aac5b3de534..2a64fb8a5c5 100644 --- a/target/linux/at91/patches-4.4/100-ARM-at91-build-dtb-for-LMU5000.patch +++ b/target/linux/at91/patches-4.9/100-ARM-at91-build-dtb-for-LMU5000.patch @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -27,6 +27,7 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \ +@@ -32,6 +32,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ usb_a9g20.dtb \ usb_a9g20_lpw.dtb \ at91sam9m10g45ek.dtb \ diff --git a/target/linux/at91/patches-4.4/101-ARM-at91-build-dtb-for-q5xr5.patch b/target/linux/at91/patches-4.9/101-ARM-at91-build-dtb-for-q5xr5.patch similarity index 81% rename from target/linux/at91/patches-4.4/101-ARM-at91-build-dtb-for-q5xr5.patch rename to target/linux/at91/patches-4.9/101-ARM-at91-build-dtb-for-q5xr5.patch index d6bf7ae41f7..1cee5588a07 100644 --- a/target/linux/at91/patches-4.4/101-ARM-at91-build-dtb-for-q5xr5.patch +++ b/target/linux/at91/patches-4.9/101-ARM-at91-build-dtb-for-q5xr5.patch @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -35,6 +35,7 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \ +@@ -40,6 +40,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ at91-ariettag25.dtb \ at91-cosino_mega2560.dtb \ at91-kizboxmini.dtb \ diff --git a/target/linux/at91/patches-4.4/102-ARM-at91-build-dtb-for-wb45n.patch b/target/linux/at91/patches-4.9/102-ARM-at91-build-dtb-for-wb45n.patch similarity index 84% rename from target/linux/at91/patches-4.4/102-ARM-at91-build-dtb-for-wb45n.patch rename to target/linux/at91/patches-4.9/102-ARM-at91-build-dtb-for-wb45n.patch index b7486626abd..aeb523a5b94 100644 --- a/target/linux/at91/patches-4.4/102-ARM-at91-build-dtb-for-wb45n.patch +++ b/target/linux/at91/patches-4.9/102-ARM-at91-build-dtb-for-wb45n.patch @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -40,7 +40,8 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \ +@@ -45,7 +45,8 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ at91sam9g25ek.dtb \ at91sam9g35ek.dtb \ at91sam9x25ek.dtb \ diff --git a/target/linux/at91/patches-4.4/103-ARM-at91-build-dtb-for-wb50n.patch b/target/linux/at91/patches-4.9/103-ARM-at91-build-dtb-for-wb50n.patch similarity index 57% rename from target/linux/at91/patches-4.4/103-ARM-at91-build-dtb-for-wb50n.patch rename to target/linux/at91/patches-4.9/103-ARM-at91-build-dtb-for-wb50n.patch index 00ffe09a0ac..a30a803c98c 100644 --- a/target/linux/at91/patches-4.4/103-ARM-at91-build-dtb-for-wb50n.patch +++ b/target/linux/at91/patches-4.9/103-ARM-at91-build-dtb-for-wb50n.patch @@ -1,11 +1,11 @@ --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -52,7 +52,8 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ - sama5d35ek.dtb \ - sama5d36ek.dtb \ +@@ -59,7 +59,8 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ + at91-sama5d4_ma5d4evk.dtb \ at91-sama5d4_xplained.dtb \ -- at91-sama5d4ek.dtb -+ at91-sama5d4ek.dtb \ + at91-sama5d4ek.dtb \ +- at91-vinco.dtb ++ at91-vinco.dtb \ + wb50n.dtb dtb-$(CONFIG_ARCH_ATLAS6) += \ atlas6-evb.dtb diff --git a/target/linux/at91/sama5/config-default b/target/linux/at91/sama5/config-default index 032a0cb2a22..00d4cf930ca 100644 --- a/target/linux/at91/sama5/config-default +++ b/target/linux/at91/sama5/config-default @@ -5,6 +5,7 @@ CONFIG_ARM_HEAVY_MB=y CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_L1_CACHE_SHIFT_6=y # CONFIG_ARM_LPAE is not set +CONFIG_ARM_PATCH_IDIV=y # CONFIG_ARM_THUMBEE is not set CONFIG_ARM_VIRT_EXT=y CONFIG_ATMEL_AIC5_IRQ=y @@ -23,6 +24,7 @@ CONFIG_CPU_V7=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_GENERIC_PINCONF=y CONFIG_HAVE_ARCH_BITREVERSE=y +CONFIG_HAVE_ARM_SMCCC=y CONFIG_HAVE_AT91_GENERATED_CLK=y CONFIG_HAVE_AT91_H32MX=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y @@ -39,6 +41,7 @@ CONFIG_PL310_ERRATA_588369=y CONFIG_PL310_ERRATA_727915=y CONFIG_PL310_ERRATA_753970=y CONFIG_PL310_ERRATA_769419=y +CONFIG_POWER_RESET_AT91_SAMA5D2_SHDWC=y CONFIG_SOC_SAMA5=y CONFIG_SOC_SAMA5D2=y CONFIG_SOC_SAMA5D3=y -- 2.30.2