diff options
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/gpu.h | 15 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/gpu.c | 19 | ||||
| -rw-r--r-- | board/nvidia/jetson-tk1/jetson-tk1.c | 8 | ||||
| -rw-r--r-- | board/nvidia/p2571/p2571.c | 7 | ||||
| -rw-r--r-- | board/nvidia/venice2/venice2.c | 8 | ||||
| -rw-r--r-- | include/configs/jetson-tk1.h | 2 | ||||
| -rw-r--r-- | include/configs/p2571.h | 1 | ||||
| -rw-r--r-- | include/configs/venice2.h | 2 |
8 files changed, 62 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-tegra/gpu.h b/arch/arm/include/asm/arch-tegra/gpu.h index b347a21835..52280f40ce 100644 --- a/arch/arm/include/asm/arch-tegra/gpu.h +++ b/arch/arm/include/asm/arch-tegra/gpu.h @@ -25,3 +25,18 @@ static inline bool gpu_configured(void) } #endif /* CONFIG_TEGRA_GPU */ + +#if defined(CONFIG_OF_LIBFDT) + +int gpu_enable_node(void *blob, const char *gpupath); + +#else /* CONFIG_OF_LIBFDT */ + +static inline int gpu_enable_node(void *blob, const char *gpupath) +{ + return 0; +} + +#endif /* CONFIG_OF_LIBFDT */ + +#endif /* __ASM_ARCH_TEGRA_GPU_H */ diff --git a/arch/arm/mach-tegra/gpu.c b/arch/arm/mach-tegra/gpu.c index b2fa50b540..4ea046d3e5 100644 --- a/arch/arm/mach-tegra/gpu.c +++ b/arch/arm/mach-tegra/gpu.c @@ -45,3 +45,22 @@ bool vpr_configured(void) { return _configured; } + +#if defined(CONFIG_OF_LIBFDT) + +int gpu_enable_node(void *blob, const char *gpupath) +{ + int offset; + + if (vpr_configured()) { + offset = fdt_path_offset(blob, gpupath); + if (offset > 0) { + fdt_status_okay(blob, offset); + debug("enabled GPU node %s\n", gpupath); + } + } + + return 0; +} + +#endif diff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c index 52425a8f6d..3c21767ce4 100644 --- a/board/nvidia/jetson-tk1/jetson-tk1.c +++ b/board/nvidia/jetson-tk1/jetson-tk1.c @@ -11,6 +11,7 @@ #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> +#include <asm/arch-tegra/gpu.h> #include "pinmux-config-jetson-tk1.h" @@ -79,3 +80,10 @@ int board_eth_init(bd_t *bis) return pci_eth_init(bis); } #endif /* PCI */ + +int ft_board_setup(void *blob, bd_t *bd) +{ + gpu_enable_node(blob, "/gpu@0,57000000"); + + return 0; +} diff --git a/board/nvidia/p2571/p2571.c b/board/nvidia/p2571/p2571.c index d80a7d0d3e..d33e4d12b2 100644 --- a/board/nvidia/p2571/p2571.c +++ b/board/nvidia/p2571/p2571.c @@ -11,6 +11,7 @@ #include <asm/arch/pinmux.h> #include <asm/gpio.h> #include "max77620_init.h" +#include <asm/arch-tegra/gpu.h> #include "pinmux-config-p2571.h" void pin_mux_mmc(void) @@ -61,3 +62,9 @@ void start_cpu_fan(void) gpio_request(GPIO_PE4, "FAN_VDD"); gpio_direction_output(GPIO_PE4, 1); } + +int ft_board_setup(void *blob, bd_t *bd) +{ + gpu_enable_node(blob, "/gpu@0,57000000"); + return 0; +} diff --git a/board/nvidia/venice2/venice2.c b/board/nvidia/venice2/venice2.c index c56ef129d6..3e2b9a7745 100644 --- a/board/nvidia/venice2/venice2.c +++ b/board/nvidia/venice2/venice2.c @@ -8,6 +8,7 @@ #include <common.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> +#include <asm/arch-tegra/gpu.h> #include "pinmux-config-venice2.h" /* @@ -27,3 +28,10 @@ void pinmux_init(void) pinmux_config_drvgrp_table(venice2_drvgrps, ARRAY_SIZE(venice2_drvgrps)); } + +int ft_board_setup(void *blob, bd_t *bd) +{ + gpu_enable_node(blob, "/gpu@0,57000000"); + + return 0; +} diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index 55ef5f8cc6..def0ab4121 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -79,4 +79,6 @@ #define CONFIG_ARMV7_SECURE_BASE 0xfff00000 #define CONFIG_ARMV7_SECURE_RESERVE_SIZE 0x00100000 +#define CONFIG_OF_BOARD_SETUP + #endif /* __CONFIG_H */ diff --git a/include/configs/p2571.h b/include/configs/p2571.h index b22117bfdf..54427ad429 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -65,5 +65,6 @@ #include "tegra-common-post.h" #define COUNTER_FREQUENCY 38400000 +#define CONFIG_OF_BOARD_SETUP #endif /* _P2571_H */ diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 2c43f3ebed..8b1189e7c4 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -61,4 +61,6 @@ #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" +#define CONFIG_OF_BOARD_SETUP + #endif /* __CONFIG_H */ |
