Equalize hekate main and Nyx common functions

bootloader/soc/clock.c

@@ -276,7 +276,7 @@ void clock_enable_pllc(u32 divn)
 		return;
 
 	// Take PLLC out of reset and set basic misc parameters.
-	CLOCK(CLK_RST_CONTROLLER_PLLC_MISC) = 
+	CLOCK(CLK_RST_CONTROLLER_PLLC_MISC) =
 		((CLOCK(CLK_RST_CONTROLLER_PLLC_MISC) & 0xFFF0000F) & ~PLLC_MISC_RESET) | (0x80000 << 4); // PLLC_EXT_FRU.
 	CLOCK(CLK_RST_CONTROLLER_PLLC_MISC_2) |= 0xF0 << 8; // PLLC_FLL_LD_MEM.
 
@@ -312,6 +312,53 @@ void clock_disable_pllc()
 	usleep(10);
 }
 
+#define PLLC4_ENABLED (1 << 31)
+#define PLLC4_IN_USE  (~PLLC4_ENABLED)
+
+u32 pllc4_enabled = 0;
+
+static void _clock_enable_pllc4(u32 mask)
+{
+	pllc4_enabled |= mask;
+
+	if (pllc4_enabled & PLLC4_ENABLED)
+		return;
+
+	// Enable Phase and Frequency lock detection.
+	//CLOCK(CLK_RST_CONTROLLER_PLLC4_MISC) = PLLC4_MISC_EN_LCKDET;
+
+	// Disable PLL and IDDQ in case they are on.
+	CLOCK(CLK_RST_CONTROLLER_PLLC4_BASE) &= ~PLLCX_BASE_ENABLE;
+	CLOCK(CLK_RST_CONTROLLER_PLLC4_BASE) &= ~PLLC4_BASE_IDDQ;
+	usleep(10);
+
+	// Set PLLC4 dividers.
+	CLOCK(CLK_RST_CONTROLLER_PLLC4_BASE) = (104 << 8) | 4; // DIVM: 4, DIVP: 1.
+
+	// Enable PLLC4 and wait for Phase and Frequency lock.
+	CLOCK(CLK_RST_CONTROLLER_PLLC4_BASE) |= PLLCX_BASE_ENABLE;
+	while (!(CLOCK(CLK_RST_CONTROLLER_PLLC4_BASE) & PLLCX_BASE_LOCK))
+		;
+
+	msleep(1); // Wait a bit for PLL to stabilize.
+
+	pllc4_enabled |= PLLC4_ENABLED;
+}
+
+static void _clock_disable_pllc4(u32 mask)
+{
+	pllc4_enabled &= ~mask;
+
+	if (pllc4_enabled & PLLC4_IN_USE)
+		return;
+
+	// Disable PLLC4.
+	CLOCK(CLK_RST_CONTROLLER_PLLC4_BASE) &= ~PLLCX_BASE_ENABLE;
+	CLOCK(CLK_RST_CONTROLLER_PLLC4_BASE) |= PLLC4_BASE_IDDQ;
+
+	pllc4_enabled = 0;
+}
+
 #define L_SWR_SDMMC1_RST (1 << 14)
 #define L_SWR_SDMMC2_RST (1 << 9)
 #define L_SWR_SDMMC4_RST (1 << 15)
@@ -501,16 +548,32 @@ static int _clock_sdmmc_config_clock_host(u32 *pclock, u32 id, u32 val)
 		divisor = 14; // 8 div.
 		break;
 	case 100000:
-		*pclock = 90667;
-		divisor = 7;  // 4.5 div.
+		source = SDMMC_CLOCK_SRC_PLLC4_OUT2;
+		*pclock = 99840;
+		divisor = 2;  // 2 div.
 		break;
 	case 164000:
 		*pclock = 163200;
 		divisor = 3;  // 2.5 div.
 		break;
