mirror of
https://github.com/torvalds/linux.git
synced 2026-07-28 01:55:51 +02:00
Microchip clock updates for v7.2
This update includes:
- 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.
-- Rename the macb_clk peripheral clock to gmac_clk to match the
documentation.
-- Add the I3C clock for the SAMA7D65 SoC.
-----BEGIN PGP SIGNATURE-----
iHQEABYKAB0WIQTsZ8eserC1pmhwqDmejrg/N2X7/QUCahxKeAAKCRCejrg/N2X7
/coGAPdzgU5KAAE+gRV4gFuFbPzousvJfR2RdPBbqNIOzMOQAP95QTwYc2W9vx6M
nJ1Da01/nxdXP8scboA85zhRXOetDQ==
=sFGD
-----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
iQJIBAABCAAyFiEE9L57QeeUxqYDyoaDrQKIl8bklSUFAmotxyMUHHN3Ym95ZEBj
aHJvbWl1bS5vcmcACgkQrQKIl8bklSV93hAA0Yb50sWtJDZpxhpoPmCv0CP5c+/Z
yeqiWE92VTtlWb63wgjIg95oWx/WlMEk/7tjBwy5hvohQF5VDfdkn7NcNReVCqP8
doPDXe7QdM9ellluW4qpQu4J54EFe9fDgzM+EHQS4jHbarzCX+aonFodfJ0GMQj7
oSoBOyETHr1J9M9xHKilFuX8h+U2drmk5fDRLpYVKaBSBXhbmtMU2uvbqqK32UhC
LNiSpE37sc64G8GF/9sQVRXGBTdmJX0X8lYzjdagds/ZTJkH0WkgaMZBNlx/EJF5
9VL0U3gLHMKCJgfN60KVd/dA6aIiuFbHkMtw6loGoCodBQW3IPZIVXrff8nWo8TX
NlrLItnCsRbhIU+Mfb3Xzm/WwQAsFCkNzeAlx+N91s5ek38gOhZknj6dIdT7J1g9
rkhRnjkeglaNNjbKQMZZwZrrisCRvQKb5lWLa4U+dLn8y7uweUc1w9bMNrSKWKys
zmudCaNScWqQ/Af2Qh7ZqA1NTbIy/e0B5J45iweY3bPgpVOiN1NUKl5bax5tMHp/
9F/biGEfNVrLggqrECgaohoVCk/zeWNu0tVipxY5zPebBVgcIXpo4kp8UDDWLaen
jZYiFew/v0cyvKfrtwbjU+ltc2PnCGll/frXJeXavxUVkC//QMB0ROgA6W2s+3Wa
dd4Kwbm4SK5HJ3I=
=eGAb
-----END PGP SIGNATURE-----
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:
commit
92ab4c80aa
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user