diff options
| author | Marek Vasut <marek.vasut+renesas@gmail.com> | 2020-04-04 16:12:48 +0200 |
|---|---|---|
| committer | marex <marex@desktop.lan> | 2020-04-28 21:34:51 +0200 |
| commit | c7d681207dd6c202087fa1c8732fadd1c0288863 (patch) | |
| tree | 52c3756eed5b9d1777819dcd76307693121157e6 /arch/arm/dts/ulcb.dtsi | |
| parent | 329267fad2fd6358e9a8660a18dce5a43e6d8a16 (diff) | |
| download | u-boot-c7d681207dd6c202087fa1c8732fadd1c0288863.tar.gz | |
ARM: dts: rmobile: Synchronize Gen3 DTs with Linux 5.6.2
Synchronize R-Car Gen3 device trees with Linux 5.6.2,
commit 9fbe5c87eaa9b72db08425c52c373eb5f6537a0a .
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Diffstat (limited to 'arch/arm/dts/ulcb.dtsi')
| -rw-r--r-- | arch/arm/dts/ulcb.dtsi | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/dts/ulcb.dtsi b/arch/arm/dts/ulcb.dtsi index e70e1bac2be..ff88af8e39d 100644 --- a/arch/arm/dts/ulcb.dtsi +++ b/arch/arm/dts/ulcb.dtsi @@ -26,7 +26,7 @@ }; chosen { - bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp"; + bootargs = "ignore_loglevel rw root=/dev/nfs ip=on"; stdout-path = "serial0:115200n8"; }; @@ -120,8 +120,7 @@ gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; gpios-states = <1>; - states = <3300000 1 - 1800000 0>; + states = <3300000 1>, <1800000 0>; }; x12_clk: x12 { @@ -428,6 +427,11 @@ }; }; +&rwdt { + timeout-sec = <60>; + status = "okay"; +}; + &scif2 { pinctrl-0 = <&scif2_pins>; pinctrl-names = "default"; @@ -478,8 +482,3 @@ status = "okay"; }; - -&rwdt { - timeout-sec = <60>; - status = "okay"; -}; |