diff --git a/board/altera/socfpga/Makefile b/board/altera/socfpga/Makefile
index c867f73ff7..d96039464b 100644
--- a/board/altera/socfpga/Makefile
+++ b/board/altera/socfpga/Makefile
@@ -7,4 +7,4 @@
 #
 
 obj-y	:= socfpga.o
-obj-$(CONFIG_SPL_BUILD) += pinmux_config.o iocsr_config.o
+obj-$(CONFIG_SPL_BUILD) += qts/
diff --git a/board/altera/socfpga/qts/Makefile b/board/altera/socfpga/qts/Makefile
new file mode 100644
index 0000000000..dbcedd8c46
--- /dev/null
+++ b/board/altera/socfpga/qts/Makefile
@@ -0,0 +1,7 @@
+#
+# (C) Copyright 2015 Marek Vasut <marex@denx.de>
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y += pinmux_config.o iocsr_config.o
diff --git a/board/altera/socfpga/iocsr_config.c b/board/altera/socfpga/qts/iocsr_config.c
similarity index 100%
rename from board/altera/socfpga/iocsr_config.c
rename to board/altera/socfpga/qts/iocsr_config.c
diff --git a/board/altera/socfpga/iocsr_config.h b/board/altera/socfpga/qts/iocsr_config.h
similarity index 100%
rename from board/altera/socfpga/iocsr_config.h
rename to board/altera/socfpga/qts/iocsr_config.h
diff --git a/board/altera/socfpga/pinmux_config.c b/board/altera/socfpga/qts/pinmux_config.c
similarity index 100%
rename from board/altera/socfpga/pinmux_config.c
rename to board/altera/socfpga/qts/pinmux_config.c
diff --git a/board/altera/socfpga/pinmux_config.h b/board/altera/socfpga/qts/pinmux_config.h
similarity index 100%
rename from board/altera/socfpga/pinmux_config.h
rename to board/altera/socfpga/qts/pinmux_config.h
diff --git a/board/altera/socfpga/pll_config.h b/board/altera/socfpga/qts/pll_config.h
similarity index 100%
rename from board/altera/socfpga/pll_config.h
rename to board/altera/socfpga/qts/pll_config.h
diff --git a/include/configs/socfpga_arria5.h b/include/configs/socfpga_arria5.h
index 7aee1ce315..e3c66b4b9d 100644
--- a/include/configs/socfpga_arria5.h
+++ b/include/configs/socfpga_arria5.h
@@ -7,9 +7,9 @@
 #define __CONFIG_SOCFPGA_ARRIA5_H__
 
 #include <asm/arch/socfpga_base_addrs.h>
-#include "../../board/altera/socfpga/pinmux_config.h"
-#include "../../board/altera/socfpga/iocsr_config.h"
-#include "../../board/altera/socfpga/pll_config.h"
+#include "../../board/altera/socfpga/qts/pinmux_config.h"
+#include "../../board/altera/socfpga/qts/iocsr_config.h"
+#include "../../board/altera/socfpga/qts/pll_config.h"
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h
index 33d04fdc4a..a5565a7b5f 100644
--- a/include/configs/socfpga_cyclone5.h
+++ b/include/configs/socfpga_cyclone5.h
@@ -7,9 +7,9 @@
 #define __CONFIG_SOCFPGA_CYCLONE5_H__
 
 #include <asm/arch/socfpga_base_addrs.h>
-#include "../../board/altera/socfpga/pinmux_config.h"
-#include "../../board/altera/socfpga/iocsr_config.h"
-#include "../../board/altera/socfpga/pll_config.h"
+#include "../../board/altera/socfpga/qts/pinmux_config.h"
+#include "../../board/altera/socfpga/qts/iocsr_config.h"
+#include "../../board/altera/socfpga/qts/pll_config.h"
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH