diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2014-05-15 20:39:32 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-17 19:56:36 +0900 |
| commit | 6d4abd79c80742629477479b01077bb92eccdd53 (patch) | |
| tree | 2559ce5352de9333a3bca0753ce9cae95d1a5b83 /arch/arm/boot/dts/r8a7779-marzen.dts | |
| parent | 33b9966db3024b3b739cf8031a28ad9ee5919f36 (diff) | |
| download | blackbird-op-linux-6d4abd79c80742629477479b01077bb92eccdd53.tar.gz blackbird-op-linux-6d4abd79c80742629477479b01077bb92eccdd53.zip | |
ARM: shmobile: marzen: Initialise SCIF devices using DT
Initialise SCIF devices using DT when booting marzen
using multiplatform.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/boot/dts/r8a7779-marzen.dts')
| -rw-r--r-- | arch/arm/boot/dts/r8a7779-marzen.dts | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts index 321290828eee..20b176807848 100644 --- a/arch/arm/boot/dts/r8a7779-marzen.dts +++ b/arch/arm/boot/dts/r8a7779-marzen.dts @@ -18,6 +18,11 @@ model = "marzen"; compatible = "renesas,marzen", "renesas,r8a7779"; + aliases { + serial2 = &scif2; + serial4 = &scif4; + }; + chosen { bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on"; }; @@ -74,9 +79,6 @@ }; &pfc { - pinctrl-0 = <&scif2_pins &scif4_pins>; - pinctrl-names = "default"; - lan0_pins: lan0 { intc { renesas,groups = "intc_irq1_b"; @@ -109,6 +111,20 @@ }; }; +&scif2 { + pinctrl-0 = <&scif2_pins>; + pinctrl-names = "default"; + + status = "okay"; +}; + +&scif4 { + pinctrl-0 = <&scif4_pins>; + pinctrl-names = "default"; + + status = "okay"; +}; + &sdhi0 { pinctrl-0 = <&sdhi0_pins>; pinctrl-names = "default"; |
