Skip to contentSkip to conversation

ep93xx: Fix type error warnings in ts72xx build

PATCH New Ryan Mallon 2 participants 4 messages Sep 13, 2012 – Sep 14, 2012

Subsystems (4)
Arm (32-bit) Arm sub-architectures Arm/Cirrus logic EP93XX Arm architecture Arm/Cirrus logic BK3 machine support
lore
Share & tools
lore

Ryan Mallon

author
#0 lore raw

PATCH 1/2 ep93xx: Fix type error warnings in ts72xx build

Add IOMEM defines for the TS72xx VIRT_BASE defines to fix type conversion warnings.

Signed-off-by Ryan Mallon <[email protected]>
---
 arch/arm/mach-ep93xx/include/mach/ts72xx.h |   20 ++++++++++++++++----
 arch/arm/mach-ep93xx/ts72xx.c              |    8 ++++----
 2 files changed, 20 insertions(+), 8 deletions(-)
arch/arm/mach-ep93xx/include/mach/ts72xx.h +16 -4
index f1397a1..b30deb6 100644
@@ -2,6 +2,11 @@
  * arch/arm/mach-ep93xx/include/mach/ts72xx.h
  */
 
+#ifndef _TS72XX_H
+#define _TS72XX_H
+
+#include <asm/io.h>
+
 /*
  * TS72xx memory map:
  *

@@ -15,6 +20,7 @@
 
 #define TS72XX_MODEL_PHYS_BASE		0x22000000
 #define TS72XX_MODEL_VIRT_BASE		0xfebff000
+#define TS72XX_MODEL_VIRT_BASE_IOMEM	IOMEM(TS72XX_MODEL_VIRT_BASE)
 #define TS72XX_MODEL_SIZE		0x00001000
 
 #define TS72XX_MODEL_TS7200		0x00

@@ -27,6 +33,7 @@
 
 #define TS72XX_OPTIONS_PHYS_BASE	0x22400000
 #define TS72XX_OPTIONS_VIRT_BASE	0xfebfe000
+#define TS72XX_OPTIONS_VIRT_BASE_IOMEM	IOMEM(TS72XX_OPTIONS_VIRT_BASE)
 #define TS72XX_OPTIONS_SIZE		0x00001000
 
 #define TS72XX_OPTIONS_COM2_RS485	0x02

@@ -35,6 +42,7 @@
 
 #define TS72XX_OPTIONS2_PHYS_BASE	0x22800000
 #define TS72XX_OPTIONS2_VIRT_BASE	0xfebfd000
+#define TS72XX_OPTIONS2_VIRT_BASE_IOMEM	IOMEM(TS72XX_OPTIONS2_VIRT_BASE)
 #define TS72XX_OPTIONS2_SIZE		0x00001000
 
 #define TS72XX_OPTIONS2_TS9420		0x04

@@ -42,10 +50,12 @@
 
 
 #define TS72XX_RTC_INDEX_VIRT_BASE	0xfebf9000
+#define TS72XX_RTC_INDEX_VIRT_BASE_IOMEM IOMEM(TS72XX_RTC_INDEX_VIRT_BASE)
 #define TS72XX_RTC_INDEX_PHYS_BASE	0x10800000
 #define TS72XX_RTC_INDEX_SIZE		0x00001000
 
 #define TS72XX_RTC_DATA_VIRT_BASE	0xfebf8000
+#define TS72XX_RTC_DATA_VIRT_BASE_IOMEM	IOMEM(TS72XX_RTC_DATA_VIRT_BASE)
 #define TS72XX_RTC_DATA_PHYS_BASE	0x11700000
 #define TS72XX_RTC_DATA_SIZE		0x00001000
 

@@ -56,7 +66,7 @@
 
 static inline int ts72xx_model(void)
 {
-	return __raw_readb(TS72XX_MODEL_VIRT_BASE) & TS72XX_MODEL_MASK;
+	return __raw_readb(TS72XX_MODEL_VIRT_BASE_IOMEM) & TS72XX_MODEL_MASK;
 }
 
 static inline int board_is_ts7200(void)

@@ -86,13 +96,15 @@ static inline int board_is_ts7400(void)
 
 static inline int is_max197_installed(void)
 {
-	return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE) &
+	return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE_IOMEM) &
 					TS72XX_OPTIONS_MAX197);
 }
 
 static inline int is_ts9420_installed(void)
 {
-	return !!(__raw_readb(TS72XX_OPTIONS2_VIRT_BASE) &
+	return !!(__raw_readb(TS72XX_OPTIONS2_VIRT_BASE_IOMEM) &
 					TS72XX_OPTIONS2_TS9420);
 }
-#endif
+#endif /* __ASSEMBLY__ */
+
+#endif /* _TS72XX_H */
arch/arm/mach-ep93xx/ts72xx.c +4 -4
index 75cab2d..aefda11 100644
@@ -183,14 +183,14 @@ static void __init ts72xx_register_flash(void)
 
 static unsigned char ts72xx_rtc_readbyte(unsigned long addr)
 {
-	__raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE);
-	return __raw_readb(TS72XX_RTC_DATA_VIRT_BASE);
+	__raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE_IOMEM);
+	return __raw_readb(TS72XX_RTC_DATA_VIRT_BASE_IOMEM);
 }
 
 static void ts72xx_rtc_writebyte(unsigned char value, unsigned long addr)
 {
-	__raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE);
-	__raw_writeb(value, TS72XX_RTC_DATA_VIRT_BASE);
+	__raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE_IOMEM);
+	__raw_writeb(value, TS72XX_RTC_DATA_VIRT_BASE_IOMEM);
 }
 
 static struct m48t86_ops ts72xx_rtc_ops = {
Signature · 1 line
1.7.9.7
author
#1 lore raw

PATCH 2/2 ep93xx: Move ts72xx.h out of include/mach

The ts72xx.h header is only included by arch/arm/mach-ep93xx/ts72xx.c. It therefore does not need to be in the globally exported include/mach directory. Move it to to arch/arm/mach-ep93xx.

Signed-off-by Ryan Mallon <[email protected]>
---
 arch/arm/mach-ep93xx/include/mach/ts72xx.h |  110 ----------------------------
 arch/arm/mach-ep93xx/ts72xx.c              |    2 +-
 arch/arm/mach-ep93xx/ts72xx.h              |  110 ++++++++++++++++++++++++++++
 3 files changed, 111 insertions(+), 111 deletions(-)
 delete mode 100644 arch/arm/mach-ep93xx/include/mach/ts72xx.h
 create mode 100644 arch/arm/mach-ep93xx/ts72xx.h
arch/arm/mach-ep93xx/include/mach/ts72xx.h deleted +0 -110
deleted file mode 100644
index b30deb6..0000000
@@ -1,110 +0,0 @@
-/*
- * arch/arm/mach-ep93xx/include/mach/ts72xx.h
- */
-
-#ifndef _TS72XX_H
-#define _TS72XX_H
-
-#include <asm/io.h>
-
-/*
- * TS72xx memory map:
- *
- * virt		phys		size
- * febff000	22000000	4K	model number register (bits 0-2)
- * febfe000	22400000	4K	options register
- * febfd000	22800000	4K	options register #2
- * febf9000	10800000	4K	TS-5620 RTC index register
- * febf8000	11700000	4K	TS-5620 RTC data register
- */
-
-#define TS72XX_MODEL_PHYS_BASE		0x22000000
-#define TS72XX_MODEL_VIRT_BASE		0xfebff000
-#define TS72XX_MODEL_VIRT_BASE_IOMEM	IOMEM(TS72XX_MODEL_VIRT_BASE)
-#define TS72XX_MODEL_SIZE		0x00001000
-
-#define TS72XX_MODEL_TS7200		0x00
-#define TS72XX_MODEL_TS7250		0x01
-#define TS72XX_MODEL_TS7260		0x02
-#define TS72XX_MODEL_TS7300		0x03
-#define TS72XX_MODEL_TS7400		0x04
-#define TS72XX_MODEL_MASK		0x07
-
-
-#define TS72XX_OPTIONS_PHYS_BASE	0x22400000
-#define TS72XX_OPTIONS_VIRT_BASE	0xfebfe000
-#define TS72XX_OPTIONS_VIRT_BASE_IOMEM	IOMEM(TS72XX_OPTIONS_VIRT_BASE)
-#define TS72XX_OPTIONS_SIZE		0x00001000
-
-#define TS72XX_OPTIONS_COM2_RS485	0x02
-#define TS72XX_OPTIONS_MAX197		0x01
-
-
-#define TS72XX_OPTIONS2_PHYS_BASE	0x22800000
-#define TS72XX_OPTIONS2_VIRT_BASE	0xfebfd000
-#define TS72XX_OPTIONS2_VIRT_BASE_IOMEM	IOMEM(TS72XX_OPTIONS2_VIRT_BASE)
-#define TS72XX_OPTIONS2_SIZE		0x00001000
-
-#define TS72XX_OPTIONS2_TS9420		0x04
-#define TS72XX_OPTIONS2_TS9420_BOOT	0x02
-
-
-#define TS72XX_RTC_INDEX_VIRT_BASE	0xfebf9000
-#define TS72XX_RTC_INDEX_VIRT_BASE_IOMEM IOMEM(TS72XX_RTC_INDEX_VIRT_BASE)
-#define TS72XX_RTC_INDEX_PHYS_BASE	0x10800000
-#define TS72XX_RTC_INDEX_SIZE		0x00001000
-
-#define TS72XX_RTC_DATA_VIRT_BASE	0xfebf8000
-#define TS72XX_RTC_DATA_VIRT_BASE_IOMEM	IOMEM(TS72XX_RTC_DATA_VIRT_BASE)
-#define TS72XX_RTC_DATA_PHYS_BASE	0x11700000
-#define TS72XX_RTC_DATA_SIZE		0x00001000
-
-#define TS72XX_WDT_CONTROL_PHYS_BASE	0x23800000
-#define TS72XX_WDT_FEED_PHYS_BASE	0x23c00000
-
-#ifndef __ASSEMBLY__
-
-static inline int ts72xx_model(void)
-{
-	return __raw_readb(TS72XX_MODEL_VIRT_BASE_IOMEM) & TS72XX_MODEL_MASK;
-}
-
-static inline int board_is_ts7200(void)
-{
-	return ts72xx_model() == TS72XX_MODEL_TS7200;
-}
-
-static inline int board_is_ts7250(void)
-{
-	return ts72xx_model() == TS72XX_MODEL_TS7250;
-}
-
-static inline int board_is_ts7260(void)
-{
-	return ts72xx_model() == TS72XX_MODEL_TS7260;
-}
-
-static inline int board_is_ts7300(void)
-{
-	return ts72xx_model()  == TS72XX_MODEL_TS7300;
-}
-
-static inline int board_is_ts7400(void)
-{
-	return ts72xx_model() == TS72XX_MODEL_TS7400;
-}
-
-static inline int is_max197_installed(void)
-{
-	return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE_IOMEM) &
-					TS72XX_OPTIONS_MAX197);
-}
-
-static inline int is_ts9420_installed(void)
-{
-	return !!(__raw_readb(TS72XX_OPTIONS2_VIRT_BASE_IOMEM) &
-					TS72XX_OPTIONS2_TS9420);
-}
-#endif /* __ASSEMBLY__ */
-
-#endif /* _TS72XX_H */
arch/arm/mach-ep93xx/ts72xx.c +1 -1
index aefda11..b363dd8 100644
@@ -21,13 +21,13 @@
 #include <linux/mtd/partitions.h>
 
 #include <mach/hardware.h>
-#include <mach/ts72xx.h>
 
 #include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
 
+#include "ts72xx.h"
 #include "soc.h"
 
 static struct map_desc ts72xx_io_desc[] __initdata = {
arch/arm/mach-ep93xx/ts72xx.h new file +110 -0

110 lines not on this page · raw message

Signature · 1 line
1.7.9.7