Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6be44b1f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next 



Marc Kleine-Budde says:

====================
this is a pull-request for net-next/master. It consists of three
patches by Fabio Estevam and me, which convert the flexcan transceiver
switching to DT[1] and a patch by Sachin Kamat, which cleans up the
at91_can driver a bit.

[1] These patches touch arch/arm/mach-imx, so I collected Acked-bys
from Shawn Guo and Sascha Hauer.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d36a21da 1f3e4b0c

Documentation/devicetree/bindings/net/can/fsl-flexcan.txt

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ Optional properties: 


- clock-frequency : The oscillator frequency driving the flexcan device



- xceiver-supply: Regulator that powers the CAN transceiver



Example:



	can@1c000 {

arch/arm/boot/dts/imx28-evk.dts

+12 −0
Original line number Diff line number Diff line
@@ -155,12 +155,14 @@ 
			can0: can@80032000 {

				pinctrl-names = "default";

				pinctrl-0 = <&can0_pins_a>;

				xceiver-supply = <&reg_can_3v3>;

				status = "okay";

			};



			can1: can@80034000 {

				pinctrl-names = "default";

				pinctrl-0 = <&can1_pins_a>;

				xceiver-supply = <&reg_can_3v3>;

				status = "okay";

			};

		};
@@ -319,6 +321,16 @@ 
			gpio = <&gpio3 30 0>;

			enable-active-high;

		};



		reg_can_3v3: can-3v3 {

			compatible = "regulator-fixed";

			regulator-name = "can-3v3";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			gpio = <&gpio2 13 0>;

			enable-active-high;

		};



	};



	sound {

arch/arm/mach-imx/devices-imx25.h

+4 −4
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ extern const struct imx_fec_data imx25_fec_data; 
	imx_add_fec(&imx25_fec_data, pdata)



extern const struct imx_flexcan_data imx25_flexcan_data[];

#define imx25_add_flexcan(id, pdata)	\

	imx_add_flexcan(&imx25_flexcan_data[id], pdata)

#define imx25_add_flexcan0(pdata)	imx25_add_flexcan(0, pdata)

#define imx25_add_flexcan1(pdata)	imx25_add_flexcan(1, pdata)

#define imx25_add_flexcan(id)	\

	imx_add_flexcan(&imx25_flexcan_data[id])

#define imx25_add_flexcan0()		imx25_add_flexcan(0)

#define imx25_add_flexcan1()		imx25_add_flexcan(1)



extern const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data;

#define imx25_add_fsl_usb2_udc(pdata)	\

arch/arm/mach-imx/devices-imx35.h

+4 −4
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ extern const struct imx_fsl_usb2_udc_data imx35_fsl_usb2_udc_data; 
	imx_add_fsl_usb2_udc(&imx35_fsl_usb2_udc_data, pdata)



extern const struct imx_flexcan_data imx35_flexcan_data[];

#define imx35_add_flexcan(id, pdata)	\

	imx_add_flexcan(&imx35_flexcan_data[id], pdata)

#define imx35_add_flexcan0(pdata)	imx35_add_flexcan(0, pdata)

#define imx35_add_flexcan1(pdata)	imx35_add_flexcan(1, pdata)

#define imx35_add_flexcan(id)	\

	imx_add_flexcan(&imx35_flexcan_data[id])

#define imx35_add_flexcan0()		imx35_add_flexcan(0)

#define imx35_add_flexcan1()		imx35_add_flexcan(1)



extern const struct imx_imx2_wdt_data imx35_imx2_wdt_data;

#define imx35_add_imx2_wdt()       \

arch/arm/mach-imx/devices/devices-common.h

+1 −3
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ struct platform_device *__init imx_add_fec( 
		const struct imx_fec_data *data,

		const struct fec_platform_data *pdata);



#include <linux/can/platform/flexcan.h>

struct imx_flexcan_data {

	int id;

	resource_size_t iobase;
@@ -58,8 +57,7 @@ struct imx_flexcan_data { 
	resource_size_t irq;

};

struct platform_device *__init imx_add_flexcan(

		const struct imx_flexcan_data *data,

		const struct flexcan_platform_data *pdata);

		const struct imx_flexcan_data *data);



#include <linux/fsl_devices.h>

struct imx_fsl_usb2_udc_data {