diff --git a/ports/samd/machine_led.c b/ports/samd/machine_led.c
index 9c15769581..48ab869199 100644
--- a/ports/samd/machine_led.c
+++ b/ports/samd/machine_led.c
@@ -32,37 +32,16 @@
 #include "modmachine.h"
 #include "pins.h"
 
-// ASF4 (MCU package specific pin defs in 'boards')
-#include "hal_gpio.h"
+extern mp_obj_t machine_pin_low_obj;
+extern mp_obj_t machine_pin_high_obj;
+extern mp_obj_t machine_pin_toggle_obj;
+extern mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
 
 STATIC void machine_led_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_led_obj_t *self = self_in;
     mp_printf(print, "LED(%u)", self->id);
 }
 
-// LED.init(mode, *, value=None)
-STATIC mp_obj_t machine_led_obj_init_helper(const machine_led_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_mode, ARG_value };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_mode, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
-        { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
-    };
-
-    // parse args
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    // set initial value (do this before configuring mode/pull)
-    if (args[ARG_value].u_obj != mp_const_none) {
-        gpio_set_pin_level(self->id, mp_obj_is_true(args[ARG_value].u_obj));
-    }
-
-    // configure mode
-    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
-
-    return mp_const_none;
-}
-
 // constructor(id, ...)
 mp_obj_t mp_led_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
@@ -73,90 +52,23 @@ mp_obj_t mp_led_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
     if (0 <= wanted_led && wanted_led < MP_ARRAY_SIZE(machine_led_obj)) {
         self = (machine_led_obj_t *)&machine_led_obj[wanted_led];
     }
-
     // the array could be padded with 'nulls' (see other Ports).
     // Will also error if the asked for LED (index) is greater than the array row size.
     if (self == NULL || self->base.type == NULL) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid LED"));
     }
-
-    if (n_args > 1 || n_kw > 0) {
-        // mode given, so configure this GPIO
-        mp_map_t kw_args;
-        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-        machine_led_obj_init_helper(self, n_args - 1, args + 1, &kw_args);
-    }
+    mp_hal_pin_output(self->id);
+    mp_hal_pin_low(self->id);
 
     return MP_OBJ_FROM_PTR(self);
 }
 
-// fast method for getting/setting pin value
-STATIC mp_obj_t machine_led_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    mp_arg_check_num(n_args, n_kw, 0, 1, false);
-    machine_led_obj_t *self = self_in;
-    if (n_args == 0) {
-        // get pin
-        return MP_OBJ_NEW_SMALL_INT(gpio_get_pin_level(self->id));
-    } else {
-        // set pin
-        bool value = mp_obj_is_true(args[0]);
-        gpio_set_pin_level(self->id, value);
-
-        return mp_const_none;
-    }
-}
-
-// pin.init(mode)
-STATIC mp_obj_t machine_led_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    return machine_led_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(machine_led_init_obj, 1, machine_led_obj_init);
-
-// pin.value([value])
-STATIC mp_obj_t machine_led_value(size_t n_args, const mp_obj_t *args) {
-    return machine_led_call(args[0], n_args - 1, 0, args + 1);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_led_value_obj, 1, 2, machine_led_value);
-
-// pin.low()
-STATIC mp_obj_t machine_led_low(mp_obj_t self_in) {
-    machine_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
-    gpio_set_pin_level(self->id, false);
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_led_low_obj, machine_led_low);
-
-// pin.high()
-STATIC mp_obj_t machine_led_high(mp_obj_t self_in) {
-    machine_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
-    gpio_set_pin_level(self->id, true);
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_led_high_obj, machine_led_high);
-
-// pin.toggle()
-STATIC mp_obj_t machine_led_toggle(mp_obj_t self_in) {
-    machine_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
-    gpio_toggle_pin_level(self->id);
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_led_toggle_obj, machine_led_toggle);
 
 STATIC const mp_rom_map_elem_t machine_led_locals_dict_table[] = {
     // instance methods
-    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_led_init_obj) },
-    { MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&machine_led_value_obj) },
-    { MP_ROM_QSTR(MP_QSTR_low), MP_ROM_PTR(&machine_led_low_obj) },
-    { MP_ROM_QSTR(MP_QSTR_high), MP_ROM_PTR(&machine_led_high_obj) },
-    { MP_ROM_QSTR(MP_QSTR_off), MP_ROM_PTR(&machine_led_low_obj) },
-    { MP_ROM_QSTR(MP_QSTR_on), MP_ROM_PTR(&machine_led_high_obj) },
-    { MP_ROM_QSTR(MP_QSTR_toggle), MP_ROM_PTR(&machine_led_toggle_obj) },
+    { MP_ROM_QSTR(MP_QSTR_off), MP_ROM_PTR(&machine_pin_low_obj) },
+    { MP_ROM_QSTR(MP_QSTR_on), MP_ROM_PTR(&machine_pin_high_obj) },
+    { MP_ROM_QSTR(MP_QSTR_toggle), MP_ROM_PTR(&machine_pin_toggle_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_led_locals_dict, machine_led_locals_dict_table);
 
@@ -166,6 +78,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     make_new, mp_led_make_new,
     print, machine_led_print,
-    call, machine_led_call,
+    call, machine_pin_call,
     locals_dict, &machine_led_locals_dict
     );
diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index bef19d177d..e900174a91 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -220,7 +220,7 @@ STATIC mp_obj_t machine_pin_low(mp_obj_t self_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_low_obj, machine_pin_low);
+MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_low_obj, machine_pin_low);
 
 // Pin.high() Totem-pole (push-pull)
 STATIC mp_obj_t machine_pin_high(mp_obj_t self_in) {
@@ -232,7 +232,7 @@ STATIC mp_obj_t machine_pin_high(mp_obj_t self_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_high_obj, machine_pin_high);
+MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_high_obj, machine_pin_high);
 
 // Pin.toggle(). Only TOGGLE pins set as OUTPUT.
 STATIC mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
@@ -254,7 +254,7 @@ STATIC mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_toggle_obj, machine_pin_toggle);
+MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_toggle_obj, machine_pin_toggle);
 
 // Pin.drive(). Normal (0) is 2mA, High (1) allows 8mA.
 STATIC mp_obj_t machine_pin_drive(size_t n_args, const mp_obj_t *args) {