From d6c64e031fc614b18bba946d406ef32142e9487a Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Fri, 26 Jun 2015 10:59:27 +0200 Subject: [PATCH] axi_hdmi_rx: Drop TPG enable from register map The TPG is no longer part of the RX core and the corresponding bit in the register map isn't hooked up to anything. So drop it. Signed-off-by: Lars-Peter Clausen --- library/axi_hdmi_rx/axi_hdmi_rx.v | 3 --- library/axi_hdmi_rx/axi_hdmi_rx_core.v | 2 -- library/common/up_hdmi_rx.v | 12 +----------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/library/axi_hdmi_rx/axi_hdmi_rx.v b/library/axi_hdmi_rx/axi_hdmi_rx.v index e4df6c670..75139b38b 100644 --- a/library/axi_hdmi_rx/axi_hdmi_rx.v +++ b/library/axi_hdmi_rx/axi_hdmi_rx.v @@ -129,7 +129,6 @@ module axi_hdmi_rx ( wire hdmi_bgr_s; wire hdmi_packed_s; wire hdmi_csc_bypass_s; - wire hdmi_tpg_enable_s; wire [15:0] hdmi_vs_count_s; wire [15:0] hdmi_hs_count_s; wire hdmi_tpm_oos_s; @@ -189,7 +188,6 @@ module axi_hdmi_rx ( .hdmi_bgr (hdmi_bgr_s), .hdmi_packed (hdmi_packed_s), .hdmi_csc_bypass (hdmi_csc_bypass_s), - .hdmi_tpg_enable (hdmi_tpg_enable_s), .hdmi_vs_count (hdmi_vs_count_s), .hdmi_hs_count (hdmi_hs_count_s), .hdmi_dma_ovf (hdmi_dma_ovf), @@ -223,7 +221,6 @@ module axi_hdmi_rx ( .hdmi_bgr (hdmi_bgr_s), .hdmi_packed (hdmi_packed_s), .hdmi_csc_bypass (hdmi_csc_bypass_s), - .hdmi_tpg_enable (hdmi_tpg_enable_s), .hdmi_vs_count (hdmi_vs_count_s), .hdmi_hs_count (hdmi_hs_count_s), .hdmi_tpm_oos (hdmi_tpm_oos_s), diff --git a/library/axi_hdmi_rx/axi_hdmi_rx_core.v b/library/axi_hdmi_rx/axi_hdmi_rx_core.v index 8e402bd97..508f14ceb 100644 --- a/library/axi_hdmi_rx/axi_hdmi_rx_core.v +++ b/library/axi_hdmi_rx/axi_hdmi_rx_core.v @@ -47,7 +47,6 @@ module axi_hdmi_rx_core ( hdmi_bgr, hdmi_packed, hdmi_csc_bypass, - hdmi_tpg_enable, hdmi_vs_count, hdmi_hs_count, hdmi_tpm_oos, @@ -73,7 +72,6 @@ module axi_hdmi_rx_core ( input hdmi_bgr; input hdmi_packed; input hdmi_csc_bypass; - input hdmi_tpg_enable; input [15:0] hdmi_vs_count; input [15:0] hdmi_hs_count; output hdmi_tpm_oos; diff --git a/library/common/up_hdmi_rx.v b/library/common/up_hdmi_rx.v index 40ff39bbd..0931db20c 100644 --- a/library/common/up_hdmi_rx.v +++ b/library/common/up_hdmi_rx.v @@ -45,7 +45,6 @@ module up_hdmi_rx ( hdmi_bgr, hdmi_packed, hdmi_csc_bypass, - hdmi_tpg_enable, hdmi_vs_count, hdmi_hs_count, hdmi_dma_ovf, @@ -85,7 +84,6 @@ module up_hdmi_rx ( output hdmi_bgr; output hdmi_packed; output hdmi_csc_bypass; - output hdmi_tpg_enable; output [15:0] hdmi_vs_count; output [15:0] hdmi_hs_count; input hdmi_dma_ovf; @@ -121,7 +119,6 @@ module up_hdmi_rx ( reg up_bgr = 'd0; reg up_packed = 'd0; reg up_csc_bypass = 'd0; - reg up_tpg_enable = 'd0; reg up_dma_ovf = 'd0; reg up_dma_unf = 'd0; reg up_tpm_oos = 'd0; @@ -164,7 +161,6 @@ module up_hdmi_rx ( up_bgr <= 'd0; up_packed <= 'd0; up_csc_bypass <= 'd0; - up_tpg_enable <= 'd0; up_dma_ovf <= 'd0; up_dma_unf <= 'd0; up_tpm_oos <= 'd0; @@ -188,9 +184,6 @@ module up_hdmi_rx ( up_packed <= up_wdata[1]; up_csc_bypass <= up_wdata[0]; end - if ((up_wreq_s == 1'b1) && (up_waddr[11:0] == 12'h012)) begin - up_tpg_enable <= up_wdata[0]; - end if (up_dma_ovf_s == 1'b1) begin up_dma_ovf <= 1'b1; end else if ((up_wreq_s == 1'b1) && (up_waddr[11:0] == 12'h018)) begin @@ -248,7 +241,6 @@ module up_hdmi_rx ( 12'h002: up_rdata <= up_scratch; 12'h010: up_rdata <= {31'h0, ~up_preset}; 12'h011: up_rdata <= {28'h0, up_edge_sel, up_bgr, up_packed, up_csc_bypass}; - 12'h012: up_rdata <= {31'h0, up_tpg_enable}; 12'h015: up_rdata <= up_clk_count_s; 12'h016: up_rdata <= hdmi_clk_ratio; 12'h018: up_rdata <= {30'h0, up_dma_ovf, up_dma_unf}; @@ -272,14 +264,13 @@ module up_hdmi_rx ( // hdmi control & status - up_xfer_cntrl #(.DATA_WIDTH(37)) i_hdmi_xfer_cntrl ( + up_xfer_cntrl #(.DATA_WIDTH(36)) i_hdmi_xfer_cntrl ( .up_rstn (up_rstn), .up_clk (up_clk), .up_data_cntrl ({ up_edge_sel, up_bgr, up_packed, up_csc_bypass, - up_tpg_enable, up_vs_count, up_hs_count}), .up_xfer_done (), @@ -289,7 +280,6 @@ module up_hdmi_rx ( hdmi_bgr, hdmi_packed, hdmi_csc_bypass, - hdmi_tpg_enable, hdmi_vs_count, hdmi_hs_count}));