-	case 200000:
-		*pclock = 204000;
-		divisor = 2;  // 2 div.
+	case 200000: // 240MHz evo+.
+		switch (id)
+		{
+		case SDMMC_1:
+			source = SDMMC_CLOCK_SRC_PLLC4_OUT2;
+			break;
+		case SDMMC_2:
+			source = SDMMC4_CLOCK_SRC_PLLC4_OUT2_LJ;
+			break;
+		case SDMMC_3:
+			source = SDMMC_CLOCK_SRC_PLLC4_OUT2;
+			break;
+		case SDMMC_4:
+			source = SDMMC4_CLOCK_SRC_PLLC4_OUT2_LJ;
+			break;
+		}
+		*pclock = 199680;
+		divisor = 0;  // 1 div.
 		break;
 	default:
 		*pclock = 24728;
@@ -520,6 +583,10 @@ static int _clock_sdmmc_config_clock_host(u32 *pclock, u32 id, u32 val)
 	_clock_sdmmc_table[id].clock = val;
 	_clock_sdmmc_table[id].real_clock = *pclock;
 
+	// Enable PLLC4 if in use by any SDMMC.
+	if (source)
+		_clock_enable_pllc4(1 << id);
+
 	// Set SDMMC legacy timeout clock.
 	_clock_sdmmc_config_legacy_tm();
 
@@ -642,4 +709,5 @@ void clock_sdmmc_disable(u32 id)
 	_clock_sdmmc_set_reset(id);
 	_clock_sdmmc_clear_enable(id);
 	_clock_sdmmc_is_reset(id);
+	_clock_disable_pllc4(1 << id);
 }

bootloader/soc/hw_init.c

@@ -25,18 +25,23 @@
 #include "i2c.h"
 #include "pinmux.h"
 #include "pmc.h"
-#include "t210.h"
 #include "uart.h"
+#include "t210.h"
+#include "../input/joycon.h"
+#include "../input/touch.h"
 #include "../gfx/di.h"
 #include "../mem/mc.h"
 #include "../mem/minerva.h"
 #include "../mem/sdram.h"
-#include "../power/max77620.h"
-#include "../power/max7762x.h"
 #include "../sec/se.h"
 #include "../sec/se_t210.h"
+#include "../power/max77620.h"
+#include "../power/max7762x.h"
+#include "../gfx/di.h"
+#include "../power/regulator_5v.h"
 #include "../storage/nx_sd.h"
 #include "../storage/sdmmc.h"
+#include "../thermal/fan.h"
 #include "../utils/util.h"
 
 extern boot_cfg_t b_cfg;
@@ -326,9 +331,21 @@ void config_hw()
 
 void reconfig_hw_workaround(bool extra_reconfig, u32 magic)
 {
-	// Flush and disable MMU.
-	bpmp_mmu_disable();
+	// Disable BPMP max clock.
 	bpmp_clk_rate_set(BPMP_CLK_NORMAL);
+
+#ifdef NYX
+	// Deinit touchscreen, 5V regulators and Joy-Con.
+	touch_power_off();
+	set_fan_duty(0);
+	jc_deinit();
+	regulator_disable_5v(REGULATOR_5V_ALL);
+	clock_disable_uart(UART_B);
+	clock_disable_uart(UART_C);
+#endif
+
+	// Flush/disable MMU cache and set DRAM clock to 204MHz.
+	bpmp_mmu_disable();
 	minerva_change_freq(FREQ_204);
 	nyx_str->mtc_cfg.init_done = 0;
 

bootloader/soc/kfuse.c

@@ -18,9 +18,6 @@
 #include "../soc/clock.h"
 #include "../soc/t210.h"
 
-#pragma GCC push_options
-#pragma GCC optimize ("Os")
-
 int kfuse_wait_ready()
 {
 	// Wait for KFUSE to finish init and verification of data.
@@ -48,9 +45,7 @@ int kfuse_read(u32 *buf)
 
 	res = 1;
 
-out:;
+out:
 	clock_disable_kfuse();
 	return res;
 }
-
-#pragma GCC pop_options

bootloader/soc/uart.c

@@ -79,7 +79,7 @@ void uart_send(u32 idx, const u8 *buf, u32 len)
 		while (!(uart->UART_LSR & UART_LSR_THRE))
 			;
 		uart->UART_THR_DLAB = buf[i];
-	};
+	}
 }
 
 u32 uart_recv(u32 idx, u8 *buf, u32 len)