[PATCH 1/2] ARM: move flexcan1 configuration to hummingboard

[shawn.guo@linaro.org (Shawn Guo)]

On Thu, Jan 16, 2014 at 06:22:49PM +0000, Russell King wrote:
> Flexcan1 is not used on the cubox-i, so move it out of the microsom.
> 
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

The patch will not apply against the branch/tag - imx-dt-3.14 I'm
sending to arm-soc.  Please re-generate it against the tag.

Acked-by: Shawn Guo <shawn.guo@linaro.org>

> ---
>  arch/arm/boot/dts/imx6dl-hummingboard.dts | 13 +++++++++++++
>  arch/arm/boot/dts/imx6qdl-microsom.dtsi   | 13 -------------
>  2 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx6dl-hummingboard.dts b/arch/arm/boot/dts/imx6dl-hummingboard.dts
> index 6184b0366926..e22f3d855c02 100644
> --- a/arch/arm/boot/dts/imx6dl-hummingboard.dts
> +++ b/arch/arm/boot/dts/imx6dl-hummingboard.dts
> @@ -36,6 +36,12 @@
>  	};
>  };
>  
> +&can1 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pinctrl_hummingboard_flexcan1>;
> +	status = "okay";
> +};
> +
>  &i2c1 {
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&pinctrl_i2c1_1>;
> @@ -53,6 +59,13 @@
>  
>  &iomuxc {
>  	hummingboard {
> +		pinctrl_hummingboard_flexcan1: hummingboard-flexcan1 {
> +			fsl,pins = <
> +				MX6QDL_PAD_SD3_CLK__FLEXCAN1_RX 0x80000000
> +				MX6QDL_PAD_SD3_CMD__FLEXCAN1_TX 0x80000000
> +			>;
> +		};
> +
>  		pinctrl_hummingboard_gpio1_2: hummingboard-gpio1_2 {
>  			fsl,pins = <
>  				MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
> diff --git a/arch/arm/boot/dts/imx6qdl-microsom.dtsi b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
> index 8aa31a842236..965ac4c1f509 100644
> --- a/arch/arm/boot/dts/imx6qdl-microsom.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
> @@ -36,21 +36,8 @@
>  	};
>  };
>  
> -&can1 {
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&pinctrl_microsom_flexcan1>;
> -	status = "okay";
> -};
> -
>  &iomuxc {
>  	microsom {
> -		pinctrl_microsom_flexcan1: microsom-flexcan1 {
> -			fsl,pins = <
> -				MX6QDL_PAD_SD3_CLK__FLEXCAN1_RX 0x80000000
> -				MX6QDL_PAD_SD3_CMD__FLEXCAN1_TX 0x80000000
> -			>;
> -		};
> -
>  		pinctrl_microsom_usbotg: microsom-usbotg {
>  			/*
>  			 * Similar to pinctrl_usbotg_2, but we want it
> -- 
> 1.8.3.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html