Commit 69bc3279 authored by Russell King's avatar Russell King

[ARM] Update neponset/sa1111 for Linux device model updates.

This updates these neponset and sa1111 support to use the new system
device infrastructure in the Linux device model.
parent 9c7fd8c7
...@@ -193,20 +193,30 @@ static int neponset_resume(struct device *dev, u32 level) ...@@ -193,20 +193,30 @@ static int neponset_resume(struct device *dev, u32 level)
} }
static struct device_driver neponset_device_driver = { static struct device_driver neponset_device_driver = {
.suspend = neponset_suspend, .name = "NEPONSET",
.resume = neponset_resume, .bus = &system_bus_type,
.suspend = neponset_suspend,
.resume = neponset_resume,
}; };
static struct device neponset_device = { static struct sys_device neponset_device = {
.name = "Neponset", .name = "NEPONSET",
.bus_id = "neponset", .id = 0,
.driver = &neponset_device_driver, .root = NULL,
.dev = {
.name = "Neponset",
.bus_id = "neponset",
.bus = &system_bus_type,
.driver = &neponset_device_driver,
},
}; };
static int __init neponset_init(void) static int __init neponset_init(void)
{ {
int ret; int ret;
driver_register(&neponset_device_driver);
/* /*
* The Neponset is only present on the Assabet machine type. * The Neponset is only present on the Assabet machine type.
*/ */
...@@ -231,7 +241,7 @@ static int __init neponset_init(void) ...@@ -231,7 +241,7 @@ static int __init neponset_init(void)
return -ENODEV; return -ENODEV;
} }
ret = register_sys_device(&neponset_device); ret = sys_device_register(&neponset_device);
if (ret) if (ret)
return ret; return ret;
...@@ -256,7 +266,7 @@ static int __init neponset_init(void) ...@@ -256,7 +266,7 @@ static int __init neponset_init(void)
return sa1111_init(0x40000000, IRQ_NEPONSET_SA1111); return sa1111_init(0x40000000, IRQ_NEPONSET_SA1111);
} }
arch_initcall(neponset_init); subsys_initcall(neponset_init);
static struct map_desc neponset_io_desc[] __initdata = { static struct map_desc neponset_io_desc[] __initdata = {
/* virtual physical length type */ /* virtual physical length type */
......
This diff is collapsed.
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
#define AUDRDD (IRQ_BOARD_END + 41) #define AUDRDD (IRQ_BOARD_END + 41)
#define AUDSTO (IRQ_BOARD_END + 42) #define AUDSTO (IRQ_BOARD_END + 42)
#define IRQ_USBPWR (IRQ_BOARD_END + 43) #define IRQ_USBPWR (IRQ_BOARD_END + 43)
#define IRQ_NHCIM (IRQ_BOARD_END + 44) #define IRQ_HCIM (IRQ_BOARD_END + 44)
#define IRQ_HCIBUFFACC (IRQ_BOARD_END + 45) #define IRQ_HCIBUFFACC (IRQ_BOARD_END + 45)
#define IRQ_HCIRMTWKP (IRQ_BOARD_END + 46) #define IRQ_HCIRMTWKP (IRQ_BOARD_END + 46)
#define IRQ_NHCIMFCIR (IRQ_BOARD_END + 47) #define IRQ_NHCIMFCIR (IRQ_BOARD_END + 47)
......
...@@ -64,10 +64,6 @@ ...@@ -64,10 +64,6 @@
#define SA1111_SMCR 0x0004 #define SA1111_SMCR 0x0004
#define SA1111_SKID 0x0008 #define SA1111_SKID 0x0008
#define SBI_SKCR __CCREG(SA1111_SKCR)
#define SBI_SMCR __CCREG(SA1111_SMCR)
#define SBI_SKID __CCREG(SA1111_SKID)
#define SKCR_PLL_BYPASS (1<<0) #define SKCR_PLL_BYPASS (1<<0)
#define SKCR_RCLKEN (1<<1) #define SKCR_RCLKEN (1<<1)
#define SKCR_SLEEP (1<<2) #define SKCR_SLEEP (1<<2)
...@@ -131,16 +127,6 @@ ...@@ -131,16 +127,6 @@
#define SA1111_SKPEN1 0x021c #define SA1111_SKPEN1 0x021c
#define SA1111_SKPWM1 0x0220 #define SA1111_SKPWM1 0x0220
#define SKPCR __CCREG(SA1111_SKPCR)
#define SKCDR __CCREG(SA1111_SKCDR)
#define SKAUD __CCREG(SA1111_SKAUD)
#define SKPMC __CCREG(SA1111_SKPMC)
#define SKPTC __CCREG(SA1111_SKPTC)
#define SKPEN0 __CCREG(SA1111_SKPEN0)
#define SKPWM0 __CCREG(SA1111_SKPWM0)
#define SKPEN1 __CCREG(SA1111_SKPEN1)
#define SKPWM1 __CCREG(SA1111_SKPWM1)
#define SKPCR_UCLKEN (1<<0) #define SKPCR_UCLKEN (1<<0)
#define SKPCR_ACCLKEN (1<<1) #define SKPCR_ACCLKEN (1<<1)
#define SKPCR_I2SCLKEN (1<<2) #define SKPCR_I2SCLKEN (1<<2)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment