ethernet: add kconfig help for GPIO0 output mode

1. add kconfig help for GPIO0 output mode
2. fix a bug when select gpio0 output mode and initialize psram
3. make default config to official development board
4. fix wrong LAN8720 register index

diff --git a/components/ethernet/emac_main.c b/components/ethernet/emac_main.c
index a74d594d0bda99f6936ae288d570a87800946a45..c32d946dd3b70c5d8a5c16c666cab41c1d027674 100644 (file)
--- a/components/ethernet/emac_main.c
+++ b/components/ethernet/emac_main.c
@@ -825,9 +825,9 @@ static void emac_start(void *param)
     emac_mac_init();
 
     /* check if enable promiscuous mode */
-    if(emac_config.promiscuous_enable){
+    if (emac_config.promiscuous_enable) {
         emac_enable_promiscuous();
-    }else{
+    } else {
         emac_disable_promiscuous();
     }
 
@@ -1116,12 +1116,15 @@ esp_err_t esp_eth_init_internal(eth_config_t *config)
 
     if (emac_config.clock_mode != ETH_CLOCK_GPIO0_IN) {
 #if CONFIG_SPIRAM_SUPPORT
-        if (esp_spiram_is_initialized()) {
-            ESP_LOGE(TAG, "GPIO16 and GPIO17 has been occupied by PSRAM, Only ETH_CLOCK_GPIO_IN is supported!");
-            ret = ESP_FAIL;
-            goto _verify_err;
-        } else {
-            ESP_LOGW(TAG, "GPIO16/17 is used for clock of EMAC, Please Make Sure you're not using PSRAM.");
+        // make sure Ethernet won't have conflict with PSRAM
+        if (emac_config.clock_mode >= ETH_CLOCK_GPIO16_OUT) {
+            if (esp_spiram_is_initialized()) {
+                ESP_LOGE(TAG, "GPIO16 and GPIO17 are occupied by PSRAM, please switch to ETH_CLOCK_GPIO_IN or ETH_CLOCK_GPIO_OUT mode");
+                ret = ESP_FAIL;
+                goto _verify_err;
+            } else {
+                ESP_LOGW(TAG, "Using GPIO16/17 to output Ethernet RMII clock, make sure you don't have PSRAM on board");
+            }
         }
 #endif
         // 50 MHz = 40MHz * (6 + 4) / (2 * (2 + 2) = 400MHz / 8

diff --git a/components/ethernet/eth_phy/phy_lan8720.c b/components/ethernet/eth_phy/phy_lan8720.c
index 666b82868e8f717a5ac2f1d8a2dfe12c3a8e16d5..79f2836da24bdb1e57e83980836a761858df18d7 100644 (file)
--- a/components/ethernet/eth_phy/phy_lan8720.c
+++ b/components/ethernet/eth_phy/phy_lan8720.c
@@ -128,11 +128,11 @@ void phy_lan8720_dump_registers()
     ESP_LOGD(TAG, "ANAR   0x%04x", esp_eth_smi_read(0x4));
     ESP_LOGD(TAG, "ANLPAR 0x%04x", esp_eth_smi_read(0x5));
     ESP_LOGD(TAG, "ANER   0x%04x", esp_eth_smi_read(0x6));
-    ESP_LOGD(TAG, "MCSR   0x%04x", esp_eth_smi_read(0x17));
-    ESP_LOGD(TAG, "SM     0x%04x", esp_eth_smi_read(0x18));
-    ESP_LOGD(TAG, "SECR   0x%04x", esp_eth_smi_read(0x26));
-    ESP_LOGD(TAG, "CSIR   0x%04x", esp_eth_smi_read(0x27));
-    ESP_LOGD(TAG, "ISR    0x%04x", esp_eth_smi_read(0x29));
-    ESP_LOGD(TAG, "IMR    0x%04x", esp_eth_smi_read(0x30));
-    ESP_LOGD(TAG, "PSCSR  0x%04x", esp_eth_smi_read(0x31));
+    ESP_LOGD(TAG, "MCSR   0x%04x", esp_eth_smi_read(0x11));
+    ESP_LOGD(TAG, "SM     0x%04x", esp_eth_smi_read(0x12));
+    ESP_LOGD(TAG, "SECR   0x%04x", esp_eth_smi_read(0x1A));
+    ESP_LOGD(TAG, "CSIR   0x%04x", esp_eth_smi_read(0x1B));
+    ESP_LOGD(TAG, "ISR    0x%04x", esp_eth_smi_read(0x1D));
+    ESP_LOGD(TAG, "IMR    0x%04x", esp_eth_smi_read(0x1E));
+    ESP_LOGD(TAG, "PSCSR  0x%04x", esp_eth_smi_read(0x1F));
 }

diff --git a/examples/ethernet/ethernet/main/Kconfig.projbuild b/examples/ethernet/ethernet/main/Kconfig.projbuild
index c6bacb60c2b3bc4a9034fe112289140af055664a..c887cf133de3f425b55df4b62fa3f04f7fd95a0e 100644 (file)
--- a/examples/ethernet/ethernet/main/Kconfig.projbuild
+++ b/examples/ethernet/ethernet/main/Kconfig.projbuild
@@ -2,7 +2,7 @@ menu "Example Configuration"
 
     choice PHY_MODEL
         prompt "Ethernet PHY Device"
-        default PHY_TLK110
+        default PHY_IP101
         help
             Select the PHY driver to use for the example.
         config PHY_IP101
@@ -24,7 +24,7 @@ menu "Example Configuration"
 
     config PHY_ADDRESS
         int "Ethernet PHY Address"
-        default 31
+        default 1
         range 0 31
         help
             PHY Address of your PHY device. It dependens on your schematic design.
@@ -39,9 +39,15 @@ menu "Example Configuration"
             help
                 Input of 50MHz RMII clock on GPIO0.
         config PHY_CLOCK_GPIO0_OUT
-            bool "GPIO0 Output"
+            bool "GPIO0 Output(READ HELP)"
             help
-                Output the internal 50MHz RMII clock on GPIO0.
+                GPIO0 can be set to output a pre-divided PLL clock (test only!).
+                Enabling this option will configure GPIO0 to output a 50MHz clock.
+                In fact this clock doesn't have directly relationship with EMAC peripheral.
+                Sometimes this clock won't work well with your PHY chip. You might need to
+                add some extra devices after GPIO0 (e.g. inverter).
+                Note that outputting RMII clock on GPIO0 is an experimental practice.
+                If you want the Ethernet to work with WiFi, don't select GPIO0 output mode for stability.
         config PHY_CLOCK_GPIO16_OUT
             bool "GPIO16 Output"
             help
@@ -61,7 +67,7 @@ menu "Example Configuration"
 
     config PHY_USE_POWER_PIN
         bool "Use PHY Power (enable / disable) pin"
-        default n
+        default y
         help
             Use a GPIO "power pin" to power the PHY on/off during operation.
             When using GPIO0 to input RMII clock, the reset process will be interfered by this clock.
@@ -70,7 +76,7 @@ menu "Example Configuration"
     if PHY_USE_POWER_PIN
         config PHY_POWER_PIN
             int "PHY Power GPIO"
-            default 17
+            default 5
             range 0 33
             depends on PHY_USE_POWER_PIN
             help

diff --git a/examples/ethernet/ethernet/sdkconfig.defaults b/examples/ethernet/ethernet/sdkconfig.defaults
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/examples/ethernet/ethernet/sdkconfig.defaults
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/examples/ethernet/iperf/main/Kconfig.projbuild b/examples/ethernet/iperf/main/Kconfig.projbuild
index 4e83016b662d576374a970eaf81064d986e793e2..4235a4ff564f31e98da7c2265c1ed8337f70121a 100644 (file)
--- a/examples/ethernet/iperf/main/Kconfig.projbuild
+++ b/examples/ethernet/iperf/main/Kconfig.projbuild
@@ -11,7 +11,7 @@ menu "Example Configuration"
     menu "Etherent PHY Device"
         choice PHY_MODEL
             prompt "Ethernet PHY Device"
-            default PHY_TLK110
+            default PHY_IP101
             help
                 Select the PHY driver to use for the example.
             config PHY_IP101
@@ -33,7 +33,7 @@ menu "Example Configuration"
 
         config PHY_ADDRESS
             int "Ethernet PHY Address"
-            default 31
+            default 1
             range 0 31
             help
                 PHY Address of your PHY device. It dependens on your schematic design.
@@ -48,9 +48,15 @@ menu "Example Configuration"
                 help
                     Input of 50MHz RMII clock on GPIO0.
             config PHY_CLOCK_GPIO0_OUT
-                bool "GPIO0 Output"
+                bool "GPIO0 Output(READ HELP)"
                 help
-                    Output the internal 50MHz RMII clock on GPIO0.
+                    GPIO0 can be set to output a pre-divided PLL clock (test only!).
+                    Enabling this option will configure GPIO0 to output a 50MHz clock.
+                    In fact this clock doesn't have directly relationship with EMAC peripheral.
+                    Sometimes this clock won't work well with your PHY chip. You might need to
+                    add some extra devices after GPIO0 (e.g. inverter).
+                    Note that outputting RMII clock on GPIO0 is an experimental practice.
+                    If you want the Ethernet to work with WiFi, don't select GPIO0 output mode for stability.
             config PHY_CLOCK_GPIO16_OUT
                 bool "GPIO16 Output"
                 help
@@ -70,7 +76,7 @@ menu "Example Configuration"
 
         config PHY_USE_POWER_PIN
             bool "Use PHY Power (enable / disable) pin"
-            default n
+            default y
             help
                 Use a GPIO "power pin" to power the PHY on/off during operation.
                 When using GPIO0 to input RMII clock, the reset process will be interfered by this clock.
@@ -79,7 +85,7 @@ menu "Example Configuration"
         if PHY_USE_POWER_PIN
             config PHY_POWER_PIN
                 int "PHY Power GPIO"
-                default 17
+                default 5
                 range 0 33
                 depends on PHY_USE_POWER_PIN
                 help