Commit eb10a264 authored by Neil Armstrong's avatar Neil Armstrong Committed by Jerome Brunet
Browse files

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: default avatarNeil 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: default avatarJerome Brunet <jbrunet@baylibre.com>
parent 40fb6772

drivers/clk/meson/axg-aoclk.c

+3 −1
Original line number Diff line number Diff line
@@ -14,11 +14,13 @@ 
#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include "meson-aoclk.h"

#include "axg-aoclk.h"



#include "clk-regmap.h"

#include "clk-dualdiv.h"



#include <dt-bindings/clock/axg-aoclkc.h>

#include <dt-bindings/reset/axg-aoclkc.h>



/*

 * AO Configuration Clock registers offsets

 * Register offsets from the data sheet must be multiplied by 4.

drivers/clk/meson/axg-aoclk.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */

/*

 * Copyright (c) 2017 BayLibre, SAS

 * Author: Neil Armstrong <narmstrong@baylibre.com>

 *

 * Copyright (c) 2018 Amlogic, inc.

 * Author: Qiufang Dai <qiufang.dai@amlogic.com>

 */



#ifndef __AXG_AOCLKC_H

#define __AXG_AOCLKC_H



#include <dt-bindings/clock/axg-aoclkc.h>

#include <dt-bindings/reset/axg-aoclkc.h>



#endif /* __AXG_AOCLKC_H */

drivers/clk/meson/g12a-aoclk.c

+3 −1
Original line number Diff line number Diff line
@@ -14,11 +14,13 @@ 
#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include "meson-aoclk.h"

#include "g12a-aoclk.h"



#include "clk-regmap.h"

#include "clk-dualdiv.h"



#include <dt-bindings/clock/g12a-aoclkc.h>

#include <dt-bindings/reset/g12a-aoclkc.h>



/*

 * AO Configuration Clock registers offsets

 * Register offsets from the data sheet must be multiplied by 4.

drivers/clk/meson/g12a-aoclk.h

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */

/*

 * Copyright (c) 2019 BayLibre, SAS

 * Author: Neil Armstrong <narmstrong@baylibre.com>

 */



#ifndef __G12A_AOCLKC_H

#define __G12A_AOCLKC_H



#include <dt-bindings/clock/g12a-aoclkc.h>

#include <dt-bindings/reset/g12a-aoclkc.h>



#endif /* __G12A_AOCLKC_H */

drivers/clk/meson/gxbb-aoclk.c

+3 −1
Original line number Diff line number Diff line
@@ -7,11 +7,13 @@ 
#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include "meson-aoclk.h"

#include "gxbb-aoclk.h"



#include "clk-regmap.h"

#include "clk-dualdiv.h"



#include <dt-bindings/clock/gxbb-aoclkc.h>

#include <dt-bindings/reset/gxbb-aoclkc.h>



/* AO Configuration Clock registers offsets */

#define AO_RTI_PWR_CNTL_REG1	0x0c

#define AO_RTI_PWR_CNTL_REG0	0x10