From 4fb40cb333fb1475c885e6d1bd3411401a8f3871 Mon Sep 17 00:00:00 2001 From: Zongdong Jiao Date: Fri, 28 Aug 2020 15:01:04 +0800 Subject: [PATCH] hdmitx: remove unnecessary printk during boot [1/1] PD#SWPL-30632 Problem: Too many hdmitx printk during boot stage Solution: Remove unnecessary printk during boot Verify: SM1/Newton Change-Id: I228bcaab1b307852dcfd7bf0aead8133bd5f13fd Signed-off-by: Zongdong Jiao Signed-off-by: chunlong.cao --- .../vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c | 8 +- .../vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c | 86 ++++--------------- .../vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_ddc.c | 10 +-- 3 files changed, 24 insertions(+), 80 deletions(-) diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c index 22cbdd451cae..cb8302aaa264 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c @@ -199,7 +199,6 @@ static void store_vesa_idx(struct rx_cap *prxcap, enum hdmi_vic vesa_timing) if (prxcap->vesa_timing[i] == vesa_timing) break; } - pr_info("hdmitx: reach vesa idx MAX\n"); } static void Edid_EstablishedTimings(struct rx_cap *prxcap, unsigned char *data) @@ -2108,7 +2107,8 @@ next: prxcap->dtd_idx, para->vic); prxcap->dtd_idx++; } else - dump_dtd_info(t); + if (0) /* for debug usage */ + dump_dtd_info(t); } static void edid_check_pcm_declare(struct rx_cap *prxcap) @@ -2970,9 +2970,7 @@ static unsigned int hdmitx_edid_check_valid_blocks(unsigned char *buf) tmp_chksum += buf[i + j*128]; if (tmp_chksum != 0) { valid_blk_no++; - if ((tmp_chksum & 0xff) == 0) - pr_info(EDID "check sum valid\n"); - else + if (tmp_chksum & 0xff) pr_info(EDID "check sum invalid\n"); } tmp_chksum = 0; diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c index 2b7c077c22b3..3fa05c09ca83 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c @@ -5382,17 +5382,12 @@ static int get_dt_vend_init_data(struct device_node *np, ret = of_property_read_string(np, "vendor_name", (const char **)&(vend->vendor_name)); - if (ret) - pr_info(SYS "not find vendor name\n"); ret = of_property_read_u32(np, "vendor_id", &(vend->vendor_id)); - if (ret) - pr_info(SYS "not find vendor id\n"); ret = of_property_read_string(np, "product_desc", (const char **)&(vend->product_desc)); - if (ret) - pr_info(SYS "not find product desc\n"); + return 0; } @@ -5732,11 +5727,11 @@ static int amhdmitx_get_dt_info(struct platform_device *pdev) /* Get ic type information */ ret = of_property_read_u32(pdev->dev.of_node, "ic_type", &(hdmitx_device.chip_type)); - if (ret) - pr_info(SYS "not find ic_type\n"); - else - pr_info(SYS "hdmitx_device.chip_type : %d\n", - hdmitx_device.chip_type); + + /* Get dongle_mode information */ + ret = of_property_read_u32(pdev->dev.of_node, "dongle_mode", + &dongle_mode); + hdmitx_device.dongle_mode = !!dongle_mode; ret = of_property_read_u32(pdev->dev.of_node, "repeater_tx", &val); @@ -5754,50 +5749,32 @@ static int amhdmitx_get_dt_info(struct platform_device *pdev) /* Get vendor information */ ret = of_property_read_u32(pdev->dev.of_node, "vend-data", &val); - if (ret) - pr_info(SYS "not find match init-data\n"); if (ret == 0) { phandle = val; init_data = of_find_node_by_phandle(phandle); - if (!init_data) - pr_info(SYS "not find device node\n"); hdmitx_device.config_data.vend_data = kzalloc( sizeof(struct vendor_info_data), GFP_KERNEL); - if (!(hdmitx_device.config_data.vend_data)) - pr_info(SYS "not allocate memory\n"); ret = get_dt_vend_init_data(init_data, hdmitx_device.config_data.vend_data); - if (ret) - pr_info(SYS "not find vend_init_data\n"); } /* Get power control */ ret = of_property_read_u32(pdev->dev.of_node, "pwr-ctrl", &val); - if (ret) - pr_info(SYS "not find match pwr-ctl\n"); if (ret == 0) { phandle = val; init_data = of_find_node_by_phandle(phandle); - if (!init_data) - pr_info(SYS "not find device node\n"); hdmitx_device.config_data.pwr_ctl = kzalloc((sizeof( struct hdmi_pwr_ctl)) * HDMI_TX_PWR_CTRL_NUM, GFP_KERNEL); - if (!hdmitx_device.config_data.pwr_ctl) - pr_info(SYS"can not get pwr_ctl mem\n"); memset(hdmitx_device.config_data.pwr_ctl, 0, sizeof(struct hdmi_pwr_ctl)); - if (ret) - pr_info(SYS "not find pwr_ctl\n"); } /* Get drm feature information */ drm_node = of_find_node_by_path("/drm-amhdmitx"); if (drm_node) { ret = of_property_read_string(drm_node, "status", (const char **)&(drm_status)); - if (ret) - pr_info(SYS "not find drm_feature\n"); - else { + if (!ret) { if (memcmp(drm_status, "okay", 4) == 0) hdmitx_device.drm_feature = 1; else @@ -5805,26 +5782,13 @@ static int amhdmitx_get_dt_info(struct platform_device *pdev) pr_info(SYS "hdmitx_device.drm_feature : %d\n", hdmitx_device.drm_feature); } - } else { - pr_info(SYS "not find drm_amhdmitx\n"); } } #else - hdmi_pdata = pdev->dev.platform_data; - if (!hdmi_pdata) { - pr_info(SYS "not get platform data\n"); - r = -ENOENT; - } else { - pr_info(SYS "get hdmi platform data\n"); - } + hdmi_pdata = pdev->dev.platform_data; #endif hdmitx_device.irq_hpd = platform_get_irq_byname(pdev, "hdmitx_hpd"); - if (hdmitx_device.irq_hpd == -ENXIO) { - pr_err("%s: ERROR: hdmitx hpd irq No not found\n", - __func__); - return -ENXIO; - } pr_info(SYS "hpd irq = %d\n", hdmitx_device.irq_hpd); @@ -5842,49 +5806,35 @@ static void amhdmitx_clktree_probe(struct device *hdmitx_dev) struct clk *venci_top_gate, *venci_0_gate, *venci_1_gate; hdmi_clk_vapb = devm_clk_get(hdmitx_dev, "hdmi_vapb_clk"); - if (IS_ERR(hdmi_clk_vapb)) - pr_warn(SYS "vapb_clk failed to probe\n"); - else { + if (!IS_ERR(hdmi_clk_vapb)) { hdmitx_device.hdmitx_clk_tree.hdmi_clk_vapb = hdmi_clk_vapb; clk_prepare_enable(hdmitx_device.hdmitx_clk_tree.hdmi_clk_vapb); } hdmi_clk_vpu = devm_clk_get(hdmitx_dev, "hdmi_vpu_clk"); - if (IS_ERR(hdmi_clk_vpu)) - pr_warn(SYS "vpu_clk failed to probe\n"); - else { + if (!IS_ERR(hdmi_clk_vpu)) { hdmitx_device.hdmitx_clk_tree.hdmi_clk_vpu = hdmi_clk_vpu; clk_prepare_enable(hdmitx_device.hdmitx_clk_tree.hdmi_clk_vpu); } hdcp22_tx_skp = devm_clk_get(hdmitx_dev, "hdcp22_tx_skp"); - if (IS_ERR(hdcp22_tx_skp)) - pr_warn(SYS "hdcp22_tx_skp failed to probe\n"); - else + if (!IS_ERR(hdcp22_tx_skp)) hdmitx_device.hdmitx_clk_tree.hdcp22_tx_skp = hdcp22_tx_skp; hdcp22_tx_esm = devm_clk_get(hdmitx_dev, "hdcp22_tx_esm"); - if (IS_ERR(hdcp22_tx_esm)) - pr_warn(SYS "hdcp22_tx_esm failed to probe\n"); - else + if (!IS_ERR(hdcp22_tx_esm)) hdmitx_device.hdmitx_clk_tree.hdcp22_tx_esm = hdcp22_tx_esm; venci_top_gate = devm_clk_get(hdmitx_dev, "venci_top_gate"); - if (IS_ERR(venci_top_gate)) - pr_warn(SYS "venci_top_gate failed to probe\n"); - else + if (!IS_ERR(venci_top_gate)) hdmitx_device.hdmitx_clk_tree.venci_top_gate = venci_top_gate; venci_0_gate = devm_clk_get(hdmitx_dev, "venci_0_gate"); - if (IS_ERR(venci_0_gate)) - pr_warn(SYS "venci_0_gate failed to probe\n"); - else + if (!IS_ERR(venci_0_gate)) hdmitx_device.hdmitx_clk_tree.venci_0_gate = venci_0_gate; venci_1_gate = devm_clk_get(hdmitx_dev, "venci_1_gate"); - if (IS_ERR(venci_1_gate)) - pr_warn(SYS "venci_0_gate failed to probe\n"); - else + if (!IS_ERR(venci_1_gate)) hdmitx_device.hdmitx_clk_tree.venci_1_gate = venci_1_gate; } @@ -5893,8 +5843,6 @@ static int amhdmitx_probe(struct platform_device *pdev) int r, ret = 0; struct device *dev; - pr_info(SYS "amhdmitx_probe start\n"); - amhdmitx_device_init(&hdmitx_device); ret = amhdmitx_get_dt_info(pdev); @@ -6021,8 +5969,8 @@ static int amhdmitx_probe(struct platform_device *pdev) hdmitx_device.task = kthread_run(hdmi_task_handle, &hdmitx_device, "kthread_hdmi"); + edidinfo_attach_to_vinfo(&hdmitx_device); - pr_info(SYS "amhdmitx_probe end\n"); return r; } @@ -6311,8 +6259,6 @@ static int __init hdmitx_boot_frac_rate(char *str) else hdmitx_device.frac_rate_policy = 1; - pr_info("hdmitx boot frac_rate_policy: %d", - hdmitx_device.frac_rate_policy); return 0; } diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_ddc.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_ddc.c index 858cc79c845d..8fa1c019af01 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_ddc.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_ddc.c @@ -54,7 +54,7 @@ static uint32_t ddc_write_1byte(uint8_t slave, uint8_t offset_addr, mdelay(2); if (hdmitx_rd_reg(HDMITX_DWC_IH_I2CM_STAT0) & (1 << 0)) { st = 0; - pr_info("ddc w1b error 0x%02x 0x%02x 0x%02x\n", + pr_info("E: ddc w1b 0x%02x 0x%02x 0x%02x\n", slave, offset_addr, data); } else st = 1; @@ -80,7 +80,7 @@ static uint32_t ddc_readext_8byte(uint8_t slave, uint8_t offset_addr, mdelay(2); if (hdmitx_rd_reg(HDMITX_DWC_IH_I2CM_STAT0) & (1 << 0)) { st = 0; - pr_info("hdmitx: ddc rdext8b error 0x%02x 0x%02x\n", + pr_info("E: ddc rdext8b 0x%02x 0x%02x\n", slave, offset_addr); } else st = 1; @@ -106,7 +106,7 @@ static uint32_t ddc_read_8byte(uint8_t slave, uint8_t offset_addr, mdelay(2); if (hdmitx_rd_reg(HDMITX_DWC_IH_I2CM_STAT0) & (1 << 0)) { st = 0; - pr_info("hdmitx: ddc rd8b error 0x%02x 0x%02x 0x%02x\n", + pr_info("E: ddc rd8b 0x%02x 0x%02x 0x%02x\n", slave, offset_addr, *data); } else st = 1; @@ -133,7 +133,7 @@ static uint32_t ddc_readext_1byte(uint8_t slave, uint8_t address, uint8_t *data) mdelay(2); if (hdmitx_rd_reg(HDMITX_DWC_IH_I2CM_STAT0) & (1 << 0)) { st = 0; - pr_info("hdmitx: ddc rd8b error 0x%02x 0x%02x\n", + pr_info("E: hdmitx: ddc rd8b 0x%02x 0x%02x\n", slave, offset_addr); } else st = 1; @@ -157,7 +157,7 @@ static uint32_t ddc_read_1byte(uint8_t slave, uint8_t offset_addr, mdelay(2); if (hdmitx_rd_reg(HDMITX_DWC_IH_I2CM_STAT0) & (1 << 0)) { st = 0; - pr_info("ddc rd8b error 0x%02x 0x%02x\n", + pr_info("E: ddc rd8b 0x%02x 0x%02x\n", slave, offset_addr); } else st = 1;