]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
arm: tegra: se: Add DT support for SE
authorShravani Dingari <shravanid@nvidia.com>
Tue, 26 Nov 2013 06:03:18 +0000 (11:33 +0530)
committerShravani Dingari <shravanid@nvidia.com>
Fri, 13 Dec 2013 05:17:56 +0000 (21:17 -0800)
Modify board files to support DT for SE

Bug 1369830

Change-Id: I994c57e0f0878953db4d1b0ce0bd8edccbcc55a8
Signed-off-by: Shravani Dingari <shravanid@nvidia.com>
Reviewed-on: http://git-master/r/334928
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
arch/arm/mach-tegra/board-ardbeg.c
arch/arm/mach-tegra/board-loki.c

index 91e6ed8589969f5c1df844c24b1dd1141f5c94ea..82ee3a18b81c94c1d4782065bf54855e0fec07d0 100644 (file)
@@ -458,7 +458,7 @@ static struct platform_device *ardbeg_devices[] __initdata = {
 #if defined(CONFIG_TEGRA_AVP)
        &tegra_avp_device,
 #endif
-#if defined(CONFIG_CRYPTO_DEV_TEGRA_SE)
+#if defined(CONFIG_CRYPTO_DEV_TEGRA_SE) && !defined(CONFIG_USE_OF)
        &tegra12_se_device,
 #endif
        &tegra_ahub_device,
@@ -897,6 +897,7 @@ static struct of_dev_auxdata ardbeg_auxdata_lookup[] __initdata = {
                                NULL),
        OF_DEV_AUXDATA("nvidia,tegra124-apbdma", 0x60020000, "tegra-apbdma",
                                NULL),
+       OF_DEV_AUXDATA("nvidia,tegra124-se", 0x70012000, "tegra12-se", NULL),
        OF_DEV_AUXDATA("nvidia,tegra124-host1x", TEGRA_HOST1X_BASE, "host1x",
                NULL),
        OF_DEV_AUXDATA("nvidia,tegra124-gk20a", TEGRA_GK20A_BAR0_BASE,
index bd836b3a34b1dd9aa038cca9bec13a723219ca31..6ea8de66e63029a4f5ea42909979bb9e68cbe710 100644 (file)
@@ -317,7 +317,7 @@ static struct platform_device *loki_devices[] __initdata = {
 #if defined(CONFIG_TEGRA_AVP)
        &tegra_avp_device,
 #endif
-#if defined(CONFIG_CRYPTO_DEV_TEGRA_SE)
+#if defined(CONFIG_CRYPTO_DEV_TEGRA_SE) && !defined(CONFIG_USE_OF)
        &tegra12_se_device,
 #endif
        &tegra_ahub_device,
@@ -679,6 +679,7 @@ struct of_dev_auxdata loki_auxdata_lookup[] __initdata = {
                                NULL),
        OF_DEV_AUXDATA("nvidia,tegra124-apbdma", 0x60020000, "tegra-apbdma",
                                NULL),
+       OF_DEV_AUXDATA("nvidia,tegra124-se", 0x70012000, "tegra12-se", NULL),
        OF_DEV_AUXDATA("nvidia,tegra124-host1x", TEGRA_HOST1X_BASE, "host1x",
                NULL),
        OF_DEV_AUXDATA("nvidia,tegra124-gk20a", TEGRA_GK20A_BAR0_BASE,