Skip to content

Commit

Permalink
Merge branch 'tegra/soc' into next/boards
Browse files Browse the repository at this point in the history
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
Arnd Bergmann committed Jan 6, 2012
2 parents 1fc3eb8 + e5570bb commit e067096
Show file tree
Hide file tree
Showing 40 changed files with 1,682 additions and 222 deletions.
14 changes: 14 additions & 0 deletions Documentation/devicetree/bindings/arm/tegra.txt
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";
13 changes: 13 additions & 0 deletions Documentation/devicetree/bindings/usb/tegra-usb.txt
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.
36 changes: 36 additions & 0 deletions arch/arm/boot/dts/tegra-cardhu.dts
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>;
};
};
29 changes: 24 additions & 5 deletions arch/arm/boot/dts/tegra-harmony.dts
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
/dts-v1/;

/memreserve/ 0x1c000000 0x04000000;
/include/ "tegra20.dtsi"

/ {
model = "NVIDIA Tegra2 Harmony evaluation board";
compatible = "nvidia,harmony", "nvidia,tegra20";

chosen {
bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootwait";
};

memory@0 {
reg = < 0x00000000 0x40000000 >;
};
Expand Down Expand Up @@ -52,16 +47,40 @@
ext-mic-en-gpios = <&gpio 185 0>;
};

serial@70006000 {
status = "disable";
};

serial@70006040 {
status = "disable";
};

serial@70006200 {
status = "disable";
};

serial@70006300 {
clock-frequency = < 216000000 >;
};

serial@70006400 {
status = "disable";
};

sdhci@c8000000 {
status = "disable";
};

sdhci@c8000200 {
cd-gpios = <&gpio 69 0>; /* gpio PI5 */
wp-gpios = <&gpio 57 0>; /* gpio PH1 */
power-gpios = <&gpio 155 0>; /* gpio PT3 */
};

sdhci@c8000400 {
status = "disable";
};

sdhci@c8000600 {
cd-gpios = <&gpio 58 0>; /* gpio PH2 */
wp-gpios = <&gpio 59 0>; /* gpio PH3 */
Expand Down
77 changes: 77 additions & 0 deletions arch/arm/boot/dts/tegra-paz00.dts
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;
};
};
49 changes: 44 additions & 5 deletions arch/arm/boot/dts/tegra-seaboard.dts
Original file line number Diff line number Diff line change
@@ -1,25 +1,60 @@
/dts-v1/;

/memreserve/ 0x1c000000 0x04000000;
/include/ "tegra20.dtsi"

/ {
model = "NVIDIA Seaboard";
compatible = "nvidia,seaboard", "nvidia,tegra20";

chosen {
bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk1p3 rw rootwait";
};

memory {
device_type = "memory";
reg = < 0x00000000 0x40000000 >;
};

i2c@7000c000 {
clock-frequency = <400000>;
};

i2c@7000c400 {
clock-frequency = <400000>;
};

i2c@7000c500 {
clock-frequency = <400000>;
};

i2c@7000d000 {
clock-frequency = <400000>;
};

serial@70006000 {
status = "disable";
};

serial@70006040 {
status = "disable";
};

serial@70006200 {
status = "disable";
};

serial@70006300 {
clock-frequency = < 216000000 >;
};

serial@70006400 {
status = "disable";
};

sdhci@c8000000 {
status = "disable";
};

sdhci@c8000200 {
status = "disable";
};

sdhci@c8000400 {
cd-gpios = <&gpio 69 0>; /* gpio PI5 */
wp-gpios = <&gpio 57 0>; /* gpio PH1 */
Expand All @@ -29,4 +64,8 @@
sdhci@c8000600 {
support-8bit;
};

usb@c5000000 {
nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */
};
};
65 changes: 65 additions & 0 deletions arch/arm/boot/dts/tegra-trimslice.dts
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>;
};
};
Loading

0 comments on commit e067096

Please sign in to comment.