Merge branch 'master' of gitlab.multitech.net:mirrors/meta-multitech

2 files changed, 40 insertions, 12 deletions

diff --git a/recipes-kernel/linux/linux-3.12.70/mtcap/defconfig b/recipes-kernel/linux/linux-3.12.70/mtcap/defconfig
index da689cf..3fa7f34 100644
--- a/recipes-kernel/linux/linux-3.12.70/mtcap/defconfig
+++ b/recipes-kernel/linux/linux-3.12.70/mtcap/defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.12.27 Kernel Configuration
+# Linux/arm 3.12.70 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -624,7 +624,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
 # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
 # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=y
-# CONFIG_NETFILTER_XT_TARGET_TEE is not set
+CONFIG_NETFILTER_XT_TARGET_TEE=m
 # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
 # CONFIG_NETFILTER_XT_TARGET_TRACE is not set
 # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
@@ -648,7 +648,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
 # CONFIG_NETFILTER_XT_MATCH_DSCP is not set
 CONFIG_NETFILTER_XT_MATCH_ECN=y
 # CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 # CONFIG_NETFILTER_XT_MATCH_HELPER is not set
 CONFIG_NETFILTER_XT_MATCH_HL=y
 # CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
@@ -876,7 +876,10 @@ CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 # CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+# CONFIG_RFKILL_INPUT is not set
+CONFIG_RFKILL_GPIO=m
 # CONFIG_NET_9P is not set
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set
@@ -1128,7 +1131,7 @@ CONFIG_SCSI_LOWLEVEL=y
 CONFIG_NETDEVICES=y
 CONFIG_MII=m
 CONFIG_NET_CORE=y
-# CONFIG_BONDING is not set
+CONFIG_BONDING=m
 CONFIG_DUMMY=m
 # CONFIG_EQUALIZER is not set
 # CONFIG_NET_TEAM is not set
@@ -1272,6 +1275,7 @@ CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_NET_CX82310_ETH=m
 # CONFIG_USB_NET_KALMIA is not set
 CONFIG_USB_NET_QMI_WWAN=m
+# CONFIG_USB_HSO is not set
 CONFIG_USB_NET_INT51X1=m
 CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
diff --git a/recipes-kernel/linux/linux-3.12.70/mtcap/linux-3.12-mtcap-device-tree.patch b/recipes-kernel/linux/linux-3.12.70/mtcap/linux-3.12-mtcap-device-tree.patch
index 474f606..f6addbc 100644
--- a/recipes-kernel/linux/linux-3.12.70/mtcap/linux-3.12-mtcap-device-tree.patch
+++ b/recipes-kernel/linux/linux-3.12.70/mtcap/linux-3.12-mtcap-device-tree.patch
@@ -1,8 +1,7 @@
-Index: linux-3.12.27/arch/arm/boot/dts/mtcap.dts
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.12.27/arch/arm/boot/dts/mtcap.dts	2015-01-13 13:58:20.766078428 -0600
-@@ -0,0 +1,210 @@
+diff -Naru linux-3.12.70.orig/arch/arm/boot/dts/mtcap.dts linux-3.12.70/arch/arm/boot/dts/mtcap.dts
+--- linux-3.12.70.orig/arch/arm/boot/dts/mtcap.dts	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.12.70/arch/arm/boot/dts/mtcap.dts	2017-09-07 18:36:07.841825140 -0500
+@@ -0,0 +1,235 @@
 +/*
 + * DTS file for Multi-Tech Systems MTCAP Hardware
 + */
@@ -44,7 +43,27 @@ Index: linux-3.12.27/arch/arm/boot/dts/mtcap.dts
 +				status = "okay";
 +			};
 +
++			mmc0: mmc@f0008000 {
++				pinctrl-names = "default";
++				pinctrl-0 = <
++					/* &pinctrl_board_mmc0 */
++					&pinctrl_mmc0_slot0_clk_cmd_dat0
++					&pinctrl_mmc0_slot0_dat1_3>;
++				status = "okay";
++				slot@0 {
++					reg = <0>;
++					bus-width = <4>;
++				};
++			};
++
 +			pinctrl@fffff400 {
++				mmc0 {
++					pinctrl_board_mmc0: mmc0-board {
++						atmel,pins =
++							<AT91_PIOA 4 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;  /* PA4 gpio pin pull up and deglitch - WIFI enable */
++					};
++				};
++
 +				nand {
 +					pinctrl_nand: nand-0 {
 +						atmel,pins =
@@ -93,14 +112,19 @@ Index: linux-3.12.27/arch/arm/boot/dts/mtcap.dts
 +				};
 +			};
 +
-+			spi0: spi@f0000000 {
++			spi@f0000000 {
 +				status = "okay";
-+				cs-gpios = <&pioA 7 0>, <0>, <0>, <0>;
++				cs-gpios = <&pioA 7 0>, <&pioA 1 0>, <0>, <0>;
 +				lora-spi@0 {
 +					compatible = "spidev";
 +					spi-max-frequency = <2000000>;
 +					reg = <0>;
 +				};
++				lora-spi@1 {
++					compatible = "spidev";
++					spi-max-frequency = <2000000>;
++					reg = <1>;
++				};
 +			};
 +
 +			dbgu: serial@fffff200 {