diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index f997e258..92815b5a 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -2006,6 +2006,7 @@ void homeaxis(int axis) {
         plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
 
 #ifdef HAVE_TMC2130_DRIVERS
+		sg_homing_delay = 0;
 		tmc2130_axis_stalled[axis] = false;
 #endif
         st_synchronize();
@@ -2016,6 +2017,7 @@ void homeaxis(int axis) {
         plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
 
 #ifdef HAVE_TMC2130_DRIVERS
+		sg_homing_delay = 0;
 		tmc2130_axis_stalled[axis] = false;
 #endif
         st_synchronize();
@@ -2030,6 +2032,7 @@ void homeaxis(int axis) {
         plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
 
 #ifdef HAVE_TMC2130_DRIVERS
+		sg_homing_delay = 0;
 		tmc2130_axis_stalled[axis] = false;
 #endif
         st_synchronize();
diff --git a/Firmware/swspi.h b/Firmware/swspi.h
index 772c20c4..551d2283 100755
--- a/Firmware/swspi.h
+++ b/Firmware/swspi.h
@@ -14,10 +14,18 @@
 #endif //SWSPI_RPI
 
 #ifdef SWSPI_AVR
-#define SWSPI_MISO	16
-#define SWSPI_MOSI	16
-#define SWSPI_SCK	17
-#define SWSPI_CS	20
+#if (MOTHERBOARD == BOARD_EINY_0_3a)
+#define SWSPI_MISO	16 //RX2
+#define SWSPI_MOSI	16 //RX2
+#define SWSPI_SCK	17 //TX2
+#define SWSPI_CS	20 //SDA
+#endif //(MOTHERBOARD == BOARD_EINY_0_3a)
+#if (MOTHERBOARD == BOARD_EINY_0_4a)
+#define SWSPI_MISO	62 //PK0
+#define SWSPI_MOSI	62 //PK0
+#define SWSPI_SCK	21 //SCL
+#define SWSPI_CS	20 //SDA
+#endif //(MOTHERBOARD == BOARD_EINY_0_4a)
 #endif //SWSPI_AVR
 
 #define SWSPI_POL	1 //polarity