UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

clk: meson: a1: move bindings include to main driver 

Now the clock ids are no more defined in private headers,
cleanup and include the dt-bindings headers from the main
driver file.

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Dmitry Rokosov <ddrokosov@sberdevices.ru>
Link: https://lore.kernel.org/r/20230607-topic-amlogic-upstream-clkid-public-migration-v2-17-38172d17c27a@linaro.org
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
This commit is contained in:
Neil Armstrong 2023-06-12 11:57:34 +02:00 committed by Jerome Brunet
parent ccbfbd3679
commit afcb7c07be
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/clk/meson/a1-peripherals.c
View File

@ -15,6 +15,8 @@
#include "clk-regmap.h" #include "clk-regmap.h"
#include "meson-clkc-utils.h" #include "meson-clkc-utils.h"
#include <dt-bindings/clock/amlogic,a1-peripherals-clkc.h>
static struct clk_regmap xtal_in = { static struct clk_regmap xtal_in = {
.data = &(struct clk_regmap_gate_data){ .data = &(struct clk_regmap_gate_data){
.offset = SYS_OSCIN_CTRL, .offset = SYS_OSCIN_CTRL,

3
drivers/clk/meson/a1-peripherals.h
View File

@ -43,7 +43,4 @@
#define PSRAM_CLK_CTRL 0xf4 #define PSRAM_CLK_CTRL 0xf4
#define DMC_CLK_CTRL 0xf8 #define DMC_CLK_CTRL 0xf8
/* include the CLKIDs that have been made part of the DT binding */
#include <dt-bindings/clock/amlogic,a1-peripherals-clkc.h>
#endif /* __A1_PERIPHERALS_H */ #endif /* __A1_PERIPHERALS_H */

2
drivers/clk/meson/a1-pll.c
View File

@ -14,6 +14,8 @@
#include "clk-regmap.h" #include "clk-regmap.h"
#include "meson-clkc-utils.h" #include "meson-clkc-utils.h"
#include <dt-bindings/clock/amlogic,a1-pll-clkc.h>
static struct clk_regmap fixed_pll_dco = { static struct clk_regmap fixed_pll_dco = {
.data = &(struct meson_clk_pll_data){ .data = &(struct meson_clk_pll_data){
.en = { .en = {

3
drivers/clk/meson/a1-pll.h
View File

@ -25,7 +25,4 @@
#define ANACTRL_HIFIPLL_CTRL4 0xd0 #define ANACTRL_HIFIPLL_CTRL4 0xd0
#define ANACTRL_HIFIPLL_STS 0xd4 #define ANACTRL_HIFIPLL_STS 0xd4
/* include the CLKIDs that have been made part of the DT binding */
#include <dt-bindings/clock/amlogic,a1-pll-clkc.h>
#endif /* __A1_PLL_H */ #endif /* __A1_PLL_H */