diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-05-10 08:48:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-05-10 08:48:23 +1000 |
| commit | 6b81371826fa536ef4e08687d37b54fa9bce6966 (patch) | |
| tree | 1ecbcfc1ff8af0b345ca9cff3959e14b4ac8e26a /arch/arm/boot/dts/imx6qdl-tx6.dtsi | |
| parent | cc77775bd92d656fc9124a593382e4fa6bd117de (diff) | |
| parent | 75ed360763f2dc5776a372c3303d1bae501769ad (diff) | |
| download | linux-next-6b81371826fa536ef4e08687d37b54fa9bce6966.tar.gz | |
Merge remote-tracking branch 'imx-mxs/for-next'
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-tx6.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-tx6.dtsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi index f015e2d1cf35..a98fb2564c63 100644 --- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi +++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi @@ -50,11 +50,11 @@ can0 = &can2; can1 = &can1; ethernet0 = &fec; - lcdif_23bit_pins_a = &pinctrl_disp0_1; - lcdif_24bit_pins_a = &pinctrl_disp0_2; + lcdif-23bit-pins-a = &pinctrl_disp0_1; + lcdif-24bit-pins-a = &pinctrl_disp0_2; pwm0 = &pwm1; pwm1 = &pwm2; - reg_can_xcvr = ®_can_xcvr; + reg-can-xcvr = ®_can_xcvr; stk5led = &user_led; usbotg = &usbotg; sdhc0 = &usdhc1; |