nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-11-15 09:36:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

thermosphere: fix uart pinmuxing. As it's now possible to init all uarts at the same time, do it.

Browse source 
Thanks to @CTCaer

See dumped values from HOS: ccaa47ee04/kernel-dts/icosa-platforms/tegra210-icosa-pinmux.dtsi
This commit is contained in:
TuxSH 2020-03-08 17:44:55 +00:00
parent 6790895487
commit 548367453b
2 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
thermosphere/src/drivers/tegra/t210/hvisor_drivers_tegra_t210_gpio.hpp
View file

@ -193,15 +193,14 @@ namespace ams::hvisor::drivers::tegra::t210 {
return static_cast<Level>((m_regs->bank[pin.port / portsPerBank].in[pin.port % portsPerBank] >> pin.pos) & 1); return static_cast<Level>((m_regs->bank[pin.port / portsPerBank].in[pin.port % portsPerBank] >> pin.pos) & 1);
} }
void ConfigureUartPins(u32 id) void ConfigureUartPins()
{ {
if (id > 3) {
return;
}
constexpr Pin uartPins[] = {uart1Tx, uart2Tx, uart3Tx, uart4Tx}; constexpr Pin uartPins[] = {uart1Tx, uart2Tx, uart3Tx, uart4Tx};
// Set SFIO to all the 4 contiguous pins (tx, rx, rts, cts) // Set SFIO to all the 4 contiguous pins (tx, rx, rts, cts)
SetModeContiguous(uartPins[id], 4, Mode::Sfio); for (Pin pin : uartPins) {
SetModeContiguous(pin, 4, Mode::Sfio);
}
} }
}; };

30
thermosphere/src/drivers/tegra/t210/hvisor_drivers_tegra_t210_pinmux.hpp
View file

@ -234,20 +234,24 @@ namespace ams::hvisor::drivers::tegra::t210 {
volatile Registers *m_regs = nullptr; volatile Registers *m_regs = nullptr;
public: public:
CONFIGURE_UART_DECL(1) void ConfigureUartPins() const
CONFIGURE_UART_DECL(2)
CONFIGURE_UART_DECL(3)
CONFIGURE_UART_DECL(4)
void ConfigureUart(u32 id)
{ {
switch (id) { m_regs->uart1_tx = 0 | 0 | PULL_NONE | SELECT_FUNCTION0;
case 0: ConfigureUart1(); break; m_regs->uart1_rx = INPUT | TRISTATE | PULL_UP | SELECT_FUNCTION0;
case 1: ConfigureUart2(); break; m_regs->uart1_rts = 0 | 0 | PULL_NONE | SELECT_FUNCTION0;
case 2: ConfigureUart3(); break; m_regs->uart1_cts = INPUT | TRISTATE | PULL_DOWN | SELECT_FUNCTION0;
case 3: ConfigureUart4(); break; m_regs->uart2_tx = 0 | 0 | PULL_NONE | SELECT_FUNCTION0;
default: break; m_regs->uart2_rx = INPUT | TRISTATE | PULL_NONE | SELECT_FUNCTION0;
} m_regs->uart2_rts = 0 | 0 | PULL_DOWN | SELECT_FUNCTION0;
m_regs->uart2_cts = INPUT | TRISTATE | PULL_NONE | SELECT_FUNCTION0;
m_regs->uart3_tx = 0 | 0 | PULL_NONE | SELECT_FUNCTION0;
m_regs->uart3_rx = INPUT | TRISTATE | PULL_NONE | SELECT_FUNCTION0;
m_regs->uart3_rts = 0 | 0 | PULL_DOWN | SELECT_FUNCTION0;
m_regs->uart3_cts = INPUT | TRISTATE | PULL_NONE | SELECT_FUNCTION0;
m_regs->uart4_tx = 0 | 0 | PULL_DOWN | SELECT_FUNCTION0;
m_regs->uart4_rx = INPUT | TRISTATE | PULL_DOWN | SELECT_FUNCTION0;
m_regs->uart4_cts = 0 | 0 | PULL_DOWN | SELECT_FUNCTION0;
m_regs->uart4_rts = INPUT | TRISTATE | PULL_DOWN | SELECT_FUNCTION0;
} }
}; };
} }