mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 02:21:52 +09:00
Merge tag 'fixes-for-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes: usb: fixes for v4.3-rc4 A memory leak fix for the BCD UDC driver, a build warning fix on Renesas and a new device ID for R-Car H3. Nothing major. Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
@@ -5,6 +5,7 @@ Required properties:
|
||||
- "renesas,usbhs-r8a7790"
|
||||
- "renesas,usbhs-r8a7791"
|
||||
- "renesas,usbhs-r8a7794"
|
||||
- "renesas,usbhs-r8a7795"
|
||||
- reg: Base address and length of the register for the USBHS
|
||||
- interrupts: Interrupt specifier for the USBHS
|
||||
- clocks: A list of phandle + clock specifier pairs
|
||||
|
||||
@@ -159,8 +159,10 @@ static int ep_bd_list_alloc(struct bdc_ep *ep)
|
||||
bd_table->start_bd = dma_pool_alloc(bdc->bd_table_pool,
|
||||
GFP_ATOMIC,
|
||||
&dma);
|
||||
if (!bd_table->start_bd)
|
||||
if (!bd_table->start_bd) {
|
||||
kfree(bd_table);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
bd_table->dma = dma;
|
||||
|
||||
|
||||
@@ -476,6 +476,11 @@ static const struct of_device_id usbhs_of_match[] = {
|
||||
.compatible = "renesas,usbhs-r8a7794",
|
||||
.data = (void *)USBHS_TYPE_RCAR_GEN2,
|
||||
},
|
||||
{
|
||||
/* Gen3 is compatible with Gen2 */
|
||||
.compatible = "renesas,usbhs-r8a7795",
|
||||
.data = (void *)USBHS_TYPE_RCAR_GEN2,
|
||||
},
|
||||
{ },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, usbhs_of_match);
|
||||
@@ -493,7 +498,7 @@ static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev)
|
||||
return NULL;
|
||||
|
||||
dparam = &info->driver_param;
|
||||
dparam->type = of_id ? (u32)of_id->data : 0;
|
||||
dparam->type = of_id ? (uintptr_t)of_id->data : 0;
|
||||
if (!of_property_read_u32(dev->of_node, "renesas,buswait", &tmp))
|
||||
dparam->buswait_bwait = tmp;
|
||||
gpio = of_get_named_gpio_flags(dev->of_node, "renesas,enable-gpio", 0,
|
||||
|
||||
@@ -157,7 +157,7 @@ struct renesas_usbhs_driver_param {
|
||||
*/
|
||||
int pio_dma_border; /* default is 64byte */
|
||||
|
||||
u32 type;
|
||||
uintptr_t type;
|
||||
u32 enable_gpio;
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user