Skip to content

Commit 84448fa

Browse files
committed
Merge tag 'sunxi-clk-for-6.9-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-allwinner
Pull Allwinner clk driver updates from Jernej Skrabec: - fix kerneldoc warnings * tag 'sunxi-clk-for-6.9-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: clk: sunxi: usb: fix kernel-doc warnings clk: sunxi: sun9i-cpus: fix kernel-doc warnings clk: sunxi: a20-gmac: fix kernel-doc warnings
2 parents 6613476 + aed6d71 commit 84448fa

File tree

3 files changed

+21
-16
lines changed

3 files changed

+21
-16
lines changed

drivers/clk/sunxi/clk-a20-gmac.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,19 @@
1515

1616
static DEFINE_SPINLOCK(gmac_lock);
1717

18+
19+
#define SUN7I_A20_GMAC_GPIT 2
20+
#define SUN7I_A20_GMAC_MASK 0x3
21+
#define SUN7I_A20_GMAC_PARENTS 2
22+
23+
static u32 sun7i_a20_gmac_mux_table[SUN7I_A20_GMAC_PARENTS] = {
24+
0x00, /* Select mii_phy_tx_clk */
25+
0x02, /* Select gmac_int_tx_clk */
26+
};
27+
1828
/**
1929
* sun7i_a20_gmac_clk_setup - Setup function for A20/A31 GMAC clock module
30+
* @node: &struct device_node for the clock
2031
*
2132
* This clock looks something like this
2233
* ________________________
@@ -39,16 +50,6 @@ static DEFINE_SPINLOCK(gmac_lock);
3950
* enable/disable this clock to configure the required state. The clock
4051
* driver then responds by auto-reparenting the clock.
4152
*/
42-
43-
#define SUN7I_A20_GMAC_GPIT 2
44-
#define SUN7I_A20_GMAC_MASK 0x3
45-
#define SUN7I_A20_GMAC_PARENTS 2
46-
47-
static u32 sun7i_a20_gmac_mux_table[SUN7I_A20_GMAC_PARENTS] = {
48-
0x00, /* Select mii_phy_tx_clk */
49-
0x02, /* Select gmac_int_tx_clk */
50-
};
51-
5253
static void __init sun7i_a20_gmac_clk_setup(struct device_node *node)
5354
{
5455
struct clk *clk;

drivers/clk/sunxi/clk-sun9i-cpus.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818

1919
static DEFINE_SPINLOCK(sun9i_a80_cpus_lock);
2020

21-
/**
22-
* sun9i_a80_cpus_clk_setup() - Setup function for a80 cpus composite clk
23-
*/
2421

2522
#define SUN9I_CPUS_MAX_PARENTS 4
2623
#define SUN9I_CPUS_MUX_PARENT_PLL4 3
@@ -180,6 +177,10 @@ static const struct clk_ops sun9i_a80_cpus_clk_ops = {
180177
.set_rate = sun9i_a80_cpus_clk_set_rate,
181178
};
182179

180+
/**
181+
* sun9i_a80_cpus_setup() - Setup function for a80 cpus composite clk
182+
* @node: &struct device_node for the clock
183+
*/
183184
static void sun9i_a80_cpus_setup(struct device_node *node)
184185
{
185186
const char *clk_name = node->name;

drivers/clk/sunxi/clk-usb.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ static const struct reset_control_ops sunxi_usb_reset_ops = {
7373
.deassert = sunxi_usb_reset_deassert,
7474
};
7575

76-
/**
77-
* sunxi_usb_clk_setup() - Setup function for usb gate clocks
78-
*/
7976

8077
#define SUNXI_USB_MAX_SIZE 32
8178

@@ -85,6 +82,12 @@ struct usb_clk_data {
8582
bool reset_needs_clk;
8683
};
8784

85+
/**
86+
* sunxi_usb_clk_setup() - Setup function for usb gate clocks
87+
* @node: &struct device_node for the clock
88+
* @data: &struct usb_clk_data for the clock
89+
* @lock: spinlock for the clock
90+
*/
8891
static void __init sunxi_usb_clk_setup(struct device_node *node,
8992
const struct usb_clk_data *data,
9093
spinlock_t *lock)

0 commit comments

Comments
 (0)