On 12/06/2018 01:32 AM, Philipp Tomsich wrote:
> The regs_phy field of the platform data structure for dwc2-otg is
> today declared an unsigned int, but will eventually be cast into a
> void* for a writel operation. This triggers errors on modern GCC
> versions.
>
> E.g. we get the following error with GCC 6.3:
> drivers/usb/phy/rockchip_usb2_phy.c: In function 'property_enable':
> arch/arm/include/asm/io.h:49:29: error: cast to pointer from integer of
> different size [-Werror=int-to-pointer-cast]
> #define __arch_putl(v,a) (*(volatile unsigned int *)(a) = (v))
> ^
> arch/arm/include/asm/io.h:117:48: note: in expansion of macro '__arch_putl'
> #define writel(v,c) ({ u32 __v = v; __iowmb(); __arch_putl(__v,c); __v; })
> ^~~~~~~~~~~
> drivers/usb/phy/rockchip_usb2_phy.c:61:2: note: in expansion of macro
> 'writel'
> writel(val, pdata->regs_phy + reg->offset);
> ^~~~~~
>
> This commit changes regs_phy to be a uintptr_t to ensure that it is
> large enough to hold any valid pointer (and fix the associated
> warning).
>
> Signed-off-by: Philipp Tomsich <philipp.toms...@theobroma-systems.com>
Oh, ew. Good catch.
Acked-by: Marek Vasut <ma...@denx.de>
Apply it alongside the Rock960 series, thanks.
> ---
>
> include/usb/dwc2_udc.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/usb/dwc2_udc.h b/include/usb/dwc2_udc.h
> index 62e3236..4068de0 100644
> --- a/include/usb/dwc2_udc.h
> +++ b/include/usb/dwc2_udc.h
> @@ -14,7 +14,7 @@ struct dwc2_plat_otg_data {
> void *priv;
> int phy_of_node;
> int (*phy_control)(int on);
> - unsigned int regs_phy;
> + uintptr_t regs_phy;
> uintptr_t regs_otg;
> unsigned int usb_phy_ctrl;
> unsigned int usb_flags;
>
--
Best regards,
Marek Vasut
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
