diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dcccbfe..d812685 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1135,7 +1135,6 @@
 	select DM_MMC if MMC
 	select DM_SCSI if SCSI
 	select DM_SERIAL
-	select GPIO_EXTRA_HEADER
 	select OF_BOARD_SETUP
 	select OF_CONTROL
 	select OF_SEPARATE
diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h
deleted file mode 100644
index e0fb5b5..0000000
--- a/arch/arm/include/asm/arch-sunxi/gpio.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2007-2012
- * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
- * Tom Cubie <tangliang@allwinnertech.com>
- *
- * Definitions that are shared between the Allwinner pinctrl and GPIO drivers,
- * also used by some non-DM SPL code directly.
- */
-
-#ifndef _SUNXI_GPIO_H
-#define _SUNXI_GPIO_H
-
-#include <linux/types.h>
-#include <asm/arch/cpu.h>
-
-/*
- * sunxi has 9 banks of gpio, they are:
- * PA0 - PA17 | PB0 - PB23 | PC0 - PC24
- * PD0 - PD27 | PE0 - PE31 | PF0 - PF5
- * PG0 - PG9  | PH0 - PH27 | PI0 - PI12
- */
-
-#define SUNXI_GPIO_A	0
-#define SUNXI_GPIO_B	1
-#define SUNXI_GPIO_C	2
-#define SUNXI_GPIO_D	3
-#define SUNXI_GPIO_E	4
-#define SUNXI_GPIO_F	5
-#define SUNXI_GPIO_G	6
-#define SUNXI_GPIO_H	7
-#define SUNXI_GPIO_I	8
-
-/*
- * sun6i/sun8i and later SoCs have an additional GPIO controller (R_PIO)
- * at a different register offset.
- *
- * sun6i has 2 banks:
- * PL0 - PL8  | PM0 - PM7
- *
- * sun8i has 1 bank:
- * PL0 - PL11
- *
- * sun9i has 3 banks:
- * PL0 - PL9  | PM0 - PM15  | PN0 - PN1
- */
-#define SUNXI_GPIO_L	11
-#define SUNXI_GPIO_M	12
-#define SUNXI_GPIO_N	13
-
-#define SUN50I_H6_GPIO_POW_MOD_SEL	0x340
-#define SUN50I_H6_GPIO_POW_MOD_VAL	0x348
-
-#define SUNXI_GPIOS_PER_BANK	32
-#define SUNXI_PINCTRL_BANK_SIZE 0x24
-
-#define SUNXI_GPIO_NEXT(__gpio) \
-	((__gpio##_START) + SUNXI_GPIOS_PER_BANK)
-
-enum sunxi_gpio_number {
-	SUNXI_GPIO_A_START = 0,
-	SUNXI_GPIO_B_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_A),
-	SUNXI_GPIO_C_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_B),
-	SUNXI_GPIO_D_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_C),
-	SUNXI_GPIO_E_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_D),
-	SUNXI_GPIO_F_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_E),
-	SUNXI_GPIO_G_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_F),
-	SUNXI_GPIO_H_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_G),
-	SUNXI_GPIO_I_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_H),
-	SUNXI_GPIO_L_START = 352,
-	SUNXI_GPIO_M_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_L),
-	SUNXI_GPIO_N_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_M),
-	SUNXI_GPIO_AXP0_START = 1024,
-};
-
-/* SUNXI GPIO number definitions */
-#define SUNXI_GPA(_nr)	(SUNXI_GPIO_A_START + (_nr))
-#define SUNXI_GPB(_nr)	(SUNXI_GPIO_B_START + (_nr))
-#define SUNXI_GPC(_nr)	(SUNXI_GPIO_C_START + (_nr))
-#define SUNXI_GPD(_nr)	(SUNXI_GPIO_D_START + (_nr))
-#define SUNXI_GPE(_nr)	(SUNXI_GPIO_E_START + (_nr))
-#define SUNXI_GPF(_nr)	(SUNXI_GPIO_F_START + (_nr))
-#define SUNXI_GPG(_nr)	(SUNXI_GPIO_G_START + (_nr))
-#define SUNXI_GPH(_nr)	(SUNXI_GPIO_H_START + (_nr))
-#define SUNXI_GPI(_nr)	(SUNXI_GPIO_I_START + (_nr))
-#define SUNXI_GPL(_nr)	(SUNXI_GPIO_L_START + (_nr))
-#define SUNXI_GPM(_nr)	(SUNXI_GPIO_M_START + (_nr))
-#define SUNXI_GPN(_nr)	(SUNXI_GPIO_N_START + (_nr))
-
-#define SUNXI_GPAXP0(_nr)	(SUNXI_GPIO_AXP0_START + (_nr))
-
-/* GPIO pin function config */
-#define SUNXI_GPIO_INPUT	0
-#define SUNXI_GPIO_OUTPUT	1
-#define SUNXI_GPIO_DISABLE	7
-
-#define SUN8I_H3_GPA_UART0	2
-#define SUN8I_H3_GPA_UART2	2
-
-#define SUN4I_GPB_PWM		2
-#define SUN4I_GPB_TWI0		2
-#define SUN4I_GPB_TWI1		2
-#define SUN5I_GPB_TWI1		2
-#define SUN8I_V3S_GPB_TWI0	2
-#define SUN4I_GPB_UART0		2
-#define SUN5I_GPB_UART0		2
-#define SUN8I_GPB_UART2		2
-#define SUN8I_A33_GPB_UART0	3
-#define SUN8I_A83T_GPB_UART0	2
-#define SUN8I_V3S_GPB_UART0	3
-#define SUN50I_GPB_UART0	4
-
-#define SUNXI_GPC_NAND		2
-#define SUNXI_GPC_SPI0		3
-#define SUNXI_GPC_SDC2		3
-#define SUN6I_GPC_SDC3		4
-#define SUN50I_GPC_SPI0		4
-#define SUNIV_GPC_SPI0		2
-
-#define SUNXI_GPD_LCD0		2
-#define SUNXI_GPD_LVDS0		3
-
-#define SUNIV_GPE_UART0		5
-
-#define SUNXI_GPF_SDC0		2
-#define SUNXI_GPF_UART0		4
-#define SUN8I_GPF_UART0		3
-
-#define SUN4I_GPG_SDC1		4
-#define SUN5I_GPG_SDC1		2
-#define SUN6I_GPG_SDC1		2
-#define SUN8I_GPG_SDC1		2
-#define SUN8I_GPG_UART1		2
-#define SUN5I_GPG_UART1		4
-
-#define SUN6I_GPH_PWM		2
-#define SUN8I_GPH_PWM		2
-#define SUN4I_GPH_SDC1		5
-#define SUN6I_GPH_TWI0		2
-#define SUN8I_GPH_TWI0		2
-#define SUN50I_GPH_TWI0		2
-#define SUN6I_GPH_TWI1		2
-#define SUN8I_GPH_TWI1		2
-#define SUN50I_GPH_TWI1		2
-#define SUN6I_GPH_UART0		2
-#define SUN9I_GPH_UART0		2
-#define SUN50I_H6_GPH_UART0	2
-#define SUN50I_H616_GPH_UART0	2
-
-#define SUNXI_GPI_SDC3		2
-
-#define SUN6I_GPL0_R_P2WI_SCK	3
-#define SUN6I_GPL1_R_P2WI_SDA	3
-
-#define SUN8I_GPL_R_RSB		2
-#define SUN8I_H3_GPL_R_TWI	2
-#define SUN8I_A23_GPL_R_TWI	3
-#define SUN8I_GPL_R_UART	2
-#define SUN50I_GPL_R_TWI	2
-#define SUN50I_H616_GPL_R_TWI	3
-
-#define SUN9I_GPN_R_RSB		3
-
-/* GPIO pin pull-up/down config */
-#define SUNXI_GPIO_PULL_DISABLE	0
-#define SUNXI_GPIO_PULL_UP	1
-#define SUNXI_GPIO_PULL_DOWN	2
-
-/* Virtual AXP0 GPIOs */
-#define SUNXI_GPIO_AXP0_PREFIX "AXP0-"
-#define SUNXI_GPIO_AXP0_VBUS_ENABLE	5
-#define SUNXI_GPIO_AXP0_GPIO_COUNT	6
-
-struct sunxi_gpio_plat {
-	void			*regs;
-	char			bank_name[3];
-};
-
-/* prototypes for the non-DM GPIO/pinctrl functions, used in the SPL */
-void sunxi_gpio_set_cfgbank(void *bank_base, int pin_offset, u32 val);
-void sunxi_gpio_set_cfgpin(u32 pin, u32 val);
-int sunxi_gpio_get_cfgbank(void *bank_base, int pin_offset);
-int sunxi_gpio_get_cfgpin(u32 pin);
-void sunxi_gpio_set_drv(u32 pin, u32 val);
-void sunxi_gpio_set_drv_bank(void *bank_base, u32 pin_offset, u32 val);
-void sunxi_gpio_set_pull(u32 pin, u32 val);
-void sunxi_gpio_set_pull_bank(void *bank_base, int pin_offset, u32 val);
-int sunxi_name_to_gpio(const char *name);
-
-#if !defined CONFIG_SPL_BUILD && defined CONFIG_AXP_GPIO
-int axp_gpio_init(void);
-#else
-static inline int axp_gpio_init(void) { return 0; }
-#endif
-
-#endif /* _SUNXI_GPIO_H */
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
index 78597ad..4a1a0ea 100644
--- a/arch/arm/mach-sunxi/board.c
+++ b/arch/arm/mach-sunxi/board.c
@@ -17,6 +17,7 @@
 #include <i2c.h>
 #include <serial.h>
 #include <spl.h>
+#include <sunxi_gpio.h>
 #include <asm/cache.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-sunxi/dram_suniv.c b/arch/arm/mach-sunxi/dram_suniv.c
index 3aa3ce7..9e583e1 100644
--- a/arch/arm/mach-sunxi/dram_suniv.c
+++ b/arch/arm/mach-sunxi/dram_suniv.c
@@ -13,10 +13,10 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
-#include <asm/arch/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <hang.h>
+#include <sunxi_gpio.h>
 
 #define SDR_T_CAS			(0x2)
 #define SDR_T_RAS			(0x8)
diff --git a/arch/arm/mach-sunxi/spl_spi_sunxi.c b/arch/arm/mach-sunxi/spl_spi_sunxi.c
index 81159cf..c2410dd 100644
--- a/arch/arm/mach-sunxi/spl_spi_sunxi.c
+++ b/arch/arm/mach-sunxi/spl_spi_sunxi.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
+#include <sunxi_gpio.h>
 
 #ifdef CONFIG_SPL_OS_BOOT
 #error CONFIG_SPL_OS_BOOT is not supported yet