Merge tag 'acpi-5.9-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull more ACPI updates from Rafael Wysocki:
 "Add new hardware support to the ACPI driver for AMD SoCs, the x86 clk
  driver and the Designware i2c driver (changes from Akshu Agrawal and
  Pu Wen)"

* tag 'acpi-5.9-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  clk: x86: Support RV architecture
  ACPI: APD: Add a fmw property is_raven
  clk: x86: Change name from ST to FCH
  ACPI: APD: Change name from ST to FCH
  i2c: designware: Add device HID for Hygon I2C controller
This commit is contained in:
Linus Torvalds
2020-08-15 08:18:22 -07:00
6 changed files with 121 additions and 91 deletions

View File

@@ -1,17 +1,18 @@
/* SPDX-License-Identifier: MIT */
/*
* clock framework for AMD Stoney based clock
* clock framework for AMD misc clocks
*
* Copyright 2018 Advanced Micro Devices, Inc.
*/
#ifndef __CLK_ST_H
#define __CLK_ST_H
#ifndef __CLK_FCH_H
#define __CLK_FCH_H
#include <linux/compiler.h>
struct st_clk_data {
struct fch_clk_data {
void __iomem *base;
u32 is_rv;
};
#endif /* __CLK_ST_H */
#endif /* __CLK_FCH_H */