From a4ee4d20adf57010b16e7cf795d11ddab24d3062 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Wed, 8 May 2019 06:20:36 -0700 Subject: [PATCH] boot: use correct clock out setting on < 6.0 --- .../boot/source/boot_clock_initial_configuration.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stratosphere/boot/source/boot_clock_initial_configuration.cpp b/stratosphere/boot/source/boot_clock_initial_configuration.cpp index f70ffaa21..20ce31ded 100644 --- a/stratosphere/boot/source/boot_clock_initial_configuration.cpp +++ b/stratosphere/boot/source/boot_clock_initial_configuration.cpp @@ -18,9 +18,11 @@ #include "boot_registers_pmc.hpp" static constexpr u32 PmcClkOutCntrl = PmcBase + APBDEV_PMC_CLK_OUT_CNTRL; -static constexpr u32 InitialClockOutMask = 0xC4C4; +static constexpr u32 InitialClockOutMask1x = 0x00C4; +static constexpr u32 InitialClockOutMask6x = 0xC4C4; void Boot::SetInitialClockConfiguration() { /* Write mask to APBDEV_PMC_PWR_DET, then clear APBDEV_PMC_PWR_DET_VAL. */ - WritePmcRegister(PmcClkOutCntrl, InitialClockOutMask, InitialClockOutMask); + const u32 mask = GetRuntimeFirmwareVersion() >= FirmwareVersion_600 ? InitialClockOutMask6x : InitialClockOutMask1x; + WritePmcRegister(PmcClkOutCntrl, mask, mask); }