diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 14:58:12 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 14:58:12 +0100 |
| commit | ad77b791255a63e533a263613b86324fec394360 (patch) | |
| tree | d480d7915047f367a9c8ea27250d5370398a81b4 /arch/arm/mach-imx/iomux-imx31.c | |
| parent | Merge tag 'samsung-cleanup-2' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | ARM: imx: Remove unneeded .map_io initialization (diff) | |
| download | linux-ad77b791255a63e533a263613b86324fec394360.tar.xz linux-ad77b791255a63e533a263613b86324fec394360.zip | |
Merge tag 'imx-cleanup-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/cleanup
Pull "The i.MX cleanup for 3.19" from Shawn Guo:
- Clean up reset handler for DT machines, since reset has been handled
in watchdog driver
- Remove unneeded .map_io hook for a couple of i.MX6 machines
- A few small i.MX6 device tree source cleanups
- Some random iomuxc and pllv3 code cleanup
* tag 'imx-cleanup-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx: Remove unneeded .map_io initialization
ARM: dts: imx6qdl-sabresd: Fix the microphone route
ARM: imx: refactor mxc_iomux_mode()
ARM: imx: simplify clk_pllv3_prepare()
ARM: imx6q: drop unnecessary semicolon
ARM: imx: clean up machine mxc_arch_reset_init_dt reset init
ARM: dts: imx6qdl-rex: Remove unneeded 'fsl,mode' property
ARM: dts: imx6qdl-gw5x: Remove unneeded 'fsl,mode' property
ARM: dts: imx6qdl-sabresd: Use IMX6QDL_CLK_CKO define
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/iomux-imx31.c')
| -rw-r--r-- | arch/arm/mach-imx/iomux-imx31.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/iomux-imx31.c b/arch/arm/mach-imx/iomux-imx31.c index 1657fe64cd0f..d6a30753ca7c 100644 --- a/arch/arm/mach-imx/iomux-imx31.c +++ b/arch/arm/mach-imx/iomux-imx31.c @@ -44,9 +44,11 @@ static unsigned long mxc_pin_alloc_map[NB_PORTS * 32 / BITS_PER_LONG]; /* * set the mode for a IOMUX pin. */ -int mxc_iomux_mode(unsigned int pin_mode) +void mxc_iomux_mode(unsigned int pin_mode) { - u32 field, l, mode, ret = 0; + u32 field; + u32 l; + u32 mode; void __iomem *reg; reg = IOMUXSW_MUX_CTL + (pin_mode & IOMUX_REG_MASK); @@ -61,8 +63,6 @@ int mxc_iomux_mode(unsigned int pin_mode) __raw_writel(l, reg); spin_unlock(&gpio_mux_lock); - - return ret; } /* |