From a821c4af79e4f5ce9b629b20473863397bbe9b10 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Wed, 17 May 2017 17:18:05 -0600
Subject: dm: Rename dev_addr..() functions

These support the flat device tree. We want to use the dev_read_..()
prefix for functions that support both flat tree and live tree. So rename
the existing functions to avoid confusion.

In the end we will have:

   1. dev_read_addr...()    - works on devices, supports flat/live tree
   2. devfdt_get_addr...()  - current functions, flat tree only
   3. of_get_address() etc. - new functions, live tree only

All drivers will be written to use 1. That function will in turn call
either 2 or 3 depending on whether the flat or live tree is in use.

Note this involves changing some dead code - the imx_lpi2c.c file.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 include/dm/fdtaddr.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'include')

diff --git a/include/dm/fdtaddr.h b/include/dm/fdtaddr.h
index fd05b6fe95..ef6e86379f 100644
--- a/include/dm/fdtaddr.h
+++ b/include/dm/fdtaddr.h
@@ -16,26 +16,26 @@
 struct udevice;
 
 /**
- * dev_get_addr() - Get the reg property of a device
+ * devfdt_get_addr() - Get the reg property of a device
  *
  * @dev: Pointer to a device
  *
  * @return addr
  */
-fdt_addr_t dev_get_addr(struct udevice *dev);
+fdt_addr_t devfdt_get_addr(struct udevice *dev);
 
 /**
- * dev_get_addr_ptr() - Return pointer to the address of the reg property
+ * devfdt_get_addr_ptr() - Return pointer to the address of the reg property
  *                      of a device
  *
  * @dev: Pointer to a device
  *
  * @return Pointer to addr, or NULL if there is no such property
  */
-void *dev_get_addr_ptr(struct udevice *dev);
+void *devfdt_get_addr_ptr(struct udevice *dev);
 
 /**
- * dev_map_physmem() - Read device address from reg property of the
+ * devfdt_map_physmem() - Read device address from reg property of the
  *                     device node and map the address into CPU address
  *                     space.
  *
@@ -45,10 +45,10 @@ void *dev_get_addr_ptr(struct udevice *dev);
  * @return  mapped address, or NULL if the device does not have reg
  *          property.
  */
-void *dev_map_physmem(struct udevice *dev, unsigned long size);
+void *devfdt_map_physmem(struct udevice *dev, unsigned long size);
 
 /**
- * dev_get_addr_index() - Get the indexed reg property of a device
+ * devfdt_get_addr_index() - Get the indexed reg property of a device
  *
  * @dev: Pointer to a device
  * @index: the 'reg' property can hold a list of <addr, size> pairs
@@ -56,10 +56,10 @@ void *dev_map_physmem(struct udevice *dev, unsigned long size);
  *
  * @return addr
  */
-fdt_addr_t dev_get_addr_index(struct udevice *dev, int index);
+fdt_addr_t devfdt_get_addr_index(struct udevice *dev, int index);
 
 /**
- * dev_get_addr_size_index() - Get the indexed reg property of a device
+ * devfdt_get_addr_size_index() - Get the indexed reg property of a device
  *
  * Returns the address and size specified in the 'reg' property of a device.
  *
@@ -71,11 +71,11 @@ fdt_addr_t dev_get_addr_index(struct udevice *dev, int index);
  *
  * @return addr
  */
-fdt_addr_t dev_get_addr_size_index(struct udevice *dev, int index,
+fdt_addr_t devfdt_get_addr_size_index(struct udevice *dev, int index,
 				   fdt_size_t *size);
 
 /**
- * dev_get_addr_name() - Get the reg property of a device, indexed by name
+ * devfdt_get_addr_name() - Get the reg property of a device, indexed by name
  *
  * @dev: Pointer to a device
  * @name: the 'reg' property can hold a list of <addr, size> pairs, with the
@@ -84,7 +84,7 @@ fdt_addr_t dev_get_addr_size_index(struct udevice *dev, int index,
  *
  * @return addr
  */
-fdt_addr_t dev_get_addr_name(struct udevice *dev, const char *name);
+fdt_addr_t devfdt_get_addr_name(struct udevice *dev, const char *name);
 
 /**
  * dm_set_translation_offset() - Set translation offset
@@ -93,7 +93,7 @@ fdt_addr_t dev_get_addr_name(struct udevice *dev, const char *name);
  * Some platforms need a special address translation. Those
  * platforms (e.g. mvebu in SPL) can configure a translation
  * offset in the DM by calling this function. It will be
- * added to all addresses returned in dev_get_addr().
+ * added to all addresses returned in devfdt_get_addr().
  */
 void dm_set_translation_offset(fdt_addr_t offs);
 
-- 
cgit