diff options
| -rw-r--r-- | arch/arm/mach-tegra/board-ardbeg-panel.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-loki-panel.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-vcm30_t124-panel.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-tegra/board-ardbeg-panel.c b/arch/arm/mach-tegra/board-ardbeg-panel.c index b7a1d04a5ec6..013acee2eae1 100644 --- a/arch/arm/mach-tegra/board-ardbeg-panel.c +++ b/arch/arm/mach-tegra/board-ardbeg-panel.c @@ -840,7 +840,7 @@ int __init ardbeg_panel_init(void) struct device_node *dc1_node = NULL; struct device_node *dc2_node = NULL; -#ifdef CONFIG_TEGRA_NVMAP +#ifdef CONFIG_NVMAP_USE_CMA_FOR_CARVEOUT struct dma_declare_info vpr_dma_info; struct dma_declare_info generic_dma_info; #endif @@ -858,6 +858,7 @@ int __init ardbeg_panel_init(void) ardbeg_carveouts[2].base = tegra_vpr_start; ardbeg_carveouts[2].size = tegra_vpr_size; +#ifdef CONFIG_NVMAP_USE_CMA_FOR_CARVEOUT generic_dma_info.name = "generic"; generic_dma_info.base = tegra_carveout_start; generic_dma_info.size = tegra_carveout_size; @@ -869,7 +870,6 @@ int __init ardbeg_panel_init(void) vpr_dma_info.size = tegra_vpr_size; vpr_dma_info.resize = false; vpr_dma_info.cma_dev = NULL; -#ifdef CONFIG_NVMAP_USE_CMA_FOR_CARVEOUT ardbeg_carveouts[1].cma_dev = &tegra_generic_cma_dev; ardbeg_carveouts[1].resize = false; ardbeg_carveouts[2].cma_dev = &tegra_vpr_cma_dev; @@ -879,7 +879,6 @@ int __init ardbeg_panel_init(void) vpr_dma_info.resize = true; vpr_dma_info.cma_dev = &tegra_vpr_cma_dev; vpr_dma_info.notifier.ops = &vpr_dev_ops; -#endif if (tegra_carveout_size) { err = dma_declare_coherent_resizable_cma_memory( @@ -897,6 +896,7 @@ int __init ardbeg_panel_init(void) return err; } } +#endif err = platform_device_register(&ardbeg_nvmap_device); if (err) { diff --git a/arch/arm/mach-tegra/board-loki-panel.c b/arch/arm/mach-tegra/board-loki-panel.c index d0aa639e6f97..94610d9f1b85 100644 --- a/arch/arm/mach-tegra/board-loki-panel.c +++ b/arch/arm/mach-tegra/board-loki-panel.c @@ -460,7 +460,7 @@ int __init loki_panel_init(int board_id) struct resource __maybe_unused *res; struct platform_device *phost1x = NULL; struct board_info bi; -#ifdef CONFIG_TEGRA_NVMAP +#ifdef CONFIG_NVMAP_USE_CMA_FOR_CARVEOUT struct dma_declare_info vpr_dma_info; struct dma_declare_info generic_dma_info; #endif @@ -492,6 +492,7 @@ int __init loki_panel_init(int board_id) loki_carveouts[2].base = tegra_vpr_start; loki_carveouts[2].size = tegra_vpr_size; +#ifdef CONFIG_NVMAP_USE_CMA_FOR_CARVEOUT generic_dma_info.name = "generic"; generic_dma_info.base = tegra_carveout_start; generic_dma_info.size = tegra_carveout_size; @@ -503,7 +504,6 @@ int __init loki_panel_init(int board_id) vpr_dma_info.size = tegra_vpr_size; vpr_dma_info.resize = false; vpr_dma_info.cma_dev = NULL; -#ifdef CONFIG_NVMAP_USE_CMA_FOR_CARVEOUT loki_carveouts[1].cma_dev = &tegra_generic_cma_dev; loki_carveouts[1].resize = false; loki_carveouts[2].cma_dev = &tegra_vpr_cma_dev; @@ -513,7 +513,6 @@ int __init loki_panel_init(int board_id) vpr_dma_info.resize = true; vpr_dma_info.cma_dev = &tegra_vpr_cma_dev; vpr_dma_info.notifier.ops = &vpr_dev_ops; -#endif if (tegra_carveout_size) { err = dma_declare_coherent_resizable_cma_memory( @@ -531,6 +530,7 @@ int __init loki_panel_init(int board_id) return err; } } +#endif err = platform_device_register(&loki_nvmap_device); if (err) { diff --git a/arch/arm/mach-tegra/board-vcm30_t124-panel.c b/arch/arm/mach-tegra/board-vcm30_t124-panel.c index 16e1abbb81bc..30ec927862c4 100644 --- a/arch/arm/mach-tegra/board-vcm30_t124-panel.c +++ b/arch/arm/mach-tegra/board-vcm30_t124-panel.c @@ -392,7 +392,7 @@ int __init vcm30_t124_panel_init(void) int err = 0; struct resource *res; struct platform_device *phost1x = NULL; -#ifdef CONFIG_TEGRA_NVMAP +#ifdef CONFIG_NVMAP_USE_CMA_FOR_CARVEOUT struct dma_declare_info vpr_dma_info; struct dma_declare_info generic_dma_info; #endif @@ -408,6 +408,7 @@ int __init vcm30_t124_panel_init(void) vcm30_t124_carveouts[2].base = tegra_vpr_start; vcm30_t124_carveouts[2].size = tegra_vpr_size; +#ifdef CONFIG_NVMAP_USE_CMA_FOR_CARVEOUT generic_dma_info.name = "generic"; generic_dma_info.base = tegra_carveout_start; generic_dma_info.size = tegra_carveout_size; @@ -419,7 +420,6 @@ int __init vcm30_t124_panel_init(void) vpr_dma_info.size = tegra_vpr_size; vpr_dma_info.resize = false; vpr_dma_info.cma_dev = NULL; -#ifdef CONFIG_NVMAP_USE_CMA_FOR_CARVEOUT vcm30_t124_carveouts[1].cma_dev = &tegra_generic_cma_dev; vcm30_t124_carveouts[1].resize = false; vcm30_t124_carveouts[2].cma_dev = &tegra_vpr_cma_dev; @@ -429,7 +429,6 @@ int __init vcm30_t124_panel_init(void) vpr_dma_info.resize = true; vpr_dma_info.cma_dev = &tegra_vpr_cma_dev; vpr_dma_info.notifier.ops = &vpr_dev_ops; -#endif if (tegra_carveout_size) { err = dma_declare_coherent_resizable_cma_memory( @@ -447,6 +446,7 @@ int __init vcm30_t124_panel_init(void) return err; } } +#endif err = platform_device_register(&vcm30_t124_nvmap_device); if (err) { |