diff options
| author | Tom Rini <trini@konsulko.com> | 2015-09-02 10:39:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-09-02 10:39:28 -0400 |
| commit | 0ffadab1b9ab59816a0f71c927604bb6c402d863 (patch) | |
| tree | 8338cea40ce53158387da4f708b09487cdebeaf9 /arch/arm/imx-common | |
| parent | 6923b069bd50b3ac519b16b6ae6aabbd2984c391 (diff) | |
| parent | 37cf215253a488ba6b903989b1eff072f59d266e (diff) | |
| download | u-boot-imx-0ffadab1b9ab59816a0f71c927604bb6c402d863.zip u-boot-imx-0ffadab1b9ab59816a0f71c927604bb6c402d863.tar.gz u-boot-imx-0ffadab1b9ab59816a0f71c927604bb6c402d863.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/imx-common')
| -rw-r--r-- | arch/arm/imx-common/iomux-v3.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c index 7fb23dd..b4f481f 100644 --- a/arch/arm/imx-common/iomux-v3.c +++ b/arch/arm/imx-common/iomux-v3.c @@ -41,6 +41,18 @@ void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad) } #endif +#ifdef CONFIG_IOMUX_LPSR + u32 lpsr = (pad & MUX_MODE_LPSR) >> MUX_MODE_SHIFT; + + if (lpsr == IOMUX_CONFIG_LPSR) { + base = (void *)IOMUXC_LPSR_BASE_ADDR; + mux_mode &= ~IOMUX_CONFIG_LPSR; + /* set daisy chain sel_input */ + if (sel_input_ofs) + sel_input_ofs += IOMUX_LPSR_SEL_INPUT_OFS; + } +#endif + if (mux_ctrl_ofs) __raw_writel(mux_mode, base + mux_ctrl_ofs); @@ -55,6 +67,12 @@ void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad) if (!(pad_ctrl & NO_PAD_CTRL) && pad_ctrl_ofs) __raw_writel(pad_ctrl, base + pad_ctrl_ofs); #endif + +#ifdef CONFIG_IOMUX_LPSR + if (lpsr == IOMUX_CONFIG_LPSR) + base = (void *)IOMUXC_BASE_ADDR; +#endif + } /* configures a list of pads within declared with IOMUX_PADS macro */ |