Unverified Commit 67637de7 authored by Hsiao Chien Sung's avatar Hsiao Chien Sung Committed by AngeloGioacchino Del Regno
Browse files

soc: mediatek: Support reset bit mapping in mmsys driver 



- Reset ID must starts from 0 and be consecutive, but
  the reset bits in our hardware design is not continuous,
  some bits are left unused, we need a map to solve the problem
- Use old style 1-to-1 mapping if .rst_tb is not defined

Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarHsiao Chien Sung <shawn.sung@mediatek.com>
Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
parent 2ffdd477

drivers/soc/mediatek/mtk-mmsys.c

+9 −0
Original line number Diff line number Diff line
@@ -324,6 +324,15 @@ static int mtk_mmsys_reset_update(struct reset_controller_dev *rcdev, unsigned l 
	u32 offset;

	u32 reg;



	if (mmsys->data->rst_tb) {

		if (id >= mmsys->data->num_resets) {

			dev_err(rcdev->dev, "Invalid reset ID: %lu (>=%u)\n",

				id, mmsys->data->num_resets);

			return -EINVAL;

		}

		id = mmsys->data->rst_tb[id];

	}



	offset = (id / MMSYS_SW_RESET_PER_REG) * sizeof(u32);

	id = id % MMSYS_SW_RESET_PER_REG;

	reg = mmsys->data->sw0_rst_offset + offset;

drivers/soc/mediatek/mtk-mmsys.h

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ 
#define DSI_SEL_IN_RDMA				0x1

#define DSI_SEL_IN_MASK				0x1



#define MMSYS_RST_NR(bank, bit) (((bank) * 32) + (bit))



struct mtk_mmsys_routes {

	u32 from_comp;

	u32 to_comp;
@@ -119,6 +121,7 @@ struct mtk_mmsys_driver_data { 
	const struct mtk_mmsys_routes *routes;

	const unsigned int num_routes;

	const u16 sw0_rst_offset;

	const u8 *rst_tb;

	const u32 num_resets;

	const bool is_vppsys;

	const u8 vsync_len;