diff --git a/board/nm/nrhw20/mux.c b/board/nm/nrhw20/mux.c
index 4b5fc9791c..3273e11af3 100644
--- a/board/nm/nrhw20/mux.c
+++ b/board/nm/nrhw20/mux.c
@@ -113,24 +113,24 @@ static struct module_pin_mux i2c2_pin_mux[] = {
 	{-1},
 };
 
+/* RMII1: Ethernet Switch */
 static struct module_pin_mux rmii1_pin_mux[] = {
 	/* RMII */
-	{OFFSET(mii1_crs), MODE(1) | PULLUDDIS | RXACTIVE},		/* (H17) rmii1_crs */
-	/* TODO: Check whether pin can be disabled, resistor R1013 removed */
-	{OFFSET(mii1_rxerr), MODE(1) | PULLUDDIS | RXACTIVE},		/* (J15) rmii1_rxerr */
-	{OFFSET(mii1_rxd0), MODE(1) | PULLUDDIS | RXACTIVE },		/* (M16) rmii1_rxd0 */
-	{OFFSET(mii1_rxd1), MODE(1) | PULLUDDIS | RXACTIVE },		/* (L15) rmii1_rxd1 */
-	{OFFSET(mii1_txen), MODE(1) | PULLUDDIS },			/* (J16) rmii1_txen */
-	{OFFSET(mii1_txd0), MODE(1) | PULLUDDIS },			/* (K17) rmii1_txd0 */
-	{OFFSET(mii1_txd1), MODE(1) | PULLUDDIS },			/* (K16) rmii1_txd1 */
-	{OFFSET(rmii1_refclk), MODE(0) | PULLUDDIS | RXACTIVE},		/* (H18) rmii1_refclk */
+	{OFFSET(mii1_crs), MODE(1) | PULLUDDIS | RXACTIVE},			/* (H17) rmii1_crs */
+	{OFFSET(mii1_rxerr), MODE(7) | PULLUDEN | PULLDOWN_EN | RXACTIVE},	/* (J15) gpio */
+	{OFFSET(mii1_rxd0), MODE(1) | PULLUDDIS | RXACTIVE},			/* (M16) rmii1_rxd0 */
+	{OFFSET(mii1_rxd1), MODE(1) | PULLUDDIS | RXACTIVE},			/* (L15) rmii1_rxd1 */
+	{OFFSET(mii1_txen), MODE(1) | PULLUDDIS},				/* (J16) rmii1_txen */
+	{OFFSET(mii1_txd0), MODE(1) | PULLUDDIS},				/* (K17) rmii1_txd0 */
+	{OFFSET(mii1_txd1), MODE(1) | PULLUDDIS},				/* (K16) rmii1_txd1 */
+	{OFFSET(rmii1_refclk), MODE(0) | PULLUDDIS | RXACTIVE},			/* (H18) rmii1_refclk */
 
 	/* SMI */
-	{OFFSET(mdio_clk), MODE(0) | PULLUDDIS },			/* (M18) mdio_clk */
-	{OFFSET(mdio_data), MODE(0) | PULLUDEN | PULLUP_EN | RXACTIVE },/* (M17) mdio_data */
+	{OFFSET(mdio_clk), MODE(0) | PULLUDDIS},				/* (M18) mdio_clk */
+	{OFFSET(mdio_data), MODE(0) | PULLUDEN | PULLUP_EN | RXACTIVE},		/* (M17) mdio_data */
 
 	/* 25MHz Clock Output */
-	{OFFSET(xdma_event_intr0), MODE(3) },				/* (A15) clkout1 (25 MHz clk for Switch) */
+	{OFFSET(xdma_event_intr0), MODE(3)},					/* (A15) clkout1 (25 MHz clk for Switch) */
 	{-1},
 };
 
@@ -181,8 +181,8 @@ static struct module_pin_mux uart0_pin_mux[] = {
 static struct module_pin_mux uart0_disabled_pin_mux[] = {
 	{OFFSET(uart0_rxd), (MODE(7) | PULLUDDIS | RXACTIVE)},			/* (E15) GPIO1_10 */
 	{OFFSET(uart0_txd), (MODE(7) | PULLUDDIS | RXACTIVE)},			/* (E16) GPIO1_11 */
-	{OFFSET(uart0_ctsn), (MODE(7) | PULLUDDIS | RXACTIVE )},		/* (E18) GPIO1_8 */
-	{OFFSET(uart0_rtsn), (MODE(7) | PULLUDEN | PULLUP_EN )},		/* (E17) GPIO1_9 */
+	{OFFSET(uart0_ctsn), (MODE(7) | PULLUDDIS | RXACTIVE)},			/* (E18) GPIO1_8 */
+	{OFFSET(uart0_rtsn), (MODE(7) | PULLUDEN | PULLUP_EN)},			/* (E17) GPIO1_9 */
 	{-1},
 };
 
@@ -193,14 +193,14 @@ static struct module_pin_mux uart1_pin_mux[] = {
 	{-1},
 };
 
-/* GNSS */
+/* UART3: GNSS */
 static struct module_pin_mux uart3_pin_mux[] = {
 	{OFFSET(mii1_rxd3), (MODE(1) | PULLUDEN | PULLUP_EN | RXACTIVE)},	/* (L17) UART3_RXD */
 	{OFFSET(mii1_rxd2), (MODE(1) | PULLUDEN | PULLUP_EN | SLEWCTRL)},	/* (L16) UART3_TXD */
 	{-1},
 };
 
-/* Highspeed UART for Bluetooth (no SLEWCTRL) */
+/* UART5: Highspeed UART for Bluetooth (no SLEWCTRL) */
 static struct module_pin_mux uart5_pin_mux[] = {
 	{OFFSET(lcd_data9), (MODE(4) | PULLUDEN | PULLUP_EN | RXACTIVE)},	/* (U2) UART5_RXD */
 	{OFFSET(lcd_data8), (MODE(4) | PULLUDEN | PULLUP_EN)},			/* (U1) UART5_TXD */