diff options
Diffstat (limited to 'drivers/ps3')
| -rw-r--r-- | drivers/ps3/ps3-vuart.c | 5 | ||||
| -rw-r--r-- | drivers/ps3/sys-manager-core.c | 6 | ||||
| -rw-r--r-- | drivers/ps3/vuart.h | 16 |
3 files changed, 19 insertions, 8 deletions
diff --git a/drivers/ps3/ps3-vuart.c b/drivers/ps3/ps3-vuart.c index bc1e5139ba29..d6db822bef84 100644 --- a/drivers/ps3/ps3-vuart.c +++ b/drivers/ps3/ps3-vuart.c @@ -151,11 +151,6 @@ static void __maybe_unused _dump_port_params(unsigned int port_number, #endif } -struct vuart_triggers { - unsigned long rx; - unsigned long tx; -}; - int ps3_vuart_get_triggers(struct ps3_system_bus_device *dev, struct vuart_triggers *trig) { diff --git a/drivers/ps3/sys-manager-core.c b/drivers/ps3/sys-manager-core.c index 0e41737ea835..c429ffca1ab7 100644 --- a/drivers/ps3/sys-manager-core.c +++ b/drivers/ps3/sys-manager-core.c @@ -47,7 +47,7 @@ void ps3_sys_manager_register_ops(const struct ps3_sys_manager_ops *ops) } EXPORT_SYMBOL_GPL(ps3_sys_manager_register_ops); -void ps3_sys_manager_power_off(void) +void __noreturn ps3_sys_manager_power_off(void) { if (ps3_sys_manager_ops.power_off) ps3_sys_manager_ops.power_off(ps3_sys_manager_ops.dev); @@ -55,7 +55,7 @@ void ps3_sys_manager_power_off(void) ps3_sys_manager_halt(); } -void ps3_sys_manager_restart(void) +void __noreturn ps3_sys_manager_restart(void) { if (ps3_sys_manager_ops.restart) ps3_sys_manager_ops.restart(ps3_sys_manager_ops.dev); @@ -63,7 +63,7 @@ void ps3_sys_manager_restart(void) ps3_sys_manager_halt(); } -void ps3_sys_manager_halt(void) +void __noreturn ps3_sys_manager_halt(void) { pr_emerg("System Halted, OK to turn off power\n"); local_irq_disable(); diff --git a/drivers/ps3/vuart.h b/drivers/ps3/vuart.h index eb7f6d94a890..23358b719319 100644 --- a/drivers/ps3/vuart.h +++ b/drivers/ps3/vuart.h @@ -82,4 +82,20 @@ void ps3_vuart_cancel_async(struct ps3_system_bus_device *dev); void ps3_vuart_clear_rx_bytes(struct ps3_system_bus_device *dev, unsigned int bytes); +struct vuart_triggers { + unsigned long rx; + unsigned long tx; +}; + +int ps3_vuart_get_triggers(struct ps3_system_bus_device *dev, + struct vuart_triggers *trig); +int ps3_vuart_set_triggers(struct ps3_system_bus_device *dev, unsigned int tx, + unsigned int rx); +int ps3_vuart_enable_interrupt_tx(struct ps3_system_bus_device *dev); +int ps3_vuart_disable_interrupt_tx(struct ps3_system_bus_device *dev); +int ps3_vuart_enable_interrupt_rx(struct ps3_system_bus_device *dev); +int ps3_vuart_disable_interrupt_rx(struct ps3_system_bus_device *dev); +int ps3_vuart_enable_interrupt_disconnect(struct ps3_system_bus_device *dev); +int ps3_vuart_disable_interrupt_disconnect(struct ps3_system_bus_device *dev); + #endif |