github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 23:22:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

mmsys: fix compilation by adding SW reset infrastructure

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCAA1FiEEUdvKHhzqrUYPB/u8L21+TfbCqH4FAmIh23sXHG1hdHRoaWFz
 LmJnZ0BnbWFpbC5jb20ACgkQL21+TfbCqH40AA/7BnqESpln5mQ2lbvd2X7JSyMu
 JMTI4y3LyS0iFCMm1z/Njib+9YCdrN5WIcW8zNTxMbloIsdnLFPyNwvgyfVSWVRv
 F1dKf5t93SxE/+UpgjjjE+DJDIXgnGlf+iO6sGmmp/XFGo8jnMj4oagqdBMBToU0
 7ZTIfq0lXA9Z63fMccz4MEQUxoqqGqFUT5GJwOZ0p4JZn1Cv5FwZj+xLcY38DCC6
 YSCqirmxXHVf6Q8x80glVLodriT3vjsIUfY6kBxJIKC+mNcXHjczwOKhmjmQMjnY
 fpQhj5X/mdHg83dAXL6dBu2GI2cmbewIPVH5zz6El3gR9tClvrSE6RvH4M6Y1Pxa
 WfgzD3FxJJ3W8HGjFXoyRYVyDxfcBC2gaxTJ7BIDsk2U5FYzydTEeP9QRcMYjkSS
 9RP04QTrchobHObJO+ALqRb1FLnFQXBN2gCjV5Ym2OMtrEkLJUXJL6sBFFx6yTOS
 wrGUHHga6/0xD1aw85c/xE3aZomDPTIXDGBkbBBdPcGqahkcK3g8ZckI4ZnPwwzV
 Ug65pxF/pYbqjwuel5kZOAkTpRMTlp65JW0C3Lngy8YKaXpHlz2/j/HTrTQpErc7
 8HFqCCvkOzEX2Z9kdU/Gv6Hb30bldeXqQuEtLqVm2GLUJilnJuAY0MfhVriwP3Md
 Gju8DzAHPd+A/W/OZOA=
 =G73P
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmImi5QACgkQmmx57+YA
 GNnalRAAlKhmFyaPFnvrRHIYvjopI2p3ZBK7IKNQcJuy6rxg8IAPLzdFQbuaiAGe
 azGYny5/oBoTtuuPuQyJ88i+yi0UJDf/HBk2Qr2BLRar1X8ZsQpVc9cQv462D4NM
 AAabD3dG+dA9D3nWAsFJBRlwSgAkCAS7983E1lkhNskSD4CqthRP9RNcDr7haBmo
 yOev6mJxhxvKrpa2wSRQSlTOM9AIKdi2g2dUHWZrZaxjnnqOUK9TShpZOVH2LYwa
 fD1s8eaqGeO1nBcifghfJ7Fe8t7cTxQLMwwLW/IhOJ0ynMBHapBanCZqBvic1yld
 s8mVuQVy/wAVXByOuXk4Yreo58E9Hf5+w/WQFEUbu2HzQvlYX2RzLbrTJWbh+KIi
 taHv//DWQM626WunFcE3WbrcF4VvlD9+VLInEY9F6m+uZClRWYBGS5sBKNFmJynr
 816Wg4gAl6CMt/tPrYlCKXbk7nFoNebD0mhy5J36KiVDIDI9U2gAt4pJGkD9tr2p
 Kif+sNC9bzPnPrbxxLB7mAvUmjCDhShmxzFEvt6yLx3FYw8tNiCOE1WVC6snFugO
 hnVLbHUFUEMl0WSc9yaVy8uDyDkExU/S6Iom7QXlsKNEePnzEMSyfTwLXxwuAH5V
 ZVMCMT29ebyANN4iCCPZU8pzoccpUB+FrR1OiTodm+Zb9v0YEp4=
 =7Yyq
 -----END PGP SIGNATURE-----

Merge tag 'v5.17-next-soc.2' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/drivers

mmsys: fix compilation by adding SW reset infrastructure

* tag 'v5.17-next-soc.2' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  soc: mediatek: mmsys: add sw0_rst_offset in mmsys driver data

Link: https://lore.kernel.org/r/e1b90372-a041-db6e-f35a-d17b26069e40@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-03-07 23:47:47 +01:00
commit a2d266a8f1
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/soc/mediatek/mt8183-mmsys.h
View File

@ -25,6 +25,8 @@
#define MT8183_RDMA0_SOUT_COLOR0 0x1
#define MT8183_RDMA1_SOUT_DSI0 0x1
#define MT8183_MMSYS_SW0_RST_B 0x140
static const struct mtk_mmsys_routes mmsys_mt8183_routing_table[] = {
{
DDP_COMPONENT_OVL0, DDP_COMPONENT_OVL_2L0,

6
drivers/soc/mediatek/mtk-mmsys.c
View File

@ -49,12 +49,14 @@ static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = {
.clk_driver = "clk-mt8173-mm",
.routes = mmsys_default_routing_table,
.num_routes = ARRAY_SIZE(mmsys_default_routing_table),
.sw0_rst_offset = MT8183_MMSYS_SW0_RST_B,
};
static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = {
.clk_driver = "clk-mt8183-mm",
.routes = mmsys_mt8183_routing_table,
.num_routes = ARRAY_SIZE(mmsys_mt8183_routing_table),
.sw0_rst_offset = MT8183_MMSYS_SW0_RST_B,
};
static const struct mtk_mmsys_driver_data mt8186_mmsys_driver_data = {
@ -129,14 +131,14 @@ static int mtk_mmsys_reset_update(struct reset_controller_dev *rcdev, unsigned l
spin_lock_irqsave(&mmsys->lock, flags);
reg = readl_relaxed(mmsys->regs + MMSYS_SW0_RST_B);
reg = readl_relaxed(mmsys->regs + mmsys->data->sw0_rst_offset);
if (assert)
reg &= ~BIT(id);
else
reg |= BIT(id);
writel_relaxed(reg, mmsys->regs + MMSYS_SW0_RST_B);
writel_relaxed(reg, mmsys->regs + mmsys->data->sw0_rst_offset);
spin_unlock_irqrestore(&mmsys->lock, flags);

3
drivers/soc/mediatek/mtk-mmsys.h
View File

@ -78,8 +78,6 @@
#define DSI_SEL_IN_RDMA 0x1
#define DSI_SEL_IN_MASK 0x1
#define MMSYS_SW0_RST_B 0x140
struct mtk_mmsys_routes {
u32 from_comp;
u32 to_comp;
@ -92,6 +90,7 @@ struct mtk_mmsys_driver_data {
const char *clk_driver;
const struct mtk_mmsys_routes *routes;
const unsigned int num_routes;
const u16 sw0_rst_offset;
};
/*