[PATCH 0/5] prepare for release + add more clocks to can-calc-bit-timing

[PATCH 0/5] prepare for release + add more clocks to can-calc-bit-timing

[Marc Kleine-Budde]

Hello,

this patch series prepares configure.ac for a release (adjusting bug report
address  + enabling silent rules in autoools). Then some more refclocks for
flexcan and mscan are added and support for ti_hecc to can-calc-bit-timing.

regards,
Marc

[PATCH 1/5] configure: adjust bug report address

[Marc Kleine-Budde]

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 3ec20fb..dec8c8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
 
-AC_INIT([can-utils], [trunk], [socketcan-core@lists.berlios.de])
+AC_INIT([can-utils], [trunk], [linux-can@vger.kernel.org])
 AC_CONFIG_SRCDIR([lib.c])
 AC_CONFIG_MACRO_DIR([config/m4])
 AC_CONFIG_AUX_DIR([config/autoconf])
-- 
1.7.10.4

[PATCH 2/5] configure: enable silent rules if available

[Marc Kleine-Budde]

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index dec8c8d..0a24e1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_PROG_LIBTOOL
 # LT_INIT(win32-dll)
 
 AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2])
-
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes]]))
 
 #
 # Checks for header files.
-- 
1.7.10.4

[PATCH 3/5] can-calc-bit-timing: add 24 and 66 MHz flexcan ref clock

[Marc Kleine-Budde]

as found on some imx boards.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 can-calc-bit-timing.c |   28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/can-calc-bit-timing.c b/can-calc-bit-timing.c
index c5c66b0..f49ba09 100644
--- a/can-calc-bit-timing.c
+++ b/can-calc-bit-timing.c
@@ -310,6 +310,20 @@ static struct can_bittiming_const can_calc_consts[] = {
 		.brp_max = 256,
 		.brp_inc = 1,
 
+		.ref_clk = 24000000,	/* mx28 */
+		.printf_btr = printf_btr_flexcan,
+	},
+	{
+		.name = "flexcan",
+		.tseg1_min = 4,
+		.tseg1_max = 16,
+		.tseg2_min = 2,
+		.tseg2_max = 8,
+		.sjw_max = 4,
+		.brp_min = 1,
+		.brp_max = 256,
+		.brp_inc = 1,
+
 		.ref_clk = 49875000,
 		.printf_btr = printf_btr_flexcan,
 	},
@@ -324,6 +338,20 @@ static struct can_bittiming_const can_calc_consts[] = {
 		.brp_max = 256,
 		.brp_inc = 1,
 
+		.ref_clk = 66000000,
+		.printf_btr = printf_btr_flexcan,
+	},
+	{
+		.name = "flexcan",
+		.tseg1_min = 4,
+		.tseg1_max = 16,
+		.tseg2_min = 2,
+		.tseg2_max = 8,
+		.sjw_max = 4,
+		.brp_min = 1,
+		.brp_max = 256,
+		.brp_inc = 1,
+
 		.ref_clk = 66500000,
 		.printf_btr = printf_btr_flexcan,
 	},
-- 
1.7.10.4

[PATCH 4/5] can-calc-bit-timing: add 66.66 MHz mscan refclock

[Marc Kleine-Budde]

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 can-calc-bit-timing.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/can-calc-bit-timing.c b/can-calc-bit-timing.c
index f49ba09..d97ebe6 100644
--- a/can-calc-bit-timing.c
+++ b/can-calc-bit-timing.c
@@ -271,6 +271,20 @@ static struct can_bittiming_const can_calc_consts[] = {
 		.printf_btr = printf_btr_sja1000,
 	},
 	{
+		.name = "mscan",
+		.tseg1_min = 4,
+		.tseg1_max = 16,
+		.tseg2_min = 2,
+		.tseg2_max = 8,
+		.sjw_max = 4,
+		.brp_min = 1,
+		.brp_max = 64,
+		.brp_inc = 1,
+
+		.ref_clk = 66660000,	/* mpc5121 */
+		.printf_btr = printf_btr_sja1000,
+	},
+	{
 		.name = "at91",
 		.tseg1_min = 4,
 		.tseg1_max = 16,
-- 
1.7.10.4

[PATCH 5/5] can-calc-bit-timing: add support for ti_hecc

[Marc Kleine-Budde]

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 can-calc-bit-timing.c |   31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/can-calc-bit-timing.c b/can-calc-bit-timing.c
index d97ebe6..a9fb992 100644
--- a/can-calc-bit-timing.c
+++ b/can-calc-bit-timing.c
@@ -199,6 +199,23 @@ static void printf_btr_mcp251x(struct can_bittiming *bt, int hdr)
 	}
 }
 
