diff --git a/cpu/cc430/cc430-gpioint.c b/cpu/cc430/cc430-gpioint.c
deleted file mode 100644
index d03867175666714831b1b67d4deb3b630856d37e..0000000000000000000000000000000000000000
--- a/cpu/cc430/cc430-gpioint.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright 2010, Freie Universität Berlin (FUB).
- * Copyright 2013, INRIA.
- *
- * This file is subject to the terms and conditions of the GNU Lesser
- * General Public License v2.1. See the file LICENSE in the top level
- * directory for more details.
- */
-
-/**
- * @ingroup cc430
- * @file
- * @brief CC430 GPIO Interrupt Multiplexer implementation
- * @author Oliver Hahm <oliver.hahm@inria.fr>
- */
-
-#include <stdlib.h>
-#include <legacymsp430.h>
-#include "gpioint.h"
-#include "bitarithm.h"
-#include "cpu.h"
-#include "irq.h"
-#include "xtimer.h"
-
-/** min and max portnumber to generate interrupts */
-#define PORTINT_MIN (1)
-#define PORTINT_MAX (2)
-
-/** amount of interrupt capable ports */
-#define INT_PORTS (2)
-
-/** number of bits per port */
-#define BITMASK_SIZE (8)
-
-/** debouncing port interrupts */
-#define DEBOUNCE_TIMEOUT (250)
-
-/** interrupt callbacks */
-fp_irqcb cb[INT_PORTS][BITMASK_SIZE];
-
-/** debounce interrupt flags */
-uint8_t debounce_flags[INT_PORTS];
-
-/** debounce interrupt times */
-uint16_t debounce_time[INT_PORTS][BITMASK_SIZE];
-
-uint16_t c1 = 0, c2 = 0;
-
-void gpioint_init(void)
-{
- uint8_t i, j;
-
- for (i = 0; i < INT_PORTS; i++) {
- for (j = 0; j < BITMASK_SIZE; j++) {
- cb[i][j] = NULL;
- debounce_time[i][j] = 0;
- }
- }
-}
-
-bool gpioint_set(int port, uint32_t bitmask, int flags, fp_irqcb callback)
-{
- if ((port >= PORTINT_MIN) && (port <= PORTINT_MAX)) {
- /* set the callback function */
- int8_t base = bitarithm_msb(bitmask);
-
- if (base >= 0) {
- cb[port - PORTINT_MIN][base] = callback;
- }
- else {
- return false;
- }
-
- if (flags & GPIOINT_DEBOUNCE) {
- debounce_flags[port - PORTINT_MIN] |= bitmask;
- }
- else {
- debounce_flags[port - PORTINT_MIN] &= ~bitmask;
- }
- }
-
- switch(port) {
- case 1:
- /* set port to input */
- P1DIR &= ~bitmask;
- /* enable internal pull-down */
- P1OUT &= ~bitmask;
- P1REN |= bitmask;
-
- /* reset IRQ flag */
- P1IFG &= ~bitmask;
-
- /* trigger on rising... */
- if (flags & GPIOINT_RISING_EDGE) {
- P1IES &= bitmask;
- }
-
- /* ...or falling edge */
- if (flags & GPIOINT_FALLING_EDGE) {
- P1IES |= bitmask;
- }
-
- /* disable interrupt */
- if (flags == GPIOINT_DISABLE) {
- P1IE &= ~bitmask;
- }
-
- /* enable interrupt */
- P1IE |= bitmask;
- break;
-
- case 2:
- /* set port to input */
- P2DIR &= ~bitmask;
- /* enable internal pull-down */
- P2OUT &= ~bitmask;
- P2REN |= bitmask;
-
- /* reset IRQ flag */
- P2IFG &= ~bitmask;
-
- /* trigger on rising... */
- if (flags == GPIOINT_RISING_EDGE) {
- P2IES &= bitmask;
- }
- /* ...or falling edge */
- else if (flags == GPIOINT_FALLING_EDGE) {
- P2IES |= bitmask;
- }
- /* or disable interrupt */
- else {
- P2IE &= ~bitmask;
- }
-
- /* enable interrupt */
- P2IE |= bitmask;
- break;
-
- default:
- return false;
- }
-
- return 1;
-}
-
-interrupt(PORT1_VECTOR) __attribute__((naked)) port1_isr(void)
-{
- uint8_t int_enable, ifg_num, p1ifg;
- uint16_t p1iv;
- uint16_t diff;
- __enter_isr();
-
- /* Debounce
- * Disable PORT1 IRQ
- */
- p1ifg = P1IFG;
- p1iv = P1IV;
- int_enable = P1IE;
- P1IE = 0x00;
-
- ifg_num = (p1iv >> 1) - 1;
-
- /* check interrupt source */
- if (debounce_flags[0] & p1ifg) {
- /* check if bouncing */
- diff = xtimer_now_usec() - debounce_time[0][ifg_num];
-
- if (diff > DEBOUNCE_TIMEOUT) {
- debounce_time[0][ifg_num] = xtimer_now_usec();
-
- if (cb[0][ifg_num] != NULL) {
- cb[0][ifg_num]();
- }
- }
- else {
- /* TODO: check for long duration irq */
- __asm__ volatile(" nop ");
- }
- }
- else {
- if (cb[0][ifg_num] != NULL) {
- cb[0][ifg_num]();
- }
- }
-
- P1IFG = 0x00;
- P1IE = int_enable;
- __exit_isr();
-}
-
-interrupt(PORT2_VECTOR) __attribute__((naked)) port2_isr(void)
-{
- uint8_t int_enable, ifg_num, p2ifg;
- uint16_t p2iv;
- uint16_t diff;
- __enter_isr();
-
- /* Debounce
- * Disable PORT2 IRQ
- */
- p2ifg = P2IFG;
- p2iv = P2IV;
- int_enable = P2IE;
- P2IE = 0x00;
-
- ifg_num = (p2iv >> 1) - 1;
-
- /* check interrupt source */
- if (debounce_flags[1] & p2ifg) {
- /* check if bouncing */
- diff = xtimer_now_usec() - debounce_time[1][ifg_num];
-
- if (diff > DEBOUNCE_TIMEOUT) {
- debounce_time[1][ifg_num] = xtimer_now_usec();
- c1++;
-
- if (cb[1][ifg_num] != NULL) {
- cb[1][ifg_num]();
- }
- }
- else {
- c2++;
- /* TODO: check for long duration irq */
- __asm__ volatile(" nop ");
- }
- }
- else {
- if (cb[1][ifg_num] != NULL) {
- cb[1][ifg_num]();
- }
- }
-
-
- P2IFG = 0x00;
- P2IE = int_enable;
- __exit_isr();
-}
diff --git a/drivers/include/gpioint.h b/drivers/include/gpioint.h
deleted file mode 100644
index 72c72af4fd8085ce32d575e7a7e3ed48c79db599..0000000000000000000000000000000000000000
--- a/drivers/include/gpioint.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
- *
- * This file is subject to the terms and conditions of the GNU Lesser
- * General Public License v2.1. See the file LICENSE in the top level
- * directory for more details.
- */
-
-/**
- * @defgroup drivers_gpioint GPIO IRQ Multiplexer
- * @ingroup drivers_periph
- * @brief Provides an API to implement interrupt handlers on IO pins.
- *
- * Multiplexer and interrupt handling must be implemented platform specific.
- *
- * @note This interface is deprecated, use `periph/gpio.h` instead
- *
- * @{
- *
- * @file
- * @brief GPIO IRQ Multiplexer interface
- *
- * @author Michael Baar <michael.baar@fu-berlin.de>
- */
-
-#ifndef GPIOINT_H
-#define GPIOINT_H
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * @brief GPIO IRQ multiplexer flags
- *
- * @note We rely on the exact values for the edges.
- * @note These flags are extended in hal/drivers/device-gpio.h
- *
- * @{
- */
-#define GPIOINT_DISABLE 0x00 /**< disable interrupt */
-#define GPIOINT_RISING_EDGE 0x01 /**< interrupt is generated on rising edge */
-#define GPIOINT_FALLING_EDGE 0x02 /**< interrupt is generated on falling edge */
-#define GPIOINT_DEBOUNCE 0x04 /**< debounce this interrupt */
-/** @} */
-
-/**
- * @brief GPIO IRQ callback function type
- */
-typedef void(*fp_irqcb)(void);
-
-/**
- * @brief GPIO IRQ handler setup
- * @param[in] port CPU specific port number (starting at 0)
- * @param[in] bitmask One or more bits for which to set the handler
- * @param[in] flags A combination of #GPIOINT_RISING_EDGE and #GPIOINT_FALLING_EDGE
- * @param[in] callback A pointer to a handler function
- * @retval true successful
- * @retval false failed
- *
- * To enable interrupt handling for a pin flags and callback must be non-zero. To disable interrupt
- * handling flags and callback shall be zero.
- */
-bool gpioint_set(int port, uint32_t bitmask, int flags, fp_irqcb callback);
-
-/**
- * @brief Initialize the multiplexer
- */
-void gpioint_init(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-/** @} */
-#endif /* GPIOINT_H */
diff --git a/sys/auto_init/auto_init.c b/sys/auto_init/auto_init.c
index 85565f54053303c63f55a9db650822a9b0ccfda6..36b9350ddc3d7423e6a3e2a7828bdee470ce6645 100644
--- a/sys/auto_init/auto_init.c
+++ b/sys/auto_init/auto_init.c
@@ -28,10 +28,6 @@
#include "sht11.h"
#endif
-#ifdef MODULE_GPIOINT
-#include "gpioint.h"
-#endif
-
#ifdef MODULE_MCI
#include "diskio.h"
#endif
@@ -116,10 +112,6 @@ void auto_init(void)
DEBUG("Auto init SHT11 module.\n");
sht11_init();
#endif
-#ifdef MODULE_GPIOINT
- DEBUG("Auto init gpioint module.\n");
- gpioint_init();
-#endif
#ifdef MODULE_MCI
DEBUG("Auto init mci module.\n");
mci_initialize();