-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'tegra/soc' into next/soc
* tegra/soc: arm/tegra: Compile tegra_dt_init_irq only when CONFIG_OF arm/tegra: Make MACH_TEGRA_DT depend on ARCH_TEGRA_2x_SOC arm/tegra: Delete tegra_init_clock() arm/tegra: Fix section mismatch errors in tegra30 pinmux arm/tegra: Fix section mismatch errors in tegra20 pinmux arm/tegra: refresh defconfig for tegra30 arm/tegra: add support for tegra30 based board cardhu arm/tegra: implement support for tegra30 arm/tegra: pinmux tables and definitions for tegra30 arm/tegra: add new fields to struct tegra_pingroup_desc arm/tegra: prepare pinmux code for multiple tegra variants arm/tegra: rename tegra20 pinmux files arm/tegra: generalize L2 cache initialization arm/tegra: use PMC reset arm/tegra: rename board-dt.c to board-dt-tegra20.c arm/tegra: prepare early init for multiple tegra variants arm/tegra: don't export clk_measure_input_freq arm/tegra: prepare clock code for multiple tegra variants arm/tegra: cleanup tegra20 support arm/tegra: clk_get should not be fatal Conflicts: arch/arm/mach-tegra/board-dt-tegra20.c
- Loading branch information
Showing
30 changed files
with
1,116 additions
and
167 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
/dts-v1/; | ||
|
||
/include/ "tegra30.dtsi" | ||
|
||
/ { | ||
model = "NVIDIA Tegra30 Cardhu evaluation board"; | ||
compatible = "nvidia,cardhu", "nvidia,tegra30"; | ||
|
||
memory { | ||
reg = < 0x80000000 0x40000000 >; | ||
}; | ||
|
||
serial@70006000 { | ||
clock-frequency = < 408000000 >; | ||
}; | ||
|
||
i2c@7000c000 { | ||
clock-frequency = <100000>; | ||
}; | ||
|
||
i2c@7000c400 { | ||
clock-frequency = <100000>; | ||
}; | ||
|
||
i2c@7000c500 { | ||
clock-frequency = <100000>; | ||
}; | ||
|
||
i2c@7000c700 { | ||
clock-frequency = <100000>; | ||
}; | ||
|
||
i2c@7000d000 { | ||
clock-frequency = <100000>; | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
/* | ||
* arch/arm/mach-tegra/board-dt-tegra30.c | ||
* | ||
* NVIDIA Tegra30 device tree board support | ||
* | ||
* Copyright (C) 2011 NVIDIA Corporation | ||
* | ||
* Derived from: | ||
* | ||
* arch/arm/mach-tegra/board-dt-tegra20.c | ||
* | ||
* Copyright (C) 2010 Secret Lab Technologies, Ltd. | ||
* Copyright (C) 2010 Google, Inc. | ||
* | ||
* This software is licensed under the terms of the GNU General Public | ||
* License version 2, as published by the Free Software Foundation, and | ||
* may be copied, distributed, and modified under those terms. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
*/ | ||
|
||
#include <linux/kernel.h> | ||
#include <linux/of.h> | ||
#include <linux/of_address.h> | ||
#include <linux/of_fdt.h> | ||
#include <linux/of_irq.h> | ||
#include <linux/of_platform.h> | ||
|
||
#include <asm/mach/arch.h> | ||
#include <asm/hardware/gic.h> | ||
|
||
#include "board.h" | ||
|
||
static struct of_device_id tegra_dt_match_table[] __initdata = { | ||
{ .compatible = "simple-bus", }, | ||
{} | ||
}; | ||
|
||
static void __init tegra30_dt_init(void) | ||
{ | ||
of_platform_populate(NULL, tegra_dt_match_table, | ||
NULL, NULL); | ||
} | ||
|
||
static const char *tegra30_dt_board_compat[] = { | ||
"nvidia,cardhu", | ||
NULL | ||
}; | ||
|
||
DT_MACHINE_START(TEGRA30_DT, "NVIDIA Tegra30 (Flattened Device Tree)") | ||
.map_io = tegra_map_common_io, | ||
.init_early = tegra30_init_early, | ||
.init_irq = tegra_dt_init_irq, | ||
.handle_irq = gic_handle_irq, | ||
.timer = &tegra_timer, | ||
.init_machine = tegra30_dt_init, | ||
.restart = tegra_assert_system_reset, | ||
.dt_compat = tegra30_dt_board_compat, | ||
MACHINE_END |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.