History

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

Linus Torvalds committed 6 years ago

Commit 341323f2 parents 1a5d9db 19fe87f6 files · +121 −91Browse files

Showing the changes to include/linux (1 of 6 files). Show all

Unified · Split

include/linux/platform_data/clk-fch.hrenamed from include/linux/platform_data/clk-st.h+6−5
@@ -1,17 +1,18 @@
1/* SPDX-License-Identifier: MIT */1/* SPDX-License-Identifier: MIT */
2/*2/*
3 * clock framework for AMD Stoney based clock3 * clock framework for AMD misc clocks
4 *4 *
5 * Copyright 2018 Advanced Micro Devices, Inc.5 * Copyright 2018 Advanced Micro Devices, Inc.
6 */6 */
7 7
8#ifndef __CLK_ST_H8#ifndef __CLK_FCH_H
9#define __CLK_ST_H9#define __CLK_FCH_H
10 10
11#include <linux/compiler.h>11#include <linux/compiler.h>
12 12
13struct st_clk_data {13struct fch_clk_data {
14 void __iomem *base;14 void __iomem *base;
15 u32 is_rv;
15};16};
16 17
17#endif /* __CLK_ST_H */18#endif /* __CLK_FCH_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t