diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index b39ea50d77ff..7505f2569815 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.226 2020/10/23 15:18:10 jdc Exp $ */
+/*	$NetBSD: autoconf.c,v 1.227 2020/10/29 06:47:38 jdc Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.226 2020/10/23 15:18:10 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.227 2020/10/29 06:47:38 jdc Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -1089,6 +1089,11 @@ device_register(device_t dev, void *aux)
 				add_gpio_props_v210(dev, aux);
 			}
 		} 
+		if (device_is_a(dev, "pcf8574io")) {
+			if (!strcmp(machine_model, "SUNW,Ultra-250")) {
+				add_gpio_props_e250(dev, aux);
+			}
+		} 
 	} else if (device_is_a(dev, "sd") || device_is_a(dev, "cd")) {
 		struct scsipibus_attach_args *sa = aux;
 		struct scsipi_periph *periph = sa->sa_periph;
@@ -1117,9 +1122,7 @@ device_register(device_t dev, void *aux)
 		    0, periph->periph_lun);
 		if (device_is_a(busdev, "scsibus")) {
 			/* see if we're in a known SCA drivebay */
-			if (strcmp(machine_model, "SUNW,Sun-Fire-V210") == 0) {
-				add_drivebay_props_v210(dev, ofnode, aux);
-			}
+			add_drivebay_props(dev, ofnode, aux);
 		}
 		return;
 	} else if (device_is_a(dev, "wd")) {
diff --git a/sys/arch/sparc64/sparc64/ofw_patch.c b/sys/arch/sparc64/sparc64/ofw_patch.c
index 0f978a4755fc..661a62685af1 100644
--- a/sys/arch/sparc64/sparc64/ofw_patch.c
+++ b/sys/arch/sparc64/sparc64/ofw_patch.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofw_patch.c,v 1.5 2020/10/25 07:46:53 jdc Exp $ */
+/*	$NetBSD: ofw_patch.c,v 1.6 2020/10/29 06:47:38 jdc Exp $ */
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_patch.c,v 1.5 2020/10/25 07:46:53 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_patch.c,v 1.6 2020/10/29 06:47:38 jdc Exp $");
 
 #include <sys/param.h>
 
@@ -42,11 +42,10 @@ __KERNEL_RCSID(0, "$NetBSD: ofw_patch.c,v 1.5 2020/10/25 07:46:53 jdc Exp $");
 #include <sparc64/sparc64/static_edid.h>
 
 static void
-add_gpio_LED(prop_array_t pins, const char *name, int num, int act, int def)
+add_gpio_pin(prop_array_t pins, const char *name, int num, int act, int def)
 {
 	prop_dictionary_t pin = prop_dictionary_create();
 	prop_dictionary_set_string(pin, "name", name);
-	prop_dictionary_set_uint32(pin, "type", 0);	/* 0 for LED, for now */
 	prop_dictionary_set_uint32(pin, "pin", num);
 	prop_dictionary_set_bool(pin, "active_high", act);
 	if (def != -1)
@@ -62,7 +61,7 @@ create_i2c_dict(device_t busdev)
 	prop_array_t cfg = NULL;
 
 	cfg = prop_dictionary_get(props, "i2c-child-devices");
- 	if (!cfg) {
+	if (!cfg) {
 		DPRINTF(ACDB_PROBE, ("\nCreating new i2c-child-devices\n"));
 		cfg = prop_array_create();
 		prop_dictionary_set(props, "i2c-child-devices", cfg);
@@ -100,18 +99,27 @@ add_gpio_props_v210(device_t dev, void *aux)
 	switch (ia->ia_addr) {
 		case 0x38:	/* front panel LEDs */
 			pins = prop_array_create();
-			add_gpio_LED(pins, "indicator", 7, 0, -1);
-			add_gpio_LED(pins, "fault", 5, 0, 0);
-			add_gpio_LED(pins, "power", 4, 0, 1);
+			add_gpio_pin(pins, "LED indicator", 7, 0, -1);
+			add_gpio_pin(pins, "LED fault", 5, 0, 0);
+			add_gpio_pin(pins, "LED power", 4, 0, 1);
 			prop_dictionary_set(dict, "pins", pins);
 			prop_object_release(pins);
 			break;
-		case 0x23:	/* drive bay LEDs */
+		case 0x23:	/* drive bay O/1 LEDs */
 			pins = prop_array_create();
-			add_gpio_LED(pins, "bay0_fault", 10, 0, 0);
-			add_gpio_LED(pins, "bay1_fault", 11, 0, 0);
-			add_gpio_LED(pins, "bay0_remove", 12, 0, 0);
-			add_gpio_LED(pins, "bay1_remove", 13, 0, 0);
+			add_gpio_pin(pins, "LED bay0_fault", 10, 0, 0);
+			add_gpio_pin(pins, "LED bay1_fault", 11, 0, 0);
+			add_gpio_pin(pins, "LED bay0_remove", 12, 0, 0);
+			add_gpio_pin(pins, "LED bay1_remove", 13, 0, 0);
+			prop_dictionary_set(dict, "pins", pins);
+			prop_object_release(pins);
+			break;
+		case 0x25:	/* drive bay 2/3 LEDs (v240 only)*/
+			pins = prop_array_create();
+			add_gpio_pin(pins, "LED bay2_fault", 10, 0, 0);
+			add_gpio_pin(pins, "LED bay3_fault", 11, 0, 0);
+			add_gpio_pin(pins, "LED bay2_remove", 12, 0, 0);
+			add_gpio_pin(pins, "LED bay3_remove", 13, 0, 0);
 			prop_dictionary_set(dict, "pins", pins);
 			prop_object_release(pins);
 			break;
@@ -119,24 +127,112 @@ add_gpio_props_v210(device_t dev, void *aux)
 }
 
 void
-add_drivebay_props_v210(device_t dev, int ofnode, void *aux)
+add_gpio_props_e250(device_t dev, void *aux)
+{
+	struct i2c_attach_args *ia = aux;
+	prop_dictionary_t dict = device_properties(dev);
+	prop_array_t pins;
+
+	switch (ia->ia_addr) {
+		case 0x39:	/* PSU status */
+			pins = prop_array_create();
+			add_gpio_pin(pins, "INDICATOR psu0_present", 0, 0, -1);
+			add_gpio_pin(pins, "INDICATOR psu1_present", 1, 0, -1);
+			add_gpio_pin(pins, "INDICATOR psu0_fault", 4, 0, -1);
+			add_gpio_pin(pins, "INDICATOR psu1_fault", 5, 0, -1);
+			prop_dictionary_set(dict, "pins", pins);
+			prop_object_release(pins);
+			break;
+		case 0x3d:	/* disk status */
+			pins = prop_array_create();
+			add_gpio_pin(pins, "INDICATOR disk0_present",
+			    0, 0, -1);
+			add_gpio_pin(pins, "INDICATOR disk1_present",
+			    1, 0, -1);
+			add_gpio_pin(pins, "INDICATOR disk2_present",
+			    2, 0, -1);
+			add_gpio_pin(pins, "INDICATOR disk3_present",
+			    3, 0, -1);
+			add_gpio_pin(pins, "INDICATOR disk4_present",
+			    4, 0, -1);
+			add_gpio_pin(pins, "INDICATOR disk5_present",
+			    5, 0, -1);
+			prop_dictionary_set(dict, "pins", pins);
+			prop_object_release(pins);
+			break;
+		case 0x3e:	/* front panel LEDs */
+			pins = prop_array_create();
+			add_gpio_pin(pins, "LED disk_fault", 0, 0, -1);
+			add_gpio_pin(pins, "LED psu_fault", 1, 0, -1);
+			add_gpio_pin(pins, "LED overtemp", 2, 0, -1);
+			add_gpio_pin(pins, "LED fault", 3, 0, -1);
+			add_gpio_pin(pins, "LED activity", 4, 0, -1);
+			/* Pin 5 is power LED, but not controllable */
+			add_gpio_pin(pins, "INDICATOR key_normal", 6, 0, -1);
+			add_gpio_pin(pins, "INDICATOR key_diag", 7, 0, -1);
+			/* If not "normal" or "diag", key is "lock" */
+			prop_dictionary_set(dict, "pins", pins);
+			prop_object_release(pins);
+			break;
+		case 0x3f:	/* disk fault LEDs */
+			pins = prop_array_create();
+			add_gpio_pin(pins, "LED disk0_fault", 0, 0, -1);
+			add_gpio_pin(pins, "LED disk1_fault", 1, 0, -1);
+			add_gpio_pin(pins, "LED disk2_fault", 2, 0, -1);
+			add_gpio_pin(pins, "LED disk3_fault", 3, 0, -1);
+			add_gpio_pin(pins, "LED disk4_fault", 4, 0, -1);
+			add_gpio_pin(pins, "LED disk5_fault", 5, 0, -1);
+			prop_dictionary_set(dict, "pins", pins);
+			prop_object_release(pins);
+			break;
+	}
+}
+
+void
+add_drivebay_props(device_t dev, int ofnode, void *aux)
 {
 	struct scsipibus_attach_args *sa = aux;
 	int target = sa->sa_periph->periph_target;
+	prop_dictionary_t dict = device_properties(dev);
 	char path[256]= "";
+	char name[16];
+	int nbays;
 
-	OF_package_to_path(ofnode, path, sizeof(path));
+	if ((strcmp(machine_model, "SUNW,Sun-Fire-V210") == 0) ||
+	    (strcmp(machine_model, "SUNW,Sun-Fire-V240") == 0)) {
+		OF_package_to_path(ofnode, path, sizeof(path));
 
-	/* see if we're on the onboard controller's 1st channel */
-	if (strcmp(path, "/pci@1c,600000/scsi@2") != 0)
-		return;
-	/* yes, yes we are */
-	if ( target < 2) {
-		prop_dictionary_t dict = device_properties(dev);
-		char name[16];
+		/* see if we're on the onboard controller's 1st channel */
+		if (strcmp(path, "/pci@1c,600000/scsi@2") != 0)
+			return;
 
-		snprintf(name, sizeof(name), "bay%d", target);		
-		prop_dictionary_set_string(dict, "location", name);
+		/* yes, yes we are */
+		if (strcmp(machine_model, "SUNW,Sun-Fire-V240") == 0)
+			nbays = 4;
+		else
+			nbays = 2;
+		if ( target < nbays) {
+			snprintf(name, sizeof(name), "bay%d", target);
+			prop_dictionary_set_string(dict, "location", name);
+		}
+	}
+
+	if (!strcmp(machine_model, "SUNW,Ultra-250")) {
+		OF_package_to_path(ofnode, path, sizeof(path));
+
+		/* see if we're on the onboard controller's 1st channel */
+		if (strcmp(path, "/pci@1f,4000/scsi@3") != 0)
+			return;
+
+		/* disk 0 is target 0 */
+		if (!target) {
+			strncpy(name, "bay0", sizeof(name));
+			prop_dictionary_set_string(dict, "location", name);
+		/* disks 1 - 5 are targets 8 - 12 */
+		} else if ( target < 13) {
+			snprintf(name, sizeof(name), "bay%d", target - 7);
+			prop_dictionary_set_string(dict, "location", name);
+		}
 	}
 }
 
diff --git a/sys/arch/sparc64/sparc64/ofw_patch.h b/sys/arch/sparc64/sparc64/ofw_patch.h
index ab390b218a5c..06797234f54d 100644
--- a/sys/arch/sparc64/sparc64/ofw_patch.h
+++ b/sys/arch/sparc64/sparc64/ofw_patch.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofw_patch.h,v 1.3 2020/10/23 15:18:10 jdc Exp $ */
+/*	$NetBSD: ofw_patch.h,v 1.4 2020/10/29 06:47:38 jdc Exp $ */
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -42,7 +42,8 @@ extern int autoconf_debug;
 #endif
 
 void add_gpio_props_v210(device_t, void *);
-void add_drivebay_props_v210(device_t, int, void *);
+void add_gpio_props_e250(device_t, void *);
+void add_drivebay_props(device_t, int, void *);
 void add_spdmem_props_sparcle(device_t);
 void add_env_sensors_v210(device_t);
 void add_i2c_props_e450(device_t, uint64_t);