Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd090eed authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ACPI: Display "ACPI" to motherboard resources in /proc/io{mem,port} 



Add "ACPI" to motherboard resource allocation names, so people have a clue
about where to look.  And remove some trailing spaces.

Changes these /proc/iomem entries from this:

    ff5c1004-ff5c1007 : PM_TMR
    ff5c1008-ff5c100b : PM1a_EVT_BLK
    ff5c100c-ff5c100d : PM1a_CNT_BLK
    ff5c1010-ff5c1013 : GPE0_BLK
    ff5c1014-ff5c1017 : GPE1_BLK

to this:

    ff5c1004-ff5c1007 : ACPI PM_TMR
    ff5c1008-ff5c100b : ACPI PM1a_EVT_BLK
    ff5c100c-ff5c100d : ACPI PM1a_CNT_BLK
    ff5c1010-ff5c1013 : ACPI GPE0_BLK
    ff5c1014-ff5c1017 : ACPI GPE1_BLK

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 81507ea9

drivers/acpi/motherboard.c

+11 −11
Original line number Diff line number Diff line
@@ -138,32 +138,32 @@ static void __init acpi_request_region (struct acpi_generic_address *addr, 
static void __init acpi_reserve_resources(void)

{

	acpi_request_region(&acpi_gbl_FADT->xpm1a_evt_blk,

			       acpi_gbl_FADT->pm1_evt_len, "PM1a_EVT_BLK");

			       acpi_gbl_FADT->pm1_evt_len, "ACPI PM1a_EVT_BLK");



	acpi_request_region(&acpi_gbl_FADT->xpm1b_evt_blk,

			       acpi_gbl_FADT->pm1_evt_len, "PM1b_EVT_BLK");

			       acpi_gbl_FADT->pm1_evt_len, "ACPI PM1b_EVT_BLK");



	acpi_request_region(&acpi_gbl_FADT->xpm1a_cnt_blk,

			       acpi_gbl_FADT->pm1_cnt_len, "PM1a_CNT_BLK");

			       acpi_gbl_FADT->pm1_cnt_len, "ACPI PM1a_CNT_BLK");



	acpi_request_region(&acpi_gbl_FADT->xpm1b_cnt_blk,

			       acpi_gbl_FADT->pm1_cnt_len, "PM1b_CNT_BLK");

			       acpi_gbl_FADT->pm1_cnt_len, "ACPI PM1b_CNT_BLK");



	if (acpi_gbl_FADT->pm_tm_len == 4)

		acpi_request_region(&acpi_gbl_FADT->xpm_tmr_blk, 4, "PM_TMR");

		acpi_request_region(&acpi_gbl_FADT->xpm_tmr_blk, 4, "ACPI PM_TMR");



	acpi_request_region(&acpi_gbl_FADT->xpm2_cnt_blk,

			       acpi_gbl_FADT->pm2_cnt_len, "PM2_CNT_BLK");

			       acpi_gbl_FADT->pm2_cnt_len, "ACPI PM2_CNT_BLK");



	/* Length of GPE blocks must be a non-negative multiple of 2 */



	if (!(acpi_gbl_FADT->gpe0_blk_len & 0x1))

		acpi_request_region(&acpi_gbl_FADT->xgpe0_blk,

			       acpi_gbl_FADT->gpe0_blk_len, "GPE0_BLK");

			       acpi_gbl_FADT->gpe0_blk_len, "ACPI GPE0_BLK");



	if (!(acpi_gbl_FADT->gpe1_blk_len & 0x1))

		acpi_request_region(&acpi_gbl_FADT->xgpe1_blk,

			       acpi_gbl_FADT->gpe1_blk_len, "GPE1_BLK");

			       acpi_gbl_FADT->gpe1_blk_len, "ACPI GPE1_BLK");

}



static int __init acpi_motherboard_init(void)