Skip to contentSkip to conversation

sh-sci h8300 fix

PATCH In review Yoshinori Sato 2 participants 4 messages Apr 28, 2009 – May 8, 2009 SuperH

lore
Share & tools
lore

Yoshinori Sato

author maintainer
#0 lore raw

PATCH 1/1 sh-sci h8300 fix

- Dummy SCIF functions define.
- h8300 specific header include.

Signed-off-by Yoshinori Sato <[email protected]>
drivers/serial/sh-sci.c +4 -0
index dbf5357..d85b2ae 100644
@@ -53,6 +53,10 @@
 #include <asm/sh_bios.h>
 #endif
 
+#ifdef CONFIG_H8300
+#include <asm/gpio.h>
+#endif
+
 #include "sh-sci.h"
 
 struct sci_port {
drivers/serial/sh-sci.h +14 -1
index d0aa82d..a9c9e56 100644
@@ -314,6 +314,7 @@
     }									\
   }
 
+#ifndef CONFIG_H8300
 #define CPU_SCIF_FNS(name, scif_offset, scif_size)				\
   static inline unsigned int sci_##name##_in(struct uart_port *port)	\
   {									\

@@ -323,6 +324,17 @@
   {									\
     SCI_OUT(scif_size, scif_offset, value);				\
   }
+#else
+/* h8300 don't have SCIF */
+#define CPU_SCIF_FNS(name)						\
+  static inline unsigned int sci_##name##_in(struct uart_port *port)	\
+  {									\
+    return 0;								\
+  }									\
+  static inline void sci_##name##_out(struct uart_port *port, unsigned int value) \
+  {									\
+  }
+#endif
 
 #define CPU_SCI_FNS(name, sci_offset, sci_size)				\
   static inline unsigned int sci_##name##_in(struct uart_port* port)	\

@@ -360,7 +372,8 @@
 		 sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size, \
                  h8_sci_offset, h8_sci_size) \
   CPU_SCI_FNS(name, h8_sci_offset, h8_sci_size)
-#define SCIF_FNS(name, sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size)
+#define SCIF_FNS(name, sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size) \
+  CPU_SCIF_FNS(name)
 #elif defined(CONFIG_CPU_SUBTYPE_SH7723)
         #define SCIx_FNS(name, sh4_scifa_offset, sh4_scifa_size, sh4_scif_offset, sh4_scif_size) \
                 CPU_SCIx_FNS(name, sh4_scifa_offset, sh4_scifa_size, sh4_scif_offset, sh4_scif_size)
Signature · 2 lines
Yoshinori Sato
<[email protected]>
#1 lore raw
Quoted 1 line · Yoshinori Sato

- Dummy SCIF functions define.

Why? The generic ones should work fine for you.

Quoted 2 lines

- h8300 specific header include.

I guess this one we have to live with. Do you have any plans to convert the H8300 GPIO API to GENERIC_GPIO?

Also, I note that h8300 does not register an sh-sci platform driver anywhere. How exactly are you using this driver?

author maintainer
#2 lore raw
In reply to Yoshinori Sato

At Tue, 28 Apr 2009 15:46:22 +0900,

Quoted 5 lines · Paul Mundt
Quoted 1 line · Yoshinori Sato

- Dummy SCIF functions define.

Why? The generic ones should work fine for you.

SCI don't have SCFCR, SCFDR and SCLSR register.
So use dummy r/w functions.

Quoted 5 lines
Quoted 3 lines

- h8300 specific header include.

I guess this one we have to live with. Do you have any plans to convert the H8300 GPIO API to GENERIC_GPIO?

Yes.
But not working now.

Quoted 2 lines

Also, I note that h8300 does not register an sh-sci platform driver anywhere. How exactly are you using this driver?

It's already fixed.

Signature · 2 lines
Yoshinori Sato
<[email protected]>
#3 lore raw
In reply to Yoshinori Sato
Quoted 18 lines · Yoshinori Sato

At Tue, 28 Apr 2009 15:46:22 +0900,

Quoted 5 lines · Paul Mundt
Quoted 1 line · Yoshinori Sato

- Dummy SCIF functions define.

Why? The generic ones should work fine for you.

SCI don't have SCFCR, SCFDR and SCLSR register.
So use dummy r/w functions.

Quoted 5 lines
Quoted 3 lines

- h8300 specific header include.

I guess this one we have to live with. Do you have any plans to convert the H8300 GPIO API to GENERIC_GPIO?

Quoted 8 lines

Yes.
But not working now.

Quoted 2 lines

Also, I note that h8300 does not register an sh-sci platform driver anywhere. How exactly are you using this driver?

It's already fixed.

Ok, applied.

I would also like to get rid of the HAVE_CLK ifdefs within the driver and simply depend on the clock framework outright. It would be nice if h8300 could implement a trivial clock framework implementation to feed sh-sci the uart clock definitions, then we can clean up a lot of the current mess..