+static void printf_btr_ti_hecc(struct can_bittiming *bt, int hdr)
+{
+	if (hdr) {
+		printf("%10s", "CANBTC");
+	} else {
+		uint32_t can_btc;
+
+		can_btc = (bt->phase_seg2 - 1) & 0x7;
+		can_btc |= ((bt->phase_seg1 + bt->prop_seg - 1)
+			    & 0xF) << 3;
+		can_btc |= ((bt->sjw - 1) & 0x3) << 8;
+		can_btc |= ((bt->brp - 1) & 0xFF) << 16;
+
+		printf("0x%08x", can_btc);
+	}
+}
+
 static struct can_bittiming_const can_calc_consts[] = {
 	{
 		.name = "sja1000",
@@ -397,6 +414,20 @@ static struct can_bittiming_const can_calc_consts[] = {
 		.ref_clk = 16000000,
 		.printf_btr = printf_btr_mcp251x,
 	},
+	{
+		.name = "ti_hecc",
+		.tseg1_min = 1,
+		.tseg1_max = 16,
+		.tseg2_min = 1,
+		.tseg2_max = 8,
+		.sjw_max = 4,
+		.brp_min = 1,
+		.brp_max = 256,
+		.brp_inc = 1,
+
+		.ref_clk = 13000000,
+		.printf_btr = printf_btr_ti_hecc,
+	}
 };
 
 static long common_bitrates[] = {
-- 
1.7.10.4

Re: [PATCH 0/5] prepare for release + add more clocks to can-calc-bit-timing

[Oliver Hartkopp]

On 26.11.2012 21:44, Marc Kleine-Budde wrote:

> this patch series prepares configure.ac for a release (adjusting bug report
> address  + enabling silent rules in autoools). Then some more refclocks for
> flexcan and mscan are added and support for ti_hecc to can-calc-bit-timing.


Hello Marc,

that's fine to me.

I also pushed the slcanpty fix from Ulrich with an appropriate commit message.

Thanks,
Oliver

Re: [PATCH 0/5] prepare for release + add more clocks to can-calc-bit-timing

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 797 bytes --]

On 11/26/2012 09:54 PM, Oliver Hartkopp wrote:
> On 26.11.2012 21:44, Marc Kleine-Budde wrote:
> 
>> this patch series prepares configure.ac for a release (adjusting bug report
>> address  + enabling silent rules in autoools). Then some more refclocks for
>> flexcan and mscan are added and support for ti_hecc to can-calc-bit-timing.
> 
> 
> Hello Marc,
> 
> that's fine to me.
> 
> I also pushed the slcanpty fix from Ulrich with an appropriate commit message.
I'll add your Acked-by then

Thanks,
Marc
-- 
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 261 bytes --]

Re: [PATCH 0/5] prepare for release + add more clocks to can-calc-bit-timing

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 857 bytes --]

On 11/26/2012 09:56 PM, Marc Kleine-Budde wrote:
> On 11/26/2012 09:54 PM, Oliver Hartkopp wrote:
>> On 26.11.2012 21:44, Marc Kleine-Budde wrote:
>>
>>> this patch series prepares configure.ac for a release (adjusting bug report
>>> address  + enabling silent rules in autoools). Then some more refclocks for
>>> flexcan and mscan are added and support for ti_hecc to can-calc-bit-timing.
>>
>>
>> Hello Marc,
>>
>> that's fine to me.
>>
>> I also pushed the slcanpty fix from Ulrich with an appropriate commit message.
> I'll add your Acked-by then
done

Marc

-- 
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 261 bytes --]

Re: [PATCH 0/5] prepare for release + add more clocks to can-calc-bit-timing

[uescher]

Am 26.11.2012 21:54, schrieb Oliver Hartkopp:
> I also pushed the slcanpty fix from Ulrich with an appropriate commit message.
Thanks, your comment is complete correct.