linux-next: manual merge of the driver-core tree with the arm tree

linux-next: manual merge of the driver-core tree with the arm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1880 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/arm/mach-s5pv210/common.c between commit 1f34f0e2fb86 ("ARM: 7252/1:
restart: S5PV210: use new restart hook") from the arm tree and commit
4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from
the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-s5pv210/common.c
index 2622b8a,28e71ef..0000000
--- a/arch/arm/mach-s5pv210/common.c
+++ b/arch/arm/mach-s5pv210/common.c
@@@ -231,38 -185,20 +232,38 @@@ static struct device s5pv210_dev = 
  
  static int __init s5pv210_core_init(void)
  {
- 	return sysdev_class_register(&s5pv210_sysclass);
+ 	return subsys_system_register(&s5pv210_subsys, NULL);
  }
 -
  core_initcall(s5pv210_core_init);
  
  int __init s5pv210_init(void)
  {
  	printk(KERN_INFO "S5PV210: Initializing architecture\n");
- 	return sysdev_register(&s5pv210_sysdev);
++	return device_register(&s5pv210_dev);
 +}
  
 -	/* set idle function */
 -	pm_idle = s5pv210_idle;
 +static struct s3c24xx_uart_clksrc s5pv210_serial_clocks[] = {
 +	[0] = {
 +		.name		= "pclk",
 +		.divisor	= 1,
 +		.min_baud	= 0,
 +		.max_baud	= 0,
 +	},
 +};
  
 -	/* set sw_reset function */
 -	s5p_reset_hook = s5pv210_sw_reset;
 +/* uart registration process */
  
 -	return device_register(&s5pv210_dev);
 +void __init s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 +{
 +	struct s3c2410_uartcfg *tcfg = cfg;
 +	u32 ucnt;
 +
 +	for (ucnt = 0; ucnt < no; ucnt++, tcfg++) {
 +		if (!tcfg->clocks) {
 +			tcfg->clocks = s5pv210_serial_clocks;
 +			tcfg->clocks_size = ARRAY_SIZE(s5pv210_serial_clocks);
 +		}
 +	}
 +
 +	s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);
  }

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

RE: linux-next: manual merge of the driver-core tree with the arm tree

[Kukjin Kim]

Stephen Rothwell wrote:
> 
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/arm/mach-s5pv210/common.c between commit 1f34f0e2fb86 ("ARM: 7252/1:
> restart: S5PV210: use new restart hook") from the arm tree and commit
> 4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from
> the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/arm/mach-s5pv210/common.c
> index 2622b8a,28e71ef..0000000
> --- a/arch/arm/mach-s5pv210/common.c
> +++ b/arch/arm/mach-s5pv210/common.c
> @@@ -231,38 -185,20 +232,38 @@@ static struct device s5pv210_dev =
> 
>   static int __init s5pv210_core_init(void)
>   {
> - 	return sysdev_class_register(&s5pv210_sysclass);
> + 	return subsys_system_register(&s5pv210_subsys, NULL);
>   }
>  -
>   core_initcall(s5pv210_core_init);
> 
>   int __init s5pv210_init(void)
>   {
>   	printk(KERN_INFO "S5PV210: Initializing architecture\n");
> - 	return sysdev_register(&s5pv210_sysdev);
> ++	return device_register(&s5pv210_dev);
>  +}
> 
>  -	/* set idle function */
>  -	pm_idle = s5pv210_idle;
>  +static struct s3c24xx_uart_clksrc s5pv210_serial_clocks[] = {
>  +	[0] = {
>  +		.name		= "pclk",
>  +		.divisor	= 1,
>  +		.min_baud	= 0,
>  +		.max_baud	= 0,
>  +	},
>  +};
> 
Hi,

Well, above is removed by commit afba7f91 ("ARM: SAMSUNG: remove struct
's3c24xx_uart_clksrc' and all uses of it"). But I'm not sure we don't need
to add it for current conflicts between driver-core and arm tree because the
commit afba7f91 is in arm-soc tree.

>  -	/* set sw_reset function */
>  -	s5p_reset_hook = s5pv210_sw_reset;
>  +/* uart registration process */
> 
>  -	return device_register(&s5pv210_dev);
>  +void __init s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no)
>  +{
>  +	struct s3c2410_uartcfg *tcfg = cfg;
>  +	u32 ucnt;
>  +
>  +	for (ucnt = 0; ucnt < no; ucnt++, tcfg++) {
>  +		if (!tcfg->clocks) {
>  +			tcfg->clocks = s5pv210_serial_clocks;
>  +			tcfg->clocks_size =
ARRAY_SIZE(s5pv210_serial_clocks);
>  +		}
>  +	}
>  +

Same as above.

>  +	s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);
>   }

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

