mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-22 02:17:36 -04:00
Merge tag 'clk-microchip-7.2' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into clk-microchip
Pull Microchip clk driver updates from Claudiu Beznea: - PIC32: Rename the clk-core.c Microchip clock driver to clk-pic32.c to better reflect its usage. - AT91: Remove peripheral clock ID 67 (GMAC TSU) for the SAM9X7 SoC, as it does not exist according to the documentation. - AT91: Rename the macb_clk peripheral clock to gmac_clk to match the documentation. - AT91: Add the I3C clock for the SAMA7D65 SoC. * tag 'clk-microchip-7.2' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: clk: at91: sama7d65: add peripheral clock for I3C clk: at91: sam9x7: Rename macb0_clk to gmac_clk clk: at91: sam9x7: Remove gmac peripheral clock with ID 67 clk: microchip: rename clk-core to clk-pic32
This commit is contained in:
@@ -387,7 +387,7 @@ static const struct {
|
||||
{ .n = "dma0_clk", .id = 20, },
|
||||
{ .n = "uhphs_clk", .id = 22, },
|
||||
{ .n = "udphs_clk", .id = 23, },
|
||||
{ .n = "macb0_clk", .id = 24, },
|
||||
{ .n = "gmac_clk", .id = 24, },
|
||||
{ .n = "lcd_clk", .id = 25, },
|
||||
{ .n = "sdmmc1_clk", .id = 26, },
|
||||
{ .n = "ssc_clk", .id = 28, },
|
||||
@@ -420,7 +420,6 @@ static const struct {
|
||||
{ .n = "lvdsc_clk", .id = 56, },
|
||||
{ .n = "pit64b1_clk", .id = 58, },
|
||||
{ .n = "puf_clk", .id = 59, },
|
||||
{ .n = "gmactsu_clk", .id = 67, },
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
@@ -677,6 +677,7 @@ static struct {
|
||||
{ .n = "uhphs_clk", .p = PCK_PARENT_HW_MCK5, .id = 101, },
|
||||
{ .n = "dsi_clk", .p = PCK_PARENT_HW_MCK3, .id = 103, },
|
||||
{ .n = "lvdsc_clk", .p = PCK_PARENT_HW_MCK3, .id = 104, },
|
||||
{ .n = "i3cc_clk", .p = PCK_PARENT_HW_MCK8, .id = 105, },
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
obj-$(CONFIG_COMMON_CLK_PIC32) += clk-core.o
|
||||
obj-$(CONFIG_COMMON_CLK_PIC32) += clk-pic32.o
|
||||
obj-$(CONFIG_PIC32MZDA) += clk-pic32mzda.o
|
||||
obj-$(CONFIG_MCHP_CLK_MPFS) += clk-mpfs.o
|
||||
obj-$(CONFIG_MCHP_CLK_MPFS) += clk-mpfs-ccc.o
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <linux/iopoll.h>
|
||||
#include <linux/platform_data/pic32.h>
|
||||
|
||||
#include "clk-core.h"
|
||||
#include "clk-pic32.h"
|
||||
|
||||
/* OSCCON Reg fields */
|
||||
#define OSC_CUR_MASK 0x07
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <linux/platform_device.h>
|
||||
#include <asm/traps.h>
|
||||
|
||||
#include "clk-core.h"
|
||||
#include "clk-pic32.h"
|
||||
|
||||
/* FRC Postscaler */
|
||||
#define OSC_FRCDIV_MASK 0x07
|
||||
|
||||
Reference in New Issue
Block a user