From d833511fcf5e01b2c950bb5533ee330b14e3007a Mon Sep 17 00:00:00 2001 From: Arthur Liberman Date: Sat, 9 Mar 2019 15:23:35 +0200 Subject: [PATCH] drivers/amlogic: fix 'dobly' typos to 'dolby' --- drivers/amlogic/media/frame_sync/tsync.c | 2 +- drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.c | 2 +- drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c | 2 +- drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_pktinfo.c | 4 ++-- drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_audio.c | 2 +- drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c | 4 ++-- drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/amlogic/media/frame_sync/tsync.c b/drivers/amlogic/media/frame_sync/tsync.c index 7e2f69108dd0..64fc4641f0da 100644 --- a/drivers/amlogic/media/frame_sync/tsync.c +++ b/drivers/amlogic/media/frame_sync/tsync.c @@ -1238,7 +1238,7 @@ int tsync_set_apts(unsigned int pts) t = timestamp_pcrscr_get(); if (tsync_mode == TSYNC_MODE_AMASTER) { - /* special used for Dobly Certification AVSync test */ + /* special used for Dolby Certification AVSync test */ if (dobly_avsync_test) { if (get_vsync_pts_inc_mode() && diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.c b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.c index 66b5242956c0..ca523b08fac9 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.c +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.c @@ -687,7 +687,7 @@ int hdmirx_hw_get_3d_structure(void) /* * hdmirx_get_vsi_info - get vsi info - * this func is used to get 3D format and dobly + * this func is used to get 3D format and dolby * vision state of current video */ void hdmirx_get_vsi_info(struct tvin_sig_property_s *prop) diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c index c94ee5bbea0a..b25e571e9b9c 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_edid.c @@ -95,7 +95,7 @@ static unsigned char edid_14[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3B, }; -/* 1.4 edid,support dobly,MAT,DTS,ATMOS*/ +/* 1.4 edid,support dolby,MAT,DTS,ATMOS*/ static unsigned char edid_14_aud[] = { 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x05, 0xAC, 0x30, 0x00, 0x01, 0x00, 0x00, 0x00, diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_pktinfo.c b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_pktinfo.c index c85fb5c49869..d9cdd8dbd125 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_pktinfo.c +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_pktinfo.c @@ -516,7 +516,7 @@ static void rx_pktdump_vsi(void *pdata) rx_pr("3d vdfmt: 0x%x\n", pktdata->sbpkt.vsi.vdfmt); if (pktdata->length == E_DV_LENGTH_24) { - /*dobly version v0 pkt*/ + /*dolby version v0 pkt*/ } else { if (pktdata->sbpkt.vsi.vdfmt == 0) { @@ -1378,7 +1378,7 @@ void rx_get_vsi_info(void) rx.vs_info_details.eff_tmax_pq = tmp; } } else if (pkt->ieee == 0x000c03) { - /* dobly10 */ + /* dolby10 */ if (pkt->length == E_DV_LENGTH_24) { rx.vs_info_details.dolby_vision = true; if ((pkt->sbpkt.payload.data[0] & 0xffff) == 0) diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_audio.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_audio.c index 1357960bec17..9ade063bdea1 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_audio.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_audio.c @@ -159,7 +159,7 @@ static void hdmi_tx_construct_aud_packet( AUD_DB[4] = 0; } } else if (audio_param->type == CT_DOLBY_D) { - pr_info(AUD "Audio Type: Dobly Digital +\n"); + pr_info(AUD "Audio Type: Dolby Digital +\n"); if (AUD_DB) { AUD_DB[0] = (FS_REFER_TO_STREAM<<4)|(CC_REFER_TO_STREAM); 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 3beac8207dcd..5b5f1b6ab49e 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 @@ -1909,7 +1909,7 @@ static ssize_t show_config(struct device *dev, conf = "One Bit Audio"; break; case CT_DOLBY_D: - conf = "Dobly Digital+"; + conf = "Dolby Digital+"; break; case CT_DTS_HD: conf = "DTS_HD"; @@ -2382,7 +2382,7 @@ static ssize_t show_aud_cap(struct device *dev, static const char * const aud_ct[] = { "ReferToStreamHeader", "PCM", "AC-3", "MPEG1", "MP3", "MPEG2", "AAC", "DTS", "ATRAC", "OneBitAudio", - "Dobly_Digital+", "DTS-HD", "MAT", "DST", "WMA_Pro", + "Dolby_Digital+", "DTS-HD", "MAT", "DST", "WMA_Pro", "Reserved", NULL}; static const char * const aud_sampling_frequency[] = { "ReferToStreamHeader", "32", "44.1", "48", "88.2", "96", diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c index e293cf066221..7b7ae1b8cf93 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c @@ -3678,7 +3678,7 @@ static void hdmitx_dump_audio_info(void) conf = "One Bit Audio"; break; case CT_DOLBY_D: - conf = "Dobly Digital+"; + conf = "Dolby Digital+"; break; case CT_DTS_HD: conf = "DTS_HD";