On Wed, May 20, 2015 at 11:49:29PM +0200, Peter Seiderer wrote: > Regulator stuff copied from imx6qdl-tx6.dtsi, pin configuration > taken from Boundary Devices linux kernel tree ([1] and [2]). > > [1] https://github.com/boundarydevices/linux-imx6/blob/boundary-imx_3.10.17_1.0.2_ga/arch/arm/boot/dts/imx6qdl-nitrogen6x.dts > [2] https://github.com/boundarydevices/linux-imx6/blob/boundary-imx_3.10.17_1.0.2_ga/arch/arm/boot/dts/imx6qdl.dtsi > > Signed-off-by: Peter Seiderer <ps.report@xxxxxxx> > --- > arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 32 +++++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) > > diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi > index fd096dc..1c415e4 100644 > --- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi > @@ -54,6 +54,17 @@ > gpio = <&gpio3 22 0>; > enable-active-high; > }; > + > + reg_can_xcvr: regulator@3 { > + compatible = "regulator-fixed"; > + reg = <3>; > + regulator-name = "CAN XCVR"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_can_xcvr>; > + gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>; > + }; > }; > > gpio-keys { > @@ -138,6 +149,13 @@ > status = "okay"; > }; > > +&can1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_can1_1>; > + xceiver-supply = <®_can_xcvr>; > + status = "okay"; > +}; > + > &ecspi1 { > fsl,spi-num-chipselects = <1>; > cs-gpios = <&gpio3 19 0>; > @@ -234,6 +252,20 @@ > >; > }; > > + pinctrl_can1_1: can1grp-1 { The '_1' suffix is meaningless. pinctrl_can1: can1grp { Shawn > + fsl,pins = < > + MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x80000000 > + MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000 > + >; > + }; > + > + pinctrl_can_xcvr: can-xcvrgrp { > + fsl,pins = < > + /* Flexcan XCVR enable */ > + MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x1b0b0 > + >; > + }; > + > pinctrl_ecspi1: ecspi1grp { > fsl,pins = < > MX6QDL_PAD_EIM_D17__ECSPI1_MISO 0x100b1 > -- > 2.1.4 > > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html