mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'tegra-for-5.18-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt

Browse Source 
ARM: tegra: Device tree changes for v5.18-rc1

The changes in this set are cleanups and fixes for 32-bit Tegra device
tree files. With these, some json-schema validation errors are fixed.

* tag 'tegra-for-5.18-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: tamonten: Fix I2C3 pad setting
  ARM: tegra: Fix ethernet node names
  ARM: tegra: paz00: Add MMC aliases
  ARM: tegra: tf700t: Rename DSI node
  ARM: tegra: transformer: Drop reg-shift for Tegra HS UART
  ARM: tegra: asus-tf101: Enable S/PDIF and HDMI audio
  ARM: tegra: Update jedec,lpddr2 revision-id binding

Link: https://lore.kernel.org/r/20220225164741.1064416-3-thierry.reding@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2022-02-28 15:12:59 +01:00
parent cba4cdeb35 0092c25b54
commit f08a71d29d
9 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/boot/dts/tegra20-asus-tf101.dts
View File

@@ -436,17 +436,27 @@
};
};
spdif@70002400 {
status = "okay";
nvidia,fixed-parent-rate;
};
i2s@70002800 {
status = "okay";
nvidia,fixed-parent-rate;
};
serial@70006040 {
compatible = "nvidia,tegra20-hsuart";
/delete-property/ reg-shift;
/* GPS BCM4751 */
};
serial@70006200 {
compatible = "nvidia,tegra20-hsuart";
/delete-property/ reg-shift;
status = "okay";
/* Azurewave AW-NH615 BCM4329B1 */
@@ -756,7 +766,7 @@
lpddr2 {
compatible = "elpida,B8132B2PB-6D-F", "jedec,lpddr2-s4";
revision-id1 = <1>;
revision-id = <1 0>;
density = <2048>;
io-width = <16>;
};

2
arch/arm/boot/dts/tegra20-colibri.dtsi
View File

@@ -691,7 +691,7 @@
#address-cells = <1>;
#size-cells = <0>;
asix@1 {
ethernet@1 {
compatible = "usbb95,772b";
reg = <1>;
local-mac-address = [00 00 00 00 00 00];

6
arch/arm/boot/dts/tegra20-paz00.dts
View File

@@ -13,6 +13,8 @@
compatible = "compal,paz00", "nvidia,tegra20";
aliases {
mmc0 = &sdmmc4; /* eMMC */
mmc1 = &sdmmc1; /* MicroSD */
rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000";
serial0 = &uarta;
@@ -558,7 +560,7 @@
status = "okay";
};
mmc@c8000000 {
sdmmc1: mmc@c8000000 {
status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
@@ -566,7 +568,7 @@
bus-width = <4>;
};
mmc@c8000600 {
sdmmc4: mmc@c8000600 {
status = "okay";
bus-width = <8>;
non-removable;

6
arch/arm/boot/dts/tegra20-tamonten.dtsi
View File

@@ -183,8 +183,8 @@
};
conf_ata {
nvidia,pins = "ata", "atb", "atc", "atd", "ate",
"cdev1", "cdev2", "dap1", "dtb", "gma",
"gmb", "gmc", "gmd", "gme", "gpu7",
"cdev1", "cdev2", "dap1", "dtb", "dtf",
"gma", "gmb", "gmc", "gmd", "gme", "gpu7",
"gpv", "i2cp", "irrx", "irtx", "pta",
"rm", "slxa", "slxk", "spia", "spib",
"uac";
@@ -203,7 +203,7 @@
};
conf_crtp {
nvidia,pins = "crtp", "dap2", "dap3", "dap4",
"dtc", "dte", "dtf", "gpu", "sdio1",
"dtc", "dte", "gpu", "sdio1",
"slxc", "slxd", "spdi", "spdo", "spig",
"uda";
nvidia,pull = <TEGRA_PIN_PULL_NONE>;

2
arch/arm/boot/dts/tegra30-asus-tf700t.dts
View File

@@ -742,7 +742,7 @@
#address-cells = <1>;
#size-cells = <0>;
dsi-bridge@7 {
dsi@7 {
compatible = "toshiba,tc358768";
reg = <0x7>;

2
arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi
View File

@@ -1080,6 +1080,7 @@
serial@70006040 {
compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
status = "okay";
/* Broadcom GPS BCM47511 */
@@ -1087,6 +1088,7 @@
serial@70006200 {
compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
status = "okay";
nvidia,adjust-baud-rates = <0 9600 100>,

2
arch/arm/boot/dts/tegra30-colibri.dtsi
View File

@@ -960,7 +960,7 @@
#address-cells = <1>;
#size-cells = <0>;
asix@1 {
ethernet@1 {
compatible = "usbb95,772b";
reg = <1>;
local-mac-address = [00 00 00 00 00 00];

2
arch/arm/boot/dts/tegra30-ouya.dts
View File

@@ -4553,7 +4553,7 @@
#address-cells = <1>;
#size-cells = <0>;
smsc@2 { /* SMSC 10/100T Ethernet Controller */
ethernet@2 { /* SMSC 10/100T Ethernet Controller */
compatible = "usb424,9e00";
reg = <2>;
local-mac-address = [00 11 22 33 44 55];

2
arch/arm/boot/dts/tegra30-pegatron-chagall.dts
View File

@@ -1103,6 +1103,7 @@
uartb: serial@70006040 {
compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
status = "okay";
/* Broadcom GPS BCM47511 */
@@ -1110,6 +1111,7 @@
uartc: serial@70006200 {
compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
status = "okay";
nvidia,adjust-baud-rates = <0 9600 100>,