diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-12-21 14:34:21 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-12-21 14:34:21 +0100 |
| commit | a898b45a9c18bd9d723f82576a5b32a102808a09 (patch) | |
| tree | e34c381ee55f0524bb2c69b9162901dd87f29d39 /arch/arm/boot | |
| parent | 9282ed58a8d84776f995225f1b3d2e793d0bdb50 (diff) | |
| parent | 727301c4a23f798ab3f50f8ce6dc032f11dd75f3 (diff) | |
Merge remote-tracking branch 'linux-fslc/4.9-1.0.x-imx' into toradex_4.9-1.0.x-imx-next
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/imx7ulp-evk.dts | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/imx7ulp-evk.dts b/arch/arm/boot/dts/imx7ulp-evk.dts index 0ff23f42aa44..3ee6e3c34747 100644 --- a/arch/arm/boot/dts/imx7ulp-evk.dts +++ b/arch/arm/boot/dts/imx7ulp-evk.dts @@ -16,6 +16,11 @@ model = "NXP i.MX7ULP EVK"; compatible = "fsl,imx7ulp-evk", "fsl,imx7ulp", "Generic DT based system"; + aliases { + gpio4 = &rpmsg_gpio0; + gpio5 = &rpmsg_gpio1; + }; + chosen { bootargs = "console=ttyLP0,115200 earlycon=lpuart32,0x402D0000,115200"; stdout-path = &lpuart4; @@ -166,6 +171,22 @@ status = "okay"; }; + rpmsg_gpio0: rpmsg-gpio0 { + compatible = "fsl,imx-rpmsg-gpio"; + port_idx = <0>; + gpio-controller; + #gpio-cells = <2>; + status = "okay"; + }; + + rpmsg_gpio1: rpmsg-gpio1 { + compatible = "fsl,imx-rpmsg-gpio"; + port_idx = <1>; + gpio-controller; + #gpio-cells = <2>; + status = "okay"; + }; + rpmsg_keys: rpmsg-keys { compatible = "fsl,rpmsg-keys"; @@ -484,15 +505,11 @@ &rpmsg{ /* * 64K for one rpmsg instance, default using 2 rpmsg instances: - * --0x9FF00000~0x9FF0FFFF: pingpong - * --0x9FF10000~0x9FF1FFFF: pmic - * --0x9FF20000~0x9FF2FFFF: pm - * --0x9FF30000~0x9FF3FFFF: audio - * --0x9FF40000~0x9FF4FFFF: virtual tty - * --0x9FF50000~0x9FF5FFFF: keys + * --0x9FF00000~0x9FF0FFFF: pmic,pm,audio,keys,gpio + * --0x9FF10000~0x9FF1FFFF: pingpong,virtual tty */ - vdev-nums = <6>; - reg = <0x9FF00000 0x60000>; + vdev-nums = <2>; + reg = <0x9FF00000 0x20000>; status = "okay"; }; |