Commit 535409d9 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'tegra-for-3.10-dt' of...

Merge tag 'tegra-for-3.10-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/dt2

From Stephen Warren <swarren@wwwdotorg.org>:

ARM: tegra: device tree changes

This branch contains the majority of the device tree changes for Tegra.
Highlights include:

* Many changes for Tegra114, and the Dalmore board, to enable pinctrl,
  SDHCI/MMC, PWM, DMA, I2C, KBC, SPI, battery, regulators.
* Adding or enabling suspend wakeup sources on many boards, and adding
  suspend timing parameters, to support the system suspend patches.
* Adding clocks to the audio-related nodes, so that in 3.11, the audio
  driver can pull these clocks from device tree rather than hard-coding
  clock names.
* Some small DT fixes/cleanup.

This branch is based on the previous clk pull request.

* tag 'tegra-for-3.10-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (25 commits)
  clk: tegra: Fix cdev1 and cdev2 IDs
  ARM: dts: tegra: add the PM configurations of PMC
  ARM: tegra: add non-removable and keep-power-in-suspend property for MMC
  ARM: tegra: whistler: add wakeup source for KBC
  ARM: tegra: add power gpio keys to DT
  ARM: tegra: keep power on to SD slot on Dalmore
  ARM: tegra: add clocks property to AC'97 sound nodes
  ARM: tegra: add clocks property to sound nodes
  ARM: tegra: dalmore: add fixed regulator node
  ARM: tegra: dalmore: add TPS65090 node
  ARM: tegra: dalmore: add cpu regulator node
  ARM: tegra: Add sbs-battery node to Dalmore
  ARM: tegra: add DT binding for i2c-tegra
  ARM: tegra: add SPI nodes to Tegra114 DT
  ARM: tegra: add KBC nodes to Tegra114 DT
  ARM: tegra: add aliases and DMA requestor for serial nodes of Tegra114
  ARM: tegra: add I2C nodes to Tegra114 DT
  ARM: tegra: add APB DMA nodes to Tegra114 DT
  ARM: tegra: add PWM nodes to Tegra114 DT
  ARM: tegra: fix the status of PWM DT nodes
  ...
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f8da810c 1071b2df
NVIDIA Tegra20/Tegra30/Tegra114 I2C controller driver.
Required properties:
- compatible : should be:
"nvidia,tegra114-i2c"
"nvidia,tegra30-i2c"
"nvidia,tegra20-i2c"
"nvidia,tegra20-i2c-dvc"
Details of compatible are as follows:
nvidia,tegra20-i2c-dvc: Tegra20 has specific I2C controller called as DVC I2C
controller. This only support master mode of I2C communication. Register
interface/offset and interrupts handling are different than generic I2C
controller. Driver of DVC I2C controller is only compatible with
"nvidia,tegra20-i2c-dvc".
nvidia,tegra20-i2c: Tegra20 has 4 generic I2C controller. This can support
master and slave mode of I2C communication. The i2c-tegra driver only
support master mode of I2C communication. Driver of I2C controller is
only compatible with "nvidia,tegra20-i2c".
nvidia,tegra30-i2c: Tegra30 has 5 generic I2C controller. This controller is
very much similar to Tegra20 I2C controller with additional feature:
Continue Transfer Support. This feature helps to implement M_NO_START
as per I2C core API transfer flags. Driver of I2C controller is
compatible with "nvidia,tegra30-i2c" to enable the continue transfer
support. This is also compatible with "nvidia,tegra20-i2c" without
continue transfer support.
nvidia,tegra114-i2c: Tegra114 has 5 generic I2C controller. This controller is
very much similar to Tegra30 I2C controller with some hardware
modification:
- Tegra30/Tegra20 I2C controller has 2 clock source called div-clk and
fast-clk. Tegra114 has only one clock source called as div-clk and
hence clock mechanism is changed in I2C controller.
- Tegra30/Tegra20 I2C controller has enabled per packet transfer by
default and there is no way to disable it. Tegra114 has this
interrupt disable by default and SW need to enable explicitly.
Due to above changes, Tegra114 I2C driver makes incompatible with
previous hardware driver. Hence, tegra114 I2C controller is compatible
with "nvidia,tegra114-i2c".
- reg: Should contain I2C controller registers physical address and length.
- interrupts: Should contain I2C controller interrupts.
- address-cells: Address cells for I2C device address.
- size-cells: Size of the I2C device address.
- clocks: Clock ID as per
Documentation/devicetree/bindings/clock/tegra<chip-id>.txt
for I2C controller.
- clock-names: Name of the clock:
Tegra20/Tegra30 I2C controller: "div-clk and "fast-clk".
Tegra114 I2C controller: "div-clk".
Example:
i2c@7000c000 {
compatible = "nvidia,tegra20-i2c";
reg = <0x7000c000 0x100>;
interrupts = <0 38 0x04>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&tegra_car 12>, <&tegra_car 124>;
clock-names = "div-clk", "fast-clk";
status = "disabled";
};
...@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex ...@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex
Required properties: Required properties:
- compatible : "nvidia,tegra-audio-alc5632" - compatible : "nvidia,tegra-audio-alc5632"
- clocks : Must contain an entry for each entry in clock-names.
- clock-names : Must include the following entries:
"pll_a" (The Tegra clock of that name),
"pll_a_out0" (The Tegra clock of that name),
"mclk" (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)
- nvidia,model : The user-visible name of this sound complex. - nvidia,model : The user-visible name of this sound complex.
- nvidia,audio-routing : A list of the connections between audio components. - nvidia,audio-routing : A list of the connections between audio components.
Each entry is a pair of strings, the first being the connection's sink, Each entry is a pair of strings, the first being the connection's sink,
...@@ -56,4 +61,7 @@ sound { ...@@ -56,4 +61,7 @@ sound {
nvidia,i2s-controller = <&tegra_i2s1>; nvidia,i2s-controller = <&tegra_i2s1>;
nvidia,audio-codec = <&alc5632>; nvidia,audio-codec = <&alc5632>;
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
...@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex for TrimSlice ...@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex for TrimSlice
Required properties: Required properties:
- compatible : "nvidia,tegra-audio-trimslice" - compatible : "nvidia,tegra-audio-trimslice"
- clocks : Must contain an entry for each entry in clock-names.
- clock-names : Must include the following entries:
"pll_a" (The Tegra clock of that name),
"pll_a_out0" (The Tegra clock of that name),
"mclk" (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)
- nvidia,i2s-controller : The phandle of the Tegra I2S1 controller - nvidia,i2s-controller : The phandle of the Tegra I2S1 controller
- nvidia,audio-codec : The phandle of the WM8903 audio codec - nvidia,audio-codec : The phandle of the WM8903 audio codec
...@@ -11,4 +16,6 @@ sound { ...@@ -11,4 +16,6 @@ sound {
compatible = "nvidia,tegra-audio-trimslice"; compatible = "nvidia,tegra-audio-trimslice";
nvidia,i2s-controller = <&tegra_i2s1>; nvidia,i2s-controller = <&tegra_i2s1>;
nvidia,audio-codec = <&codec>; nvidia,audio-codec = <&codec>;
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
...@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex ...@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex
Required properties: Required properties:
- compatible : "nvidia,tegra-audio-wm8753" - compatible : "nvidia,tegra-audio-wm8753"
- clocks : Must contain an entry for each entry in clock-names.
- clock-names : Must include the following entries:
"pll_a" (The Tegra clock of that name),
"pll_a_out0" (The Tegra clock of that name),
"mclk" (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)
- nvidia,model : The user-visible name of this sound complex. - nvidia,model : The user-visible name of this sound complex.
- nvidia,audio-routing : A list of the connections between audio components. - nvidia,audio-routing : A list of the connections between audio components.
Each entry is a pair of strings, the first being the connection's sink, Each entry is a pair of strings, the first being the connection's sink,
...@@ -50,5 +55,8 @@ sound { ...@@ -50,5 +55,8 @@ sound {
nvidia,i2s-controller = <&i2s1>; nvidia,i2s-controller = <&i2s1>;
nvidia,audio-codec = <&wm8753>; nvidia,audio-codec = <&wm8753>;
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
...@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex ...@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex
Required properties: Required properties:
- compatible : "nvidia,tegra-audio-wm8903" - compatible : "nvidia,tegra-audio-wm8903"
- clocks : Must contain an entry for each entry in clock-names.
- clock-names : Must include the following entries:
"pll_a" (The Tegra clock of that name),
"pll_a_out0" (The Tegra clock of that name),
"mclk" (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)
- nvidia,model : The user-visible name of this sound complex. - nvidia,model : The user-visible name of this sound complex.
- nvidia,audio-routing : A list of the connections between audio components. - nvidia,audio-routing : A list of the connections between audio components.
Each entry is a pair of strings, the first being the connection's sink, Each entry is a pair of strings, the first being the connection's sink,
...@@ -67,5 +72,8 @@ sound { ...@@ -67,5 +72,8 @@ sound {
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */ nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */ nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
...@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex ...@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex
Required properties: Required properties:
- compatible : "nvidia,tegra-audio-wm9712" - compatible : "nvidia,tegra-audio-wm9712"
- clocks : Must contain an entry for each entry in clock-names.
- clock-names : Must include the following entries:
"pll_a" (The Tegra clock of that name),
"pll_a_out0" (The Tegra clock of that name),
"mclk" (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)
- nvidia,model : The user-visible name of this sound complex. - nvidia,model : The user-visible name of this sound complex.
- nvidia,audio-routing : A list of the connections between audio components. - nvidia,audio-routing : A list of the connections between audio components.
Each entry is a pair of strings, the first being the connection's sink, Each entry is a pair of strings, the first being the connection's sink,
...@@ -48,4 +53,7 @@ sound { ...@@ -48,4 +53,7 @@ sound {
"Mic", "MIC1"; "Mic", "MIC1";
nvidia,ac97-controller = <&ac97>; nvidia,ac97-controller = <&ac97>;
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
This diff is collapsed.
...@@ -4,6 +4,13 @@ / { ...@@ -4,6 +4,13 @@ / {
compatible = "nvidia,tegra114"; compatible = "nvidia,tegra114";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
aliases {
serial0 = &uarta;
serial1 = &uartb;
serial2 = &uartc;
serial3 = &uartd;
};
gic: interrupt-controller { gic: interrupt-controller {
compatible = "arm,cortex-a15-gic"; compatible = "arm,cortex-a15-gic";
#interrupt-cells = <3>; #interrupt-cells = <3>;
...@@ -33,6 +40,44 @@ tegra_car: clock { ...@@ -33,6 +40,44 @@ tegra_car: clock {
#clock-cells = <1>; #clock-cells = <1>;
}; };
apbdma: dma {
compatible = "nvidia,tegra114-apbdma";
reg = <0x6000a000 0x1400>;
interrupts = <0 104 0x04
0 105 0x04
0 106 0x04
0 107 0x04
0 108 0x04
0 109 0x04
0 110 0x04
0 111 0x04
0 112 0x04
0 113 0x04
0 114 0x04
0 115 0x04
0 116 0x04
0 117 0x04
0 118 0x04
0 119 0x04
0 128 0x04
0 129 0x04
0 130 0x04
0 131 0x04
0 132 0x04
0 133 0x04
0 134 0x04
0 135 0x04
0 136 0x04
0 137 0x04
0 138 0x04
0 139 0x04
0 140 0x04
0 141 0x04
0 142 0x04
0 143 0x04>;
clocks = <&tegra_car 34>;
};
ahb: ahb { ahb: ahb {
compatible = "nvidia,tegra114-ahb", "nvidia,tegra30-ahb"; compatible = "nvidia,tegra114-ahb", "nvidia,tegra30-ahb";
reg = <0x6000c004 0x14c>; reg = <0x6000c004 0x14c>;
...@@ -61,42 +106,189 @@ pinmux: pinmux { ...@@ -61,42 +106,189 @@ pinmux: pinmux {
0x70003000 0x40c>; /* Mux registers */ 0x70003000 0x40c>; /* Mux registers */
}; };
serial@70006000 { /*
* There are two serial driver i.e. 8250 based simple serial
* driver and APB DMA based serial driver for higher baudrate
* and performace. To enable the 8250 based driver, the compatible
* is "nvidia,tegra114-uart", "nvidia,tegra20-uart" and to enable
* the APB DMA based serial driver, the comptible is
* "nvidia,tegra114-hsuart", "nvidia,tegra30-hsuart".
*/
uarta: serial@70006000 {
compatible = "nvidia,tegra114-uart", "nvidia,tegra20-uart"; compatible = "nvidia,tegra114-uart", "nvidia,tegra20-uart";
reg = <0x70006000 0x40>; reg = <0x70006000 0x40>;
reg-shift = <2>; reg-shift = <2>;
interrupts = <0 36 0x04>; interrupts = <0 36 0x04>;
nvidia,dma-request-selector = <&apbdma 8>;
status = "disabled"; status = "disabled";
clocks = <&tegra_car 6>; clocks = <&tegra_car 6>;
}; };
serial@70006040 { uartb: serial@70006040 {
compatible = "nvidia,tegra114-uart", "nvidia,tegra20-uart"; compatible = "nvidia,tegra114-uart", "nvidia,tegra20-uart";
reg = <0x70006040 0x40>; reg = <0x70006040 0x40>;
reg-shift = <2>; reg-shift = <2>;
interrupts = <0 37 0x04>; interrupts = <0 37 0x04>;
nvidia,dma-request-selector = <&apbdma 9>;
status = "disabled"; status = "disabled";
clocks = <&tegra_car 192>; clocks = <&tegra_car 192>;
}; };
serial@70006200 { uartc: serial@70006200 {
compatible = "nvidia,tegra114-uart", "nvidia,tegra20-uart"; compatible = "nvidia,tegra114-uart", "nvidia,tegra20-uart";
reg = <0x70006200 0x100>; reg = <0x70006200 0x100>;
reg-shift = <2>; reg-shift = <2>;
interrupts = <0 46 0x04>; interrupts = <0 46 0x04>;
nvidia,dma-request-selector = <&apbdma 10>;
status = "disabled"; status = "disabled";
clocks = <&tegra_car 55>; clocks = <&tegra_car 55>;
}; };
serial@70006300 { uartd: serial@70006300 {
compatible = "nvidia,tegra114-uart", "nvidia,tegra20-uart"; compatible = "nvidia,tegra114-uart", "nvidia,tegra20-uart";
reg = <0x70006300 0x100>; reg = <0x70006300 0x100>;
reg-shift = <2>; reg-shift = <2>;
interrupts = <0 90 0x04>; interrupts = <0 90 0x04>;
nvidia,dma-request-selector = <&apbdma 19>;
status = "disabled"; status = "disabled";
clocks = <&tegra_car 65>; clocks = <&tegra_car 65>;
}; };
pwm: pwm {
compatible = "nvidia,tegra114-pwm", "nvidia,tegra20-pwm";
reg = <0x7000a000 0x100>;
#pwm-cells = <2>;
clocks = <&tegra_car 17>;
status = "disabled";
};
i2c@7000c000 {
compatible = "nvidia,tegra114-i2c";
reg = <0x7000c000 0x100>;
interrupts = <0 38 0x04>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&tegra_car 12>;
clock-names = "div-clk";
status = "disabled";
};
i2c@7000c400 {
compatible = "nvidia,tegra114-i2c";
reg = <0x7000c400 0x100>;
interrupts = <0 84 0x04>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&tegra_car 54>;
clock-names = "div-clk";
status = "disabled";
};
i2c@7000c500 {
compatible = "nvidia,tegra114-i2c";
reg = <0x7000c500 0x100>;
interrupts = <0 92 0x04>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&tegra_car 67>;
clock-names = "div-clk";
status = "disabled";
};
i2c@7000c700 {
compatible = "nvidia,tegra114-i2c";
reg = <0x7000c700 0x100>;
interrupts = <0 120 0x04>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&tegra_car 103>;
clock-names = "div-clk";
status = "disabled";
};
i2c@7000d000 {
compatible = "nvidia,tegra114-i2c";
reg = <0x7000d000 0x100>;
interrupts = <0 53 0x04>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&tegra_car 47>;
clock-names = "div-clk";
status = "disabled";
};
spi@7000d400 {
compatible = "nvidia,tegra114-spi";
reg = <0x7000d400 0x200>;
interrupts = <0 59 0x04>;
nvidia,dma-request-selector = <&apbdma 15>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&tegra_car 41>;
clock-names = "spi";
status = "disabled";
};
spi@7000d600 {
compatible = "nvidia,tegra114-spi";
reg = <0x7000d600 0x200>;
interrupts = <0 82 0x04>;
nvidia,dma-request-selector = <&apbdma 16>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&tegra_car 44>;
clock-names = "spi";
status = "disabled";
};
spi@7000d800 {
compatible = "nvidia,tegra114-spi";
reg = <0x7000d800 0x200>;
interrupts = <0 83 0x04>;
nvidia,dma-request-selector = <&apbdma 17>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&tegra_car 46>;
clock-names = "spi";
status = "disabled";
};
spi@7000da00 {
compatible = "nvidia,tegra114-spi";
reg = <0x7000da00 0x200>;
interrupts = <0 93 0x04>;
nvidia,dma-request-selector = <&apbdma 18>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&tegra_car 68>;
clock-names = "spi";
status = "disabled";
};
spi@7000dc00 {
compatible = "nvidia,tegra114-spi";
reg = <0x7000dc00 0x200>;
interrupts = <0 94 0x04>;
nvidia,dma-request-selector = <&apbdma 27>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&tegra_car 104>;
clock-names = "spi";
status = "disabled";
};
spi@7000de00 {
compatible = "nvidia,tegra114-spi";
reg = <0x7000de00 0x200>;
interrupts = <0 79 0x04>;
nvidia,dma-request-selector = <&apbdma 28>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&tegra_car 105>;
clock-names = "spi";
status = "disabled";
};
rtc { rtc {
compatible = "nvidia,tegra114-rtc", "nvidia,tegra20-rtc"; compatible = "nvidia,tegra114-rtc", "nvidia,tegra20-rtc";
reg = <0x7000e000 0x100>; reg = <0x7000e000 0x100>;
...@@ -104,6 +296,14 @@ rtc { ...@@ -104,6 +296,14 @@ rtc {
clocks = <&tegra_car 4>; clocks = <&tegra_car 4>;
}; };
kbc {
compatible = "nvidia,tegra114-kbc";
reg = <0x7000e200 0x100>;
interrupts = <0 85 0x04>;
clocks = <&tegra_car 36>;
status = "disabled";
};
pmc { pmc {
compatible = "nvidia,tegra114-pmc"; compatible = "nvidia,tegra114-pmc";
reg = <0x7000e400 0x400>; reg = <0x7000e400 0x400>;
...@@ -122,6 +322,38 @@ iommu { ...@@ -122,6 +322,38 @@ iommu {
nvidia,ahb = <&ahb>; nvidia,ahb = <&ahb>;
}; };
sdhci@78000000 {
compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
reg = <0x78000000 0x200>;
interrupts = <0 14 0x04>;
clocks = <&tegra_car 14>;
status = "disable";
};
sdhci@78000200 {
compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
reg = <0x78000200 0x200>;
interrupts = <0 15 0x04>;
clocks = <&tegra_car 9>;
status = "disable";
};
sdhci@78000400 {
compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
reg = <0x78000400 0x200>;
interrupts = <0 19 0x04>;
clocks = <&tegra_car 69>;
status = "disable";
};
sdhci@78000600 {
compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
reg = <0x78000600 0x200>;
interrupts = <0 31 0x04>;
clocks = <&tegra_car 15>;
status = "disable";
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
...@@ -361,6 +361,15 @@ temperature-sensor@4c { ...@@ -361,6 +361,15 @@ temperature-sensor@4c {
}; };
}; };
pmc {
nvidia,suspend-mode = <2>;
nvidia,cpu-pwr-good-time = <5000>;
nvidia,cpu-pwr-off-time = <5000>;
nvidia,core-pwr-good-time = <3845 3845>;
nvidia,core-pwr-off-time = <3875>;
nvidia,sys-clock-req-active-high;
};
memory-controller@7000f400 { memory-controller@7000f400 {
emc-table@83250 { emc-table@83250 {
reg = <83250>; reg = <83250>;
...@@ -473,6 +482,9 @@ sound { ...@@ -473,6 +482,9 @@ sound {
"Mic", "MIC1"; "Mic", "MIC1";
nvidia,ac97-controller = <&ac97>; nvidia,ac97-controller = <&ac97>;
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
regulators { regulators {
......
...@@ -416,6 +416,12 @@ temperature-sensor@4c { ...@@ -416,6 +416,12 @@ temperature-sensor@4c {
pmc { pmc {
nvidia,invert-interrupt; nvidia,invert-interrupt;
nvidia,suspend-mode = <2>;
nvidia,cpu-pwr-good-time = <5000>;
nvidia,cpu-pwr-off-time = <5000>;
nvidia,core-pwr-good-time = <3845 3845>;
nvidia,core-pwr-off-time = <3875>;
nvidia,sys-clock-req-active-high;
}; };
usb@c5000000 { usb@c5000000 {
...@@ -464,6 +470,17 @@ clk32k_in: clock { ...@@ -464,6 +470,17 @@ clk32k_in: clock {
}; };
}; };
gpio-keys {
compatible = "gpio-keys";
power {
label = "Power";
gpios = <&gpio 170 1>; /* gpio PV2, active low */
linux,code = <116>; /* KEY_POWER */
gpio-key,wakeup;
};
};
kbc { kbc {
status = "okay"; status = "okay";
nvidia,debounce-delay-ms = <2>; nvidia,debounce-delay-ms = <2>;
...@@ -669,5 +686,8 @@ sound { ...@@ -669,5 +686,8 @@ sound {
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */ nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */ nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
}; };
...@@ -6,6 +6,10 @@ / { ...@@ -6,6 +6,10 @@ / {
model = "Avionic Design Medcom-Wide board"; model = "Avionic Design Medcom-Wide board";
compatible = "ad,medcom-wide", "ad,tamonten", "nvidia,tegra20"; compatible = "ad,medcom-wide", "ad,tamonten", "nvidia,tegra20";
pwm {
status = "okay";
};
i2c@7000c000 { i2c@7000c000 {
wm8903: wm8903@1a { wm8903: wm8903@1a {
compatible = "wlf,wm8903"; compatible = "wlf,wm8903";
...@@ -54,5 +58,8 @@ sound { ...@@ -54,5 +58,8 @@ sound {
nvidia,spkr-en-gpios = <&wm8903 2 0>; nvidia,spkr-en-gpios = <&wm8903 2 0>;
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
}; };
...@@ -415,6 +415,12 @@ adt7461@4c { ...@@ -415,6 +415,12 @@ adt7461@4c {
pmc { pmc {
nvidia,invert-interrupt; nvidia,invert-interrupt;
nvidia,suspend-mode = <2>;
nvidia,cpu-pwr-good-time = <2000>;
nvidia,cpu-pwr-off-time = <0>;
nvidia,core-pwr-good-time = <3845 3845>;
nvidia,core-pwr-off-time = <0>;
nvidia,sys-clock-req-active-high;
}; };
usb@c5000000 { usb@c5000000 {
...@@ -445,6 +451,7 @@ sdhci@c8000000 { ...@@ -445,6 +451,7 @@ sdhci@c8000000 {
sdhci@c8000600 { sdhci@c8000600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable;
}; };
clocks { clocks {
...@@ -514,5 +521,8 @@ sound { ...@@ -514,5 +521,8 @@ sound {
nvidia,audio-codec = <&alc5632>; nvidia,audio-codec = <&alc5632>;
nvidia,i2s-controller = <&tegra_i2s1>; nvidia,i2s-controller = <&tegra_i2s1>;
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
}; };
...@@ -52,5 +52,8 @@ sound { ...@@ -52,5 +52,8 @@ sound {
nvidia,spkr-en-gpios = <&wm8903 2 0>; nvidia,spkr-en-gpios = <&wm8903 2 0>;
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
}; };
...@@ -517,6 +517,12 @@ magnetometer@c { ...@@ -517,6 +517,12 @@ magnetometer@c {
pmc { pmc {
nvidia,invert-interrupt; nvidia,invert-interrupt;
nvidia,suspend-mode = <2>;
nvidia,cpu-pwr-good-time = <5000>;
nvidia,cpu-pwr-off-time = <5000>;
nvidia,core-pwr-good-time = <3845 3845>;
nvidia,core-pwr-off-time = <3875>;
nvidia,sys-clock-req-active-high;
}; };
memory-controller@7000f400 { memory-controller@7000f400 {
...@@ -580,6 +586,7 @@ sdhci@c8000000 { ...@@ -580,6 +586,7 @@ sdhci@c8000000 {
status = "okay"; status = "okay";
power-gpios = <&gpio 86 0>; /* gpio PK6 */ power-gpios = <&gpio 86 0>; /* gpio PK6 */
bus-width = <4>; bus-width = <4>;
keep-power-in-suspend;
}; };
sdhci@c8000400 { sdhci@c8000400 {
...@@ -593,6 +600,7 @@ sdhci@c8000400 { ...@@ -593,6 +600,7 @@ sdhci@c8000400 {
sdhci@c8000600 { sdhci@c8000600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable;
}; };
clocks { clocks {
...@@ -821,5 +829,8 @@ sound { ...@@ -821,5 +829,8 @@ sound {
nvidia,spkr-en-gpios = <&wm8903 2 0>; nvidia,spkr-en-gpios = <&wm8903 2 0>;
nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */ nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
}; };
...@@ -458,6 +458,12 @@ temperature-sensor@4c { ...@@ -458,6 +458,12 @@ temperature-sensor@4c {
pmc { pmc {
nvidia,invert-interrupt; nvidia,invert-interrupt;
nvidia,suspend-mode = <2>;
nvidia,cpu-pwr-good-time = <5000>;
nvidia,cpu-pwr-off-time = <5000>;
nvidia,core-pwr-good-time = <3845 3845>;
nvidia,core-pwr-off-time = <3875>;
nvidia,sys-clock-req-active-high;
}; };
usb@c5008000 { usb@c5008000 {
......
...@@ -52,5 +52,8 @@ sound { ...@@ -52,5 +52,8 @@ sound {
nvidia,spkr-en-gpios = <&wm8903 2 0>; nvidia,spkr-en-gpios = <&wm8903 2 0>;
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
}; };
...@@ -300,6 +300,15 @@ rtc@56 { ...@@ -300,6 +300,15 @@ rtc@56 {
}; };
}; };
pmc {
nvidia,suspend-mode = <2>;
nvidia,cpu-pwr-good-time = <5000>;
nvidia,cpu-pwr-off-time = <5000>;
nvidia,core-pwr-good-time = <3845 3845>;
nvidia,core-pwr-off-time = <3875>;
nvidia,sys-clock-req-active-high;
};
usb@c5000000 { usb@c5000000 {
status = "okay"; status = "okay";
nvidia,vbus-gpio = <&gpio 170 0>; /* gpio PV2 */ nvidia,vbus-gpio = <&gpio 170 0>; /* gpio PV2 */
...@@ -343,6 +352,17 @@ clk32k_in: clock { ...@@ -343,6 +352,17 @@ clk32k_in: clock {
}; };
}; };
gpio-keys {
compatible = "gpio-keys";
power {
label = "Power";
gpios = <&gpio 190 1>; /* gpio PX6, active low */
linux,code = <116>; /* KEY_POWER */
gpio-key,wakeup;
};
};
poweroff { poweroff {
compatible = "gpio-poweroff"; compatible = "gpio-poweroff";
gpios = <&gpio 191 1>; /* gpio PX7, active low */ gpios = <&gpio 191 1>; /* gpio PX7, active low */
...@@ -376,5 +396,8 @@ sound { ...@@ -376,5 +396,8 @@ sound {
compatible = "nvidia,tegra-audio-trimslice"; compatible = "nvidia,tegra-audio-trimslice";
nvidia,i2s-controller = <&tegra_i2s1>; nvidia,i2s-controller = <&tegra_i2s1>;
nvidia,audio-codec = <&codec>; nvidia,audio-codec = <&codec>;
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
}; };
...@@ -493,6 +493,12 @@ temperature-sensor@4c { ...@@ -493,6 +493,12 @@ temperature-sensor@4c {
pmc { pmc {
nvidia,invert-interrupt; nvidia,invert-interrupt;
nvidia,suspend-mode = <2>;
nvidia,cpu-pwr-good-time = <2000>;
nvidia,cpu-pwr-off-time = <100>;
nvidia,core-pwr-good-time = <3845 3845>;
nvidia,core-pwr-off-time = <458>;
nvidia,sys-clock-req-active-high;
}; };
usb@c5000000 { usb@c5000000 {
...@@ -516,6 +522,7 @@ sdhci@c8000000 { ...@@ -516,6 +522,7 @@ sdhci@c8000000 {
status = "okay"; status = "okay";
power-gpios = <&gpio 86 0>; /* gpio PK6 */ power-gpios = <&gpio 86 0>; /* gpio PK6 */
bus-width = <4>; bus-width = <4>;
keep-power-in-suspend;
}; };
sdhci@c8000400 { sdhci@c8000400 {
...@@ -529,6 +536,7 @@ sdhci@c8000400 { ...@@ -529,6 +536,7 @@ sdhci@c8000400 {
sdhci@c8000600 { sdhci@c8000600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable;
}; };
clocks { clocks {
...@@ -544,6 +552,17 @@ clk32k_in: clock { ...@@ -544,6 +552,17 @@ clk32k_in: clock {
}; };
}; };
gpio-keys {
compatible = "gpio-keys";
power {
label = "Power";
gpios = <&gpio 170 1>; /* gpio PV2, active low */
linux,code = <116>; /* KEY_POWER */
gpio-key,wakeup;
};
};
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
...@@ -620,5 +639,8 @@ sound { ...@@ -620,5 +639,8 @@ sound {
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
nvidia,int-mic-en-gpios = <&gpio 184 0>; /* gpio PX0 */ nvidia,int-mic-en-gpios = <&gpio 184 0>; /* gpio PX0 */
nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */ nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
}; };
...@@ -496,6 +496,14 @@ vrtc { ...@@ -496,6 +496,14 @@ vrtc {
pmc { pmc {
nvidia,invert-interrupt; nvidia,invert-interrupt;
nvidia,suspend-mode = <2>;
nvidia,cpu-pwr-good-time = <2000>;
nvidia,cpu-pwr-off-time = <1000>;
nvidia,core-pwr-good-time = <0 3845>;
nvidia,core-pwr-off-time = <93727>;
nvidia,core-power-req-active-high;
nvidia,sys-clock-req-active-high;
nvidia,combined-power-req;
}; };
usb@c5000000 { usb@c5000000 {
...@@ -518,6 +526,7 @@ sdhci@c8000400 { ...@@ -518,6 +526,7 @@ sdhci@c8000400 {
sdhci@c8000600 { sdhci@c8000600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable;
}; };
clocks { clocks {
...@@ -539,6 +548,7 @@ kbc { ...@@ -539,6 +548,7 @@ kbc {
nvidia,repeat-delay-ms = <160>; nvidia,repeat-delay-ms = <160>;
nvidia,kbc-row-pins = <0 1 2>; nvidia,kbc-row-pins = <0 1 2>;
nvidia,kbc-col-pins = <16 17>; nvidia,kbc-col-pins = <16 17>;
nvidia,wakeup-source;
linux,keymap = <0x00000074 /* KEY_POWER */ linux,keymap = <0x00000074 /* KEY_POWER */
0x01000066 /* KEY_HOME */ 0x01000066 /* KEY_HOME */
0x0101009E /* KEY_BACK */ 0x0101009E /* KEY_BACK */
...@@ -573,5 +583,8 @@ sound { ...@@ -573,5 +583,8 @@ sound {
nvidia,i2s-controller = <&tegra_i2s1>; nvidia,i2s-controller = <&tegra_i2s1>;
nvidia,audio-codec = <&codec>; nvidia,audio-codec = <&codec>;
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
}; };
...@@ -209,7 +209,7 @@ das { ...@@ -209,7 +209,7 @@ das {
compatible = "nvidia,tegra20-das"; compatible = "nvidia,tegra20-das";
reg = <0x70000c00 0x80>; reg = <0x70000c00 0x80>;
}; };
tegra_ac97: ac97 { tegra_ac97: ac97 {
compatible = "nvidia,tegra20-ac97"; compatible = "nvidia,tegra20-ac97";
reg = <0x70002000 0x200>; reg = <0x70002000 0x200>;
...@@ -299,6 +299,7 @@ pwm: pwm { ...@@ -299,6 +299,7 @@ pwm: pwm {
reg = <0x7000a000 0x100>; reg = <0x7000a000 0x100>;
#pwm-cells = <2>; #pwm-cells = <2>;
clocks = <&tegra_car 17>; clocks = <&tegra_car 17>;
status = "disabled";
}; };
rtc { rtc {
...@@ -442,31 +443,6 @@ memory-controller@7000f400 { ...@@ -442,31 +443,6 @@ memory-controller@7000f400 {
#size-cells = <0>; #size-cells = <0>;
}; };
phy1: usb-phy@c5000400 {
compatible = "nvidia,tegra20-usb-phy";
reg = <0xc5000400 0x3c00>;
phy_type = "utmi";
nvidia,has-legacy-mode;
clocks = <&tegra_car 22>, <&tegra_car 127>;
clock-names = "phy", "pll_u";
};
phy2: usb-phy@c5004400 {
compatible = "nvidia,tegra20-usb-phy";
reg = <0xc5004400 0x3c00>;
phy_type = "ulpi";
clocks = <&tegra_car 94>, <&tegra_car 127>;
clock-names = "phy", "pll_u";
};
phy3: usb-phy@c5008400 {
compatible = "nvidia,tegra20-usb-phy";
reg = <0xc5008400 0x3C00>;
phy_type = "utmi";
clocks = <&tegra_car 22>, <&tegra_car 127>;
clock-names = "phy", "pll_u";
};
usb@c5000000 { usb@c5000000 {
compatible = "nvidia,tegra20-ehci", "usb-ehci"; compatible = "nvidia,tegra20-ehci", "usb-ehci";
reg = <0xc5000000 0x4000>; reg = <0xc5000000 0x4000>;
...@@ -479,6 +455,15 @@ usb@c5000000 { ...@@ -479,6 +455,15 @@ usb@c5000000 {
status = "disabled"; status = "disabled";
}; };
phy1: usb-phy@c5000400 {
compatible = "nvidia,tegra20-usb-phy";
reg = <0xc5000400 0x3c00>;
phy_type = "utmi";
nvidia,has-legacy-mode;
clocks = <&tegra_car 22>, <&tegra_car 127>;
clock-names = "phy", "pll_u";
};
usb@c5004000 { usb@c5004000 {
compatible = "nvidia,tegra20-ehci", "usb-ehci"; compatible = "nvidia,tegra20-ehci", "usb-ehci";
reg = <0xc5004000 0x4000>; reg = <0xc5004000 0x4000>;
...@@ -489,6 +474,14 @@ usb@c5004000 { ...@@ -489,6 +474,14 @@ usb@c5004000 {
status = "disabled"; status = "disabled";
}; };
phy2: usb-phy@c5004400 {
compatible = "nvidia,tegra20-usb-phy";
reg = <0xc5004400 0x3c00>;
phy_type = "ulpi";
clocks = <&tegra_car 93>, <&tegra_car 127>;
clock-names = "phy", "pll_u";
};
usb@c5008000 { usb@c5008000 {
compatible = "nvidia,tegra20-ehci", "usb-ehci"; compatible = "nvidia,tegra20-ehci", "usb-ehci";
reg = <0xc5008000 0x4000>; reg = <0xc5008000 0x4000>;
...@@ -499,6 +492,14 @@ usb@c5008000 { ...@@ -499,6 +492,14 @@ usb@c5008000 {
status = "disabled"; status = "disabled";
}; };
phy3: usb-phy@c5008400 {
compatible = "nvidia,tegra20-usb-phy";
reg = <0xc5008400 0x3c00>;
phy_type = "utmi";
clocks = <&tegra_car 22>, <&tegra_car 127>;
clock-names = "phy", "pll_u";
};
sdhci@c8000000 { sdhci@c8000000 {
compatible = "nvidia,tegra20-sdhci"; compatible = "nvidia,tegra20-sdhci";
reg = <0xc8000000 0x200>; reg = <0xc8000000 0x200>;
......
...@@ -253,6 +253,13 @@ i2s@70080400 { ...@@ -253,6 +253,13 @@ i2s@70080400 {
pmc { pmc {
status = "okay"; status = "okay";
nvidia,invert-interrupt; nvidia,invert-interrupt;
nvidia,suspend-mode = <2>;
nvidia,cpu-pwr-good-time = <2000>;
nvidia,cpu-pwr-off-time = <200>;
nvidia,core-pwr-good-time = <3845 3845>;
nvidia,core-pwr-off-time = <0>;
nvidia,core-power-req-active-high;
nvidia,sys-clock-req-active-high;
}; };
sdhci@78000000 { sdhci@78000000 {
...@@ -266,6 +273,7 @@ sdhci@78000000 { ...@@ -266,6 +273,7 @@ sdhci@78000000 {
sdhci@78000600 { sdhci@78000600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable;
}; };
clocks { clocks {
......
...@@ -88,6 +88,7 @@ sdhci@78000400 { ...@@ -88,6 +88,7 @@ sdhci@78000400 {
status = "okay"; status = "okay";
power-gpios = <&gpio 28 0>; /* gpio PD4 */ power-gpios = <&gpio 28 0>; /* gpio PD4 */
bus-width = <4>; bus-width = <4>;
keep-power-in-suspend;
}; };
}; };
...@@ -100,5 +100,6 @@ sdhci@78000400 { ...@@ -100,5 +100,6 @@ sdhci@78000400 {
status = "okay"; status = "okay";
power-gpios = <&gpio 27 0>; /* gpio PD3 */ power-gpios = <&gpio 27 0>; /* gpio PD3 */
bus-width = <4>; bus-width = <4>;
keep-power-in-suspend;
}; };
}; };
...@@ -307,6 +307,13 @@ i2s@70080400 { ...@@ -307,6 +307,13 @@ i2s@70080400 {
pmc { pmc {
status = "okay"; status = "okay";
nvidia,invert-interrupt; nvidia,invert-interrupt;
nvidia,suspend-mode = <2>;
nvidia,cpu-pwr-good-time = <2000>;
nvidia,cpu-pwr-off-time = <200>;
nvidia,core-pwr-good-time = <3845 3845>;
nvidia,core-pwr-off-time = <0>;
nvidia,core-power-req-active-high;
nvidia,sys-clock-req-active-high;
}; };
sdhci@78000000 { sdhci@78000000 {
...@@ -320,6 +327,7 @@ sdhci@78000000 { ...@@ -320,6 +327,7 @@ sdhci@78000000 {
sdhci@78000600 { sdhci@78000600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable;
}; };
clocks { clocks {
...@@ -509,5 +517,8 @@ sound { ...@@ -509,5 +517,8 @@ sound {
nvidia,spkr-en-gpios = <&wm8903 2 0>; nvidia,spkr-en-gpios = <&wm8903 2 0>;
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
clocks = <&tegra_car 184>, <&tegra_car 185>, <&tegra_car 120>;
clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
}; };
...@@ -286,6 +286,7 @@ pwm: pwm { ...@@ -286,6 +286,7 @@ pwm: pwm {
reg = <0x7000a000 0x100>; reg = <0x7000a000 0x100>;
#pwm-cells = <2>; #pwm-cells = <2>;
clocks = <&tegra_car 17>; clocks = <&tegra_car 17>;
status = "disabled";
}; };
rtc { rtc {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment