[U-Boot] [PATCH 1/2] Add minimal SJA1000 header for basic CAN mode

[U-Boot] [PATCH 1/2] Add minimal SJA1000 header for basic CAN mode

[Matthias Fuchs]

This patch is in preparation for the upcoming PLU405 board fix.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
---
 include/sja1000.h |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)
 create mode 100644 include/sja1000.h

diff --git a/include/sja1000.h b/include/sja1000.h
new file mode 100644
index 0000000..59e35af
--- /dev/null
+++ b/include/sja1000.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2009, Matthias Fuchs <matthias.fuchs@esd.eu>
+ *
+ * SJA1000 register layout for basic CAN mode
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef _SJA1000_H_
+#define _SJA1000_H_
+
+/*
+ * SJA1000 register layout in basic can mode
+ */
+struct sja1000_basic_s {
+	u8 cr;
+	u8 cmr;
+	u8 sr;
+	u8 ir;
+	u8 ac;
+	u8 am;
+	u8 btr0;
+	u8 btr1;
+	u8 oc;
+	u8 txb[10];
+	u8 rxb[10];
+	u8 unused;
+	u8 cdr;
+};
+
+/* control register */
+#define CR_RR		0x01
+
+/* output control register */
+#define OC_MODE0	0x01
+#define OC_MODE1	0x02
+#define OC_POL0		0x04
+#define OC_TN0		0x08
+#define OC_TP0		0x10
+#define OC_POL1		0x20
+#define OC_TN1		0x40
+#define OC_TP1		0x80
+
+#endif
-- 
1.6.1

[U-Boot] [PATCH 1/2] Add minimal SJA1000 header for basic CAN mode

[Matthias Fuchs]

Wolfgang,

can you please apply this patch. It currently prevents Stefan
to proceed with my other 4xx patches. Alternatively this
could be done by Stefan through the 4xx repo.

Regards,
Matthias

On Monday 26 October 2009 09:55, Matthias Fuchs wrote:
> This patch is in preparation for the upcoming PLU405 board fix.
> 
> Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
> ---
>  include/sja1000.h |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 60 insertions(+), 0 deletions(-)
>  create mode 100644 include/sja1000.h
> 
> diff --git a/include/sja1000.h b/include/sja1000.h
> new file mode 100644
> index 0000000..59e35af
> --- /dev/null
> +++ b/include/sja1000.h
> @@ -0,0 +1,60 @@
> +/*
> + * Copyright 2009, Matthias Fuchs <matthias.fuchs@esd.eu>
> + *
> + * SJA1000 register layout for basic CAN mode
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +#ifndef _SJA1000_H_
> +#define _SJA1000_H_
> +
> +/*
> + * SJA1000 register layout in basic can mode
> + */
> +struct sja1000_basic_s {
> +	u8 cr;
> +	u8 cmr;
> +	u8 sr;
> +	u8 ir;
> +	u8 ac;
> +	u8 am;
> +	u8 btr0;
> +	u8 btr1;
> +	u8 oc;
> +	u8 txb[10];
> +	u8 rxb[10];
> +	u8 unused;
> +	u8 cdr;
> +};
> +
> +/* control register */
> +#define CR_RR		0x01
> +
> +/* output control register */
> +#define OC_MODE0	0x01
> +#define OC_MODE1	0x02
> +#define OC_POL0		0x04
> +#define OC_TN0		0x08
> +#define OC_TP0		0x10
> +#define OC_POL1		0x20
> +#define OC_TN1		0x40
> +#define OC_TP1		0x80
> +
> +#endif

[U-Boot] [PATCH 1/2] Add minimal SJA1000 header for basic CAN mode

[Stefan Roese]

On Monday 26 October 2009 09:55:40 Matthias Fuchs wrote:
> This patch is in preparation for the upcoming PLU405 board fix.

Applied to u-boot-ppc4xx/master. Thanks.

Cheers,
Stefan

--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de