Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "drivers: cal-if: fix build without CONFIG_CMUCAL_DEBUG"

Browse source 
This reverts commit 2d84789050.
This commit is contained in:
Ksawlii 2025-01-22 20:36:26 +01:00
parent c76ef25f3f
commit 6dd26e10cb
3 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/soc/samsung/cal-if/cal-if.c
View file

@ -653,10 +653,8 @@ int cal_if_init(void *dev)
if (of_address_to_resource(dev, 1, &res) == 0)
cmucal_dbg_set_cmu_aud_base(res.start);
#if defined(CONFIG_CMUCAL_DEBUG)
if (of_address_to_resource(dev, 2, &res) == 0)
cmucal_dbg_set_cmu_nocl0_base(res.start);
#endif
if (of_address_to_resource(dev, 3, &res) == 0)
cmucal_dbg_set_cmu_cpucl0_base(res.start);

38
drivers/soc/samsung/cal-if/cmucal-debug.c
View file

@ -21,25 +21,7 @@ enum clk_info_type {
TOP_CMU_INFO,
};
#if defined(CONFIG_CMUCAL_DEBUG)
static struct dentry *rootdir;
static unsigned int cmu_aud_base = 0x0;
static unsigned int cmu_nocl0_base = 0x0;
static unsigned int cmu_cpucl0_base = 0x0;
static unsigned int cmu_cpucl1_base = 0x0;
static unsigned int cmu_cpucl2_base = 0x0;
static unsigned int cmu_dsu_base = 0x0;
static unsigned int cmu_peris_base = 0x0;
#endif
static unsigned int cmu_top_base = 0x0;
void __iomem *cmu_aud;
void __iomem *cmu_nocl0;
void __iomem *cmu_cpucl0;
void __iomem *cmu_cpucl1;
void __iomem *cmu_cpucl2;
void __iomem *cmu_dsu;
void __iomem *cmu_peris;
static struct cmucal_clk *clk_info;
static struct vclk *dvfs_domain;
static u32 cmu_id;
@ -50,6 +32,21 @@ static unsigned int margin;
static unsigned int debug_freq;
extern unsigned int dbg_offset;
static unsigned int cmu_top_base = 0x0;
static unsigned int cmu_aud_base = 0x0;
void __iomem *cmu_aud;
static unsigned int cmu_nocl0_base = 0x0;
void __iomem *cmu_nocl0;
static unsigned int cmu_cpucl0_base = 0x0;
void __iomem *cmu_cpucl0;
static unsigned int cmu_cpucl1_base = 0x0;
void __iomem *cmu_cpucl1;
static unsigned int cmu_cpucl2_base = 0x0;
void __iomem *cmu_cpucl2;
static unsigned int cmu_dsu_base = 0x0;
void __iomem *cmu_dsu;
static unsigned int cmu_peris_base = 0x0;
void __iomem *cmu_peris;
extern bool is_ignore_cmu_dbg(u32 addr);
@ -648,7 +645,6 @@ static const struct file_operations dsu_stepup_run_fops = {
};
#endif
#if defined(CONFIG_CMUCAL_DEBUG)
/* caller must hold prepare_lock */
static int vclk_debug_create_one(struct vclk *vclk, struct dentry *pdentry)
{
@ -685,9 +681,6 @@ static int vclk_debug_create_one(struct vclk *vclk, struct dentry *pdentry)
out:
return ret;
}
#endif
#if defined(CONFIG_CMUCAL_DEBUG)
unsigned int vclk_debug_clk_get_rate(unsigned int id)
{
@ -882,6 +875,5 @@ int vclk_debug_init(void)
}
EXPORT_SYMBOL_GPL(vclk_debug_init);
#endif
#endif
MODULE_LICENSE("GPL");

2
drivers/soc/samsung/exynos-pd/exynos-pd.c
View file

@ -513,7 +513,7 @@ static int exynos_pd_probe(struct platform_device *pdev)
}
}
#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_CMUCAL_DEBUG)
#ifdef CONFIG_DEBUG_FS
cal_register_pd_lookup_cmu_id(exynos_pd_lookup_cmu_id);
#endif
dev_info(dev, EXYNOS_PD_PREFIX "PM Domain Initialize\n");