Commit 64ebb57a authored by yong.liang's avatar yong.liang Committed by Stephen Boyd
Browse files

clk: reset: Modify reset-controller driver 



Set reset signal by a register and
clear reset signal by another register for 8183.

Signed-off-by: default avataryong.liang <yong.liang@mediatek.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 5f9e832c

drivers/clk/mediatek/clk-mt8183.c

+15 −1
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 


#include <dt-bindings/clock/mt8183-clk.h>



/* Infra global controller reset set register */

#define INFRA_RST0_SET_OFFSET		0x120



static DEFINE_SPINLOCK(mt8183_clk_lock);



static const struct mtk_fixed_clk top_fixed_clks[] = {
@@ -1185,13 +1188,24 @@ static int clk_mt8183_infra_probe(struct platform_device *pdev) 
{

	struct clk_onecell_data *clk_data;

	struct device_node *node = pdev->dev.of_node;

	int r;



	clk_data = mtk_alloc_clk_data(CLK_INFRA_NR_CLK);



	mtk_clk_register_gates(node, infra_clks, ARRAY_SIZE(infra_clks),

		clk_data);



	return of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);

	r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);

	if (r) {

		dev_err(&pdev->dev,

			"%s(): could not register clock provider: %d\n",

			__func__, r);

		return r;

	}



	mtk_register_reset_controller_set_clr(node, 4, INFRA_RST0_SET_OFFSET);



	return r;

}



static int clk_mt8183_mcu_probe(struct platform_device *pdev)

drivers/clk/mediatek/clk-mtk.h

+3 −0
Original line number Diff line number Diff line
@@ -240,4 +240,7 @@ struct clk *mtk_clk_register_ref2usb_tx(const char *name, 
void mtk_register_reset_controller(struct device_node *np,

			unsigned int num_regs, int regofs);



void mtk_register_reset_controller_set_clr(struct device_node *np,

	unsigned int num_regs, int regofs);



#endif /* __DRV_CLK_MTK_H */

drivers/clk/mediatek/reset.c

+53 −3
Original line number Diff line number Diff line
@@ -19,6 +19,24 @@ struct mtk_reset { 
	struct reset_controller_dev rcdev;

};



static int mtk_reset_assert_set_clr(struct reset_controller_dev *rcdev,

	unsigned long id)

{

	struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);

	unsigned int reg = data->regofs + ((id / 32) << 4);



	return regmap_write(data->regmap, reg, 1);

}



static int mtk_reset_deassert_set_clr(struct reset_controller_dev *rcdev,

	unsigned long id)

{

	struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);

	unsigned int reg = data->regofs + ((id / 32) << 4) + 0x4;



	return regmap_write(data->regmap, reg, 1);

}



static int mtk_reset_assert(struct reset_controller_dev *rcdev,

			      unsigned long id)

