diff options
| author | Marek Vasut <marek.vasut+renesas@gmail.com> | 2018-12-03 22:14:09 +0100 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2018-12-04 09:21:07 +0100 |
| commit | 47179e57372e11630014e5229b23de0f68f57577 (patch) | |
| tree | f837bef4e8b41a629010960e13cf2c22f2298bc2 /arch/arm | |
| parent | 6bdb7a80cb06f1f96d5c0468e8881c7fd81be3df (diff) | |
ARM: dts: rmobile: Extract SCIF2 node on E3 Ebisu
The SCIF2 node is not in Linux 4.17 DTs on E3, pull it into U-Boot
specific DT extras until it hits mainline Linux, to make syncing of
DTs easier.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
V2: Rebase on u-boot/master
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/r8a77990-ebisu-u-boot.dts | 19 | ||||
| -rw-r--r-- | arch/arm/dts/r8a77990-ebisu.dts | 16 |
2 files changed, 19 insertions, 16 deletions
diff --git a/arch/arm/dts/r8a77990-ebisu-u-boot.dts b/arch/arm/dts/r8a77990-ebisu-u-boot.dts index 17b749545f..b030d5c649 100644 --- a/arch/arm/dts/r8a77990-ebisu-u-boot.dts +++ b/arch/arm/dts/r8a77990-ebisu-u-boot.dts @@ -77,6 +77,19 @@ }; &pfc { + pinctrl-0 = <&scif_clk_pins>; + pinctrl-names = "default"; + + scif2_pins: scif2 { + groups = "scif2_data_a"; + function = "scif2"; + }; + + scif_clk_pins: scif_clk { + groups = "scif_clk_a"; + function = "scif_clk"; + }; + sdhi0_pins: sd0 { groups = "sdhi0_data4", "sdhi0_ctrl"; function = "sdhi0"; @@ -114,6 +127,12 @@ }; }; +&scif2 { + pinctrl-0 = <&scif2_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + &sdhi0 { /* full size SD */ pinctrl-0 = <&sdhi0_pins>; diff --git a/arch/arm/dts/r8a77990-ebisu.dts b/arch/arm/dts/r8a77990-ebisu.dts index cea08d7488..e337c902cb 100644 --- a/arch/arm/dts/r8a77990-ebisu.dts +++ b/arch/arm/dts/r8a77990-ebisu.dts @@ -122,9 +122,6 @@ }; &pfc { - pinctrl-0 = <&scif_clk_pins>; - pinctrl-names = "default"; - avb_pins: avb { mux { groups = "avb_link", "avb_mii"; @@ -132,16 +129,6 @@ }; }; - scif2_pins: scif2 { - groups = "scif2_data_a"; - function = "scif2"; - }; - - scif_clk_pins: scif_clk { - groups = "scif_clk_a"; - function = "scif_clk"; - }; - usb0_pins: usb0 { groups = "usb0"; function = "usb0"; @@ -208,8 +195,5 @@ }; &scif2 { - pinctrl-0 = <&scif2_pins>; - pinctrl-names = "default"; - status = "okay"; }; |