feature(sdio): allow to enable internal pullups of the SDIO host and slave as a debug feature

NOTE: the internal pullups are not totally reliable, please do add external pullups on your bus.

components/soc/esp32/include/soc/sdio_slave_pins.h

@@ -0,0 +1,34 @@
+// Copyright 2015-2018 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef _SOC_SDIO_SLAVE_PINS_H_
+#define _SOC_SDIO_SLAVE_PINS_H_
+
+#define SDIO_SLAVE_SLOT0_IOMUX_PIN_NUM_CLK  6
+#define SDIO_SLAVE_SLOT0_IOMUX_PIN_NUM_CMD  11
+#define SDIO_SLAVE_SLOT0_IOMUX_PIN_NUM_D0   7
+#define SDIO_SLAVE_SLOT0_IOMUX_PIN_NUM_D1   8
+#define SDIO_SLAVE_SLOT0_IOMUX_PIN_NUM_D2   9
+#define SDIO_SLAVE_SLOT0_IOMUX_PIN_NUM_D3   10
+#define SDIO_SLAVE_SLOT0_FUNC               0
+
+#define SDIO_SLAVE_SLOT1_IOMUX_PIN_NUM_CLK  14
+#define SDIO_SLAVE_SLOT1_IOMUX_PIN_NUM_CMD  15
+#define SDIO_SLAVE_SLOT1_IOMUX_PIN_NUM_D0   2
+#define SDIO_SLAVE_SLOT1_IOMUX_PIN_NUM_D1   4
+#define SDIO_SLAVE_SLOT1_IOMUX_PIN_NUM_D2   12
+#define SDIO_SLAVE_SLOT1_IOMUX_PIN_NUM_D3   13
+#define SDIO_SLAVE_SLOT1_FUNC               4
+
+#endif /* _SOC_SDIO_SLAVE_PINS_H_ */

components/soc/esp32/include/soc/sdmmc_pins.h

@@ -0,0 +1,38 @@
+// Copyright 2015-2018 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef _SOC_SDMMC_PINS_H_
+#define _SOC_SDMMC_PINS_H_
+
+#define SDMMC_SLOT0_IOMUX_PIN_NUM_CLK  6
+#define SDMMC_SLOT0_IOMUX_PIN_NUM_CMD  11
+#define SDMMC_SLOT0_IOMUX_PIN_NUM_D0   7
+#define SDMMC_SLOT0_IOMUX_PIN_NUM_D1   8
+#define SDMMC_SLOT0_IOMUX_PIN_NUM_D2   9
+#define SDMMC_SLOT0_IOMUX_PIN_NUM_D3   10
+#define SDMMC_SLOT0_IOMUX_PIN_NUM_D4   16
+#define SDMMC_SLOT0_IOMUX_PIN_NUM_D5   17
+#define SDMMC_SLOT0_IOMUX_PIN_NUM_D6   5
+#define SDMMC_SLOT0_IOMUX_PIN_NUM_D7   18
+#define SDMMC_SLOT0_FUNC               0
+
+#define SDMMC_SLOT1_IOMUX_PIN_NUM_CLK  14
+#define SDMMC_SLOT1_IOMUX_PIN_NUM_CMD  15
+#define SDMMC_SLOT1_IOMUX_PIN_NUM_D0   2
+#define SDMMC_SLOT1_IOMUX_PIN_NUM_D1   4
+#define SDMMC_SLOT1_IOMUX_PIN_NUM_D2   12
+#define SDMMC_SLOT1_IOMUX_PIN_NUM_D3   13
+#define SDMMC_SLOT1_FUNC               4
+
+#endif /* _SOC_SDMMC_PINS_H_ */

components/soc/esp32/sdio_slave_periph.c

