linux.git/drivers/net/can/flexcan.c, branch v3.7

can: flexcan: disable bus error interrupts for the i.MX6q

2012-10-23T16:43:17+00:00

This patch adds some Flexcan version info and removes the feature flag
FLEXCAN_HAS_BROKEN_ERR_STATE for the i.MX6Q. It also has the line [TR]WRN_INT
properly connected.

Cc: Hui Wang 
Cc: Shawn Guo 
Signed-off-by: Wolfgang Grandegger 
[mkl: convert to incremental patch]
Signed-off-by: Marc Kleine-Budde

flexcan: disable bus error interrupts for the i.MX28

2012-10-01T21:18:21+00:00

Due to a bug in most Flexcan cores, the bus error interrupt needs
to be enabled. Otherwise we don't get any error warning or passive
interrupts. This is _not_ necessary for the i.MX28 and this patch
disables bus error interrupts if "berr-reporting" is not requested.
This avoids bus error flooding, which might harm, especially on
low-end systems.

To handle such quirks of the Flexcan cores, a hardware feature flag
has been introduced, also replacing the "hw_ver" variable. So far
nobody could tell what Flexcan core version is available on what
Freescale SOC, apart from the i.MX6Q and P1010, and which bugs or
features are present on the various "hw_rev".

CC: Hui Wang 
CC: Shawn Guo 
Signed-off-by: Wolfgang Grandegger 
Signed-off-by: David S. Miller

can: flexcan: add 2nd clock to support imx53 and newer

2012-07-20T10:31:05+00:00

This patch adds support for a second clock to the flexcan driver. On
modern freescale ARM cores like the imx53 and imx6q two clocks ("ipg"
and "per") must be enabled in order to access the CAN core.

In the original driver, the clock was requested without specifying the
connection id, further all mainline ARM archs with flexcan support
(imx28, imx25, imx35) register their flexcan clock without a
connection id, too.

This patch first renames the existing clk variable to clk_ipg and
converts it to devm for easier error handling. The connection id "ipg"
is added to the devm_clk_get() call. Then a second clock "per" is
requested. As all archs don't specify a connection id, both clk_get
return the same clock. This ensures compatibility to existing flexcan
support and adds support for imx53 at the same time.

After this patch hits mainline, the archs may give their existing
flexcan clock the "ipg" connection id and implement a dummy "per"
clock.

This patch has been tested on imx28 (unmodified clk tree) and on imx53
with a seperate "ipg" and "per" clock.

Cc: Sascha Hauer 
Cc: Shawn Guo 
Signed-off-by: Steffen Trumtrar 
Acked-by: Hui Wang 
Signed-off-by: Marc Kleine-Budde

can: mark bittiming_const pointer in struct can_priv as const

2012-07-20T10:31:05+00:00

This patch marks the bittiming_const pointer as in the struct can_pric as
"const". This allows us to mark the struct can_bittiming_const in the CAN
drivers as "const", too.

Signed-off-by: Marc Kleine-Budde

can: flexcan: make flexcan_priv.devtype_data member point to const data

2012-07-17T07:35:58+00:00

Acked-by: Uwe Kleine-König 
Signed-off-by: Marc Kleine-Budde

can: flexcan: add hardware controller version support

2012-07-03T07:33:00+00:00

At least in the i.MX series, the flexcan contrller divides into ver_3
and ver_10, current driver is for ver_3 controller.

i.MX6 has ver_10 controller, it has more reigsters than ver_3 has.
The rxfgmask (Rx FIFO Global Mask) register is one of the new added.
Its reset value is 0xffffffff, this means ID Filter Table must be
checked when receive a packet, but the driver is designed to accept
everything during the chip start, we need to clear this register to
follow this design.

Use the data entry of the struct of_device_id to point chip specific
info, we can set hardware version for each platform.

Cc: linux-can@vger.kernel.org
Cc: Marc Kleine-Budde 
Cc: Wolfgang Grandegger 
Cc: Shawn Guo 
Signed-off-by: Hui Wang 
[mkl: add id_table support]
Tested-by: Hui Wang 
Signed-off-by: Marc Kleine-Budde

can: flexcan: use of_property_read_u32 to get DT entry value

2012-07-02T09:08:37+00:00

of_property_read_u32() can auto handle endian problems, use this
function can make code clean and simple.

No need to check return value here since the following got value
check will handle this.

Cc: linux-can@vger.kernel.org
Cc: Marc Kleine-Budde 
Cc: Wolfgang Grandegger 
Cc: Shawn Guo 
Signed-off-by: Hui Wang 
Signed-off-by: Marc Kleine-Budde

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-06-29T00:37:00+00:00

Conflicts:
	drivers/net/caif/caif_hsi.c
	drivers/net/usb/qmi_wwan.c

The qmi_wwan merge was trivial.

The caif_hsi.c, on the other hand, was not.  It's a conflict between
1c385f1fdf6f9c66d982802cd74349c040980b50 ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19cd0a30be93794aa4773c779c3eb1f3 ("caif-hsi: Postpone init of
HIS until open()") in the net tree.

I did my best with that one and will ask Sjur to check it out.

Signed-off-by: David S. Miller

can: flexcan: use be32_to_cpup to handle the value of dt entry

2012-06-27T09:12:07+00:00

The freescale arm i.MX series platform can support this driver, and
usually the arm cpu works in the little endian mode by default, while
device tree entry value is stored in big endian format, we should use
be32_to_cpup() to handle them, after modification, it can work well
both on the le cpu and be cpu.

Cc: stable  # v3.2+
Cc: Shawn Guo 
Signed-off-by: Hui Wang 
Signed-off-by: Marc Kleine-Budde

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

2012-06-06T18:13:26+00:00