sjm
/
zc706
forked from M-Labs/zynq-rs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

eth: fix io configuration 

phy detection now works
This commit is contained in:
Astro 2019-06-18 23:10:35 +02:00
parent 1634513bc7
commit 54d0f3583d
2 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/eth/mod.rs
View File

@ -15,10 +15,10 @@ pub struct Eth<RX, TX> {
impl Eth<(), ()> { impl Eth<(), ()> {
pub fn default(macaddr: [u8; 6]) -> Self { pub fn default(macaddr: [u8; 6]) -> Self {
slcr::RegisterBlock::unlocked(|slcr| { slcr::RegisterBlock::unlocked(|slcr| {
// Manual example: 0x0000_1280
// MDIO // MDIO
slcr.mio_pin_53.write( slcr.mio_pin_53.write(
slcr::MioPin53::zeroed() slcr::MioPin53::zeroed()
.tri_enable(true)
.l3_sel(0b100) .l3_sel(0b100)
.io_type(slcr::IoBufferType::Lvcmos18) .io_type(slcr::IoBufferType::Lvcmos18)
.pullup(true) .pullup(true)
@ -30,52 +30,60 @@ impl Eth<(), ()> {
.io_type(slcr::IoBufferType::Lvcmos18) .io_type(slcr::IoBufferType::Lvcmos18)
.pullup(true) .pullup(true)
); );
// Manual example: 0x0000_3902
// TX_CLK // TX_CLK
slcr.mio_pin_16.write( slcr.mio_pin_16.write(
slcr::MioPin16::zeroed() slcr::MioPin16::zeroed()
.l0_sel(true) .l0_sel(true)
.io_type(slcr::IoBufferType::Lvcmos18) .io_type(slcr::IoBufferType::Hstl)
.pullup(true) .pullup(true)
.disable_rcvr(true)
); );
// TX_CTRL // TX_CTRL
slcr.mio_pin_21.write( slcr.mio_pin_21.write(
slcr::MioPin21::zeroed() slcr::MioPin21::zeroed()
.l0_sel(true) .l0_sel(true)
.io_type(slcr::IoBufferType::Lvcmos18) .io_type(slcr::IoBufferType::Hstl)
.pullup(true) .pullup(true)
.disable_rcvr(true)
); );
// TXD3 // TXD3
slcr.mio_pin_20.write( slcr.mio_pin_20.write(
slcr::MioPin20::zeroed() slcr::MioPin20::zeroed()
.l0_sel(true) .l0_sel(true)
.io_type(slcr::IoBufferType::Lvcmos18) .io_type(slcr::IoBufferType::Hstl)
.pullup(true) .pullup(true)
.disable_rcvr(true)
); );
// TXD2 // TXD2
slcr.mio_pin_19.write( slcr.mio_pin_19.write(
slcr::MioPin19::zeroed() slcr::MioPin19::zeroed()
.io_type(slcr::IoBufferType::Lvcmos18) .io_type(slcr::IoBufferType::Hstl)
.pullup(true) .pullup(true)
.disable_rcvr(true)
); );
// TXD1 // TXD1
slcr.mio_pin_18.write( slcr.mio_pin_18.write(
slcr::MioPin18::zeroed() slcr::MioPin18::zeroed()
.io_type(slcr::IoBufferType::Lvcmos18) .io_type(slcr::IoBufferType::Hstl)
.pullup(true) .pullup(true)
.disable_rcvr(true)
); );
// TXD0 // TXD0
slcr.mio_pin_17.write( slcr.mio_pin_17.write(
slcr::MioPin17::zeroed() slcr::MioPin17::zeroed()
.l0_sel(true) .l0_sel(true)
.io_type(slcr::IoBufferType::Lvcmos18) .io_type(slcr::IoBufferType::Hstl)
.pullup(true) .pullup(true)
.disable_rcvr(true)
); );
// Manual example: 0x0000_1903
// RX_CLK // RX_CLK
slcr.mio_pin_22.write( slcr.mio_pin_22.write(
slcr::MioPin22::zeroed() slcr::MioPin22::zeroed()
.tri_enable(true) .tri_enable(true)
.l0_sel(true) .l0_sel(true)
.io_type(slcr::IoBufferType::Lvcmos18) .io_type(slcr::IoBufferType::Hstl)
.pullup(true) .pullup(true)
); );
// RX_CTRL // RX_CTRL
@ -83,7 +91,7 @@ impl Eth<(), ()> {
slcr::MioPin27::zeroed() slcr::MioPin27::zeroed()
.tri_enable(true) .tri_enable(true)
.l0_sel(true) .l0_sel(true)
.io_type(slcr::IoBufferType::Lvcmos18) .io_type(slcr::IoBufferType::Hstl)
.pullup(true) .pullup(true)
); );
// RXD3 // RXD3
@ -91,7 +99,7 @@ impl Eth<(), ()> {
slcr::MioPin26::zeroed() slcr::MioPin26::zeroed()
.tri_enable(true) .tri_enable(true)
.l0_sel(true) .l0_sel(true)
.io_type(slcr::IoBufferType::Lvcmos18) .io_type(slcr::IoBufferType::Hstl)
.pullup(true) .pullup(true)
); );
// RXD2 // RXD2
@ -99,7 +107,7 @@ impl Eth<(), ()> {
slcr::MioPin25::zeroed() slcr::MioPin25::zeroed()
.tri_enable(true) .tri_enable(true)
.l0_sel(true) .l0_sel(true)
.io_type(slcr::IoBufferType::Lvcmos18) .io_type(slcr::IoBufferType::Hstl)
.pullup(true) .pullup(true)
); );
// RXD1 // RXD1
@ -107,7 +115,7 @@ impl Eth<(), ()> {
slcr::MioPin24::zeroed() slcr::MioPin24::zeroed()
.tri_enable(true) .tri_enable(true)
.l0_sel(true) .l0_sel(true)
.io_type(slcr::IoBufferType::Lvcmos18) .io_type(slcr::IoBufferType::Hstl)
.pullup(true) .pullup(true)
); );
// RXD0 // RXD0
@ -115,9 +123,14 @@ impl Eth<(), ()> {
slcr::MioPin23::zeroed() slcr::MioPin23::zeroed()
.tri_enable(true) .tri_enable(true)
.l0_sel(true) .l0_sel(true)
.io_type(slcr::IoBufferType::Lvcmos18) .io_type(slcr::IoBufferType::Hstl)
.pullup(true) .pullup(true)
); );
// VREF internal generator
slcr.gpiob_ctrl.write(
slcr::GpiobCtrl::zeroed()
.vref_en(true)
);
}); });
Self::gem0(macaddr) Self::gem0(macaddr)
@ -125,19 +138,20 @@ impl Eth<(), ()> {
pub fn gem0(macaddr: [u8; 6]) -> Self { pub fn gem0(macaddr: [u8; 6]) -> Self {
slcr::RegisterBlock::unlocked(|slcr| { slcr::RegisterBlock::unlocked(|slcr| {
// Enable gem0 ref clock
slcr.gem0_rclk_ctrl.write(
slcr::RclkCtrl::zeroed()
.clkact(true)
);
// 0x0050_0801: 8, 5: 100 Mb/s
slcr.gem0_clk_ctrl.write( slcr.gem0_clk_ctrl.write(
// 0x0050_0801: 8, 5: 100 Mb/s
slcr::ClkCtrl::zeroed() slcr::ClkCtrl::zeroed()
.clkact(true) .clkact(true)
.srcsel(slcr::PllSource::IoPll) .srcsel(slcr::PllSource::IoPll)
.divisor(8) .divisor(8)
.divisor1(5) .divisor1(5)
); );
// Enable gem0 ref clock
slcr.gem0_rclk_ctrl.write(
// 0x0000_0801
slcr::RclkCtrl::zeroed()
.clkact(true)
);
}); });
let regs = regs::RegisterBlock::gem0(); let regs = regs::RegisterBlock::gem0();
@ -146,19 +160,19 @@ impl Eth<(), ()> {
pub fn gem1(macaddr: [u8; 6]) -> Self { pub fn gem1(macaddr: [u8; 6]) -> Self {
slcr::RegisterBlock::unlocked(|slcr| { slcr::RegisterBlock::unlocked(|slcr| {
// Enable gem1 ref clock
slcr.gem1_rclk_ctrl.write(
slcr::RclkCtrl::zeroed()
.clkact(true)
);
// 0x0050_0801: 8, 5: 100 Mb/s
slcr.gem1_clk_ctrl.write( slcr.gem1_clk_ctrl.write(
// 0x0050_0801: 8, 5: 100 Mb/s
slcr::ClkCtrl::zeroed() slcr::ClkCtrl::zeroed()
.clkact(true) .clkact(true)
.srcsel(slcr::PllSource::IoPll) .srcsel(slcr::PllSource::IoPll)
.divisor(8) .divisor(8)
.divisor1(5) .divisor1(5)
); );
// Enable gem1 ref clock
slcr.gem1_rclk_ctrl.write(
slcr::RclkCtrl::zeroed()
.clkact(true)
);
}); });
let regs = regs::RegisterBlock::gem1(); let regs = regs::RegisterBlock::gem1();
@ -253,7 +267,7 @@ impl<RX, TX> Eth<RX, TX> {
.multi_hash_en(true) .multi_hash_en(true)
// Promiscuous mode // Promiscuous mode
.copy_all(true) .copy_all(true)
.mdc_clk_div(0b111) .mdc_clk_div(0b110)
); );
let macaddr_msbs = let macaddr_msbs =

5
src/slcr.rs
View File

@ -175,7 +175,7 @@ pub struct RegisterBlock {
reserved18: [u32; 3], reserved18: [u32; 3],
pub ocm_cfg: RW<u32>, pub ocm_cfg: RW<u32>,
reserved19: [u32; 123], reserved19: [u32; 123],
pub gpiob_ctrl: RW<u32>, pub gpiob_ctrl: GpiobCtrl,
pub gpiob_cfg_cmos18: RW<u32>, pub gpiob_cfg_cmos18: RW<u32>,
pub gpiob_cfg_cmos25: RW<u32>, pub gpiob_cfg_cmos25: RW<u32>,
pub gpiob_cfg_cmos33: RW<u32>, pub gpiob_cfg_cmos33: RW<u32>,
@ -415,3 +415,6 @@ mio_pin_register!(mio_pin_50, MioPin50);
mio_pin_register!(mio_pin_51, MioPin51); mio_pin_register!(mio_pin_51, MioPin51);
mio_pin_register!(mio_pin_52, MioPin52); mio_pin_register!(mio_pin_52, MioPin52);
mio_pin_register!(mio_pin_53, MioPin53); mio_pin_register!(mio_pin_53, MioPin53);
register!(gpiob_ctrl, GpiobCtrl, RW, u32);
register_bit!(gpiob_ctrl, vref_en, 0);