diff options
| author | Warner Losh <imp@FreeBSD.org> | 2016-09-22 15:17:36 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2016-09-22 15:17:36 +0000 |
| commit | fad63e2d459885f4976cbdf133271af9b4348b98 (patch) | |
| tree | 9af8d9f009b98e00720f4ec6c14763bc1a8c4562 /sys/gnu/dts/arm/tegra20-seaboard.dts | |
| parent | 8588bc08511253782ebd80e3e32fc1adbde8e480 (diff) | |
| parent | c7716441be3a4a48aa7b7cdf69a15625c1cd8ef5 (diff) | |
Revert and redo r306083.
Update the device tree source files to a Linux 4.7-RC.
The dts tree currently can't be merged w/o specific revisions.
Note: due to a stupid bug in the commit checking script, I couldn't
just remove the svn:keyword tag from the new files, I had to add
fbsd:nokeywords to all the files (including ones that didn't need it)
Notes
Notes:
svn path=/head/; revision=306197
Diffstat (limited to 'sys/gnu/dts/arm/tegra20-seaboard.dts')
| -rw-r--r-- | sys/gnu/dts/arm/tegra20-seaboard.dts | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/gnu/dts/arm/tegra20-seaboard.dts b/sys/gnu/dts/arm/tegra20-seaboard.dts index aea8994b35f2..94b60a710dd8 100644 --- a/sys/gnu/dts/arm/tegra20-seaboard.dts +++ b/sys/gnu/dts/arm/tegra20-seaboard.dts @@ -13,6 +13,10 @@ serial0 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x00000000 0x40000000>; }; @@ -807,7 +811,7 @@ label = "Power"; gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; - gpio-key,wakeup; + wakeup-source; }; lid { @@ -816,7 +820,7 @@ linux,input-type = <5>; /* EV_SW */ linux,code = <0>; /* SW_LID */ debounce-interval = <1>; - gpio-key,wakeup; + wakeup-source; }; }; |