[U-Boot] [PATCH] ARM64: zynqmp: Sync zynq_sdhci_init() declaration

[U-Boot] [PATCH] ARM64: zynqmp: Sync zynq_sdhci_init() declaration

[Michal Simek]

This patch fix compilation error:
drivers/mmc/zynq_sdhci.c:16:5: error: conflicting types for
?zynq_sdhci_init?
 int zynq_sdhci_init(phys_addr_t regbase)
     ^
In file included from drivers/mmc/zynq_sdhci.c:14:0:
./arch/arm/include/asm/arch/sys_proto.h:16:5: note: previous declaration
of ?zynq_sdhci_init? was here
 int zynq_sdhci_init(unsigned long regbase);
     ^

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/arm/include/asm/arch-zynqmp/sys_proto.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/include/asm/arch-zynqmp/sys_proto.h b/arch/arm/include/asm/arch-zynqmp/sys_proto.h
index f5c90d11dc40..f1e95a2a28e3 100644
--- a/arch/arm/include/asm/arch-zynqmp/sys_proto.h
+++ b/arch/arm/include/asm/arch-zynqmp/sys_proto.h
@@ -13,7 +13,7 @@ static inline void zynq_slcr_gem_clk_setup(u32 gem_id, unsigned long clk_rate)
 {
 }
 
-int zynq_sdhci_init(unsigned long regbase);
+int zynq_sdhci_init(phys_addr_t regbase);
 int zynq_slcr_get_mio_pin_status(const char *periph);
 
 unsigned int zynqmp_get_silicon_version(void);
-- 
2.5.0

[U-Boot] [PATCH] ARM64: zynqmp: Sync zynq_sdhci_init() declaration

[Tom Rini]

On Thu, Nov 05, 2015 at 05:06:29PM +0100, Michal Simek wrote:

> This patch fix compilation error:
> drivers/mmc/zynq_sdhci.c:16:5: error: conflicting types for
> ?zynq_sdhci_init?
>  int zynq_sdhci_init(phys_addr_t regbase)
>      ^
> In file included from drivers/mmc/zynq_sdhci.c:14:0:
> ./arch/arm/include/asm/arch/sys_proto.h:16:5: note: previous declaration
> of ?zynq_sdhci_init? was here
>  int zynq_sdhci_init(unsigned long regbase);
>      ^
> 
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151107/64a02a36/attachment.sig>