Skip to content

Commit

Permalink
x86/platform/intel-mid: Get rid of intel_scu_ipc_legacy.h
Browse files Browse the repository at this point in the history
The header is used by a single user. Move header content to that user.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Andy Shevchenko authored and Rafael J. Wysocki committed Feb 15, 2021
1 parent 24c9253 commit 6517da7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 22 deletions.
2 changes: 0 additions & 2 deletions arch/x86/include/asm/intel_scu_ipc.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,4 @@ static inline int intel_scu_ipc_dev_command(struct intel_scu_ipc_dev *scu, int c
inlen, out, outlen);
}

#include <asm/intel_scu_ipc_legacy.h>

#endif
18 changes: 0 additions & 18 deletions arch/x86/include/asm/intel_scu_ipc_legacy.h

This file was deleted.

7 changes: 5 additions & 2 deletions arch/x86/platform/intel-mid/intel-mid.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
#include <asm/intel_scu_ipc.h>
#include <asm/reboot.h>

#define IPCMSG_COLD_OFF 0x80 /* Only for Tangier */
#define IPCMSG_COLD_RESET 0xF1

enum intel_mid_cpu_type __intel_mid_cpu_chip;
EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip);

Expand All @@ -38,12 +41,12 @@ static void intel_mid_power_off(void)
intel_mid_pwr_power_off();

/* Only for Tangier, the rest will ignore this command */
intel_scu_ipc_simple_command(IPCMSG_COLD_OFF, 1);
intel_scu_ipc_dev_simple_command(NULL, IPCMSG_COLD_OFF, 1);
};

static void intel_mid_reboot(void)
{
intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 0);
intel_scu_ipc_dev_simple_command(NULL, IPCMSG_COLD_RESET, 0);
}

static void __init intel_mid_time_init(void)
Expand Down

0 comments on commit 6517da7

Please sign in to comment.