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

Commit 112d59c7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-next-for-4.16-20171201' of... 

Merge tag 'linux-can-next-for-4.16-20171201' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next



Marc Kleine-Budde says:

====================
pull-request: can-next 2017-12-01

this is a pull request of 10 patches for net-next/master.

The first two patches are by Arnd Bergmann, they convert the peak_usb
from using "struct timeval" to "ktime_t". The error handling in the
vxcan driver is clean up by Markus Elfring's patch. Bhumika Goyal
contributes a patch for the c_can_pci driver to make the pci data const.
The six patches by Pankaj Bansal for the flexcan driver add LS1021A
support by making the endianness of the driver configurable by the
device tree.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d671965b fa2edcfb

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

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ Optional properties: 


- xceiver-supply: Regulator that powers the CAN transceiver



- big-endian: This means the registers of FlexCAN controller are big endian.

              This is optional property.i.e. if this property is not present in

              device tree node then controller is assumed to be little endian.

              if this property is present then controller is assumed to be big

              endian.



Example:



	can@1c000 {

arch/arm/boot/dts/imx25.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ 
			};



			can1: can@43f88000 {

				compatible = "fsl,imx25-flexcan", "fsl,p1010-flexcan";

				compatible = "fsl,imx25-flexcan";

				reg = <0x43f88000 0x4000>;

				interrupts = <43>;

				clocks = <&clks 75>, <&clks 75>;
@@ -131,7 +131,7 @@ 
			};



			can2: can@43f8c000 {

				compatible = "fsl,imx25-flexcan", "fsl,p1010-flexcan";

				compatible = "fsl,imx25-flexcan";

				reg = <0x43f8c000 0x4000>;

				interrupts = <44>;

				clocks = <&clks 76>, <&clks 76>;

arch/arm/boot/dts/imx28.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1038,7 +1038,7 @@ 
			};



			can0: can@80032000 {

				compatible = "fsl,imx28-flexcan", "fsl,p1010-flexcan";

				compatible = "fsl,imx28-flexcan";

				reg = <0x80032000 0x2000>;

				interrupts = <8>;

				clocks = <&clks 58>, <&clks 58>;
@@ -1047,7 +1047,7 @@ 
			};



			can1: can@80034000 {

				compatible = "fsl,imx28-flexcan", "fsl,p1010-flexcan";

				compatible = "fsl,imx28-flexcan";

				reg = <0x80034000 0x2000>;

				interrupts = <9>;

				clocks = <&clks 59>, <&clks 59>;

arch/arm/boot/dts/imx35.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ 
			};



			can1: can@53fe4000 {

				compatible = "fsl,imx35-flexcan", "fsl,p1010-flexcan";

				compatible = "fsl,imx35-flexcan";

				reg = <0x53fe4000 0x1000>;

				clocks = <&clks 33>, <&clks 33>;

				clock-names = "ipg", "per";
@@ -312,7 +312,7 @@ 
			};



			can2: can@53fe8000 {

				compatible = "fsl,imx35-flexcan", "fsl,p1010-flexcan";

				compatible = "fsl,imx35-flexcan";

				reg = <0x53fe8000 0x1000>;

				clocks = <&clks 34>, <&clks 34>;

				clock-names = "ipg", "per";

arch/arm/boot/dts/imx53.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ 
			};



			can1: can@53fc8000 {

				compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan";

				compatible = "fsl,imx53-flexcan";

				reg = <0x53fc8000 0x4000>;

				interrupts = <82>;

				clocks = <&clks IMX5_CLK_CAN1_IPG_GATE>,
@@ -555,7 +555,7 @@ 
			};



			can2: can@53fcc000 {

				compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan";

				compatible = "fsl,imx53-flexcan";

				reg = <0x53fcc000 0x4000>;

				interrupts = <83>;

				clocks = <&clks IMX5_CLK_CAN2_IPG_GATE>,