refactor: moved drivers hdr files to include/drivers/nxp
NXP drivers header files are moved:
- from: drivers/nxp/<xx>/*.h
- to : include/drivers/nxp/<xx>/*.h
To accommodate these changes each drivers makefiles
drivers/nxp/<xx>/xx.mk, are updated.
Signed-off-by: Pankaj Gupta <pankaj.gupta@nxp.com>
Change-Id: I3979c509724d87e3d631a03dbafda1ee5ef07d21
diff --git a/drivers/nxp/i2c/i2c.h b/drivers/nxp/i2c/i2c.h
deleted file mode 100644
index 925bbc0..0000000
--- a/drivers/nxp/i2c/i2c.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2016-2020 NXP
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- */
-
-
-#ifndef I2C_H
-#define I2C_H
-
-#include <lib/mmio.h>
-
-#define I2C_TIMEOUT 1000 /* ms */
-
-#define I2C_FD_CONSERV 0x7e
-#define I2C_CR_DIS (1 << 7)
-#define I2C_CR_EN (0 << 7)
-#define I2C_CR_MA (1 << 5)
-#define I2C_CR_TX (1 << 4)
-#define I2C_CR_TX_NAK (1 << 3)
-#define I2C_CR_RSTA (1 << 2)
-#define I2C_SR_BB (1 << 5)
-#define I2C_SR_IDLE (0 << 5)
-#define I2C_SR_AL (1 << 4)
-#define I2C_SR_IF (1 << 1)
-#define I2C_SR_RX_NAK (1 << 0)
-#define I2C_SR_RST (I2C_SR_AL | I2C_SR_IF)
-
-#define I2C_GLITCH_EN 0x8
-
-#define i2c_in(a) mmio_read_8((uintptr_t)(a))
-#define i2c_out(a, v) mmio_write_8((uintptr_t)(a), (v))
-
-struct ls_i2c {
- unsigned char ad; /* I2c Bus Address Register */
- unsigned char fd; /* I2c Bus Frequency Dividor Register */
- unsigned char cr; /* I2c Bus Control Register */
- unsigned char sr; /* I2c Bus Status Register */
- unsigned char dr; /* I2C Bus Data I/O Register */
- unsigned char ic; /* I2C Bus Interrupt Config Register */
- unsigned char dbg; /* I2C Bus Debug Register */
-};
-
-void i2c_init(uintptr_t nxp_i2c_addr);
-int i2c_read(unsigned char chip, int addr, int alen,
- unsigned char *buf, int len);
-int i2c_write(unsigned char chip, int addr, int alen,
- const unsigned char *buf, int len);
-int i2c_probe_chip(unsigned char chip);
-
-#endif /* I2C_H */
diff --git a/drivers/nxp/i2c/i2c.mk b/drivers/nxp/i2c/i2c.mk
index ae89115..716e14a 100644
--- a/drivers/nxp/i2c/i2c.mk
+++ b/drivers/nxp/i2c/i2c.mk
@@ -1,5 +1,5 @@
#
-# Copyright 2020 NXP
+# Copyright 2021 NXP
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -7,10 +7,10 @@
ifeq (${ADD_I2C},)
ADD_I2C := 1
-I2C_DRIVERS_PATH := ${PLAT_DRIVERS_PATH}/i2c
-I2C_SOURCES += $(I2C_DRIVERS_PATH)/i2c.c
-PLAT_INCLUDES += -I$(I2C_DRIVERS_PATH)
+I2C_SOURCES += $(PLAT_DRIVERS_PATH)/i2c/i2c.c
+
+PLAT_INCLUDES += -I$(PLAT_DRIVERS_INCLUDE_PATH)/i2c
ifeq (${BL_COMM_I2C_NEEDED},yes)
BL_COMMON_SOURCES += ${I2C_SOURCES}