Merge branch 'master' of ssh://47.105.117.50:2224/wzedmund/evm_publish_final

Author: wzedmund

components/zephyr-rtos/bootloader/mcuboot

@@ -1 +1 @@
-Subproject commit e88113bbebe34ff2ccc6627ffae885cfeed6fdfd
+Subproject commit 80a76f4af4314635bef83272779ddbed6021fc32

components/zephyr-rtos/modules/crypto/mbedtls

@@ -1 +1 @@
-Subproject commit 821154171b246f64eaeef3ccc267f58d8274739a
+Subproject commit cf7020eb4c7ef93319f2d6d2403a21e12a879bf6

components/zephyr-rtos/modules/hal/libmetal

@@ -1 +1 @@
-Subproject commit 3c3c9ec83bbb99390e34f8f2ba273ec86cf2b67c
+Subproject commit 60f40977eccb7e067a83933cec859e266bff4849

components/zephyr-rtos/modules/hal/microchip

@@ -1 +1 @@
-Subproject commit aad89bf0531a30dcd6c87e4065f1b973fb31c11f
+Subproject commit 688cb7deebd5910357e35843595149b3feba2184

components/zephyr-rtos/modules/hal/nordic

@@ -1 +1 @@
-Subproject commit 742d8fb839406951ef7f95d0132bfa8c2635343f
+Subproject commit 1ebfdf148b2ca1d9ab9267ab2cd64cc00f32d505

components/zephyr-rtos/modules/hal/st

@@ -1 +1 @@
-Subproject commit 5b3ec3e182d4310e8943cc34c6c70ae57d9711da
+Subproject commit fa481784b3c49780f18d50bafe00390ccb62b2ec

components/zephyr-rtos/modules/hal/stm32

@@ -1 +1 @@
-Subproject commit d1bc80d021f4ebc31f6e8b36f14b738cc26c7b03
+Subproject commit 37dcc0e120bb2bb99d3ee3b99dbbcf2bffe50258

components/zephyr-rtos/modules/hal/ti

@@ -1 +1 @@
-Subproject commit 15b76302bf27c307e2250467116b0f95f506ba4b
+Subproject commit 7dcbff2d5994bc48dc3aa2a6af619dadf91d88db

components/zephyr-rtos/modules/lib/mcumgr

@@ -1 +1 @@
-Subproject commit 5885efb7cabf7b566577b73129c9d277d7d8848d
+Subproject commit 1843fdce2b008b45f9cc8b38dd9a57a575ab50f6

components/zephyr-rtos/modules/lib/open-amp

@@ -1 +1 @@
-Subproject commit 724f7e2a4519d7e1d40ef330042682dea950c991
+Subproject commit 5720c73ef3bd885824b2d2184f606443e03f73c4

components/zephyr-rtos/modules/lib/openthread

@@ -1 +1 @@
-Subproject commit a83d18cf18bc8cd431ad6704ad0bf0e6d08c99d7
+Subproject commit 2ac83762b87b9cbb7072e3bca663ac13708c17d9

components/zephyr-rtos/tools/ci-tools

@@ -1 +1 @@
-Subproject commit da9a2df574094f52d87a03f6393928bdc7dce17c
+Subproject commit cf55a47d52d38af655f3efa6d38ff105b727358a

components/zephyr-rtos/tools/net-tools

@@ -1 +1 @@
-Subproject commit 1c4fdba512b268033a4cf926bddd323866c3261a
+Subproject commit 1080094bc246357c6c35e80e8b2d5d0ce7e0d963

drivers/zephyr/ethernet/w5500/driver_w5500.c

@@ -126,22 +126,31 @@ static void spi_read_burst(uint8_t *buf, uint16_t len)
 
 static void spi_cris_enter(void)
 {
-   
+	struct w5500_runtime *context = wiz_dev->driver_data;
+	const struct w5500_config  *config = wiz_dev->config_info;
+
+	z_impl_gpio_disable_callback(context->gpio,config->gpio_pin);
 }
 
 static void spi_cris_exit(void)
 {
-    
+	struct w5500_runtime *context = wiz_dev->driver_data;
+	const struct w5500_config  *config = wiz_dev->config_info;
+
+	z_impl_gpio_enable_callback(context->gpio,config->gpio_pin);
 }
 
 static void spi_cs_select(void)
 {
-    
+	struct w5500_runtime *context = wiz_dev->driver_data;
+    gpio_pin_set(context->spi_cs.gpio_dev,context->spi_cs.gpio_pin,0);
 }
 
 static void spi_cs_deselect(void)
 {
-    
+	struct w5500_runtime *context = wiz_dev->driver_data;
+
+    gpio_pin_set(context->spi_cs.gpio_dev,context->spi_cs.gpio_pin,0);
 }
 
 /* register TCP communication related callback function */
