diff options
| author | Al Viro | 2014-12-09 02:39:29 +0100 |
|---|---|---|
| committer | Al Viro | 2014-12-09 02:39:29 +0100 |
| commit | ba00410b8131b23edfb0e09f8b6dd26c8eb621fb (patch) | |
| tree | c08504e4d2fa51ac91cef544f336d0169806c49f /arch/arm/boot/dts/tegra114-tn7.dts | |
| parent | Merge tag 'trace-seq-file-cleanup' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | copy_from_iter_nocache() (diff) | |
| download | kernel-qcow2-linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.tar.gz kernel-qcow2-linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.tar.xz kernel-qcow2-linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.zip | |
Merge branch 'iov_iter' into for-next
Diffstat (limited to 'arch/arm/boot/dts/tegra114-tn7.dts')
| -rw-r--r-- | arch/arm/boot/dts/tegra114-tn7.dts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/tegra114-tn7.dts b/arch/arm/boot/dts/tegra114-tn7.dts index 963662145635..f91c2c9b2f94 100644 --- a/arch/arm/boot/dts/tegra114-tn7.dts +++ b/arch/arm/boot/dts/tegra114-tn7.dts @@ -15,6 +15,10 @@ linux,initrd-end = <0x82800000>; }; + aliases { + serial0 = &uartd; + }; + firmware { trusted-foundations { compatible = "tlm,trusted-foundations"; @@ -240,7 +244,6 @@ sdhci@78000600 { status = "okay"; bus-width = <8>; - vmmc-supply = <&vdd_1v8>; non-removable; }; |