Skip to content

Commit

Permalink
Merge tag 'tegra-for-5.3-arm64-dt' of git://git.kernel.org/pub/scm/li…
Browse files Browse the repository at this point in the history 
…nux/kernel/git/tegra/linux into arm/dt

arm64: tegra: Device tree changes for v5.3-rc1

This contains the bulk of the Tegra changes this cycle. It has a bunch
of improvements across almost all boards. These are mostly small and not
too exciting additions.

Most notably perhaps is the continuation of Jetson Nano support, which
is now mostly on feature parity with Jetson TX1.

* tag 'tegra-for-5.3-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: (28 commits)
  arm64: tegra: Enable PCIe slots in P2972-0000 board
  arm64: tegra: Add P2U and PCIe controller nodes to Tegra194 DT
  arm64: tegra: Add PEX DPD states as pinctrl properties
  arm64: tegra: Enable ACONNECT, ADMA and AGIC
  arm64: tegra: Add ACONNECT, ADMA and AGIC nodes
  arm64: tegra: Sort device tree nodes alphabetically
  arm64: tegra: Fix Jetson Nano GPU regulator
  arm64: tegra: Update Jetson TX1 GPU regulator timings
  arm64: tegra: Fix AGIC register range
  arm64: tegra: Add INA3221 channel info for Jetson TX2
  arm64: tegra: Enable PWM on Jetson Nano
  arm64: tegra: Enable CPU sleep on Jetson Nano
  arm64: tegra: Add ID EEPROMs on Jetson Nano
  arm64: tegra: Add ID EEPROM for Jetson TX2 Developer Kit
  arm64: tegra: Add ID EEPROM for Jetson TX2 module
  arm64: tegra: Add ID EEPROM for Jetson TX1 Developer Kit
  arm64: tegra: Add ID EEPROM for Jetson TX1 module
  arm64: tegra: Don't use architected timer for suspend on Tegra210
  arm64: tegra: Mark architected timer as always on
  arm64: tegra: Add pin control states for I2C on Tegra186
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
  • Loading branch information
@olofj
olofj committed Jun 25, 2019
2 parents b9569a3 + a586c88 commit 9c644f8
Show file tree
Hide file tree
Showing 11 changed files with 937 additions and 79 deletions.
75 changes: 72 additions & 3 deletions arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,70 @@
#include "tegra186-p3310.dtsi"

/ {
model = "NVIDIA Tegra186 P2771-0000 Development Board";
model = "NVIDIA Jetson TX2 Developer Kit";
compatible = "nvidia,p2771-0000", "nvidia,tegra186";

aconnect {
status = "okay";

dma-controller@2930000 {
status = "okay";
};

interrupt-controller@2a40000 {
status = "okay";
};
};

i2c@3160000 {
power-monitor@42 {
compatible = "ti,ina3221";
reg = <0x42>;
#address-cells = <1>;
#size-cells = <0>;

channel@0 {
reg = <0x0>;
label = "VDD_MUX";
shunt-resistor-micro-ohms = <20000>;
};

channel@1 {
reg = <0x1>;
label = "VDD_5V0_IO_SYS";
shunt-resistor-micro-ohms = <5000>;
};

channel@2 {
reg = <0x2>;
label = "VDD_3V3_SYS";
shunt-resistor-micro-ohms = <10000>;
};
};

power-monitor@43 {
compatible = "ti,ina3221";
reg = <0x43>;
#address-cells = <1>;
#size-cells = <0>;

channel@0 {
reg = <0x0>;
label = "VDD_3V3_IO_SLP";
shunt-resistor-micro-ohms = <10000>;
};

channel@1 {
reg = <0x1>;
label = "VDD_1V8_IO";
shunt-resistor-micro-ohms = <10000>;
};

channel@2 {
reg = <0x2>;
label = "VDD_M2_IN";
shunt-resistor-micro-ohms = <10000>;
};
};

exp1: gpio@74 {
Expand All @@ -31,6 +83,8 @@

#gpio-cells = <2>;
gpio-controller;

vcc-supply = <&vdd_3v3_sys>;
};

exp2: gpio@77 {
Expand All @@ -43,6 +97,8 @@

#gpio-cells = <2>;
gpio-controller;

vcc-supply = <&vdd_1v8>;
};
};

Expand Down Expand Up @@ -145,6 +201,19 @@
phy-names = "usb2-0", "usb2-1", "usb3-0";
};

i2c@c250000 {
/* carrier board ID EEPROM */
eeprom@57 {
compatible = "atmel,24c02";
reg = <0x57>;

address-bits = <8>;
page-size = <8>;
size = <256>;
read-only;
};
};

pcie@10003000 {
status = "okay";

Expand Down Expand Up @@ -278,7 +347,7 @@
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;

gpio = <&gpio TEGRA_MAIN_GPIO(L, 4) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA186_MAIN_GPIO(L, 4) GPIO_ACTIVE_HIGH>;
enable-active-high;

vin-supply = <&vdd_5v0_sys>;
Expand All @@ -292,7 +361,7 @@
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;

gpio = <&gpio TEGRA_MAIN_GPIO(L, 5) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA186_MAIN_GPIO(L, 5) GPIO_ACTIVE_HIGH>;
enable-active-high;

vin-supply = <&vdd_5v0_sys>;
Expand Down
53 changes: 52 additions & 1 deletion arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <dt-bindings/mfd/max77620.h>

/ {
model = "NVIDIA Tegra186 P3310 Processor Module";
model = "NVIDIA Jetson TX2";
compatible = "nvidia,p3310", "nvidia,tegra186";

aliases {
Expand Down Expand Up @@ -67,11 +67,51 @@
power-monitor@40 {
compatible = "ti,ina3221";
reg = <0x40>;
#address-cells = <1>;
#size-cells = <0>;

channel@0 {
reg = <0x0>;
label = "VDD_SYS_GPU";
shunt-resistor-micro-ohms = <10000>;
};

channel@1 {
reg = <0x1>;
label = "VDD_SYS_SOC";
shunt-resistor-micro-ohms = <10000>;
};

channel@2 {
reg = <0x2>;
label = "VDD_3V8_WIFI";
shunt-resistor-micro-ohms = <10000>;
};
};

power-monitor@41 {
compatible = "ti,ina3221";
reg = <0x41>;
#address-cells = <1>;
#size-cells = <0>;

channel@0 {
reg = <0x0>;
label = "VDD_IN";
shunt-resistor-micro-ohms = <5000>;
};

channel@1 {
reg = <0x1>;
label = "VDD_SYS_CPU";
shunt-resistor-micro-ohms = <10000>;
};

channel@2 {
reg = <0x2>;
label = "VDD_5V0_DDR";
shunt-resistor-micro-ohms = <10000>;
};
};
};

Expand Down Expand Up @@ -124,6 +164,17 @@

i2c@c250000 {
status = "okay";

/* module ID EEPROM */
eeprom@50 {
compatible = "atmel,24c02";
reg = <0x50>;

address-bits = <8>;
page-size = <8>;
size = <256>;
read-only;
};
};

rtc@c2a0000 {
Expand Down
Loading

0 comments on commit 9c644f8

Please sign in to comment.