Re: linux-next: manual merge of the driver-core tree with the arm tree

['Greg KH']

On Fri, Jan 06, 2012 at 04:08:09PM +0900, Kukjin Kim wrote:
> Stephen Rothwell wrote:
> > 
> > Hi Greg,
> > 
> > Today's linux-next merge of the driver-core tree got a conflict in
> > arch/arm/mach-s5pc100/common.c between commit 109ac862f737 ("ARM:
> > mach-s5pc100: use standard arch_idle()") from the arm tree and commit
> > 4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from
> > the driver-core tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary.
> > 
> > --
> > Cheers,
> > Stephen Rothwell                    sfr@canb.auug.org.au
> > 
> > diff --cc arch/arm/mach-s5pc100/common.c
> > index 4659fb9,af52c09..0000000
> > --- a/arch/arm/mach-s5pc100/common.c
> > +++ b/arch/arm/mach-s5pc100/common.c
> > @@@ -194,27 -154,17 +195,27 @@@ static struct device s5pc100_dev =
> > 
> >   static int __init s5pc100_core_init(void)
> >   {
> > - 	return sysdev_class_register(&s5pc100_sysclass);
> > + 	return subsys_system_register(&s5pc100_subsys, NULL);
> >   }
> >  -
> >   core_initcall(s5pc100_core_init);
> > 
> >   int __init s5pc100_init(void)
> >   {
> >   	printk(KERN_INFO "S5PC100: Initializing architecture\n");
> > - 	return sysdev_register(&s5pc100_sysdev);
> > ++	return device_register(&s5pc100_sys);
> 
> Hi Greg,
> 
> Should be 'return device_register(&s5pc100_dev);'?
> 
> Greg,
> Following should be fixed in your driver-core/driver-core-next.
> (I informed that but maybe you missed)

Sorry, I missed this patch.  I'll apply it and take the above merge fix
as well.

greg k-h

RE: linux-next: manual merge of the driver-core tree with the arm tree

[Kukjin Kim]

Stephen Rothwell wrote:
> 
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/arm/mach-s5pc100/common.c between commit 109ac862f737 ("ARM:
> mach-s5pc100: use standard arch_idle()") from the arm tree and commit
> 4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from
> the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.
> 
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/arm/mach-s5pc100/common.c
> index 4659fb9,af52c09..0000000
> --- a/arch/arm/mach-s5pc100/common.c
> +++ b/arch/arm/mach-s5pc100/common.c
> @@@ -194,27 -154,17 +195,27 @@@ static struct device s5pc100_dev =
> 
>   static int __init s5pc100_core_init(void)
>   {
> - 	return sysdev_class_register(&s5pc100_sysclass);
> + 	return subsys_system_register(&s5pc100_subsys, NULL);
>   }
>  -
>   core_initcall(s5pc100_core_init);
> 
>   int __init s5pc100_init(void)
>   {
>   	printk(KERN_INFO "S5PC100: Initializing architecture\n");
> - 	return sysdev_register(&s5pc100_sysdev);
> ++	return device_register(&s5pc100_sys);

Hi Greg,

Should be 'return device_register(&s5pc100_dev);'?

Greg,
Following should be fixed in your driver-core/driver-core-next.
(I informed that but maybe you missed)

diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c
index 4b948ec..fda5385 100644
--- a/arch/arm/mach-s3c2410/pm.c
+++ b/arch/arm/mach-s3c2410/pm.c
@@ -137,7 +137,7 @@ arch_initcall(s3c2410_pm_drvinit);
 
 static struct subsys_interface s3c2410a_pm_interface = {
 	.name		= "s3c2410a_pm",
-	subsys		= &s3c2410a_subsys,
+	.subsys		= &s3c2410a_subsys,
 	.add_dev	= s3c2410_pm_add,
 };
 
diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c
index fd7210d..d1adfa6 100644
--- a/arch/arm/mach-s3c2412/pm.c
+++ b/arch/arm/mach-s3c2412/pm.c
@@ -95,7 +95,7 @@ static struct subsys_interface s3c2412_pm_interface = {
 
 static __init int s3c2412_pm_init(void)
 {
-	return subsys_interface_register_register(&s3c2412_pm_interface);
+	return subsys_interface_register(&s3c2412_pm_interface);
 }
 
 arch_initcall(s3c2412_pm_init);
diff --git a/arch/arm/mach-s3c2440/s3c2442.c
b/arch/arm/mach-s3c2440/s3c2442.c
index 9ab15cd..8004e04 100644
--- a/arch/arm/mach-s3c2440/s3c2442.c
+++ b/arch/arm/mach-s3c2440/s3c2442.c
@@ -151,7 +151,7 @@ static int s3c2442_clk_add(struct device *dev)
 static struct subsys_interface s3c2442_clk_interface = {
 	.name		= "s3c2442_clk",
 	.subsys		= &s3c2442_subsys,
-	.add_dev	 s3c2442_clk_add,
+	.add_dev	= s3c2442_clk_add,
 };
 
 static __init int s3c2442_clk_init(void)
diff --git a/arch/arm/mach-s5p64x0/cpu.c b/arch/arm/mach-s5p64x0/cpu.c
index 8b02990..74387a1 100644
--- a/arch/arm/mach-s5p64x0/cpu.c
+++ b/arch/arm/mach-s5p64x0/cpu.c
@@ -195,7 +195,7 @@ struct bus_type s5p64x0_subsys = {
 	.dev_name	= "s5p64x0-core",
 };
 
-static struct device s5p64x0_subsys = {
+static struct device s5p64x0_dev = {
 	.bus	= &s5p64x0_subsys,
 };
 
diff --git a/arch/arm/mach-s5pc100/cpu.c b/arch/arm/mach-s5pc100/cpu.c
index af52c09..330a10b 100644
--- a/arch/arm/mach-s5pc100/cpu.c
+++ b/arch/arm/mach-s5pc100/cpu.c
@@ -166,5 +166,5 @@ int __init s5pc100_init(void)
 	/* set idle function */
 	pm_idle = s5pc100_idle;
 
-	return device_register(&s5pc100_sys);
+	return device_register(&s5pc100_dev);
 }


Thanks.

Best regards,
Kgene.
--j
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

linux-next: manual merge of the driver-core tree with the arm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1509 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/arm/mach-s5pc100/common.c between commit 109ac862f737 ("ARM:
mach-s5pc100: use standard arch_idle()") from the arm tree and commit
4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from
the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-s5pc100/common.c
index 4659fb9,af52c09..0000000
--- a/arch/arm/mach-s5pc100/common.c
+++ b/arch/arm/mach-s5pc100/common.c
@@@ -194,27 -154,17 +195,27 @@@ static struct device s5pc100_dev = 
  
  static int __init s5pc100_core_init(void)
  {
- 	return sysdev_class_register(&s5pc100_sysclass);
+ 	return subsys_system_register(&s5pc100_subsys, NULL);
  }
 -
  core_initcall(s5pc100_core_init);
  
  int __init s5pc100_init(void)
  {
  	printk(KERN_INFO "S5PC100: Initializing architecture\n");
- 	return sysdev_register(&s5pc100_sysdev);
++	return device_register(&s5pc100_sys);
 +}
  
 -	/* set idle function */
 -	pm_idle = s5pc100_idle;
 +/* uart registration process */
  
 -	return device_register(&s5pc100_sys);
 +void __init s5pc100_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 +{
 +	s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);
 +}
 +
 +void s5pc100_restart(char mode, const char *cmd)
 +{
 +	if (mode != 's')
 +		arch_wdt_reset();
 +
 +	soft_restart(0);
  }

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with the arm tree

[Greg KH]

On Wed, Dec 28, 2011 at 04:24:31PM +1100, Stephen Rothwell wrote:
> Hi again,
> 
> On Wed, 28 Dec 2011 16:12:31 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the driver-core tree got a conflict in
> > arch/arm/mach-s3c64xx/common.c between commit b024043b6d0d ("ARM: 7245/1:
> > S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch]") from the arm tree
> > and commit edbaa603eb80 ("driver-core: remove sysdev.h usage") from the
> > driver-core tree (where it is called arch/arm/mach-s3c64xx/irq-eint.c).
> > 
> > Just context changes.  I fixed it up (see below) and can carry the fix as
> > necessary.
> 
> Actually, I the fix was more extensive (see below).

Ick, messy, thanks, that looks good.

greg k-h

Re: linux-next: manual merge of the driver-core tree with the arm tree

[Greg KH]

On Wed, Dec 28, 2011 at 04:35:45PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/arm/mach-s5pv210/common.c between commit 37775320458e ("ARM: 7252/1:
> restart: S5PV210: use new restart hook") from the arm tree and commit
> 4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from
> the driver-core tree (where it is called arch/arm/mach-s5pv210/cpu.c).
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Looks good, thanks.

greg k-h

Re: linux-next: manual merge of the driver-core tree with the arm tree

[Greg KH]

On Wed, Dec 28, 2011 at 04:40:52PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/arm/plat-samsung/include/plat/cpu.h between commit b024043b6d0d
> ("ARM: 7245/1: S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch]")
> from the arm tree and commit 4a858cfc9af8 ("arm: convert sysdev_class to
> a regular subsystem") from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Looks good, thanks.

greg k-h

linux-next: manual merge of the driver-core tree with the arm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2107 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/arm/plat-samsung/include/plat/cpu.h between commit b024043b6d0d
("ARM: 7245/1: S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch]")
from the arm tree and commit 4a858cfc9af8 ("arm: convert sysdev_class to
a regular subsystem") from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/plat-samsung/include/plat/cpu.h
index abbdadb,0122a22..0000000
--- a/arch/arm/plat-samsung/include/plat/cpu.h
+++ b/arch/arm/plat-samsung/include/plat/cpu.h
@@@ -181,20 -183,22 +181,20 @@@ extern struct syscore_ops s3c2410_pm_sy
  extern struct syscore_ops s3c2412_pm_syscore_ops;
  extern struct syscore_ops s3c2416_pm_syscore_ops;
  extern struct syscore_ops s3c244x_pm_syscore_ops;
 -extern struct syscore_ops s3c64xx_irq_syscore_ops;
  
- /* system device classes */
- 
- extern struct sysdev_class s3c2410_sysclass;
- extern struct sysdev_class s3c2410a_sysclass;
- extern struct sysdev_class s3c2412_sysclass;
- extern struct sysdev_class s3c2416_sysclass;
- extern struct sysdev_class s3c2440_sysclass;
- extern struct sysdev_class s3c2442_sysclass;
- extern struct sysdev_class s3c2443_sysclass;
- extern struct sysdev_class s3c6410_sysclass;
- extern struct sysdev_class s5p64x0_sysclass;
- extern struct sysdev_class s5pv210_sysclass;
- extern struct sysdev_class exynos4_sysclass;
+ /* system device subsystems */
+ 
+ extern struct bus_type s3c2410_subsys;
+ extern struct bus_type s3c2410a_subsys;
+ extern struct bus_type s3c2412_subsys;
+ extern struct bus_type s3c2416_subsys;
+ extern struct bus_type s3c2440_subsys;
+ extern struct bus_type s3c2442_subsys;
+ extern struct bus_type s3c2443_subsys;
+ extern struct bus_type s3c6410_subsys;
 -extern struct bus_type s3c64xx_subsys;
+ extern struct bus_type s5p64x0_subsys;
+ extern struct bus_type s5pv210_subsys;
+ extern struct bus_type exynos4_subsys;
  
  extern void (*s5pc1xx_idle)(void);
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the driver-core tree with the arm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1881 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/arm/mach-s5pv210/common.c between commit 37775320458e ("ARM: 7252/1:
restart: S5PV210: use new restart hook") from the arm tree and commit
4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from
the driver-core tree (where it is called arch/arm/mach-s5pv210/cpu.c).

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-s5pv210/common.c
index a4921bc,28e71ef..0000000
--- a/arch/arm/mach-s5pv210/common.c
+++ b/arch/arm/mach-s5pv210/common.c
@@@ -239,8 -185,9 +240,8 @@@ static struct device s5pv210_dev = 
  
  static int __init s5pv210_core_init(void)
  {
- 	return sysdev_class_register(&s5pv210_sysclass);
+ 	return subsys_system_register(&s5pv210_subsys, NULL);
  }
 -
  core_initcall(s5pv210_core_init);
  
  int __init s5pv210_init(void)
@@@ -250,31 -197,8 +251,31 @@@
  	/* set idle function */
  	pm_idle = s5pv210_idle;
  
- 	return sysdev_register(&s5pv210_sysdev);
 -	/* set sw_reset function */
 -	s5p_reset_hook = s5pv210_sw_reset;
 -
+ 	return device_register(&s5pv210_dev);
  }
 +
 +static struct s3c24xx_uart_clksrc s5pv210_serial_clocks[] = {
 +	[0] = {
 +		.name		= "pclk",
 +		.divisor	= 1,
 +		.min_baud	= 0,
 +		.max_baud	= 0,
 +	},
 +};
 +
 +/* uart registration process */
 +
 +void __init s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 +{
 +	struct s3c2410_uartcfg *tcfg = cfg;
 +	u32 ucnt;
 +
 +	for (ucnt = 0; ucnt < no; ucnt++, tcfg++) {
 +		if (!tcfg->clocks) {
 +			tcfg->clocks = s5pv210_serial_clocks;
 +			tcfg->clocks_size = ARRAY_SIZE(s5pv210_serial_clocks);
 +		}
 +	}
 +
 +	s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);
 +}

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with the arm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 6629 bytes --]

Hi again,

On Wed, 28 Dec 2011 16:12:31 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/arm/mach-s3c64xx/common.c between commit b024043b6d0d ("ARM: 7245/1:
> S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch]") from the arm tree
> and commit edbaa603eb80 ("driver-core: remove sysdev.h usage") from the
> driver-core tree (where it is called arch/arm/mach-s3c64xx/irq-eint.c).
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Actually, I the fix was more extensive (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-s3c64xx/common.c
index 8ae5b16,e3e75d1..0000000
--- a/arch/arm/mach-s3c64xx/common.c
+++ b/arch/arm/mach-s3c64xx/common.c
@@@ -15,182 -13,21 +15,183 @@@
   */
  
  #include <linux/kernel.h>
 +#include <linux/init.h>
 +#include <linux/module.h>
  #include <linux/interrupt.h>
 +#include <linux/ioport.h>
- #include <linux/sysdev.h>
+ #include <linux/device.h>
 -#include <linux/gpio.h>
 -#include <linux/irq.h>
 +#include <linux/serial_core.h>
 +#include <linux/platform_device.h>
  #include <linux/io.h>
 +#include <linux/dma-mapping.h>
 +#include <linux/irq.h>
 +#include <linux/gpio.h>
  
 +#include <asm/mach/arch.h>
 +#include <asm/mach/map.h>
  #include <asm/hardware/vic.h>
  
 -#include <plat/regs-irqtype.h>
 +#include <mach/map.h>
 +#include <mach/hardware.h>
  #include <mach/regs-gpio.h>
 -#include <plat/gpio-cfg.h>
  
 -#include <mach/map.h>
  #include <plat/cpu.h>
 +#include <plat/clock.h>
 +#include <plat/devs.h>
  #include <plat/pm.h>
 +#include <plat/gpio-cfg.h>
 +#include <plat/irq-uart.h>
 +#include <plat/irq-vic-timer.h>
 +#include <plat/regs-irqtype.h>
 +#include <plat/regs-serial.h>
 +
 +#include "common.h"
 +
 +/* uart registration process */
 +
 +void __init s3c64xx_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 +{
 +	s3c24xx_init_uartdevs("s3c6400-uart", s3c64xx_uart_resources, cfg, no);
 +}
 +
 +/* table of supported CPUs */
 +
 +static const char name_s3c6400[] = "S3C6400";
 +static const char name_s3c6410[] = "S3C6410";
 +
 +static struct cpu_table cpu_ids[] __initdata = {
 +	{
 +		.idcode		= S3C6400_CPU_ID,
 +		.idmask		= S3C64XX_CPU_MASK,
 +		.map_io		= s3c6400_map_io,
 +		.init_clocks	= s3c6400_init_clocks,
 +		.init_uarts	= s3c64xx_init_uarts,
 +		.init		= s3c6400_init,
 +		.name		= name_s3c6400,
 +	}, {
 +		.idcode		= S3C6410_CPU_ID,
 +		.idmask		= S3C64XX_CPU_MASK,
 +		.map_io		= s3c6410_map_io,
 +		.init_clocks	= s3c6410_init_clocks,
 +		.init_uarts	= s3c64xx_init_uarts,
 +		.init		= s3c6410_init,
 +		.name		= name_s3c6410,
 +	},
 +};
 +
 +/* minimal IO mapping */
 +
 +/* see notes on uart map in arch/arm/mach-s3c64xx/include/mach/debug-macro.S */
 +#define UART_OFFS (S3C_PA_UART & 0xfffff)
 +
 +static struct map_desc s3c_iodesc[] __initdata = {
 +	{
 +		.virtual	= (unsigned long)S3C_VA_SYS,
 +		.pfn		= __phys_to_pfn(S3C64XX_PA_SYSCON),
 +		.length		= SZ_4K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)S3C_VA_MEM,
 +		.pfn		= __phys_to_pfn(S3C64XX_PA_SROM),
 +		.length		= SZ_4K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)(S3C_VA_UART + UART_OFFS),
 +		.pfn		= __phys_to_pfn(S3C_PA_UART),
 +		.length		= SZ_4K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)VA_VIC0,
 +		.pfn		= __phys_to_pfn(S3C64XX_PA_VIC0),
 +		.length		= SZ_16K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)VA_VIC1,
 +		.pfn		= __phys_to_pfn(S3C64XX_PA_VIC1),
 +		.length		= SZ_16K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)S3C_VA_TIMER,
 +		.pfn		= __phys_to_pfn(S3C_PA_TIMER),
 +		.length		= SZ_16K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)S3C64XX_VA_GPIO,
 +		.pfn		= __phys_to_pfn(S3C64XX_PA_GPIO),
 +		.length		= SZ_4K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)S3C64XX_VA_MODEM,
 +		.pfn		= __phys_to_pfn(S3C64XX_PA_MODEM),
 +		.length		= SZ_4K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)S3C_VA_WATCHDOG,
 +		.pfn		= __phys_to_pfn(S3C64XX_PA_WATCHDOG),
 +		.length		= SZ_4K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)S3C_VA_USB_HSPHY,
 +		.pfn		= __phys_to_pfn(S3C64XX_PA_USB_HSPHY),
 +		.length		= SZ_1K,
 +		.type		= MT_DEVICE,
 +	},
 +};
 +