@@ -174,7 +183,7 @@ static void w5500_gpio_callback(struct device *dev,
 	struct w5500_runtime *context =
 		CONTAINER_OF(cb, struct w5500_runtime, gpio_cb);
 
-	k_sem_give(&context->int_sem);
+	k_sem_give(&context->int_sem); 
 }
 
 static int w5500_tx(struct device *dev, struct net_pkt *pkt)
@@ -277,6 +286,20 @@ static enum ethernet_hw_caps w5500_get_capabilities(struct device *dev)
 	return ETHERNET_LINK_10BASE_T | ETHERNET_LINK_100BASE_T;
 }
 
+static void w5500_init_phy(struct device *dev)
+{
+	const struct w5500_config *config = dev->config_info;
+
+	uint8_t tmp = 0;
+
+	if (config->full_duplex) {
+		tmp |= PHYCFGR_OPMDC_100F;
+	} else {
+		tmp |= PHYCFGR_OPMDC_100H;
+	}
+	setPHYCFGR(tmp);
+}
+
 static void w5500_iface_init(struct net_if *iface)
 {
 	struct device *dev = net_if_get_device(iface);
@@ -301,6 +324,8 @@ static const struct ethernet_api api_funcs = {
 
 static int w5500_init(struct device *dev)
 {
+	wiz_dev = dev;
+	
 	const struct w5500_config *config = dev->config_info;
 	struct w5500_runtime *context = dev->driver_data;
 
@@ -326,6 +351,36 @@ static int w5500_init(struct device *dev)
 	context->spi_cs.gpio_pin = config->spi_cs_pin;
 	context->spi_cfg.cs = &context->spi_cs;
 #endif
+
+/* Initialize GPIO */
+	context->gpio = device_get_binding((char *)config->gpio_port);
+	if (!context->gpio) {
+		LOG_ERR("GPIO port %s not found", config->gpio_port);
+		return -EINVAL;
+	}
+
+	if (gpio_pin_configure(context->gpio, config->gpio_pin,
+			       GPIO_INPUT | config->gpio_flags)) {
+		LOG_ERR("Unable to configure GPIO pin %u", config->gpio_pin);
+		return -EINVAL;
+	}
+
+	gpio_init_callback(&(context->gpio_cb), w5500_gpio_callback,
+			   BIT(config->gpio_pin));
+
+	if (gpio_add_callback(context->gpio, &(context->gpio_cb))) {
+		return -EINVAL;
+	}
+
+	gpio_pin_interrupt_configure(context->gpio,
+				     config->gpio_pin,
+				     GPIO_INT_EDGE_TO_ACTIVE);
+					 
+	wiz_callback_register();
+	/* read MAC address */
+	getPHAR(context->mac_address);
+	w5500_init_phy(dev);
+
 	/* Start interruption-poll thread */
 	k_thread_create(&context->thread, context->thread_stack,
 			CONFIG_ETH_W5500_RX_THREAD_STACK_SIZE,
@@ -347,6 +402,9 @@ static struct w5500_runtime w5500_0_runtime = {
 };
 
 static const struct w5500_config w5500_0_config = {
+	.gpio_port = DT_INST_GPIO_LABEL(0, int_gpios),
+	.gpio_pin = DT_INST_GPIO_PIN(0, int_gpios),
+	.gpio_flags = DT_INST_GPIO_FLAGS(0, int_gpios),
 	.spi_port = DT_INST_BUS_LABEL(0),
 	.spi_freq  = DT_INST_PROP(0, spi_max_frequency),
 	.spi_slave = DT_INST_REG_ADDR(0),

drivers/zephyr/ethernet/w5500/wiznet,w5500.yaml

@@ -0,0 +1,19 @@
+# Copyright (c) 2019, Phytec Messtechnik GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    W5500 standalone 100BASE-T Ethernet controller with SPI interface
+
+compatible: "wiznet,w5500"
+
+include: [spi-device.yaml, ethernet.yaml]
+
+properties:
+    int-gpios:
+      type: phandle-array
+      required: true
+      description: Interrupt pin.
+
+        The interrupt pin of ENC424J600 is active low.
+        If connected directly the MCU pin should be configured
+        as active low.