diff options
author | Tom Rini <trini@konsulko.com> | 2019-07-30 19:19:04 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-07-30 19:19:04 -0400 |
commit | dcf722ece6aad0c1512a26cdefc2f74a192fa9d2 (patch) | |
tree | c5b2aff104820838be88341c1fc99a9c684313f2 /arch/arm/dts/r8a77995-draak.dts | |
parent | d0d07ba86afc8074d79e436b1ba4478fa0f0c1b5 (diff) | |
parent | b5f563e588d134b2cb96a2f54332b7727ee4cdad (diff) | |
download | u-boot-dcf722ece6aad0c1512a26cdefc2f74a192fa9d2.tar.gz u-boot-dcf722ece6aad0c1512a26cdefc2f74a192fa9d2.tar.xz u-boot-dcf722ece6aad0c1512a26cdefc2f74a192fa9d2.zip |
Merge branch 'master' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'arch/arm/dts/r8a77995-draak.dts')
-rw-r--r-- | arch/arm/dts/r8a77995-draak.dts | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/arch/arm/dts/r8a77995-draak.dts b/arch/arm/dts/r8a77995-draak.dts index db2bed1751..a7dc11e36f 100644 --- a/arch/arm/dts/r8a77995-draak.dts +++ b/arch/arm/dts/r8a77995-draak.dts @@ -20,7 +20,7 @@ }; chosen { - bootargs = "ignore_loglevel"; + bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp"; stdout-path = "serial0:115200n8"; }; @@ -168,7 +168,6 @@ pinctrl-names = "default"; renesas,no-ether-link; phy-handle = <&phy0>; - phy-mode = "rgmii-txid"; status = "okay"; phy0: ethernet-phy@0 { @@ -179,6 +178,18 @@ }; }; +&can0 { + pinctrl-0 = <&can0_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + +&can1 { + pinctrl-0 = <&can1_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + &du { pinctrl-0 = <&du_pins>; pinctrl-names = "default"; @@ -356,6 +367,13 @@ }; &lvds1 { + /* + * Even though the LVDS1 output is not connected, the encoder must be + * enabled to supply a pixel clock to the DU for the DPAD output when + * LVDS0 is in use. + */ + status = "okay"; + clocks = <&cpg CPG_MOD 727>, <&x12_clk>, <&extal_clk>; @@ -375,6 +393,16 @@ }; }; + can0_pins: can0 { + groups = "can0_data_a"; + function = "can0"; + }; + + can1_pins: can1 { + groups = "can1_data_a"; + function = "can1"; + }; + du_pins: du { groups = "du_rgb888", "du_sync", "du_disp", "du_clk_out_0"; function = "du"; |