From eaeabfaa97c30f9749f984eebcc61eca13230cfb Mon Sep 17 00:00:00 2001 From: Brian Glod Date: Thu, 13 Apr 2017 20:46:06 -0400 Subject: [PATCH] ip: altera: Enable areset port on PLLs --- hdl/fpga/ip/altera/fx3_pll/fx3_pll.ppf | 1 + hdl/fpga/ip/altera/fx3_pll/fx3_pll.vhd | 11 ++++++++--- hdl/fpga/ip/altera/pll/pll.cmp | 1 + hdl/fpga/ip/altera/pll/pll.ppf | 1 + hdl/fpga/ip/altera/pll/pll.vhd | 11 ++++++++--- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/hdl/fpga/ip/altera/fx3_pll/fx3_pll.ppf b/hdl/fpga/ip/altera/fx3_pll/fx3_pll.ppf index cde37bf9..e8f21046 100644 --- a/hdl/fpga/ip/altera/fx3_pll/fx3_pll.ppf +++ b/hdl/fpga/ip/altera/fx3_pll/fx3_pll.ppf @@ -2,6 +2,7 @@ + diff --git a/hdl/fpga/ip/altera/fx3_pll/fx3_pll.vhd b/hdl/fpga/ip/altera/fx3_pll/fx3_pll.vhd index a117861d..1288aee1 100644 --- a/hdl/fpga/ip/altera/fx3_pll/fx3_pll.vhd +++ b/hdl/fpga/ip/altera/fx3_pll/fx3_pll.vhd @@ -43,6 +43,7 @@ USE altera_mf.all; ENTITY fx3_pll IS PORT ( + areset : IN STD_LOGIC := '0'; inclk0 : IN STD_LOGIC := '0'; c0 : OUT STD_LOGIC ; locked : OUT STD_LOGIC @@ -121,6 +122,7 @@ ARCHITECTURE SYN OF fx3_pll IS width_clock : NATURAL ); PORT ( + areset : IN STD_LOGIC ; inclk : IN STD_LOGIC_VECTOR (1 DOWNTO 0); clk : OUT STD_LOGIC_VECTOR (4 DOWNTO 0); locked : OUT STD_LOGIC @@ -151,7 +153,7 @@ BEGIN operation_mode => "SOURCE_SYNCHRONOUS", pll_type => "AUTO", port_activeclock => "PORT_UNUSED", - port_areset => "PORT_UNUSED", + port_areset => "PORT_USED", port_clkbad0 => "PORT_UNUSED", port_clkbad1 => "PORT_UNUSED", port_clkloss => "PORT_UNUSED", @@ -195,6 +197,7 @@ BEGIN width_clock => 5 ) PORT MAP ( + areset => areset, inclk => sub_wire1, clk => sub_wire3, locked => sub_wire5 @@ -259,7 +262,7 @@ END SYN; -- Retrieval info: PRIVATE: PHASE_SHIFT_STEP_ENABLED_CHECK STRING "0" -- Retrieval info: PRIVATE: PHASE_SHIFT_UNIT0 STRING "ps" -- Retrieval info: PRIVATE: PLL_ADVANCED_PARAM_CHECK STRING "0" --- Retrieval info: PRIVATE: PLL_ARESET_CHECK STRING "0" +-- Retrieval info: PRIVATE: PLL_ARESET_CHECK STRING "1" -- Retrieval info: PRIVATE: PLL_AUTOPLL_CHECK NUMERIC "1" -- Retrieval info: PRIVATE: PLL_ENHPLL_CHECK NUMERIC "0" -- Retrieval info: PRIVATE: PLL_FASTPLL_CHECK NUMERIC "0" @@ -300,7 +303,7 @@ END SYN; -- Retrieval info: CONSTANT: OPERATION_MODE STRING "SOURCE_SYNCHRONOUS" -- Retrieval info: CONSTANT: PLL_TYPE STRING "AUTO" -- Retrieval info: CONSTANT: PORT_ACTIVECLOCK STRING "PORT_UNUSED" --- Retrieval info: CONSTANT: PORT_ARESET STRING "PORT_UNUSED" +-- Retrieval info: CONSTANT: PORT_ARESET STRING "PORT_USED" -- Retrieval info: CONSTANT: PORT_CLKBAD0 STRING "PORT_UNUSED" -- Retrieval info: CONSTANT: PORT_CLKBAD1 STRING "PORT_UNUSED" -- Retrieval info: CONSTANT: PORT_CLKLOSS STRING "PORT_UNUSED" @@ -344,9 +347,11 @@ END SYN; -- Retrieval info: CONSTANT: WIDTH_CLOCK NUMERIC "5" -- Retrieval info: USED_PORT: @clk 0 0 5 0 OUTPUT_CLK_EXT VCC "@clk[4..0]" -- Retrieval info: USED_PORT: @inclk 0 0 2 0 INPUT_CLK_EXT VCC "@inclk[1..0]" +-- Retrieval info: USED_PORT: areset 0 0 0 0 INPUT GND "areset" -- Retrieval info: USED_PORT: c0 0 0 0 0 OUTPUT_CLK_EXT VCC "c0" -- Retrieval info: USED_PORT: inclk0 0 0 0 0 INPUT_CLK_EXT GND "inclk0" -- Retrieval info: USED_PORT: locked 0 0 0 0 OUTPUT GND "locked" +-- Retrieval info: CONNECT: @areset 0 0 0 0 areset 0 0 0 0 -- Retrieval info: CONNECT: @inclk 0 0 1 1 GND 0 0 0 0 -- Retrieval info: CONNECT: @inclk 0 0 1 0 inclk0 0 0 0 0 -- Retrieval info: CONNECT: c0 0 0 0 0 @clk 0 0 1 0 diff --git a/hdl/fpga/ip/altera/pll/pll.cmp b/hdl/fpga/ip/altera/pll/pll.cmp index 0b4dac6d..0ae947cb 100644 --- a/hdl/fpga/ip/altera/pll/pll.cmp +++ b/hdl/fpga/ip/altera/pll/pll.cmp @@ -17,6 +17,7 @@ component pll PORT ( + areset : IN STD_LOGIC := '0'; inclk0 : IN STD_LOGIC := '0'; c0 : OUT STD_LOGIC ; locked : OUT STD_LOGIC diff --git a/hdl/fpga/ip/altera/pll/pll.ppf b/hdl/fpga/ip/altera/pll/pll.ppf index 7c1b2976..b8f2c8e9 100644 --- a/hdl/fpga/ip/altera/pll/pll.ppf +++ b/hdl/fpga/ip/altera/pll/pll.ppf @@ -2,6 +2,7 @@ + diff --git a/hdl/fpga/ip/altera/pll/pll.vhd b/hdl/fpga/ip/altera/pll/pll.vhd index 9f73c981..dd626784 100644 --- a/hdl/fpga/ip/altera/pll/pll.vhd +++ b/hdl/fpga/ip/altera/pll/pll.vhd @@ -43,6 +43,7 @@ USE altera_mf.all; ENTITY pll IS PORT ( + areset : IN STD_LOGIC := '0'; inclk0 : IN STD_LOGIC := '0'; c0 : OUT STD_LOGIC ; locked : OUT STD_LOGIC @@ -121,6 +122,7 @@ ARCHITECTURE SYN OF pll IS width_clock : NATURAL ); PORT ( + areset : IN STD_LOGIC ; inclk : IN STD_LOGIC_VECTOR (1 DOWNTO 0); clk : OUT STD_LOGIC_VECTOR (4 DOWNTO 0); locked : OUT STD_LOGIC @@ -151,7 +153,7 @@ BEGIN operation_mode => "NORMAL", pll_type => "AUTO", port_activeclock => "PORT_UNUSED", - port_areset => "PORT_UNUSED", + port_areset => "PORT_USED", port_clkbad0 => "PORT_UNUSED", port_clkbad1 => "PORT_UNUSED", port_clkloss => "PORT_UNUSED", @@ -195,6 +197,7 @@ BEGIN width_clock => 5 ) PORT MAP ( + areset => areset, inclk => sub_wire1, clk => sub_wire3, locked => sub_wire5 @@ -259,7 +262,7 @@ END SYN; -- Retrieval info: PRIVATE: PHASE_SHIFT_STEP_ENABLED_CHECK STRING "0" -- Retrieval info: PRIVATE: PHASE_SHIFT_UNIT0 STRING "deg" -- Retrieval info: PRIVATE: PLL_ADVANCED_PARAM_CHECK STRING "0" --- Retrieval info: PRIVATE: PLL_ARESET_CHECK STRING "0" +-- Retrieval info: PRIVATE: PLL_ARESET_CHECK STRING "1" -- Retrieval info: PRIVATE: PLL_AUTOPLL_CHECK NUMERIC "1" -- Retrieval info: PRIVATE: PLL_ENHPLL_CHECK NUMERIC "0" -- Retrieval info: PRIVATE: PLL_FASTPLL_CHECK NUMERIC "0" @@ -300,7 +303,7 @@ END SYN; -- Retrieval info: CONSTANT: OPERATION_MODE STRING "NORMAL" -- Retrieval info: CONSTANT: PLL_TYPE STRING "AUTO" -- Retrieval info: CONSTANT: PORT_ACTIVECLOCK STRING "PORT_UNUSED" --- Retrieval info: CONSTANT: PORT_ARESET STRING "PORT_UNUSED" +-- Retrieval info: CONSTANT: PORT_ARESET STRING "PORT_USED" -- Retrieval info: CONSTANT: PORT_CLKBAD0 STRING "PORT_UNUSED" -- Retrieval info: CONSTANT: PORT_CLKBAD1 STRING "PORT_UNUSED" -- Retrieval info: CONSTANT: PORT_CLKLOSS STRING "PORT_UNUSED" @@ -344,9 +347,11 @@ END SYN; -- Retrieval info: CONSTANT: WIDTH_CLOCK NUMERIC "5" -- Retrieval info: USED_PORT: @clk 0 0 5 0 OUTPUT_CLK_EXT VCC "@clk[4..0]" -- Retrieval info: USED_PORT: @inclk 0 0 2 0 INPUT_CLK_EXT VCC "@inclk[1..0]" +-- Retrieval info: USED_PORT: areset 0 0 0 0 INPUT GND "areset" -- Retrieval info: USED_PORT: c0 0 0 0 0 OUTPUT_CLK_EXT VCC "c0" -- Retrieval info: USED_PORT: inclk0 0 0 0 0 INPUT_CLK_EXT GND "inclk0" -- Retrieval info: USED_PORT: locked 0 0 0 0 OUTPUT GND "locked" +-- Retrieval info: CONNECT: @areset 0 0 0 0 areset 0 0 0 0 -- Retrieval info: CONNECT: @inclk 0 0 1 1 GND 0 0 0 0 -- Retrieval info: CONNECT: @inclk 0 0 1 0 inclk0 0 0 0 0 -- Retrieval info: CONNECT: c0 0 0 0 0 @clk 0 0 1 0