@@ -0,0 +1,43 @@
+// Copyright 2015-2018 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <stdint.h>
+#include "soc/sdio_slave_periph.h"
+#include "soc/io_mux_reg.h"
+#include "soc/sdio_slave_pins.h"
+
+// I/O slot of sdio slave:
+// 0: GPIO 6, 11, 7, 8, 9, 10,
+// 1: GPIO 14, 15, 2, 4, 12, 13 for CLK, CMD, D0, D1, D2, D3 respectively.
+// only one peripheral for SDIO and only one slot can work at the same time.
+// currently slot 0 is occupied by SPI for flash
+const sdio_slave_slot_info_t sdio_slave_slot_info[2]  = {
+    {
+        .clk_gpio = SDIO_SLAVE_SLOT0_IOMUX_PIN_NUM_CLK,
+        .cmd_gpio = SDIO_SLAVE_SLOT0_IOMUX_PIN_NUM_CMD,
+        .d0_gpio = SDIO_SLAVE_SLOT0_IOMUX_PIN_NUM_D0,
+        .d1_gpio = SDIO_SLAVE_SLOT0_IOMUX_PIN_NUM_D1,
+        .d2_gpio = SDIO_SLAVE_SLOT0_IOMUX_PIN_NUM_D2,
+        .d3_gpio = SDIO_SLAVE_SLOT0_IOMUX_PIN_NUM_D3,
+        .func = SDIO_SLAVE_SLOT0_FUNC,
+    }, {
+        .clk_gpio = SDIO_SLAVE_SLOT1_IOMUX_PIN_NUM_CLK,
+        .cmd_gpio = SDIO_SLAVE_SLOT1_IOMUX_PIN_NUM_CMD,
+        .d0_gpio = SDIO_SLAVE_SLOT1_IOMUX_PIN_NUM_D0,
+        .d1_gpio = SDIO_SLAVE_SLOT1_IOMUX_PIN_NUM_D1,
+        .d2_gpio = SDIO_SLAVE_SLOT1_IOMUX_PIN_NUM_D2,
+        .d3_gpio = SDIO_SLAVE_SLOT1_IOMUX_PIN_NUM_D3,
+        .func = SDIO_SLAVE_SLOT1_FUNC,
+    },
+};

components/soc/esp32/sdmmc_periph.c

@@ -0,0 +1,50 @@
+// Copyright 2015-2018 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "soc/sdmmc_periph.h"
+
+const sdmmc_slot_info_t sdmmc_slot_info[2]  = {
+    {
+        .clk_gpio = SDMMC_SLOT0_IOMUX_PIN_NUM_CLK,
+        .cmd_gpio = SDMMC_SLOT0_IOMUX_PIN_NUM_CMD,
+        .d0_gpio = SDMMC_SLOT0_IOMUX_PIN_NUM_D0,
+        .d1_gpio = SDMMC_SLOT0_IOMUX_PIN_NUM_D1,
+        .d2_gpio = SDMMC_SLOT0_IOMUX_PIN_NUM_D2,
+        .d3_gpio = SDMMC_SLOT0_IOMUX_PIN_NUM_D3,
+        .d4_gpio = SDMMC_SLOT0_IOMUX_PIN_NUM_D4,
+        .d5_gpio = SDMMC_SLOT0_IOMUX_PIN_NUM_D5,
+        .d6_gpio = SDMMC_SLOT0_IOMUX_PIN_NUM_D6,
+        .d7_gpio = SDMMC_SLOT0_IOMUX_PIN_NUM_D7,
+        .card_detect = HOST_CARD_DETECT_N_1_IDX,
+        .write_protect = HOST_CARD_WRITE_PRT_1_IDX,
+        .card_int = HOST_CARD_INT_N_1_IDX,
+        .width = 8
+    },
+    {
+        .clk_gpio = SDMMC_SLOT1_IOMUX_PIN_NUM_CLK,
+        .cmd_gpio = SDMMC_SLOT1_IOMUX_PIN_NUM_CMD,
+        .d0_gpio = SDMMC_SLOT1_IOMUX_PIN_NUM_D0,
+        .d1_gpio = SDMMC_SLOT1_IOMUX_PIN_NUM_D1,
+        .d2_gpio = SDMMC_SLOT1_IOMUX_PIN_NUM_D2,
+        .d3_gpio = SDMMC_SLOT1_IOMUX_PIN_NUM_D3,
+        .d4_gpio = -1,  //slot1 has no D4-7
+        .d5_gpio = -1,
+        .d6_gpio = -1,
+        .d7_gpio = -1,
+        .card_detect = HOST_CARD_DETECT_N_2_IDX,
+        .write_protect = HOST_CARD_WRITE_PRT_2_IDX,
+        .card_int = HOST_CARD_INT_N_2_IDX,
+        .width = 4
+    }
+};