From: ben-linux@fluff.org (Ben Dooks)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 7/9] Add support for MMC card reader on Acer n30 / Acer n35
Date: Thu, 6 May 2010 02:23:57 +0100 [thread overview]
Message-ID: <20100506012357.GA6684@trinity.fluff.org> (raw)
In-Reply-To: <4BE1EF47.8030903@vscht.cz>
On Thu, May 06, 2010 at 12:20:55AM +0200, Pinkava J. wrote:
> There is MMC (SD) card reader. Works fine.
>
>
> Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
> ---
> arch/arm/mach-s3c2410/mach-n30.c | 14 ++++++++++++++
> 1 files changed, 14 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
> index d63b48f..389b9f2 100644
> --- a/arch/arm/mach-s3c2410/mach-n30.c
> +++ b/arch/arm/mach-s3c2410/mach-n30.c
> @@ -26,6 +26,7 @@
> #include <linux/serial_core.h>
> #include <linux/timer.h>
> #include <linux/io.h>
> +#include <linux/mmc/host.h>
>
> #include <mach/hardware.h>
> #include <asm/irq.h>
> @@ -46,6 +47,7 @@
> #include <plat/clock.h>
> #include <plat/cpu.h>
> #include <plat/devs.h>
> +#include <plat/mci.h>
> #include <plat/s3c2410.h>
> #include <plat/udc.h>
>
> @@ -350,6 +352,15 @@ static struct s3c2410fb_mach_info n30_fb_info __initdata = {
> .lpcsel = 0x06,
> };
>
> +static struct s3c24xx_mci_pdata n30_mci_cfg __initdata = {
> + .wprotect_invert = 0,
> + .detect_invert = 0,
no need for '0' initialisers here.
> + .gpio_detect = S3C2410_GPF(1),
> + .gpio_wprotect = S3C2410_GPG(10),
> + .set_power = NULL,
no need to have 'NULL' here.
> + .ocr_avail = MMC_VDD_32_33,
> +};
> +
> static struct platform_device *n30_devices[] __initdata = {
> &s3c_device_lcd,
> &s3c_device_wdt,
> @@ -358,6 +369,7 @@ static struct platform_device *n30_devices[] __initdata = {
> &s3c_device_ohci,
> &s3c_device_rtc,
> &s3c_device_usbgadget,
> + &s3c_device_sdi,
> &n30_button_device,
> &n30_blue_led,
> &n30_warning_led,
> @@ -370,6 +382,7 @@ static struct platform_device *n35_devices[] __initdata = {
> &s3c_device_iis,
> &s3c_device_rtc,
> &s3c_device_usbgadget,
> + &s3c_device_sdi,
> &n35_button_device,
> &n35_blue_led,
> &n35_warning_led,
> @@ -538,6 +551,7 @@ static void __init n30_init(void)
> {
> s3c24xx_fb_set_platdata(&n30_fb_info);
> s3c24xx_udc_set_platdata(&n30_udc_cfg);
> + s3c24xx_mci_set_platdata(&n30_mci_cfg);
> s3c_i2c0_set_platdata(&n30_i2ccfg);
>
> /* Turn off suspend on both USB ports, and switch the
> --
> 1.7.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
--
Ben
Q: What's a light-year?
A: One-third less calories than a regular year.
next prev parent reply other threads:[~2010-05-06 1:23 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-05 22:06 [PATCH 1/9] Enable Acer n35 architecture if Acer n30 is selected Pinkava J.
2010-05-05 22:12 ` [PATCH 2/9] fix: suspended wrong USB port on Acer n35 Pinkava J.
2010-05-05 22:13 ` [PATCH 3/9] Add RTC platform device for Acer n30 / " Pinkava J.
2010-05-05 22:17 ` [PATCH 4/9] Add support for blue LED on " Pinkava J.
2010-05-05 22:17 ` [PATCH 5/9] Add support for red flashing " Pinkava J.
2010-05-05 22:18 ` [PATCH 6/9] Enable wake-up by Power button " Pinkava J.
2010-05-05 22:20 ` [PATCH 7/9] Add support for MMC card reader on Acer n30 / " Pinkava J.
2010-05-05 22:22 ` [PATCH 8/9] Add support for power on/off on Acer n30 / Acer n35 MMC card reader Pinkava J.
2010-05-06 1:23 ` Ben Dooks [this message]
2010-05-06 1:22 ` [PATCH 5/9] Add support for red flashing LED on Acer n35 Ben Dooks
2010-05-06 13:18 ` [PATCH 1/8] Enable Acer n35 architecture if Acer n30 is selected Pinkava J.
2010-05-06 13:19 ` [PATCH 2/8] fix: suspended wrong USB port on Acer n35 Pinkava J.
2010-05-06 13:20 ` [PATCH 3/8] Add RTC platform device for Acer n30 / " Pinkava J.
2010-05-06 13:21 ` [PATCH 4/8] Add support for LEDs on " Pinkava J.
2010-05-06 13:21 ` [PATCH 5/8] Enable wake-up by Power button " Pinkava J.
2010-05-06 13:22 ` [PATCH 6/8] Add support for MMC card reader on Acer n30 / " Pinkava J.
2010-05-06 13:23 ` [PATCH 7/8] Add support for power on/off on Acer n30 / Acer n35 MMC card reader Pinkava J.
2010-05-06 13:24 ` [PATCH 8/8] Add support for backlight regulation on Acer n35 Pinkava J.
2010-05-06 13:39 ` Acer n35 patches Pinkava J.
2010-05-07 0:37 ` Ben Dooks
2010-05-12 13:26 ` Pinkava J.
2010-05-07 0:35 ` [PATCH 8/8] Add support for backlight regulation on Acer n35 Ben Dooks
2010-05-12 13:18 ` Pinkava J.
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100506012357.GA6684@trinity.fluff.org \
--to=ben-linux@fluff.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).