hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OMAP: PM: the serial core + driver can no handle no_console_suspend support 

without any SoC specific handlding or SoC-specific DT bindings.  Remove
 the now unused SoC specifics for OMAP.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJRukMfAAoJEFk3GJrT+8ZlWbIP/3z+GLyclfQfO5AO0CnqdBls
 Pq1gaSw/NUU620BrA2vx1gadPV1Dty8Yzd6+Bg8GhQMKvOPLsuvnq5PYLgZYTVCy
 w9185Hk3C73C+TdZkH8D+7sxaRnjv68+sOE3QxP3p6YsuVPyljmXmrCvYwl+yEci
 M085K4yurJNaxCI2yP1C7HzVqLjqbIo8i3kcqPLbnVwIzz5wxexBPI4id8leQnV3
 ri6q/dijL4447xSibuRodk3+DzivrJnkXav5phn3fUQpNKNnrIkn+DiCry0ob/G4
 En9UfUYxn2jXMJdINoWKF9oA6jmgFDmwbpafnrFQrpGFeuhQL0fI9LUZCToO90JK
 4FNAfzPD0Fhz4wbUiXRlJdJ4SsULBy0JbnU9jfDPNcM3aaL0aP7sd9FQxFIotrbI
 DLR2S4iE6jXUpmPzJ57CPVZK32grd/c7PsrErlHE4jw4pIM+OzQEzGwD7sEOS3FJ
 IMH+iuFPrg65EVfDOErBSGashvOf/xvjowtQ74Nd8AX/yJqtJh1GzoB+/7w63e12
 6o+QlBaEPAgBAXC3OCwDZAFCLu+cAqhB8haQze/KO+gMcTvuANmMwFArRINIGJQw
 OrL2ywBpLoI0KtmXdKxdBDVb2c10zV/vwkr0Tn2fEjMr4lMtxXPZkoq8dhF+Z9r8
 DBbQPPL3oZZYnvNMcfJ4
 =NcVy
 -----END PGP SIGNATURE-----

Merge tag 'omap-pm-v3.11/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.11/pm-serial

OMAP: PM: the serial core + driver can no handle no_console_suspend support
without any SoC specific handlding or SoC-specific DT bindings.  Remove
the now unused SoC specifics for OMAP.
This commit is contained in:
Tony Lindgren 2013-06-17 04:03:14 -07:00
parent f722406faa 4b7ec5acce
commit 1e383d7bdd
4 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/am33xx.dtsi
View File

@ -394,7 +394,6 @@
compatible = "ti,am3352-ocmcram";
reg = <0x40300000 0x10000>;
ti,hwmods = "ocmcram";
ti,no_idle_on_suspend;
};
wkup_m3: wkup_m3@44d00000 {

9
arch/arm/mach-omap2/omap_device.c
View File

@ -170,9 +170,6 @@ static int omap_device_build_from_dt(struct platform_device *pdev)
r->name = dev_name(&pdev->dev);
}
if (of_get_property(node, "ti,no_idle_on_suspend", NULL))
omap_device_disable_idle_on_suspend(pdev);
pdev->dev.pm_domain = &omap_device_pm_domain;
odbfd_exit1:
@ -621,8 +618,7 @@ static int _od_suspend_noirq(struct device *dev)
if (!ret && !pm_runtime_status_suspended(dev)) {
if (pm_generic_runtime_suspend(dev) == 0) {
if (!(od->flags & OMAP_DEVICE_NO_IDLE_ON_SUSPEND))
omap_device_idle(pdev);
omap_device_idle(pdev);
od->flags |= OMAP_DEVICE_SUSPENDED;
}
}
@ -638,8 +634,7 @@ static int _od_resume_noirq(struct device *dev)
if ((od->flags & OMAP_DEVICE_SUSPENDED) &&
!pm_runtime_status_suspended(dev)) {
od->flags &= ~OMAP_DEVICE_SUSPENDED;
if (!(od->flags & OMAP_DEVICE_NO_IDLE_ON_SUSPEND))
omap_device_enable(pdev);
omap_device_enable(pdev);
pm_generic_runtime_resume(dev);
}

10
arch/arm/mach-omap2/omap_device.h
View File

@ -38,7 +38,6 @@ extern struct dev_pm_domain omap_device_pm_domain;
/* omap_device.flags values */
#define OMAP_DEVICE_SUSPENDED BIT(0)
#define OMAP_DEVICE_NO_IDLE_ON_SUSPEND BIT(1)
/**
* struct omap_device - omap_device wrapper for platform_devices
@ -101,13 +100,4 @@ static inline struct omap_device *to_omap_device(struct platform_device *pdev)
{
return pdev ? pdev->archdata.od : NULL;
}
static inline
void omap_device_disable_idle_on_suspend(struct platform_device *pdev)
{
struct omap_device *od = to_omap_device(pdev);
od->flags |= OMAP_DEVICE_NO_IDLE_ON_SUSPEND;
}
#endif

7
arch/arm/mach-omap2/serial.c
View File

@ -63,7 +63,6 @@ struct omap_uart_state {
static LIST_HEAD(uart_list);
static u8 num_uarts;
static u8 console_uart_id = -1;
static u8 no_console_suspend;
static u8 uart_debug;
#define DEFAULT_RXDMA_POLLRATE 1 /* RX DMA polling rate (us) */
@ -236,9 +235,6 @@ static int __init omap_serial_early_init(void)
uart_name, uart->num);
}
if (cmdline_find_option("no_console_suspend"))
no_console_suspend = true;
/*
* omap-uart can be used for earlyprintk logs
* So if omap-uart is used as console then prevent
@ -323,9 +319,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata,
return;
}
if ((console_uart_id == bdata->id) && no_console_suspend)
omap_device_disable_idle_on_suspend(pdev);
oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);
if (console_uart_id == bdata->id) {