- struct sysdev_class s3c64xx_sysclass = {
- 	.name	= "s3c64xx-core",
++struct bus_type s3c64xx_subsys = {
++	.name		= "s3c64xx-core",
++	.dev_name	= "s3c64xx-core",
 +};
 +
- static struct sys_device s3c64xx_sysdev = {
- 	.cls	= &s3c64xx_sysclass,
++static struct device s3c64xx_dev = {
++	.bus	= &s3c64xx_subsys,
 +};
 +
 +/* read cpu identification code */
 +
 +void __init s3c64xx_init_io(struct map_desc *mach_desc, int size)
 +{
 +	/* initialise the io descriptors we need for initialisation */
 +	iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc));
 +	iotable_init(mach_desc, size);
 +	init_consistent_dma_size(SZ_8M);
 +
 +	/* detect cpu id */
 +	s3c64xx_init_cpu();
 +
 +	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
 +}
 +
- static __init int s3c64xx_sysdev_init(void)
++static __init int s3c64xx_dev_init(void)
 +{
- 	sysdev_class_register(&s3c64xx_sysclass);
- 	return sysdev_register(&s3c64xx_sysdev);
++	subsys_system_register(&s3c64xx_subsys, NULL);
++	return device(&s3c64xx_dev);
 +}
- core_initcall(s3c64xx_sysdev_init);
++core_initcall(s3c64xx_dev_init);
 +
 +/*
 + * setup the sources the vic should advertise resume
 + * for, even though it is not doing the wake
 + * (set_irq_wake needs to be valid)
 + */
 +#define IRQ_VIC0_RESUME (1 << (IRQ_RTC_TIC - IRQ_VIC0_BASE))
 +#define IRQ_VIC1_RESUME (1 << (IRQ_RTC_ALARM - IRQ_VIC1_BASE) |	\
 +			 1 << (IRQ_PENDN - IRQ_VIC1_BASE) |	\
 +			 1 << (IRQ_HSMMC0 - IRQ_VIC1_BASE) |	\
 +			 1 << (IRQ_HSMMC1 - IRQ_VIC1_BASE) |	\
 +			 1 << (IRQ_HSMMC2 - IRQ_VIC1_BASE))
 +
 +void __init s3c64xx_init_irq(u32 vic0_valid, u32 vic1_valid)
 +{
 +	printk(KERN_DEBUG "%s: initialising interrupts\n", __func__);
 +
 +	/* initialise the pair of VICs */
 +	vic_init(VA_VIC0, IRQ_VIC0_BASE, vic0_valid, IRQ_VIC0_RESUME);
 +	vic_init(VA_VIC1, IRQ_VIC1_BASE, vic1_valid, IRQ_VIC1_RESUME);
 +
 +	/* add the timer sub-irqs */
 +	s3c_init_vic_timer_irq(5, IRQ_TIMER0);
 +}
  
  #define eint_offset(irq)	((irq) - IRQ_EINT(0))
  #define eint_irq_to_bit(irq)	((u32)(1 << eint_offset(irq)))

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the driver-core tree with the arm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 6140 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/arm/mach-s3c64xx/common.c between commit b024043b6d0d ("ARM: 7245/1:
S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch]") from the arm tree
and commit edbaa603eb80 ("driver-core: remove sysdev.h usage") from the
driver-core tree (where it is called arch/arm/mach-s3c64xx/irq-eint.c).

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-s3c64xx/common.c
index 8ae5b16,e3e75d1..0000000
--- a/arch/arm/mach-s3c64xx/common.c
+++ b/arch/arm/mach-s3c64xx/common.c
@@@ -15,182 -13,21 +15,182 @@@
   */
  
  #include <linux/kernel.h>
 +#include <linux/init.h>
 +#include <linux/module.h>
  #include <linux/interrupt.h>
 +#include <linux/ioport.h>
