On 11/28/18 10:39 AM, Joakim Zhang wrote:
> From: Aisheng Dong <aisheng.dong@xxxxxxx>
>
> The flexcan1 is pin conflict with fec. User would make flexcan1 enabled
> with fec disabled to use CAN.
>
> Signed-off-by: Aisheng Dong <aisheng.dong@xxxxxxx>
> Signed-off-by: Joakim Zhang <qiangqing.zhang@xxxxxxx>
> ---
> V1->V2:
> *using SPDX tag for new files and remove pinctrl-assert-gpios property.
There's a pinctrl-assert-gpios in the dtsi.
> V2->V3:
> *remove the new files due to a pile of DTS files for a single
> development board with pin sharing among different devices not
> maintained.
> ---
> arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 47 ++++++++++++++++++++++++
> 1 file changed, 47 insertions(+)
>
> diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
> index a10f0ad0bfb1..bd4fe0add59d 100644
> --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
> @@ -101,6 +101,25 @@
> enable-active-high;
> };
>
> + reg_can_en: regulator-can-en {
> + compatible = "regulator-fixed";
> + regulator-name = "can-en";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + gpio = <&max7310_b 6 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> + };
> +
> + reg_can_stby: regulator-can-stby {
> + compatible = "regulator-fixed";
> + regulator-name = "can-stby";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + gpio = <&max7310_b 5 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> + vin-supply = <®_can_en>;
> + };
> +
> sound-cs42888 {
> compatible = "fsl,imx6-sabreauto-cs42888",
> "fsl,imx-audio-cs42888";
> @@ -279,6 +298,20 @@
> status = "okay";
> };
>
> +&can1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_flexcan1>;
> + pinctrl-assert-gpios = <&max7310_b 3 GPIO_ACTIVE_HIGH>; /* TX */
^^^^^^^^^^^^^^^^^^^^
Marc
> + xceiver-supply = <®_can_stby>;
> + status = "disabled"; /* pin conflict with fec */ };
> +
> +&can2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_flexcan2>;
> + xceiver-supply = <®_can_stby>;
> + status = "okay";
> +};
> +
> &gpmi {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_gpmi_nand>;
> @@ -494,6 +527,20 @@
> >;
> };
>
> + pinctrl_flexcan1: flexcan1grp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x17059
> + MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x17059
> + >;
> + };
> +
> + pinctrl_flexcan2: flexcan2grp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x17059
> + MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x17059
> + >;
> + };
> +
> pinctrl_gpio_keys: gpiokeysgrp {
> fsl,pins = <
> MX6QDL_PAD_SD2_CMD__GPIO1_IO11 0x1b0b0
>
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Attachment:
signature.asc
Description: OpenPGP digital signature
