| Message ID | 20221114111513.1436165-2-herve.codina@bootlin.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
| Series | Add the Renesas USBF controller support | expand |
On Mon, Nov 14, 2022 at 12:15 PM Herve Codina <herve.codina@bootlin.com> wrote: > The usb role retrieved is determined from the CFG_USB[H2MODE] > value. The CFG_USB register is located within the system > controller. > > We need a helper to get the usb role based on H2MODE value from > the CFG_USB register without syscon. > > Signed-off-by: Herve Codina <herve.codina@bootlin.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
diff --git a/drivers/clk/renesas/r9a06g032-clocks.c b/drivers/clk/renesas/r9a06g032-clocks.c index 1488c9d6e639..9ee056498714 100644 --- a/drivers/clk/renesas/r9a06g032-clocks.c +++ b/drivers/clk/renesas/r9a06g032-clocks.c @@ -23,8 +23,11 @@ #include <linux/slab.h> #include <linux/soc/renesas/r9a06g032-sysctrl.h> #include <linux/spinlock.h> +#include <linux/usb/role.h> #include <dt-bindings/clock/r9a06g032-sysctrl.h> +#define R9A06G032_SYSCTRL_USB 0x00 +#define R9A06G032_SYSCTRL_USB_H2MODE (1<<1) #define R9A06G032_SYSCTRL_DMAMUX 0xA0 struct r9a06g032_gate { @@ -341,6 +344,21 @@ int r9a06g032_sysctrl_set_dmamux(u32 mask, u32 val) } EXPORT_SYMBOL_GPL(r9a06g032_sysctrl_set_dmamux); + +/* Exported helper to get the H2MODE bit from USB register */ +int r9a06g032_sysctrl_get_usb_role(void) +{ + u32 usb; + + if (!sysctrl_priv) + return -EPROBE_DEFER; + + usb = readl(sysctrl_priv->reg + R9A06G032_SYSCTRL_USB); + return (usb & R9A06G032_SYSCTRL_USB_H2MODE) ? + USB_ROLE_HOST : USB_ROLE_DEVICE; +} +EXPORT_SYMBOL_GPL(r9a06g032_sysctrl_get_usb_role); + /* register/bit pairs are encoded as an uint16_t */ static void clk_rdesc_set(struct r9a06g032_priv *clocks, diff --git a/include/linux/soc/renesas/r9a06g032-sysctrl.h b/include/linux/soc/renesas/r9a06g032-sysctrl.h index 066dfb15cbdd..fc18d013a498 100644 --- a/include/linux/soc/renesas/r9a06g032-sysctrl.h +++ b/include/linux/soc/renesas/r9a06g032-sysctrl.h @@ -4,8 +4,10 @@ #ifdef CONFIG_CLK_R9A06G032 int r9a06g032_sysctrl_set_dmamux(u32 mask, u32 val); +int r9a06g032_sysctrl_get_usb_role(void); #else static inline int r9a06g032_sysctrl_set_dmamux(u32 mask, u32 val) { return -ENODEV; } +static inline int r9a06g032_sysctrl_get_usb_role(void) { return -ENODEV; } #endif #endif /* __LINUX_SOC_RENESAS_R9A06G032_SYSCTRL_H__ */
The usb role retrieved is determined from the CFG_USB[H2MODE] value. The CFG_USB register is located within the system controller. We need a helper to get the usb role based on H2MODE value from the CFG_USB register without syscon. Signed-off-by: Herve Codina <herve.codina@bootlin.com> --- drivers/clk/renesas/r9a06g032-clocks.c | 18 ++++++++++++++++++ include/linux/soc/renesas/r9a06g032-sysctrl.h | 2 ++ 2 files changed, 20 insertions(+)