|
@@ -18,15 +18,19 @@
|
|
|
|
|
|
#define TI_XBAR_DRA7 0
|
|
|
#define TI_XBAR_AM335X 1
|
|
|
+static const u32 ti_xbar_type[] = {
|
|
|
+ [TI_XBAR_DRA7] = TI_XBAR_DRA7,
|
|
|
+ [TI_XBAR_AM335X] = TI_XBAR_AM335X,
|
|
|
+};
|
|
|
|
|
|
static const struct of_device_id ti_dma_xbar_match[] = {
|
|
|
{
|
|
|
.compatible = "ti,dra7-dma-crossbar",
|
|
|
- .data = (void *)TI_XBAR_DRA7,
|
|
|
+ .data = &ti_xbar_type[TI_XBAR_DRA7],
|
|
|
},
|
|
|
{
|
|
|
.compatible = "ti,am335x-edma-crossbar",
|
|
|
- .data = (void *)TI_XBAR_AM335X,
|
|
|
+ .data = &ti_xbar_type[TI_XBAR_AM335X],
|
|
|
},
|
|
|
{},
|
|
|
};
|
|
@@ -190,9 +194,6 @@ static int ti_am335x_xbar_probe(struct platform_device *pdev)
|
|
|
#define TI_DRA7_XBAR_OUTPUTS 127
|
|
|
#define TI_DRA7_XBAR_INPUTS 256
|
|
|
|
|
|
-#define TI_XBAR_EDMA_OFFSET 0
|
|
|
-#define TI_XBAR_SDMA_OFFSET 1
|
|
|
-
|
|
|
struct ti_dra7_xbar_data {
|
|
|
void __iomem *iomem;
|
|
|
|
|
@@ -280,18 +281,25 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec,
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
+#define TI_XBAR_EDMA_OFFSET 0
|
|
|
+#define TI_XBAR_SDMA_OFFSET 1
|
|
|
+static const u32 ti_dma_offset[] = {
|
|
|
+ [TI_XBAR_EDMA_OFFSET] = 0,
|
|
|
+ [TI_XBAR_SDMA_OFFSET] = 1,
|
|
|
+};
|
|
|
+
|
|
|
static const struct of_device_id ti_dra7_master_match[] = {
|
|
|
{
|
|
|
.compatible = "ti,omap4430-sdma",
|
|
|
- .data = (void *)TI_XBAR_SDMA_OFFSET,
|
|
|
+ .data = &ti_dma_offset[TI_XBAR_SDMA_OFFSET],
|
|
|
},
|
|
|
{
|
|
|
.compatible = "ti,edma3",
|
|
|
- .data = (void *)TI_XBAR_EDMA_OFFSET,
|
|
|
+ .data = &ti_dma_offset[TI_XBAR_EDMA_OFFSET],
|
|
|
},
|
|
|
{
|
|
|
.compatible = "ti,edma3-tpcc",
|
|
|
- .data = (void *)TI_XBAR_EDMA_OFFSET,
|
|
|
+ .data = &ti_dma_offset[TI_XBAR_EDMA_OFFSET],
|
|
|
},
|
|
|
{},
|
|
|
};
|
|
@@ -395,7 +403,7 @@ static int ti_dra7_xbar_probe(struct platform_device *pdev)
|
|
|
|
|
|
xbar->dmarouter.dev = &pdev->dev;
|
|
|
xbar->dmarouter.route_free = ti_dra7_xbar_free;
|
|
|
- xbar->dma_offset = (u32)match->data;
|
|
|
+ xbar->dma_offset = *(u32 *)match->data;
|
|
|
|
|
|
mutex_init(&xbar->mutex);
|
|
|
platform_set_drvdata(pdev, xbar);
|
|
@@ -428,7 +436,7 @@ static int ti_dma_xbar_probe(struct platform_device *pdev)
|
|
|
if (unlikely(!match))
|
|
|
return -EINVAL;
|
|
|
|
|
|
- switch ((u32)match->data) {
|
|
|
+ switch (*(u32 *)match->data) {
|
|
|
case TI_XBAR_DRA7:
|
|
|
ret = ti_dra7_xbar_probe(pdev);
|
|
|
break;
|