* linux-next: manual merge of the clockevents tree with the h8300 tree
@ 2015-12-07 5:26 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2015-12-07 5:26 UTC (permalink / raw)
To: Daniel Lezcano, Yoshinori Sato; +Cc: linux-next, linux-kernel
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
arch/h8300/Kconfig
between commits:
f639eeb4a60c ("h8300: enable CLKSRC_OF")
a801eb26d124 ("h8300: Add LZO compression")
from the h8300 tree and commit:
6a5c601bf048 ("clocksource/drivers/h8300_timer8: Separate the Kconfig option from the arch")
from the clockevents tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/h8300/Kconfig
index 4e48d1224456,7a17112930a9..000000000000
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@@ -16,9 -16,7 +16,10 @@@ config H830
select OF_EARLY_FLATTREE
select HAVE_MEMBLOCK
select HAVE_DMA_ATTRS
+ select CLKSRC_OF
+ select HAVE_KERNEL_GZIP
+ select HAVE_KERNEL_LZO
+ select H8300_TMR8
config RWSEM_GENERIC_SPINLOCK
def_bool y
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the clockevents tree with the h8300 tree
@ 2015-12-17 2:48 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2015-12-17 2:48 UTC (permalink / raw)
To: Daniel Lezcano, Yoshinori Sato; +Cc: linux-next, linux-kernel
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
arch/h8300/Kconfig
between commit:
a801eb26d124 ("h8300: Add LZO compression")
from the h8300 tree and commit:
97a23beb8db9 ("clocksource/drivers/h8300_timer8: Separate the Kconfig option from the arch")
from the clockevents tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/h8300/Kconfig
index 4e48d1224456,2e20333cbce9..000000000000
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@@ -17,8 -17,7 +17,9 @@@ config H830
select HAVE_MEMBLOCK
select HAVE_DMA_ATTRS
select CLKSRC_OF
+ select HAVE_KERNEL_GZIP
+ select HAVE_KERNEL_LZO
+ select H8300_TMR8
config RWSEM_GENERIC_SPINLOCK
def_bool y
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the clockevents tree with the h8300 tree
@ 2015-11-13 0:01 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2015-11-13 0:01 UTC (permalink / raw)
To: Daniel Lezcano, Yoshinori Sato; +Cc: linux-next, linux-kernel
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
arch/h8300/Kconfig
between commit:
f639eeb4a60c ("h8300: enable CLKSRC_OF")
from the h8300 tree and commit:
3e1e4573ef65 ("clocksource/drivers/h8300_timer8: Separate the Kconfig option from the arch")
from the clockevents tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
There is a lot to be said for sorting ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/h8300/Kconfig
index dd3ac75776ad,7a17112930a9..000000000000
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@@ -16,7 -16,7 +16,8 @@@ config H830
select OF_EARLY_FLATTREE
select HAVE_MEMBLOCK
select HAVE_DMA_ATTRS
+ select CLKSRC_OF
+ select H8300_TMR8
config RWSEM_GENERIC_SPINLOCK
def_bool y
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the clockevents tree with the h8300 tree
@ 2015-11-09 23:49 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2015-11-09 23:49 UTC (permalink / raw)
To: Daniel Lezcano, Yoshinori Sato; +Cc: linux-next, linux-kernel
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
arch/h8300/include/asm/io.h
between commit:
a795239b698d ("h8300: bit io fix")
from the h8300 tree and commit:
fcd51e13e368 ("h8300: Rename ctlr_out/in[bwl] to raw_read/write[bwl]")
from the clockevents tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/h8300/include/asm/io.h
index bb837cded268,2d15508015ed..000000000000
--- a/arch/h8300/include/asm/io.h
+++ b/arch/h8300/include/asm/io.h
@@@ -3,55 -3,62 +3,62 @@@
#ifdef __KERNEL__
- #include <asm-generic/io.h>
-
/* H8/300 internal I/O functions */
- static inline unsigned char ctrl_inb(unsigned long addr)
+
+ #define __raw_readb __raw_readb
+ static inline u8 __raw_readb(const volatile void __iomem *addr)
{
- return *(volatile unsigned char *)addr;
+ return *(volatile u8 *)addr;
}
- static inline unsigned short ctrl_inw(unsigned long addr)
+ #define __raw_readw __raw_readw
+ static inline u16 __raw_readw(const volatile void __iomem *addr)
{
- return *(volatile unsigned short *)addr;
+ return *(volatile u16 *)addr;
}
- static inline unsigned long ctrl_inl(unsigned long addr)
+ #define __raw_readl __raw_readl
+ static inline u32 __raw_readl(const volatile void __iomem *addr)
{
- return *(volatile unsigned long *)addr;
+ return *(volatile u32 *)addr;
}
- static inline void ctrl_outb(unsigned char b, unsigned long addr)
+ #define __raw_writeb __raw_writeb
+ static inline void __raw_writeb(u8 b, const volatile void __iomem *addr)
{
- *(volatile unsigned char *)addr = b;
+ *(volatile u8 *)addr = b;
}
- static inline void ctrl_outw(unsigned short b, unsigned long addr)
+ #define __raw_writew __raw_writew
+ static inline void __raw_writew(u16 b, const volatile void __iomem *addr)
{
- *(volatile unsigned short *)addr = b;
+ *(volatile u16 *)addr = b;
}
- static inline void ctrl_outl(unsigned long b, unsigned long addr)
+ #define __raw_writel __raw_writel
+ static inline void __raw_writel(u32 b, const volatile void __iomem *addr)
{
- *(volatile unsigned long *)addr = b;
+ *(volatile u32 *)addr = b;
}
- static inline void ctrl_bclr(int b, unsigned char *addr)
+ static inline void ctrl_bclr(int b, void __iomem *addr)
{
if (__builtin_constant_p(b))
- __asm__("bclr %1,%0" : : "WU"(addr), "i"(b));
+ __asm__("bclr %1,%0" : "+WU"(*addr): "i"(b));
else
- __asm__("bclr %w1,%0" : : "WU"(addr), "r"(b));
+ __asm__("bclr %w1,%0" : "+WU"(*addr): "r"(b));
}
- static inline void ctrl_bset(int b, unsigned char *addr)
+ static inline void ctrl_bset(int b, void __iomem *addr)
{
if (__builtin_constant_p(b))
- __asm__("bset %1,%0" : : "WU"(addr), "i"(b));
+ __asm__("bset %1,%0" : "+WU"(*addr): "i"(b));
else
- __asm__("bset %w1,%0" : : "WU"(addr), "r"(b));
+ __asm__("bset %w1,%0" : "+WU"(*addr): "r"(b));
}
+ #include <asm-generic/io.h>
+
#endif /* __KERNEL__ */
#endif /* _H8300_IO_H */
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-12-17 2:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-07 5:26 linux-next: manual merge of the clockevents tree with the h8300 tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2015-12-17 2:48 Stephen Rothwell
2015-11-13 0:01 Stephen Rothwell
2015-11-09 23:49 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).