- #include <linux/sysdev.h>
+ #include <linux/device.h>
 -#include <linux/gpio.h>
 -#include <linux/irq.h>
 +#include <linux/serial_core.h>
 +#include <linux/platform_device.h>
  #include <linux/io.h>
 +#include <linux/dma-mapping.h>
 +#include <linux/irq.h>
 +#include <linux/gpio.h>
  
 +#include <asm/mach/arch.h>
 +#include <asm/mach/map.h>
  #include <asm/hardware/vic.h>
  
 -#include <plat/regs-irqtype.h>
 +#include <mach/map.h>
 +#include <mach/hardware.h>
  #include <mach/regs-gpio.h>
 -#include <plat/gpio-cfg.h>
  
 -#include <mach/map.h>
  #include <plat/cpu.h>
 +#include <plat/clock.h>
 +#include <plat/devs.h>
  #include <plat/pm.h>
 +#include <plat/gpio-cfg.h>
 +#include <plat/irq-uart.h>
 +#include <plat/irq-vic-timer.h>
 +#include <plat/regs-irqtype.h>
 +#include <plat/regs-serial.h>
 +
 +#include "common.h"
 +
 +/* uart registration process */
 +
 +void __init s3c64xx_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 +{
 +	s3c24xx_init_uartdevs("s3c6400-uart", s3c64xx_uart_resources, cfg, no);
 +}
 +
 +/* table of supported CPUs */
 +
 +static const char name_s3c6400[] = "S3C6400";
 +static const char name_s3c6410[] = "S3C6410";
 +
 +static struct cpu_table cpu_ids[] __initdata = {
 +	{
 +		.idcode		= S3C6400_CPU_ID,
 +		.idmask		= S3C64XX_CPU_MASK,
 +		.map_io		= s3c6400_map_io,
 +		.init_clocks	= s3c6400_init_clocks,
 +		.init_uarts	= s3c64xx_init_uarts,
 +		.init		= s3c6400_init,
 +		.name		= name_s3c6400,
 +	}, {
 +		.idcode		= S3C6410_CPU_ID,
 +		.idmask		= S3C64XX_CPU_MASK,
 +		.map_io		= s3c6410_map_io,
 +		.init_clocks	= s3c6410_init_clocks,
 +		.init_uarts	= s3c64xx_init_uarts,
 +		.init		= s3c6410_init,
 +		.name		= name_s3c6410,
 +	},
 +};
 +
 +/* minimal IO mapping */
 +
 +/* see notes on uart map in arch/arm/mach-s3c64xx/include/mach/debug-macro.S */
 +#define UART_OFFS (S3C_PA_UART & 0xfffff)
 +
 +static struct map_desc s3c_iodesc[] __initdata = {
 +	{
 +		.virtual	= (unsigned long)S3C_VA_SYS,
 +		.pfn		= __phys_to_pfn(S3C64XX_PA_SYSCON),
 +		.length		= SZ_4K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)S3C_VA_MEM,
 +		.pfn		= __phys_to_pfn(S3C64XX_PA_SROM),
 +		.length		= SZ_4K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)(S3C_VA_UART + UART_OFFS),
 +		.pfn		= __phys_to_pfn(S3C_PA_UART),
 +		.length		= SZ_4K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)VA_VIC0,
 +		.pfn		= __phys_to_pfn(S3C64XX_PA_VIC0),
 +		.length		= SZ_16K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)VA_VIC1,
 +		.pfn		= __phys_to_pfn(S3C64XX_PA_VIC1),
 +		.length		= SZ_16K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)S3C_VA_TIMER,
 +		.pfn		= __phys_to_pfn(S3C_PA_TIMER),
 +		.length		= SZ_16K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)S3C64XX_VA_GPIO,
 +		.pfn		= __phys_to_pfn(S3C64XX_PA_GPIO),
 +		.length		= SZ_4K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)S3C64XX_VA_MODEM,
 +		.pfn		= __phys_to_pfn(S3C64XX_PA_MODEM),
 +		.length		= SZ_4K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)S3C_VA_WATCHDOG,
 +		.pfn		= __phys_to_pfn(S3C64XX_PA_WATCHDOG),
 +		.length		= SZ_4K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)S3C_VA_USB_HSPHY,
 +		.pfn		= __phys_to_pfn(S3C64XX_PA_USB_HSPHY),
 +		.length		= SZ_1K,
 +		.type		= MT_DEVICE,
 +	},
 +};
 +
 +struct sysdev_class s3c64xx_sysclass = {
 +	.name	= "s3c64xx-core",
 +};
 +
 +static struct sys_device s3c64xx_sysdev = {
 +	.cls	= &s3c64xx_sysclass,
 +};
 +
 +/* read cpu identification code */
 +
 +void __init s3c64xx_init_io(struct map_desc *mach_desc, int size)
 +{
 +	/* initialise the io descriptors we need for initialisation */
 +	iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc));
 +	iotable_init(mach_desc, size);
 +	init_consistent_dma_size(SZ_8M);
 +
 +	/* detect cpu id */
 +	s3c64xx_init_cpu();
 +
 +	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
 +}
 +
 +static __init int s3c64xx_sysdev_init(void)
 +{
 +	sysdev_class_register(&s3c64xx_sysclass);
 +	return sysdev_register(&s3c64xx_sysdev);
 +}
 +core_initcall(s3c64xx_sysdev_init);
 +
 +/*
 + * setup the sources the vic should advertise resume
 + * for, even though it is not doing the wake
 + * (set_irq_wake needs to be valid)
 + */
 +#define IRQ_VIC0_RESUME (1 << (IRQ_RTC_TIC - IRQ_VIC0_BASE))
 +#define IRQ_VIC1_RESUME (1 << (IRQ_RTC_ALARM - IRQ_VIC1_BASE) |	\
 +			 1 << (IRQ_PENDN - IRQ_VIC1_BASE) |	\
 +			 1 << (IRQ_HSMMC0 - IRQ_VIC1_BASE) |	\
 +			 1 << (IRQ_HSMMC1 - IRQ_VIC1_BASE) |	\
 +			 1 << (IRQ_HSMMC2 - IRQ_VIC1_BASE))
 +
 +void __init s3c64xx_init_irq(u32 vic0_valid, u32 vic1_valid)
 +{
 +	printk(KERN_DEBUG "%s: initialising interrupts\n", __func__);
 +
 +	/* initialise the pair of VICs */
 +	vic_init(VA_VIC0, IRQ_VIC0_BASE, vic0_valid, IRQ_VIC0_RESUME);
 +	vic_init(VA_VIC1, IRQ_VIC1_BASE, vic1_valid, IRQ_VIC1_RESUME);
 +
 +	/* add the timer sub-irqs */
 +	s3c_init_vic_timer_irq(5, IRQ_TIMER0);
 +}
  
  #define eint_offset(irq)	((irq) - IRQ_EINT(0))
  #define eint_irq_to_bit(irq)	((u32)(1 << eint_offset(irq)))

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]