From 174538845b1490d05a8c97c49088c54f4365551c Mon Sep 17 00:00:00 2001 From: Christoph Muellner Date: Tue, 12 Feb 2019 18:28:53 +0100 Subject: dm: pinctrl: Remove obsolete function pinctrl_decode_pin_config_dm(). This reverts commit 5ff776889212c080e3d1a33634ac904405ed6845. As noted in the comment, the function pinctrl_decode_pin_config_dm() only served as a temporary solution. Since the function has no users anymore, we can remove it again. Signed-off-by: Christoph Muellner Reviewed-by: Simon Glass --- include/dm/pinctrl.h | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'include/dm') diff --git a/include/dm/pinctrl.h b/include/dm/pinctrl.h index ff2b82e7c25..63a7d55b888 100644 --- a/include/dm/pinctrl.h +++ b/include/dm/pinctrl.h @@ -354,18 +354,6 @@ int pinctrl_get_periph_id(struct udevice *dev, struct udevice *periph); */ int pinctrl_decode_pin_config(const void *blob, int node); -/** - * pinctrl_decode_pin_config_dm() - decode pin configuration flags - * - * This decodes some of the PIN_CONFIG values into flags, with each value - * being (1 << pin_cfg). This does not support things with values like the - * slew rate. - * - * @pinconfig: Pinconfig udevice - * @return decoded flag value, or -ve on error - */ -int pinctrl_decode_pin_config_dm(struct udevice *dev); - /** * pinctrl_get_gpio_mux() - get the mux value for a particular GPIO * -- cgit v1.3.1 From c7fbee540e006b4cf6cda9272d0d5c9847b3db11 Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Wed, 20 Mar 2019 18:21:26 +0100 Subject: dm: remove unused function dm_fdt_pre_reloc The function dm_ofnode_pre_reloc should be used instead of the function dm_fdt_pre_reloc and avoid duplicated code. Signed-off-by: Patrick Delaunay Reviewed-by: Simon Glass --- drivers/core/util.c | 23 ----------------------- include/dm/util.h | 26 -------------------------- 2 files changed, 49 deletions(-) (limited to 'include/dm') diff --git a/drivers/core/util.c b/drivers/core/util.c index 451f772e880..96e47dc7070 100644 --- a/drivers/core/util.c +++ b/drivers/core/util.c @@ -31,29 +31,6 @@ int list_count_items(struct list_head *head) return count; } -bool dm_fdt_pre_reloc(const void *blob, int offset) -{ -#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_TPL_BUILD) - /* for SPL and TPL the remaining nodes after the fdtgrep 1st pass - * had property dm-pre-reloc or u-boot,dm-spl/tpl. - * They are removed in final dtb (fdtgrep 2nd pass) - */ - return true; -#else - if (fdt_getprop(blob, offset, "u-boot,dm-pre-reloc", NULL)) - return true; - /* - * In regular builds individual spl and tpl handling both - * count as handled pre-relocation for later second init. - */ - if (fdt_getprop(blob, offset, "u-boot,dm-spl", NULL) || - fdt_getprop(blob, offset, "u-boot,dm-tpl", NULL)) - return true; -#endif - - return false; -} - bool dm_ofnode_pre_reloc(ofnode node) { #if defined(CONFIG_SPL_BUILD) || defined(CONFIG_TPL_BUILD) diff --git a/include/dm/util.h b/include/dm/util.h index 9ff6531d1b2..60d3b93decd 100644 --- a/include/dm/util.h +++ b/include/dm/util.h @@ -39,32 +39,6 @@ static inline void dm_dump_devres(void) } #endif -/** - * Check if a dt node should be or was bound before relocation. - * - * Devicetree nodes can be marked as needed to be bound - * in the loader stages via special devicetree properties. - * - * Before relocation this function can be used to check if nodes - * are required in either SPL or TPL stages. - * - * After relocation and jumping into the real U-Boot binary - * it is possible to determine if a node was bound in one of - * SPL/TPL stages. - * - * There are 3 settings currently in use - * - - * - u-boot,dm-pre-reloc: legacy and indicates any of TPL or SPL - * Existing platforms only use it to indicate nodes needed in - * SPL. Should probably be replaced by u-boot,dm-spl for - * existing platforms. - * @blob: devicetree - * @offset: node offset - * - * Returns true if node is needed in SPL/TL, false otherwise. - */ -bool dm_fdt_pre_reloc(const void *blob, int offset); - /** * Check if an of node should be or was bound before relocation. * -- cgit v1.3.1