diff --git a/board/qca/ipq40xx/Makefile b/board/qca/ipq40xx/Makefile
index 2a4a0a7..8a8f936 100644
--- a/board/qca/ipq40xx/Makefile
+++ b/board/qca/ipq40xx/Makefile
@@ -1,3 +1,3 @@
 
 obj-y	:= ipq40xx.o
-
+obj-y	+= clock.o
diff --git a/board/qca/common/clk.h b/board/qca/ipq40xx/clk.h
similarity index 100%
rename from board/qca/common/clk.h
rename to board/qca/ipq40xx/clk.h
diff --git a/board/qca/common/clock.c b/board/qca/ipq40xx/clock.c
similarity index 98%
rename from board/qca/common/clock.c
rename to board/qca/ipq40xx/clock.c
index 04e9c57..fc20b0a 100644
--- a/board/qca/common/clock.c
+++ b/board/qca/ipq40xx/clock.c
@@ -12,8 +12,8 @@
  */
 
 #include <common.h>
-#include <asm/arch-qcom-common/clk.h>
-#include <asm/arch-ipq40xx/iomap.h>
+#include "clk.h"
+#include <asm/arch-qcom-common/iomap.h>
 #include <asm/io.h>
 #include <asm/errno.h>
 
@@ -204,4 +204,4 @@
 void pcie_clock_disable(int clk_addr)
 {
 	writel(0, clk_addr);
-}
\ No newline at end of file
+}
diff --git a/board/qca/ipq40xx/ipq40xx.h b/board/qca/ipq40xx/ipq40xx.h
index 60f2428..8f009fc 100644
--- a/board/qca/ipq40xx/ipq40xx.h
+++ b/board/qca/ipq40xx/ipq40xx.h
@@ -62,6 +62,7 @@
 
 #ifdef CONFIG_IPQ40XX_I2C
 typedef struct {
+	unsigned int i2c_base;
 	gpio_func_data_t *i2c_gpio;
 } i2c_cfg_t;
 #endif
diff --git a/include/configs/ipq40xx.h b/include/configs/ipq40xx.h
index 48165ff..fd5fe99 100644
--- a/include/configs/ipq40xx.h
+++ b/include/configs/ipq40xx.h
@@ -69,6 +69,7 @@
 
 #ifndef __ASSEMBLY__
 #include <compiler.h>
+
 extern loff_t board_env_offset;
 extern loff_t board_env_range;
 extern loff_t board_env_size;