mirror of
https://github.com/torvalds/linux.git
synced 2026-07-31 11:37:06 +02:00
linux-can-next-for-6.17-20250711
-----BEGIN PGP SIGNATURE----- iQFHBAABCgAxFiEEn/sM2K9nqF/8FWzzDHRl3/mQkZwFAmhw48wTHG1rbEBwZW5n dXRyb25peC5kZQAKCRAMdGXf+ZCRnMWyCACNCHDSMr0BVzC2461MjsEmfi5P4Ri7 +9qL7oV5YWL3WDO8ltId0F8Up+WX8TeDIjzzx1z5tTZ1wgCSgoN74dIfkHRjaLzT 5u+D5880GrgtUUBsZCl6eY+uqazsMnZQHSDi69/KTaii8jW4YH+/mH5hgxoVUBAX QHuMxcHQSn4lo8w31ChUVNVCFtUllZZRfdRzZX/JctFHLfUK17R04xyjzsWJDZm9 GxQwmu0Me7NFPipb1YzlDNu747XpTTnqBFNFjYJdzgkBgR7Ypy+yVng2h5j3PEy4 XGECdyfU9zmhP1ddn5k4J7H3OaWSsba5IwKwGU0zw5FHXFpfaxd7wcrb =ELzu -----END PGP SIGNATURE----- Merge tag 'linux-can-next-for-6.17-20250711' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next Marc Kleine-Budde says: ==================== pull-request: can-next 2025-07-11 The first patch is by Geert Uytterhoeven and converts the rcar_can driver to DEFINE_SIMPLE_DEV_PM_OPS. The last patch is by Biju Das and removes unused macros from the rcar_canfd driver. * tag 'linux-can-next-for-6.17-20250711' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next: can: rcar_canfd: Drop unused macros can: rcar_can: Convert to DEFINE_SIMPLE_DEV_PM_OPS() ==================== Link: https://patch.msgid.link/20250711101706.2822687-1-mkl@pengutronix.de Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
commit
5b41a682cb
|
|
@ -834,7 +834,7 @@ static void rcar_can_remove(struct platform_device *pdev)
|
|||
free_candev(ndev);
|
||||
}
|
||||
|
||||
static int __maybe_unused rcar_can_suspend(struct device *dev)
|
||||
static int rcar_can_suspend(struct device *dev)
|
||||
{
|
||||
struct net_device *ndev = dev_get_drvdata(dev);
|
||||
struct rcar_can_priv *priv = netdev_priv(ndev);
|
||||
|
|
@ -857,7 +857,7 @@ static int __maybe_unused rcar_can_suspend(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused rcar_can_resume(struct device *dev)
|
||||
static int rcar_can_resume(struct device *dev)
|
||||
{
|
||||
struct net_device *ndev = dev_get_drvdata(dev);
|
||||
struct rcar_can_priv *priv = netdev_priv(ndev);
|
||||
|
|
@ -886,7 +886,8 @@ static int __maybe_unused rcar_can_resume(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(rcar_can_pm_ops, rcar_can_suspend, rcar_can_resume);
|
||||
static DEFINE_SIMPLE_DEV_PM_OPS(rcar_can_pm_ops, rcar_can_suspend,
|
||||
rcar_can_resume);
|
||||
|
||||
static const struct of_device_id rcar_can_of_table[] __maybe_unused = {
|
||||
{ .compatible = "renesas,can-r8a7778" },
|
||||
|
|
@ -904,7 +905,7 @@ static struct platform_driver rcar_can_driver = {
|
|||
.driver = {
|
||||
.name = RCAR_CAN_DRV_NAME,
|
||||
.of_match_table = of_match_ptr(rcar_can_of_table),
|
||||
.pm = &rcar_can_pm_ops,
|
||||
.pm = pm_sleep_ptr(&rcar_can_pm_ops),
|
||||
},
|
||||
.probe = rcar_can_probe,
|
||||
.remove = rcar_can_remove,
|
||||
|
|
|
|||
|
|
@ -224,8 +224,6 @@
|
|||
|
||||
/* RSCFDnCFDRFPTRx */
|
||||
#define RCANFD_RFPTR_RFDLC(x) (((x) >> 28) & 0xf)
|
||||
#define RCANFD_RFPTR_RFPTR(x) (((x) >> 16) & 0xfff)
|
||||
#define RCANFD_RFPTR_RFTS(x) (((x) >> 0) & 0xffff)
|
||||
|
||||
/* RSCFDnCFDRFFDSTSx */
|
||||
#define RCANFD_RFFDSTS_RFFDF BIT(2)
|
||||
|
|
@ -257,12 +255,9 @@
|
|||
/* RSCFDnCFDCFIDk */
|
||||
#define RCANFD_CFID_CFIDE BIT(31)
|
||||
#define RCANFD_CFID_CFRTR BIT(30)
|
||||
#define RCANFD_CFID_CFID_MASK(x) ((x) & 0x1fffffff)
|
||||
|
||||
/* RSCFDnCFDCFPTRk */
|
||||
#define RCANFD_CFPTR_CFDLC(x) (((x) & 0xf) << 28)
|
||||
#define RCANFD_CFPTR_CFPTR(x) (((x) & 0xfff) << 16)
|
||||
#define RCANFD_CFPTR_CFTS(x) (((x) & 0xff) << 0)
|
||||
|
||||
/* RSCFDnCFDCFFDCSTSk */
|
||||
#define RCANFD_CFFDCSTS_CFFDF BIT(2)
|
||||
|
|
@ -328,59 +323,6 @@
|
|||
#define RCANFD_CFPCTR(gpriv, ch, idx) \
|
||||
((gpriv)->info->regs->cfpctr + (0x0c * (ch)) + (0x04 * (idx)))
|
||||
|
||||
/* RSCFDnCFDFESTS / RSCFDnFESTS */
|
||||
#define RCANFD_FESTS (0x0238)
|
||||
/* RSCFDnCFDFFSTS / RSCFDnFFSTS */
|
||||
#define RCANFD_FFSTS (0x023c)
|
||||
/* RSCFDnCFDFMSTS / RSCFDnFMSTS */
|
||||
#define RCANFD_FMSTS (0x0240)
|
||||
/* RSCFDnCFDRFISTS / RSCFDnRFISTS */
|
||||
#define RCANFD_RFISTS (0x0244)
|
||||
/* RSCFDnCFDCFRISTS / RSCFDnCFRISTS */
|
||||
#define RCANFD_CFRISTS (0x0248)
|
||||
/* RSCFDnCFDCFTISTS / RSCFDnCFTISTS */
|
||||
#define RCANFD_CFTISTS (0x024c)
|
||||
|
||||
/* RSCFDnCFDTMCp / RSCFDnTMCp */
|
||||
#define RCANFD_TMC(p) (0x0250 + (0x01 * (p)))
|
||||
/* RSCFDnCFDTMSTSp / RSCFDnTMSTSp */
|
||||
#define RCANFD_TMSTS(p) (0x02d0 + (0x01 * (p)))
|
||||
|
||||
/* RSCFDnCFDTMTRSTSp / RSCFDnTMTRSTSp */
|
||||
#define RCANFD_TMTRSTS(y) (0x0350 + (0x04 * (y)))
|
||||
/* RSCFDnCFDTMTARSTSp / RSCFDnTMTARSTSp */
|
||||
#define RCANFD_TMTARSTS(y) (0x0360 + (0x04 * (y)))
|
||||
/* RSCFDnCFDTMTCSTSp / RSCFDnTMTCSTSp */
|
||||
#define RCANFD_TMTCSTS(y) (0x0370 + (0x04 * (y)))
|
||||
/* RSCFDnCFDTMTASTSp / RSCFDnTMTASTSp */
|
||||
#define RCANFD_TMTASTS(y) (0x0380 + (0x04 * (y)))
|
||||
/* RSCFDnCFDTMIECy / RSCFDnTMIECy */
|
||||
#define RCANFD_TMIEC(y) (0x0390 + (0x04 * (y)))
|
||||
|
||||
/* RSCFDnCFDTXQCCm / RSCFDnTXQCCm */
|
||||
#define RCANFD_TXQCC(m) (0x03a0 + (0x04 * (m)))
|
||||
/* RSCFDnCFDTXQSTSm / RSCFDnTXQSTSm */
|
||||
#define RCANFD_TXQSTS(m) (0x03c0 + (0x04 * (m)))
|
||||
/* RSCFDnCFDTXQPCTRm / RSCFDnTXQPCTRm */
|
||||
#define RCANFD_TXQPCTR(m) (0x03e0 + (0x04 * (m)))
|
||||
|
||||
/* RSCFDnCFDTHLCCm / RSCFDnTHLCCm */
|
||||
#define RCANFD_THLCC(m) (0x0400 + (0x04 * (m)))
|
||||
/* RSCFDnCFDTHLSTSm / RSCFDnTHLSTSm */
|
||||
#define RCANFD_THLSTS(m) (0x0420 + (0x04 * (m)))
|
||||
/* RSCFDnCFDTHLPCTRm / RSCFDnTHLPCTRm */
|
||||
#define RCANFD_THLPCTR(m) (0x0440 + (0x04 * (m)))
|
||||
|
||||
/* RSCFDnCFDGTINTSTS0 / RSCFDnGTINTSTS0 */
|
||||
#define RCANFD_GTINTSTS0 (0x0460)
|
||||
/* RSCFDnCFDGTINTSTS1 / RSCFDnGTINTSTS1 */
|
||||
#define RCANFD_GTINTSTS1 (0x0464)
|
||||
/* RSCFDnCFDGTSTCFG / RSCFDnGTSTCFG */
|
||||
#define RCANFD_GTSTCFG (0x0468)
|
||||
/* RSCFDnCFDGTSTCTR / RSCFDnGTSTCTR */
|
||||
#define RCANFD_GTSTCTR (0x046c)
|
||||
/* RSCFDnCFDGLOCKK / RSCFDnGLOCKK */
|
||||
#define RCANFD_GLOCKK (0x047c)
|
||||
/* RSCFDnCFDGRMCFG */
|
||||
#define RCANFD_GRMCFG (0x04fc)
|
||||
|
||||
|
|
@ -398,12 +340,6 @@
|
|||
/* RSCFDnGAFLXXXj offset */
|
||||
#define RCANFD_C_GAFL_OFFSET (0x0500)
|
||||
|
||||
/* RSCFDnRMXXXq -> RCANFD_C_RMXXX(q) */
|
||||
#define RCANFD_C_RMID(q) (0x0600 + (0x10 * (q)))
|
||||
#define RCANFD_C_RMPTR(q) (0x0604 + (0x10 * (q)))
|
||||
#define RCANFD_C_RMDF0(q) (0x0608 + (0x10 * (q)))
|
||||
#define RCANFD_C_RMDF1(q) (0x060c + (0x10 * (q)))
|
||||
|
||||
/* RSCFDnRFXXx -> RCANFD_C_RFXX(x) */
|
||||
#define RCANFD_C_RFOFFSET (0x0e00)
|
||||
#define RCANFD_C_RFID(x) (RCANFD_C_RFOFFSET + (0x10 * (x)))
|
||||
|
|
@ -423,17 +359,6 @@
|
|||
#define RCANFD_C_CFDF(ch, idx, df) \
|
||||
(RCANFD_C_CFOFFSET + 0x08 + (0x30 * (ch)) + (0x10 * (idx)) + (0x04 * (df)))
|
||||
|
||||
/* RSCFDnTMXXp -> RCANFD_C_TMXX(p) */
|
||||
#define RCANFD_C_TMID(p) (0x1000 + (0x10 * (p)))
|
||||
#define RCANFD_C_TMPTR(p) (0x1004 + (0x10 * (p)))
|
||||
#define RCANFD_C_TMDF0(p) (0x1008 + (0x10 * (p)))
|
||||
#define RCANFD_C_TMDF1(p) (0x100c + (0x10 * (p)))
|
||||
|
||||
/* RSCFDnTHLACCm */
|
||||
#define RCANFD_C_THLACC(m) (0x1800 + (0x04 * (m)))
|
||||
/* RSCFDnRPGACCr */
|
||||
#define RCANFD_C_RPGACC(r) (0x1900 + (0x04 * (r)))
|
||||
|
||||
/* R-Car Gen4 Classical and CAN FD mode specific register map */
|
||||
#define RCANFD_GEN4_GAFL_OFFSET (0x1800)
|
||||
|
||||
|
|
@ -452,12 +377,6 @@ struct rcar_canfd_f_c {
|
|||
/* RSCFDnCFDGAFLXXXj offset */
|
||||
#define RCANFD_F_GAFL_OFFSET (0x1000)
|
||||
|
||||
/* RSCFDnCFDRMXXXq -> RCANFD_F_RMXXX(q) */
|
||||
#define RCANFD_F_RMID(q) (0x2000 + (0x20 * (q)))
|
||||
#define RCANFD_F_RMPTR(q) (0x2004 + (0x20 * (q)))
|
||||
#define RCANFD_F_RMFDSTS(q) (0x2008 + (0x20 * (q)))
|
||||
#define RCANFD_F_RMDF(q, b) (0x200c + (0x04 * (b)) + (0x20 * (q)))
|
||||
|
||||
/* RSCFDnCFDRFXXx -> RCANFD_F_RFXX(x) */
|
||||
#define RCANFD_F_RFOFFSET(gpriv) ((gpriv)->info->regs->rfoffset)
|
||||
#define RCANFD_F_RFID(gpriv, x) (RCANFD_F_RFOFFSET(gpriv) + (0x80 * (x)))
|
||||
|
|
@ -482,23 +401,11 @@ struct rcar_canfd_f_c {
|
|||
(RCANFD_F_CFOFFSET(gpriv) + 0x0c + (0x180 * (ch)) + (0x80 * (idx)) + \
|
||||
(0x04 * (df)))
|
||||
|
||||
/* RSCFDnCFDTMXXp -> RCANFD_F_TMXX(p) */
|
||||
#define RCANFD_F_TMID(p) (0x4000 + (0x20 * (p)))
|
||||
#define RCANFD_F_TMPTR(p) (0x4004 + (0x20 * (p)))
|
||||
#define RCANFD_F_TMFDCTR(p) (0x4008 + (0x20 * (p)))
|
||||
#define RCANFD_F_TMDF(p, b) (0x400c + (0x20 * (p)) + (0x04 * (b)))
|
||||
|
||||
/* RSCFDnCFDTHLACCm */
|
||||
#define RCANFD_F_THLACC(m) (0x6000 + (0x04 * (m)))
|
||||
/* RSCFDnCFDRPGACCr */
|
||||
#define RCANFD_F_RPGACC(r) (0x6400 + (0x04 * (r)))
|
||||
|
||||
/* Constants */
|
||||
#define RCANFD_FIFO_DEPTH 8 /* Tx FIFO depth */
|
||||
#define RCANFD_NAPI_WEIGHT 8 /* Rx poll quota */
|
||||
|
||||
#define RCANFD_NUM_CHANNELS 8 /* Eight channels max */
|
||||
#define RCANFD_CHANNELS_MASK BIT((RCANFD_NUM_CHANNELS) - 1)
|
||||
|
||||
#define RCANFD_GAFL_PAGENUM(entry) ((entry) / 16)
|
||||
#define RCANFD_CHANNEL_NUMRULES 1 /* only one rule per channel */
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user