From 13d1e902ace100c20cc5dab14915e8e74c4f4aac Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 23 Sep 2020 17:50:46 -0500 Subject: Correct issues with the kernel device tree patch, and the version of at91bootstrap --- recipes-bsp/at91bootstrap/at91bootstrap_3.8.12.bb | 2 +- .../mtcap/linux-4.9-mtcap-device-tree.patch | 14 ++++++++++---- recipes-kernel/linux/linux-at91_4.9.87.bb | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/recipes-bsp/at91bootstrap/at91bootstrap_3.8.12.bb b/recipes-bsp/at91bootstrap/at91bootstrap_3.8.12.bb index b8e5ba9..a70cd4f 100644 --- a/recipes-bsp/at91bootstrap/at91bootstrap_3.8.12.bb +++ b/recipes-bsp/at91bootstrap/at91bootstrap_3.8.12.bb @@ -1,5 +1,5 @@ require at91bootstrap.inc -PR = "m5" +PR = "m4" LIC_FILES_CHKSUM = "file://main.c;endline=27;md5=a2a70db58191379e2550cbed95449fbd" diff --git a/recipes-kernel/linux/linux-at91-4.9.87/mtcap/linux-4.9-mtcap-device-tree.patch b/recipes-kernel/linux/linux-at91-4.9.87/mtcap/linux-4.9-mtcap-device-tree.patch index 0486c5c..83ed031 100644 --- a/recipes-kernel/linux/linux-at91-4.9.87/mtcap/linux-4.9-mtcap-device-tree.patch +++ b/recipes-kernel/linux/linux-at91-4.9.87/mtcap/linux-4.9-mtcap-device-tree.patch @@ -257,8 +257,8 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/Makefile linux-4.9.87/arch/arm/bo ================================================================================================== diff -Naru orig/arch/arm/boot/dts/mtcap.dts new/arch/arm/boot/dts/mtcap.dts --- orig/arch/arm/boot/dts/mtcap.dts 1969-12-31 18:00:00.000000000 -0600 -+++ new/arch/arm/boot/dts/mtcap.dts 2020-09-16 11:22:15.246528081 -0500 -@@ -0,0 +1,311 @@ ++++ new/arch/arm/boot/dts/mtcap.dts 2020-09-23 17:17:22.979992310 -0500 +@@ -0,0 +1,318 @@ +/* + * DTS file for Multi-Tech Systems MTCAP Hardware + * @@ -393,6 +393,13 @@ diff -Naru orig/arch/arm/boot/dts/mtcap.dts new/arch/arm/boot/dts/mtcap.dts + atmel,use-dma-tx; + }; + ++ usb2: gadget@f803c000 { ++ atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>; ++ status = "okay"; ++ }; ++ watchdog@fffffe40 { ++ status = "okay"; ++ }; + /* uart0 is GNSS on MTCDTIP2, enabled by overlay */ + uart0: serial@f8040000 { + status = "disabled"; @@ -534,7 +541,7 @@ diff -Naru orig/arch/arm/boot/dts/mtcap.dts new/arch/arm/boot/dts/mtcap.dts + }; + }; + -+ /* GPS-PPS input on AP1 MTCDTIP2 - enabled by overlay*/ ++ /* GPS-PPS input on MTCDTIP2 - enabled by overlay*/ + pps-0 { + compatible = "pps-gpio"; + gpios = <&pioC 10 0>; @@ -570,4 +577,3 @@ diff -Naru orig/arch/arm/boot/dts/mtcap.dts new/arch/arm/boot/dts/mtcap.dts + pinctrl-0 = <&pinctrl_mts_io>; + }; +}; - diff --git a/recipes-kernel/linux/linux-at91_4.9.87.bb b/recipes-kernel/linux/linux-at91_4.9.87.bb index 26a5d21..62fb94b 100644 --- a/recipes-kernel/linux/linux-at91_4.9.87.bb +++ b/recipes-kernel/linux/linux-at91_4.9.87.bb @@ -164,4 +164,4 @@ do_install_append() { } FILES_kernel-dt-bindings-dev = "/usr/include/linux/dt-bindings" -FILES_kernel-module-i2c-at91 += "${sysconfdir}/modprobe.d" \ No newline at end of file +FILES_kernel-module-i2c-at91 += "${sysconfdir}/modprobe.d/i2c-at91.conf" -- cgit v1.2.3