Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6
This commit is contained in:
commit
e76e3ac69e
|
@ -502,6 +502,12 @@ L: openezx-devel@lists.openezx.org (subscribers-only)
|
||||||
W: http://www.openezx.org/
|
W: http://www.openezx.org/
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|
||||||
|
ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
|
||||||
|
P: Sascha Hauer
|
||||||
|
M: kernel@pengutronix.de
|
||||||
|
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
|
||||||
|
S: Maintained
|
||||||
|
|
||||||
ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
|
ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
|
||||||
P: Lennert Buytenhek
|
P: Lennert Buytenhek
|
||||||
M: kernel@wantstofly.org
|
M: kernel@wantstofly.org
|
||||||
|
|
|
@ -172,24 +172,29 @@ found:
|
||||||
|
|
||||||
return clk;
|
return clk;
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL(clk_get);
|
||||||
|
|
||||||
void clk_put(struct clk *clk)
|
void clk_put(struct clk *clk)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL(clk_put);
|
||||||
|
|
||||||
int clk_enable(struct clk *clk)
|
int clk_enable(struct clk *clk)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL(clk_enable);
|
||||||
|
|
||||||
void clk_disable(struct clk *clk)
|
void clk_disable(struct clk *clk)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL(clk_disable);
|
||||||
|
|
||||||
unsigned long clk_get_rate(struct clk *clk)
|
unsigned long clk_get_rate(struct clk *clk)
|
||||||
{
|
{
|
||||||
return clk->get_rate();
|
return clk->get_rate();
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL(clk_get_rate);
|
||||||
|
|
||||||
int imx_clocks_init(void)
|
int imx_clocks_init(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -251,7 +251,6 @@ void __init set_imx_fb_info(struct imxfb_mach_info *hard_imx_fb_info)
|
||||||
{
|
{
|
||||||
memcpy(&imx_fb_info,hard_imx_fb_info,sizeof(struct imxfb_mach_info));
|
memcpy(&imx_fb_info,hard_imx_fb_info,sizeof(struct imxfb_mach_info));
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(set_imx_fb_info);
|
|
||||||
|
|
||||||
static struct resource imxfb_resources[] = {
|
static struct resource imxfb_resources[] = {
|
||||||
[0] = {
|
[0] = {
|
||||||
|
|
|
@ -125,7 +125,7 @@ static struct platform_device *devices[] __initdata = {
|
||||||
&imx_uart2_device,
|
&imx_uart2_device,
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef CONFIG_MMC_IMX
|
#if defined(CONFIG_MMC_IMX) || defined(CONFIG_MMC_IMX_MODULE)
|
||||||
static int mx1ads_mmc_card_present(struct device *dev)
|
static int mx1ads_mmc_card_present(struct device *dev)
|
||||||
{
|
{
|
||||||
/* MMC/SD Card Detect is PB 20 on MX1ADS V1.0.7 */
|
/* MMC/SD Card Detect is PB 20 on MX1ADS V1.0.7 */
|
||||||
|
@ -143,7 +143,7 @@ mx1ads_init(void)
|
||||||
#ifdef CONFIG_LEDS
|
#ifdef CONFIG_LEDS
|
||||||
imx_gpio_mode(GPIO_PORTA | GPIO_OUT | 2);
|
imx_gpio_mode(GPIO_PORTA | GPIO_OUT | 2);
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_MMC_IMX
|
#if defined(CONFIG_MMC_IMX) || defined(CONFIG_MMC_IMX_MODULE)
|
||||||
/* SD/MMC card detect */
|
/* SD/MMC card detect */
|
||||||
imx_gpio_mode(GPIO_PORTB | GPIO_GIUS | GPIO_IN | 20);
|
imx_gpio_mode(GPIO_PORTB | GPIO_GIUS | GPIO_IN | 20);
|
||||||
imx_set_mmc_info(&mx1ads_mmc_info);
|
imx_set_mmc_info(&mx1ads_mmc_info);
|
||||||
|
|
|
@ -187,7 +187,7 @@ config CPU_ARM926T
|
||||||
ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \
|
ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \
|
||||||
ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \
|
ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \
|
||||||
ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \
|
ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \
|
||||||
ARCH_NS9XXX || ARCH_DAVINCI
|
ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2
|
||||||
default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || \
|
default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || \
|
||||||
ARCH_OMAP730 || ARCH_OMAP16XX || \
|
ARCH_OMAP730 || ARCH_OMAP16XX || \
|
||||||
ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \
|
ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \
|
||||||
|
|
Loading…
Reference in a new issue