{
@@ -49,14 +67,32 @@ static int mtk_reset(struct reset_controller_dev *rcdev, 
	return mtk_reset_deassert(rcdev, id);

}



static int mtk_reset_set_clr(struct reset_controller_dev *rcdev,

	unsigned long id)

{

	int ret;



	ret = mtk_reset_assert_set_clr(rcdev, id);

	if (ret)

		return ret;

	return mtk_reset_deassert_set_clr(rcdev, id);

}



static const struct reset_control_ops mtk_reset_ops = {

	.assert = mtk_reset_assert,

	.deassert = mtk_reset_deassert,

	.reset = mtk_reset,

};



void mtk_register_reset_controller(struct device_node *np,

			unsigned int num_regs, int regofs)

static const struct reset_control_ops mtk_reset_ops_set_clr = {

	.assert = mtk_reset_assert_set_clr,

	.deassert = mtk_reset_deassert_set_clr,

	.reset = mtk_reset_set_clr,

};



static void mtk_register_reset_controller_common(struct device_node *np,

			unsigned int num_regs, int regofs,

			const struct reset_control_ops *reset_ops)

{

	struct mtk_reset *data;

	int ret;
@@ -77,7 +113,7 @@ void mtk_register_reset_controller(struct device_node *np, 
	data->regofs = regofs;

	data->rcdev.owner = THIS_MODULE;

	data->rcdev.nr_resets = num_regs * 32;

	data->rcdev.ops = &mtk_reset_ops;

	data->rcdev.ops = reset_ops;

	data->rcdev.of_node = np;



	ret = reset_controller_register(&data->rcdev);
@@ -87,3 +123,17 @@ void mtk_register_reset_controller(struct device_node *np, 
		return;

	}

}



void mtk_register_reset_controller(struct device_node *np,

	unsigned int num_regs, int regofs)

{

	mtk_register_reset_controller_common(np, num_regs, regofs,

		&mtk_reset_ops);

}



void mtk_register_reset_controller_set_clr(struct device_node *np,

	unsigned int num_regs, int regofs)

{

	mtk_register_reset_controller_common(np, num_regs, regofs,

		&mtk_reset_ops_set_clr);

}

include/dt-bindings/reset-controller/mt8183-resets.h

0 → 100644
+81 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (c) 2019 MediaTek Inc.

 * Author: Yong Liang <yong.liang@mediatek.com>

 */



#ifndef _DT_BINDINGS_RESET_CONTROLLER_MT8183

#define _DT_BINDINGS_RESET_CONTROLLER_MT8183



/* INFRACFG AO resets */

#define MT8183_INFRACFG_AO_THERM_SW_RST				0

#define MT8183_INFRACFG_AO_USB_TOP_SW_RST			1

#define MT8183_INFRACFG_AO_MM_IOMMU_SW_RST			3

#define MT8183_INFRACFG_AO_MSDC3_SW_RST				4

#define MT8183_INFRACFG_AO_MSDC2_SW_RST				5

#define MT8183_INFRACFG_AO_MSDC1_SW_RST				6

#define MT8183_INFRACFG_AO_MSDC0_SW_RST				7

#define MT8183_INFRACFG_AO_APDMA_SW_RST				9

#define MT8183_INFRACFG_AO_MIMP_D_SW_RST			10

#define MT8183_INFRACFG_AO_BTIF_SW_RST				12

#define MT8183_INFRACFG_AO_DISP_PWM_SW_RST			14

#define MT8183_INFRACFG_AO_AUXADC_SW_RST			15



#define MT8183_INFRACFG_AO_IRTX_SW_RST				32

#define MT8183_INFRACFG_AO_SPI0_SW_RST				33

#define MT8183_INFRACFG_AO_I2C0_SW_RST				34

#define MT8183_INFRACFG_AO_I2C1_SW_RST				35

#define MT8183_INFRACFG_AO_I2C2_SW_RST				36

#define MT8183_INFRACFG_AO_I2C3_SW_RST				37

#define MT8183_INFRACFG_AO_UART0_SW_RST				38

#define MT8183_INFRACFG_AO_UART1_SW_RST				39

#define MT8183_INFRACFG_AO_UART2_SW_RST				40

#define MT8183_INFRACFG_AO_PWM_SW_RST				41

#define MT8183_INFRACFG_AO_SPI1_SW_RST				42

#define MT8183_INFRACFG_AO_I2C4_SW_RST				43

#define MT8183_INFRACFG_AO_DVFSP_SW_RST				44

#define MT8183_INFRACFG_AO_SPI2_SW_RST				45

#define MT8183_INFRACFG_AO_SPI3_SW_RST				46

#define MT8183_INFRACFG_AO_UFSHCI_SW_RST			47



#define MT8183_INFRACFG_AO_PMIC_WRAP_SW_RST			64

#define MT8183_INFRACFG_AO_SPM_SW_RST				65

#define MT8183_INFRACFG_AO_USBSIF_SW_RST			66

#define MT8183_INFRACFG_AO_KP_SW_RST				68

#define MT8183_INFRACFG_AO_APXGPT_SW_RST			69

#define MT8183_INFRACFG_AO_CLDMA_AO_SW_RST			70

#define MT8183_INFRACFG_AO_UNIPRO_UFS_SW_RST			71

#define MT8183_INFRACFG_AO_DX_CC_SW_RST				72

#define MT8183_INFRACFG_AO_UFSPHY_SW_RST			73



#define MT8183_INFRACFG_AO_DX_CC_SEC_SW_RST			96

#define MT8183_INFRACFG_AO_GCE_SW_RST				97

#define MT8183_INFRACFG_AO_CLDMA_SW_RST				98

#define MT8183_INFRACFG_AO_TRNG_SW_RST				99

#define MT8183_INFRACFG_AO_AP_MD_CCIF_1_SW_RST			103

#define MT8183_INFRACFG_AO_AP_MD_CCIF_SW_RST			104

#define MT8183_INFRACFG_AO_I2C1_IMM_SW_RST			105

#define MT8183_INFRACFG_AO_I2C1_ARB_SW_RST			106

#define MT8183_INFRACFG_AO_I2C2_IMM_SW_RST			107

#define MT8183_INFRACFG_AO_I2C2_ARB_SW_RST			108

#define MT8183_INFRACFG_AO_I2C5_SW_RST				109

#define MT8183_INFRACFG_AO_I2C5_IMM_SW_RST			110

#define MT8183_INFRACFG_AO_I2C5_ARB_SW_RST			111

#define MT8183_INFRACFG_AO_SPI4_SW_RST				112

#define MT8183_INFRACFG_AO_SPI5_SW_RST				113

#define MT8183_INFRACFG_AO_INFRA2MFGAXI_CBIP_CLAS_SW_RST	114

#define MT8183_INFRACFG_AO_MFGAXI2INFRA_M0_CBIP_GLAS_OUT_SW_RST	115

#define MT8183_INFRACFG_AO_MFGAXI2INFRA_M1_CBIP_GLAS_OUT_SW_RST	116

#define MT8183_INFRACFG_AO_UFS_AES_SW_RST			117

#define MT8183_INFRACFG_AO_CCU_I2C_IRQ_SW_RST			118

#define MT8183_INFRACFG_AO_CCU_I2C_DMA_SW_RST			119

#define MT8183_INFRACFG_AO_I2C6_SW_RST				120

#define MT8183_INFRACFG_AO_CCU_GALS_SW_RST			121

#define MT8183_INFRACFG_AO_IPU_GALS_SW_RST			122

#define MT8183_INFRACFG_AO_CONN2AP_GALS_SW_RST			123

#define MT8183_INFRACFG_AO_AP_MD_CCIF2_SW_RST			124

#define MT8183_INFRACFG_AO_AP_MD_CCIF3_SW_RST			125

#define MT8183_INFRACFG_AO_I2C7_SW_RST				126

#define MT8183_INFRACFG_AO_I2C8_SW_RST				127



#endif  /* _DT_BINDINGS_RESET_CONTROLLER_MT8183 */