android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mxc: iomux v3: remove resource handling

Browse Source 
The current model does not allow to put a pad into different modes
once a pins is allocated. Remove the resource handling.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2009-10-29 17:18:02 +01:00
parent c6e7c0e20d
commit 654166d687
2 changed files with 3 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/plat-mxc/include/mach/iomux-v3.h
View File

@ -88,9 +88,7 @@ struct pad_desc {
#define PAD_CTL_SRE_FAST (1 << 0) #define PAD_CTL_SRE_FAST (1 << 0)
/* /*
* setups a single pad: * setups a single pad in the iomuxer
* - reserves the pad so that it is not claimed by another driver
* - setups the iomux according to the configuration
*/ */
int mxc_iomux_v3_setup_pad(struct pad_desc *pad); int mxc_iomux_v3_setup_pad(struct pad_desc *pad);
@ -100,19 +98,6 @@ int mxc_iomux_v3_setup_pad(struct pad_desc *pad);
*/ */
int mxc_iomux_v3_setup_multiple_pads(struct pad_desc *pad_list, unsigned count); int mxc_iomux_v3_setup_multiple_pads(struct pad_desc *pad_list, unsigned count);
/*
* releases a single pad:
* - make it available for a future use by another driver
* - DOES NOT reconfigure the IOMUX in its reset state
*/
void mxc_iomux_v3_release_pad(struct pad_desc *pad);
/*
* releases multiple pads
* convenvient way to call the above function with tables
*/
void mxc_iomux_v3_release_multiple_pads(struct pad_desc *pad_list, int count);
/* /*
* Initialise the iomux controller * Initialise the iomux controller
*/ */

36
arch/arm/plat-mxc/iomux-v3.c
View File

@ -31,19 +31,11 @@
static void __iomem *base; static void __iomem *base;
static unsigned long iomux_v3_pad_alloc_map[0x200 / BITS_PER_LONG];
/* /*
* setups a single pin: * setups a single pad in the iomuxer
* - reserves the pin so that it is not claimed by another driver
* - setups the iomux according to the configuration
*/ */
int mxc_iomux_v3_setup_pad(struct pad_desc *pad) int mxc_iomux_v3_setup_pad(struct pad_desc *pad)
{ {
unsigned int pad_ofs = pad->pad_ctrl_ofs;
if (test_and_set_bit(pad_ofs >> 2, iomux_v3_pad_alloc_map))
return -EBUSY;
if (pad->mux_ctrl_ofs) if (pad->mux_ctrl_ofs)
__raw_writel(pad->mux_mode, base + pad->mux_ctrl_ofs); __raw_writel(pad->mux_mode, base + pad->mux_ctrl_ofs);
@ -66,37 +58,13 @@ int mxc_iomux_v3_setup_multiple_pads(struct pad_desc *pad_list, unsigned count)
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
ret = mxc_iomux_v3_setup_pad(p); ret = mxc_iomux_v3_setup_pad(p);
if (ret) if (ret)
goto setup_error; return ret;
p++; p++;
} }
return 0; return 0;
setup_error:
mxc_iomux_v3_release_multiple_pads(pad_list, i);
return ret;
} }
EXPORT_SYMBOL(mxc_iomux_v3_setup_multiple_pads); EXPORT_SYMBOL(mxc_iomux_v3_setup_multiple_pads);
void mxc_iomux_v3_release_pad(struct pad_desc *pad)
{
unsigned int pad_ofs = pad->pad_ctrl_ofs;
clear_bit(pad_ofs >> 2, iomux_v3_pad_alloc_map);
}
EXPORT_SYMBOL(mxc_iomux_v3_release_pad);
void mxc_iomux_v3_release_multiple_pads(struct pad_desc *pad_list, int count)
{
struct pad_desc *p = pad_list;
int i;
for (i = 0; i < count; i++) {
mxc_iomux_v3_release_pad(p);
p++;
}
}
EXPORT_SYMBOL(mxc_iomux_v3_release_multiple_pads);
void mxc_iomux_v3_init(void __iomem *iomux_v3_base) void mxc_iomux_v3_init(void __iomem *iomux_v3_base)
{ {
base = iomux_v3_base; base = iomux_v3_base;