aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/sparc/include/asm/byteorder.h22
-rw-r--r--arch/sparc/kernel/time.c27
-rw-r--r--arch/sparc64/kernel/time.c34
-rw-r--r--arch/sparc64/lib/PeeCeeI.c139
-rw-r--r--drivers/rtc/rtc-m48t59.c34
-rw-r--r--sound/sparc/dbri.c2
6 files changed, 97 insertions, 161 deletions
diff --git a/arch/sparc/include/asm/byteorder.h b/arch/sparc/include/asm/byteorder.h
index bcd83aa351c5..5a70f137f1f7 100644
--- a/arch/sparc/include/asm/byteorder.h
+++ b/arch/sparc/include/asm/byteorder.h
@@ -4,15 +4,14 @@
4#include <asm/types.h> 4#include <asm/types.h>
5#include <asm/asi.h> 5#include <asm/asi.h>
6 6
7#ifdef __GNUC__ 7#define __BIG_ENDIAN
8 8
9#ifdef CONFIG_SPARC32 9#ifdef CONFIG_SPARC32
10#define __SWAB_64_THRU_32__ 10#define __SWAB_64_THRU_32__
11#endif 11#endif
12 12
13#ifdef CONFIG_SPARC64 13#ifdef CONFIG_SPARC64
14 14static inline __u16 __arch_swab16p(const __u16 *addr)
15static inline __u16 ___arch__swab16p(const __u16 *addr)
16{ 15{
17 __u16 ret; 16 __u16 ret;
18 17
@@ -21,8 +20,9 @@ static inline __u16 ___arch__swab16p(const __u16 *addr)
21 : "r" (addr), "i" (ASI_PL)); 20 : "r" (addr), "i" (ASI_PL));
22 return ret; 21 return ret;
23} 22}
23#define __arch_swab16p __arch_swab16p
24 24
25static inline __u32 ___arch__swab32p(const __u32 *addr) 25static inline __u32 __arch_swab32p(const __u32 *addr)
26{ 26{
27 __u32 ret; 27 __u32 ret;
28 28
@@ -31,8 +31,9 @@ static inline __u32 ___arch__swab32p(const __u32 *addr)
31 : "r" (addr), "i" (ASI_PL)); 31 : "r" (addr), "i" (ASI_PL));
32 return ret; 32 return ret;
33} 33}
34#define __arch_swab32p __arch_swab32p
34 35
35static inline __u64 ___arch__swab64p(const __u64 *addr) 36static inline __u64 __arch_swab64p(const __u64 *addr)
36{ 37{
37 __u64 ret; 38 __u64 ret;
38 39
@@ -41,17 +42,10 @@ static inline __u64 ___arch__swab64p(const __u64 *addr)
41 : "r" (addr), "i" (ASI_PL)); 42 : "r" (addr), "i" (ASI_PL));
42 return ret; 43 return ret;
43} 44}
44 45#define __arch_swab64p __arch_swab64p
45#define __arch__swab16p(x) ___arch__swab16p(x)
46#define __arch__swab32p(x) ___arch__swab32p(x)
47#define __arch__swab64p(x) ___arch__swab64p(x)
48 46
49#endif /* CONFIG_SPARC64 */ 47#endif /* CONFIG_SPARC64 */
50 48
51#define __BYTEORDER_HAS_U64__ 49#include <linux/byteorder.h>
52
53#endif
54
55#include <linux/byteorder/big_endian.h>
56 50
57#endif /* _SPARC_BYTEORDER_H */ 51#endif /* _SPARC_BYTEORDER_H */
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c
index 62c1d94cb434..00f7383c7657 100644
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@@ -119,35 +119,16 @@ static unsigned char mostek_read_byte(struct device *dev, u32 ofs)
119{ 119{
120 struct platform_device *pdev = to_platform_device(dev); 120 struct platform_device *pdev = to_platform_device(dev);
121 struct m48t59_plat_data *pdata = pdev->dev.platform_data; 121 struct m48t59_plat_data *pdata = pdev->dev.platform_data;
122 void __iomem *regs = pdata->ioaddr; 122
123 unsigned char val = readb(regs + ofs); 123 return readb(pdata->ioaddr + ofs);
124
125 /* the year 0 is 1968 */
126 if (ofs == pdata->offset + M48T59_YEAR) {
127 val += 0x68;
128 if ((val & 0xf) > 9)
129 val += 6;
130 }
131 return val;
132} 124}
133 125
134static void mostek_write_byte(struct device *dev, u32 ofs, u8 val) 126static void mostek_write_byte(struct device *dev, u32 ofs, u8 val)
135{ 127{
136 struct platform_device *pdev = to_platform_device(dev); 128 struct platform_device *pdev = to_platform_device(dev);
137 struct m48t59_plat_data *pdata = pdev->dev.platform_data; 129 struct m48t59_plat_data *pdata = pdev->dev.platform_data;
138 void __iomem *regs = pdata->ioaddr; 130
139 131 writeb(val, pdata->ioaddr + ofs);
140 if (ofs == pdata->offset + M48T59_YEAR) {
141 if (val < 0x68)
142 val += 0x32;
143 else
144 val -= 0x68;
145 if ((val & 0xf) > 9)
146 val += 6;
147 if ((val & 0xf0) > 0x9A)
148 val += 0x60;
149 }
150 writeb(val, regs + ofs);
151} 132}
152 133
153static struct m48t59_plat_data m48t59_data = { 134static struct m48t59_plat_data m48t59_data = {
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index 80d71a5ce1e3..141da3759091 100644
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -490,6 +490,7 @@ static struct of_device_id __initdata bq4802_match[] = {
490 .name = "rtc", 490 .name = "rtc",
491 .compatible = "bq4802", 491 .compatible = "bq4802",
492 }, 492 },
493 {},
493}; 494};
494 495
495static struct of_platform_driver bq4802_driver = { 496static struct of_platform_driver bq4802_driver = {
@@ -503,39 +504,16 @@ static struct of_platform_driver bq4802_driver = {
503static unsigned char mostek_read_byte(struct device *dev, u32 ofs) 504static unsigned char mostek_read_byte(struct device *dev, u32 ofs)
504{ 505{
505 struct platform_device *pdev = to_platform_device(dev); 506 struct platform_device *pdev = to_platform_device(dev);
506 struct m48t59_plat_data *pdata = pdev->dev.platform_data; 507 void __iomem *regs = (void __iomem *) pdev->resource[0].start;
507 void __iomem *regs; 508
508 unsigned char val; 509 return readb(regs + ofs);
509
510 regs = (void __iomem *) pdev->resource[0].start;
511 val = readb(regs + ofs);
512
513 /* the year 0 is 1968 */
514 if (ofs == pdata->offset + M48T59_YEAR) {
515 val += 0x68;
516 if ((val & 0xf) > 9)
517 val += 6;
518 }
519 return val;
520} 510}
521 511
522static void mostek_write_byte(struct device *dev, u32 ofs, u8 val) 512static void mostek_write_byte(struct device *dev, u32 ofs, u8 val)
523{ 513{
524 struct platform_device *pdev = to_platform_device(dev); 514 struct platform_device *pdev = to_platform_device(dev);
525 struct m48t59_plat_data *pdata = pdev->dev.platform_data; 515 void __iomem *regs = (void __iomem *) pdev->resource[0].start;
526 void __iomem *regs; 516
527
528 regs = (void __iomem *) pdev->resource[0].start;
529 if (ofs == pdata->offset + M48T59_YEAR) {
530 if (val < 0x68)
531 val += 0x32;
532 else
533 val -= 0x68;
534 if ((val & 0xf) > 9)
535 val += 6;
536 if ((val & 0xf0) > 0x9A)
537 val += 0x60;
538 }
539 writeb(val, regs + ofs); 517 writeb(val, regs + ofs);
540} 518}
541 519
diff --git a/arch/sparc64/lib/PeeCeeI.c b/arch/sparc64/lib/PeeCeeI.c
index 8b313f11bc8d..46053e6ddd7b 100644
--- a/arch/sparc64/lib/PeeCeeI.c
+++ b/arch/sparc64/lib/PeeCeeI.c
@@ -20,107 +20,62 @@ void outsw(unsigned long __addr, const void *src, unsigned long count)
20{ 20{
21 void __iomem *addr = (void __iomem *) __addr; 21 void __iomem *addr = (void __iomem *) __addr;
22 22
23 if (count) { 23 while (count--) {
24 u16 *ps = (u16 *)src; 24 __raw_writew(*(u16 *)src, addr);
25 u32 *pi; 25 src += sizeof(u16);
26
27 if (((u64)src) & 0x2) {
28 u16 val = le16_to_cpup(ps);
29 outw(val, addr);
30 ps++;
31 count--;
32 }
33 pi = (u32 *)ps;
34 while (count >= 2) {
35 u32 w = le32_to_cpup(pi);
36
37 pi++;
38 outw(w >> 0, addr);
39 outw(w >> 16, addr);
40 count -= 2;
41 }
42 ps = (u16 *)pi;
43 if (count) {
44 u16 val = le16_to_cpup(ps);
45 outw(val, addr);
46 }
47 } 26 }
48} 27}
49 28
50void outsl(unsigned long __addr, const void *src, unsigned long count) 29void outsl(unsigned long __addr, const void *src, unsigned long count)
51{ 30{
52 void __iomem *addr = (void __iomem *) __addr; 31 void __iomem *addr = (void __iomem *) __addr;
32 u32 l, l2;
53 33
54 if (count) { 34 if (!count)
55 if ((((u64)src) & 0x3) == 0) { 35 return;
56 u32 *p = (u32 *)src;
57 while (count--) {
58 u32 val = cpu_to_le32p(p);
59 outl(val, addr);
60 p++;
61 }
62 } else {
63 u8 *pb;
64 u16 *ps = (u16 *)src;
65 u32 l = 0, l2;
66 u32 *pi;
67
68 switch (((u64)src) & 0x3) {
69 case 0x2:
70 count -= 1;
71 l = cpu_to_le16p(ps) << 16;
72 ps++;
73 pi = (u32 *)ps;
74 while (count--) {
75 l2 = cpu_to_le32p(pi);
76 pi++;
77 outl(((l >> 16) | (l2 << 16)), addr);
78 l = l2;
79 }
80 ps = (u16 *)pi;
81 l2 = cpu_to_le16p(ps);
82 outl(((l >> 16) | (l2 << 16)), addr);
83 break;
84
85 case 0x1:
86 count -= 1;
87 pb = (u8 *)src;
88 l = (*pb++ << 8);
89 ps = (u16 *)pb;
90 l2 = cpu_to_le16p(ps);
91 ps++;
92 l |= (l2 << 16);
93 pi = (u32 *)ps;
94 while (count--) {
95 l2 = cpu_to_le32p(pi);
96 pi++;
97 outl(((l >> 8) | (l2 << 24)), addr);
98 l = l2;
99 }
100 pb = (u8 *)pi;
101 outl(((l >> 8) | (*pb << 24)), addr);
102 break;
103 36
104 case 0x3: 37 switch (((unsigned long)src) & 0x3) {
105 count -= 1; 38 case 0x0:
106 pb = (u8 *)src; 39 /* src is naturally aligned */
107 l = (*pb++ << 24); 40 while (count--) {
108 pi = (u32 *)pb; 41 __raw_writel(*(u32 *)src, addr);
109 while (count--) { 42 src += sizeof(u32);
110 l2 = cpu_to_le32p(pi); 43 }
111 pi++; 44 break;
112 outl(((l >> 24) | (l2 << 8)), addr); 45 case 0x2:
113 l = l2; 46 /* 2-byte alignment */
114 } 47 while (count--) {
115 ps = (u16 *)pi; 48 l = (*(u16 *)src) << 16;
116 l2 = cpu_to_le16p(ps); 49 l |= *(u16 *)(src + sizeof(u16));
117 ps++; 50 __raw_writel(l, addr);
118 pb = (u8 *)ps; 51 src += sizeof(u32);
119 l2 |= (*pb << 16); 52 }
120 outl(((l >> 24) | (l2 << 8)), addr); 53 break;
121 break; 54 case 0x1:
122 } 55 /* Hold three bytes in l each time, grab a byte from l2 */
56 l = (*(u8 *)src) << 24;
57 l |= (*(u16 *)(src + sizeof(u8))) << 8;
58 src += sizeof(u8) + sizeof(u16);
59 while (count--) {
60 l2 = *(u32 *)src;
61 l |= (l2 >> 24);
62 __raw_writel(l, addr);
63 l = l2 << 8;
64 src += sizeof(u32);
65 }
66 break;
67 case 0x3:
68 /* Hold a byte in l each time, grab 3 bytes from l2 */
69 l = (*(u8 *)src) << 24;
70 src += sizeof(u8);
71 while (count--) {
72 l2 = *(u32 *)src;
73 l |= (l2 >> 8);
74 __raw_writel(l, addr);
75 l = l2 << 24;
76 src += sizeof(u32);
123 } 77 }
78 break;
124 } 79 }
125} 80}
126 81
diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
index 04b63dab6932..43afb7ab5289 100644
--- a/drivers/rtc/rtc-m48t59.c
+++ b/drivers/rtc/rtc-m48t59.c
@@ -87,6 +87,10 @@ static int m48t59_rtc_read_time(struct device *dev, struct rtc_time *tm)
87 dev_dbg(dev, "Century bit is enabled\n"); 87 dev_dbg(dev, "Century bit is enabled\n");
88 tm->tm_year += 100; /* one century */ 88 tm->tm_year += 100; /* one century */
89 } 89 }
90#ifdef CONFIG_SPARC
91 /* Sun SPARC machines count years since 1968 */
92 tm->tm_year += 68;
93#endif
90 94
91 tm->tm_wday = bcd2bin(val & 0x07); 95 tm->tm_wday = bcd2bin(val & 0x07);
92 tm->tm_hour = bcd2bin(M48T59_READ(M48T59_HOUR) & 0x3F); 96 tm->tm_hour = bcd2bin(M48T59_READ(M48T59_HOUR) & 0x3F);
@@ -110,11 +114,20 @@ static int m48t59_rtc_set_time(struct device *dev, struct rtc_time *tm)
110 struct m48t59_private *m48t59 = platform_get_drvdata(pdev); 114 struct m48t59_private *m48t59 = platform_get_drvdata(pdev);
111 unsigned long flags; 115 unsigned long flags;
112 u8 val = 0; 116 u8 val = 0;
117 int year = tm->tm_year;
118
119#ifdef CONFIG_SPARC
120 /* Sun SPARC machines count years since 1968 */
121 year -= 68;
122#endif
113 123
114 dev_dbg(dev, "RTC set time %04d-%02d-%02d %02d/%02d/%02d\n", 124 dev_dbg(dev, "RTC set time %04d-%02d-%02d %02d/%02d/%02d\n",
115 tm->tm_year + 1900, tm->tm_mon, tm->tm_mday, 125 year + 1900, tm->tm_mon, tm->tm_mday,
116 tm->tm_hour, tm->tm_min, tm->tm_sec); 126 tm->tm_hour, tm->tm_min, tm->tm_sec);
117 127
128 if (year < 0)
129 return -EINVAL;
130
118 spin_lock_irqsave(&m48t59->lock, flags); 131 spin_lock_irqsave(&m48t59->lock, flags);
119 /* Issue the WRITE command */ 132 /* Issue the WRITE command */
120 M48T59_SET_BITS(M48T59_CNTL_WRITE, M48T59_CNTL); 133 M48T59_SET_BITS(M48T59_CNTL_WRITE, M48T59_CNTL);
@@ -125,9 +138,9 @@ static int m48t59_rtc_set_time(struct device *dev, struct rtc_time *tm)
125 M48T59_WRITE((bin2bcd(tm->tm_mday) & 0x3F), M48T59_MDAY); 138 M48T59_WRITE((bin2bcd(tm->tm_mday) & 0x3F), M48T59_MDAY);
126 /* tm_mon is 0-11 */ 139 /* tm_mon is 0-11 */
127 M48T59_WRITE((bin2bcd(tm->tm_mon + 1) & 0x1F), M48T59_MONTH); 140 M48T59_WRITE((bin2bcd(tm->tm_mon + 1) & 0x1F), M48T59_MONTH);
128 M48T59_WRITE(bin2bcd(tm->tm_year % 100), M48T59_YEAR); 141 M48T59_WRITE(bin2bcd(year % 100), M48T59_YEAR);
129 142
130 if (pdata->type == M48T59RTC_TYPE_M48T59 && (tm->tm_year / 100)) 143 if (pdata->type == M48T59RTC_TYPE_M48T59 && (year / 100))
131 val = (M48T59_WDAY_CEB | M48T59_WDAY_CB); 144 val = (M48T59_WDAY_CEB | M48T59_WDAY_CB);
132 val |= (bin2bcd(tm->tm_wday) & 0x07); 145 val |= (bin2bcd(tm->tm_wday) & 0x07);
133 M48T59_WRITE(val, M48T59_WDAY); 146 M48T59_WRITE(val, M48T59_WDAY);
@@ -159,6 +172,10 @@ static int m48t59_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm)
159 M48T59_SET_BITS(M48T59_CNTL_READ, M48T59_CNTL); 172 M48T59_SET_BITS(M48T59_CNTL_READ, M48T59_CNTL);
160 173
161 tm->tm_year = bcd2bin(M48T59_READ(M48T59_YEAR)); 174 tm->tm_year = bcd2bin(M48T59_READ(M48T59_YEAR));
175#ifdef CONFIG_SPARC
176 /* Sun SPARC machines count years since 1968 */
177 tm->tm_year += 68;
178#endif
162 /* tm_mon is 0-11 */ 179 /* tm_mon is 0-11 */
163 tm->tm_mon = bcd2bin(M48T59_READ(M48T59_MONTH)) - 1; 180 tm->tm_mon = bcd2bin(M48T59_READ(M48T59_MONTH)) - 1;
164 181
@@ -192,11 +209,20 @@ static int m48t59_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
192 struct rtc_time *tm = &alrm->time; 209 struct rtc_time *tm = &alrm->time;
193 u8 mday, hour, min, sec; 210 u8 mday, hour, min, sec;
194 unsigned long flags; 211 unsigned long flags;
212 int year = tm->tm_year;
213
214#ifdef CONFIG_SPARC
215 /* Sun SPARC machines count years since 1968 */
216 year -= 68;
217#endif
195 218
196 /* If no irq, we don't support ALARM */ 219 /* If no irq, we don't support ALARM */
197 if (m48t59->irq == NO_IRQ) 220 if (m48t59->irq == NO_IRQ)
198 return -EIO; 221 return -EIO;
199 222
223 if (year < 0)
224 return -EINVAL;
225
200 /* 226 /*
201 * 0xff means "always match" 227 * 0xff means "always match"
202 */ 228 */
@@ -228,7 +254,7 @@ static int m48t59_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
228 spin_unlock_irqrestore(&m48t59->lock, flags); 254 spin_unlock_irqrestore(&m48t59->lock, flags);
229 255
230 dev_dbg(dev, "RTC set alarm time %04d-%02d-%02d %02d/%02d/%02d\n", 256 dev_dbg(dev, "RTC set alarm time %04d-%02d-%02d %02d/%02d/%02d\n",
231 tm->tm_year + 1900, tm->tm_mon, tm->tm_mday, 257 year + 1900, tm->tm_mon, tm->tm_mday,
232 tm->tm_hour, tm->tm_min, tm->tm_sec); 258 tm->tm_hour, tm->tm_min, tm->tm_sec);
233 return 0; 259 return 0;
234} 260}
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index c257ad8bdfbc..23ed6f04a718 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2534,6 +2534,8 @@ static int __devinit snd_dbri_create(struct snd_card *card,
2534 dbri->dma = dma_alloc_coherent(&op->dev, 2534 dbri->dma = dma_alloc_coherent(&op->dev,
2535 sizeof(struct dbri_dma), 2535 sizeof(struct dbri_dma),
2536 &dbri->dma_dvma, GFP_ATOMIC); 2536 &dbri->dma_dvma, GFP_ATOMIC);
2537 if (!dbri->dma)
2538 return -ENOMEM;
2537 memset((void *)dbri->dma, 0, sizeof(struct dbri_dma)); 2539 memset((void *)dbri->dma, 0, sizeof(struct dbri_dma));
2538 2540
2539 dprintk(D_GEN, "DMA Cmd Block 0x%p (0x%08x)\n", 2541 dprintk(D_GEN, "DMA Cmd Block 0x%p (0x%08x)\n",
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-18 19:27:47 -0500