fix(esp_hosted_ng): Remove chip specific compilation for SDIO

Author: kapilkedawat

esp_hosted_ng/host/Makefile

@@ -1,10 +1,4 @@
 CONFIG_ENABLE_MONITOR_PROCESS = n
-# In case of SDIO as transport, one of slave chipset used,
-# CONFIG_TARGET_ESP32  OR
-# CONFIG_TARGET_ESP32C6
-# need to be added depending upon slave in use
-# rpi_init.sh will add that flag using ESP_SLAVE
-ESP_SLAVE := ""
 
 # Toolchain Path
 CROSS_COMPILE :=
@@ -54,10 +48,6 @@ ifeq ($(MODULE_NAME), esp32_spi)
 	module_objects += spi/esp_spi.o
 endif
 
-ifneq ($(ESP_SLAVE), "")
-	EXTRA_CFLAGS += -D$(ESP_SLAVE)
-endif
-
 PWD := $(shell pwd)
 
 obj-m := $(MODULE_NAME).o

esp_hosted_ng/host/rpi_init.sh

@@ -20,8 +20,6 @@ BT_UART_INIT="0"
 RAW_TP_MODE="0"
 IF_TYPE="sdio"
 MODULE_NAME="esp32_${IF_TYPE}.ko"
-ESP_SLAVE_CHIPSET=""
-#For sdio ESP_SLAVE_CHIPSET can esp32 or esp32c6
 RPI_RESETPIN=6
 
 bringup_network_interface()
@@ -157,36 +155,12 @@ parse_arguments()
     done
 }
 
-select_esp_slave()
-{
-    case $ESP_SLAVE_CHIPSET in
-        [Ee][Ss][Pp]32)
-            echo "Building for esp32"
-			ESP_SLAVE='CONFIG_TARGET_ESP32=y'
-            ;;
-        [Ee][Ss][Pp]32-[Cc]6)
-            echo "Building for esp32c6"
-			ESP_SLAVE='CONFIG_TARGET_ESP32C6=y'
-            ;;
-        *)
-            echo "***** Err: Please set expected ESP slave chipset ****"
-			exit 1
-            ;;
-    esac
-
-}
-
-
 parse_arguments $*
 if [ "$IF_TYPE" = "" ] ; then
     echo "Error: No protocol selected"
     usage
     exit 1
 else
-if [ "$IF_TYPE" = "sdio" ] ; then
-    # SDIO Kernel driver registration varies for ESP32 and ESP32-C6 slave chipsets
-    select_esp_slave
-fi
     echo "Building for $IF_TYPE protocol"
     MODULE_NAME=esp32_${IF_TYPE}.ko
 fi

esp_hosted_ng/host/sdio/esp_sdio.c

@@ -48,8 +48,10 @@ static int write_packet(struct esp_adapter *adapter, struct sk_buff *skb);
 /*int deinit_context(struct esp_adapter *adapter);*/
 
 static const struct sdio_device_id esp_devices[] = {
-	{ SDIO_DEVICE(ESP_VENDOR_ID, ESP_DEVICE_ID_1) },
-	{ SDIO_DEVICE(ESP_VENDOR_ID, ESP_DEVICE_ID_2) },
+	{ SDIO_DEVICE(ESP_VENDOR_ID_1, ESP_DEVICE_ID_ESP32_1) },
+	{ SDIO_DEVICE(ESP_VENDOR_ID_1, ESP_DEVICE_ID_ESP32_2) },
+	{ SDIO_DEVICE(ESP_VENDOR_ID_2, ESP_DEVICE_ID_ESP32C6_1) },
+	{ SDIO_DEVICE(ESP_VENDOR_ID_2, ESP_DEVICE_ID_ESP32C6_2) },
 	{}
 };
 

esp_hosted_ng/host/sdio/esp_sdio_decl.h

@@ -65,15 +65,13 @@
 
 #define ESP_ADDRESS_MASK              0x3FF
 
-#if defined(CONFIG_TARGET_ESP32)
-	#define ESP_VENDOR_ID               0x6666
-	#define ESP_DEVICE_ID_1             0x2222
-	#define ESP_DEVICE_ID_2             0x3333
-#elif defined(CONFIG_TARGET_ESP32C6)
-	#define ESP_VENDOR_ID               0x0092
-	#define ESP_DEVICE_ID_1             0x6666
-	#define ESP_DEVICE_ID_2             0x7777
-#endif
+#define ESP_VENDOR_ID_1             0x6666
+#define ESP_DEVICE_ID_ESP32_1       0x2222
+#define ESP_DEVICE_ID_ESP32_2       0x3333
+
+#define ESP_VENDOR_ID_2             0x0092
+#define ESP_DEVICE_ID_ESP32C6_1     0x6666
+#define ESP_DEVICE_ID_ESP32C6_2     0x7777
 
 enum context_state {
 	ESP_CONTEXT_DISABLED = 0,