diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-29 10:39:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-29 10:39:18 -0400 |
| commit | 6864fc8704661878294d1f0f981f47e864ef470f (patch) | |
| tree | 4b1f116a26cfdded81f80b665a2d92375af6f74e /arch/arm/dts/r8a7794-silk.dts | |
| parent | 5bec37eb72bdb43d683593148f4911f1e1f34980 (diff) | |
| parent | 836f1ce6c772ef5d1c545edec62bb177708fc150 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-sh
- rmobile gen2/gen3 DTS sync and defconfig consolidation
Diffstat (limited to 'arch/arm/dts/r8a7794-silk.dts')
| -rw-r--r-- | arch/arm/dts/r8a7794-silk.dts | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/dts/r8a7794-silk.dts b/arch/arm/dts/r8a7794-silk.dts index 60e91ebfa6..2c16ad8543 100644 --- a/arch/arm/dts/r8a7794-silk.dts +++ b/arch/arm/dts/r8a7794-silk.dts @@ -34,7 +34,7 @@ }; chosen { - bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp"; + bootargs = "ignore_loglevel rw root=/dev/nfs ip=on"; stdout-path = "serial0:115200n8"; }; @@ -126,8 +126,7 @@ gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>; gpios-states = <1>; - states = <3300000 1 - 1800000 0>; + states = <3300000 1>, <1800000 0>; }; vga-encoder { |