BPI/pi-linux
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sun60iw2: fix non-fatal boot log issues

Browse Source
This commit is contained in:
Qubot 2026-06-06 11:47:40 +08:00
parent 79ff8c6ae1
commit 957c2289ae
6 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm64/boot/dts/sunxi/sun60i-a733-bananapi-m8.dts
View File

@ -1691,6 +1691,14 @@
}; };
}; };
&pd_gpu_top_test {
status = "disabled";
};
&pd_gpu_core_test {
status = "disabled";
};
&addr_mgt { &addr_mgt {
compatible = "allwinner,sunxi-addr_mgt"; compatible = "allwinner,sunxi-addr_mgt";
type_addr_wifi = <0x0>; type_addr_wifi = <0x0>;

14
bsp/drivers/sid/sunxi-sid.c
View File

@ -521,7 +521,7 @@ int sunxi_get_module_param_from_sid(u32 *dst, u32 offset, u32 len)
} }
EXPORT_SYMBOL_GPL(sunxi_get_module_param_from_sid); EXPORT_SYMBOL_GPL(sunxi_get_module_param_from_sid);
int sunxi_sid_sram_read32(const char *key, u32 *data) static int __sunxi_sid_sram_read32(const char *key, u32 *data, bool report_error)
{ {
struct device_node *pnode; struct device_node *pnode;
struct device_node *child_pnode; struct device_node *child_pnode;
@ -567,9 +567,15 @@ int sunxi_sid_sram_read32(const char *key, u32 *data)
return 0; return 0;
fail: fail:
sunxi_err(NULL, "Fail to read '%s' in dts\n", prop); if (report_error)
sunxi_err(NULL, "Fail to read '%s' in dts\n", prop);
return err; return err;
} }
int sunxi_sid_sram_read32(const char *key, u32 *data)
{
return __sunxi_sid_sram_read32(key, data, true);
}
EXPORT_SYMBOL_GPL(sunxi_sid_sram_read32); EXPORT_SYMBOL_GPL(sunxi_sid_sram_read32);
/* TODO: /* TODO:
@ -605,13 +611,13 @@ static unsigned int sunxi_sid_from_dvfs2(u32 *dvfs)
{ {
int ret; int ret;
u32 dvfs2_bak = 0, dvfs2_ori = 0; u32 dvfs2_bak = 0, dvfs2_ori = 0;
ret = sunxi_sid_sram_read32("dvfs2_ori", &dvfs2_ori); ret = __sunxi_sid_sram_read32("dvfs2_ori", &dvfs2_ori, false);
if (ret) { if (ret) {
sunxi_debug(NULL, "get dvfs2_ori sid fail\n"); sunxi_debug(NULL, "get dvfs2_ori sid fail\n");
return ret; return ret;
} }
ret = sunxi_sid_sram_read32("dvfs2_bak", &dvfs2_bak); ret = __sunxi_sid_sram_read32("dvfs2_bak", &dvfs2_bak, false);
if (ret) { if (ret) {
sunxi_debug(NULL, "get dvfs2_bak sid fail\n"); sunxi_debug(NULL, "get dvfs2_bak sid fail\n");
return ret; return ret;

4
bsp/drivers/sound/codecs/ac101.c
View File

@ -2783,8 +2783,8 @@ static int ac101_set_params_from_of(struct i2c_client *i2c, struct ac101_data *p
jack_adv_priv->key_det_vol[3][0] = temp_val; jack_adv_priv->key_det_vol[3][0] = temp_val;
} }
SND_LOG_ERR("irq_gpio -> %u\n", jack_adv_priv->irq_gpio); SND_LOG_DEBUG("irq_gpio -> %u\n", jack_adv_priv->irq_gpio);
SND_LOG_ERR("det_gpio -> %u\n", jack_adv_priv->det_gpio); SND_LOG_DEBUG("det_gpio -> %u\n", jack_adv_priv->det_gpio);
SND_LOG_DEBUG("jack-det-threshold -> %u\n", SND_LOG_DEBUG("jack-det-threshold -> %u\n",
jack_adv_priv->det_threshold); jack_adv_priv->det_threshold);
SND_LOG_DEBUG("jack-key-det-threshold -> %u\n", SND_LOG_DEBUG("jack-key-det-threshold -> %u\n",

4
bsp/drivers/sound/platform/snd_sunxi_codec_hdmi.c
View File

@ -439,7 +439,7 @@ static int sunxi_codec_dev_probe(struct platform_device *pdev)
goto err_devm_kzalloc; goto err_devm_kzalloc;
} }
SND_LOG_ERR("register codec-hdmi success\n"); SND_LOG_DEBUG("register codec-hdmi success\n");
return 0; return 0;
@ -462,7 +462,7 @@ static int sunxi_codec_dev_remove(struct platform_device *pdev)
devm_kfree(dev, codec); devm_kfree(dev, codec);
of_node_put(pdev->dev.of_node); of_node_put(pdev->dev.of_node);
SND_LOG_ERR("unregister codec-hdmi success\n"); SND_LOG_DEBUG("unregister codec-hdmi success\n");
return 0; return 0;
} }

6
bsp/drivers/sound/platform/snd_sunxi_jack_advance.c
View File

@ -232,15 +232,17 @@ static void sunxi_jack_det_irq_work(struct work_struct *work)
static void sunxi_jack_det_scan_work(struct work_struct *work) static void sunxi_jack_det_scan_work(struct work_struct *work)
{ {
struct sunxi_jack_adv *jack_adv = sunxi_jack.jack_adv; struct sunxi_jack_adv *jack_adv = sunxi_jack.jack_adv;
struct sunxi_jack_typec_cfg *jack_typec_cfg = &jack_adv->jack_typec_cfg; struct sunxi_jack_typec_cfg *jack_typec_cfg;
int ret; int ret;
SND_LOG_DEBUG("\n"); SND_LOG_DEBUG("\n");
if ((IS_ERR_OR_NULL(jack_adv)) || (IS_ERR_OR_NULL(jack_adv->extdev))) { if ((IS_ERR_OR_NULL(jack_adv)) || (IS_ERR_OR_NULL(jack_adv->extdev))) {
SND_LOG_ERR("jack_adv or extdev is null\n"); SND_LOG_DEBUG("jack_adv or extdev is null\n");
return; return;
} }
jack_typec_cfg = &jack_adv->jack_typec_cfg;
ret = extcon_get_state(jack_adv->extdev, EXTCON_JACK_HEADPHONE); ret = extcon_get_state(jack_adv->extdev, EXTCON_JACK_HEADPHONE);
SND_LOG_DEBUG("jack adv state %d\n", ret); SND_LOG_DEBUG("jack adv state %d\n", ret);
if (ret) if (ret)

6
bsp/drivers/ve/cedar-ve/platforms/ve_plat_sun60iw2.c
View File

@ -387,7 +387,11 @@ int ve_dvfs_get_attr(struct cedar_dev *cedar_devp)
attr->default_freq = attr->dvfs_array[j].ve_freq; attr->default_freq = attr->dvfs_array[j].ve_freq;
j += 1; j += 1;
} }
if (!attr->default_freq) { if (!attr->default_freq && !cedar_devp->voltage) {
attr->default_freq = VE_DVFS_MAX_FREQ;
VE_LOGD("ve regulator voltage unavailable, default %uMHz\n",
attr->default_freq);
} else if (!attr->default_freq) {
attr->default_freq = VE_DVFS_MAX_FREQ; attr->default_freq = VE_DVFS_MAX_FREQ;
VE_LOGW("get vf table failed, default %uMHz\n", attr->default_freq); VE_LOGW("get vf table failed, default %uMHz\n", attr->default_freq);
} }