Skip to content

Commit eb10a26

Browse files
superna9999jbrun3t
authored andcommitted
clk: meson: aoclk: 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> Link: https://lore.kernel.org/r/20230607-topic-amlogic-upstream-clkid-public-migration-v2-15-38172d17c27a@linaro.org Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
1 parent 40fb677 commit eb10a26

File tree

6 files changed

+9
-45
lines changed

6 files changed

+9
-45
lines changed

drivers/clk/meson/axg-aoclk.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
#include <linux/mfd/syscon.h>
1515
#include <linux/module.h>
1616
#include "meson-aoclk.h"
17-
#include "axg-aoclk.h"
1817

1918
#include "clk-regmap.h"
2019
#include "clk-dualdiv.h"
2120

21+
#include <dt-bindings/clock/axg-aoclkc.h>
22+
#include <dt-bindings/reset/axg-aoclkc.h>
23+
2224
/*
2325
* AO Configuration Clock registers offsets
2426
* Register offsets from the data sheet must be multiplied by 4.

drivers/clk/meson/axg-aoclk.h

Lines changed: 0 additions & 16 deletions
This file was deleted.

drivers/clk/meson/g12a-aoclk.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
#include <linux/mfd/syscon.h>
1515
#include <linux/module.h>
1616
#include "meson-aoclk.h"
17-
#include "g12a-aoclk.h"
1817

1918
#include "clk-regmap.h"
2019
#include "clk-dualdiv.h"
2120

21+
#include <dt-bindings/clock/g12a-aoclkc.h>
22+
#include <dt-bindings/reset/g12a-aoclkc.h>
23+
2224
/*
2325
* AO Configuration Clock registers offsets
2426
* Register offsets from the data sheet must be multiplied by 4.

drivers/clk/meson/g12a-aoclk.h

Lines changed: 0 additions & 13 deletions
This file was deleted.

drivers/clk/meson/gxbb-aoclk.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
#include <linux/mfd/syscon.h>
88
#include <linux/module.h>
99
#include "meson-aoclk.h"
10-
#include "gxbb-aoclk.h"
1110

1211
#include "clk-regmap.h"
1312
#include "clk-dualdiv.h"
1413

14+
#include <dt-bindings/clock/gxbb-aoclkc.h>
15+
#include <dt-bindings/reset/gxbb-aoclkc.h>
16+
1517
/* AO Configuration Clock registers offsets */
1618
#define AO_RTI_PWR_CNTL_REG1 0x0c
1719
#define AO_RTI_PWR_CNTL_REG0 0x10

drivers/clk/meson/gxbb-aoclk.h

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)