-
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/boards
Conflicts: arch/arm/mach-tegra/board-harmony-pcie.c To fix an internal merge conflict between the tegra/soc and tegra/boards branches. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
- Loading branch information
Showing
40 changed files
with
1,682 additions
and
222 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,14 @@ | ||
NVIDIA Tegra device tree bindings | ||
------------------------------------------- | ||
|
||
Boards with the tegra20 SoC shall have the following properties: | ||
|
||
Required root node property: | ||
|
||
compatible = "nvidia,tegra20"; | ||
|
||
Boards with the tegra30 SoC shall have the following properties: | ||
|
||
Required root node property: | ||
|
||
compatible = "nvidia,tegra30"; |
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,13 @@ | ||
Tegra SOC USB controllers | ||
|
||
The device node for a USB controller that is part of a Tegra | ||
SOC is as described in the document "Open Firmware Recommended | ||
Practice : Universal Serial Bus" with the following modifications | ||
and additions : | ||
|
||
Required properties : | ||
- compatible : Should be "nvidia,tegra20-ehci" for USB controllers | ||
used in host mode. | ||
- phy_type : Should be one of "ulpi" or "utmi". | ||
- nvidia,vbus-gpio : If present, specifies a gpio that needs to be | ||
activated for the bus to be powered. |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
/dts-v1/; | ||
|
||
/include/ "tegra20.dtsi" | ||
|
||
/ { | ||
model = "Toshiba AC100 / Dynabook AZ"; | ||
compatible = "compal,paz00", "nvidia,tegra20"; | ||
|
||
memory@0 { | ||
reg = <0x00000000 0x20000000>; | ||
}; | ||
|
||
i2c@7000c000 { | ||
clock-frequency = <400000>; | ||
}; | ||
|
||
i2c@7000c400 { | ||
clock-frequency = <400000>; | ||
}; | ||
|
||
i2c@7000c500 { | ||
status = "disable"; | ||
}; | ||
|
||
nvec@7000c500 { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
compatible = "nvidia,nvec"; | ||
reg = <0x7000C500 0x100>; | ||
interrupts = <0 92 0x04>; | ||
clock-frequency = <80000>; | ||
request-gpios = <&gpio 170 0>; | ||
slave-addr = <138>; | ||
}; | ||
|
||
i2c@7000d000 { | ||
clock-frequency = <400000>; | ||
}; | ||
|
||
serial@70006000 { | ||
clock-frequency = <216000000>; | ||
}; | ||
|
||
serial@70006040 { | ||
status = "disable"; | ||
}; | ||
|
||
serial@70006200 { | ||
status = "disable"; | ||
}; | ||
|
||
serial@70006300 { | ||
clock-frequency = <216000000>; | ||
}; | ||
|
||
serial@70006400 { | ||
status = "disable"; | ||
}; | ||
|
||
sdhci@c8000000 { | ||
cd-gpios = <&gpio 173 0>; /* gpio PV5 */ | ||
wp-gpios = <&gpio 57 0>; /* gpio PH1 */ | ||
power-gpios = <&gpio 155 0>; /* gpio PT3 */ | ||
}; | ||
|
||
sdhci@c8000200 { | ||
status = "disable"; | ||
}; | ||
|
||
sdhci@c8000400 { | ||
status = "disable"; | ||
}; | ||
|
||
sdhci@c8000600 { | ||
support-8bit; | ||
}; | ||
}; |
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,65 @@ | ||
/dts-v1/; | ||
|
||
/include/ "tegra20.dtsi" | ||
|
||
/ { | ||
model = "Compulab TrimSlice board"; | ||
compatible = "compulab,trimslice", "nvidia,tegra20"; | ||
|
||
memory@0 { | ||
reg = < 0x00000000 0x40000000 >; | ||
}; | ||
|
||
i2c@7000c000 { | ||
clock-frequency = <400000>; | ||
}; | ||
|
||
i2c@7000c400 { | ||
clock-frequency = <400000>; | ||
}; | ||
|
||
i2c@7000c500 { | ||
clock-frequency = <400000>; | ||
}; | ||
|
||
i2c@7000d000 { | ||
status = "disable"; | ||
}; | ||
|
||
serial@70006000 { | ||
clock-frequency = < 216000000 >; | ||
}; | ||
|
||
serial@70006040 { | ||
status = "disable"; | ||
}; | ||
|
||
serial@70006200 { | ||
status = "disable"; | ||
}; | ||
|
||
serial@70006300 { | ||
status = "disable"; | ||
}; | ||
|
||
serial@70006400 { | ||
status = "disable"; | ||
}; | ||
|
||
sdhci@c8000000 { | ||
status = "disable"; | ||
}; | ||
|
||
sdhci@c8000200 { | ||
status = "disable"; | ||
}; | ||
|
||
sdhci@c8000400 { | ||
status = "disable"; | ||
}; | ||
|
||
sdhci@c8000600 { | ||
cd-gpios = <&gpio 121 0>; | ||
wp-gpios = <&gpio 122 0>; | ||
}; | ||
}; |
Oops, something went wrong.