rk30:add irda code support for sdk

diff --git a/arch/arm/mach-rk29/include/mach/board.h b/arch/arm/mach-rk29/include/mach/board.h
index 152278941ad653d9fb0585238a5a3bc70f7de9c7..6c64114dee7df95e63fe920c84a049ef7ec6a713 100755 (executable)
--- a/arch/arm/mach-rk29/include/mach/board.h
+++ b/arch/arm/mach-rk29/include/mach/board.h
@@ -62,12 +62,6 @@ struct rk29_adc_battery_platform_data {
        int charge_set_level;
 };
 
-struct irda_info{
-    u32 intr_pin;
-    int (*iomux_init)(void);
-    int (*iomux_deinit)(void);
-    int (*irda_pwr_ctl)(int en);
-};
 
 struct rk29_button_light_info{
        u32 led_on_pin;

diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c
index 9207d29ffc768b3436d1e1ba237a43c527f7deed..53feb9812e5b264fbb2a8c042a9fea8c2e0b6f60 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk30-sdk.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk.c
@@ -479,7 +479,7 @@ static struct platform_device device_fb = {
 };
 #endif
 
-#if CONFIG_ANDROID_TIMED_GPIO
+#ifdef CONFIG_ANDROID_TIMED_GPIO
 static struct timed_gpio timed_gpios[] = {
        {
                .name = "vibrator",
@@ -508,7 +508,7 @@ struct platform_device rk29_device_vibrator ={
 #ifdef CONFIG_LEDS_GPIO_PLATFORM
 struct gpio_led rk29_leds[] = {
                {
-                       .name = "rk30_keyboard_led",
+                       .name = "button-backlight",
                        .gpio = RK30_PIN4_PD7,
                        .default_trigger = "timer",
                        .active_low = 0,
@@ -531,6 +531,53 @@ struct platform_device rk29_device_gpio_leds = {
 };
 #endif
 
+#ifdef CONFIG_RK_IRDA
+#define IRDA_IRQ_PIN           RK30_PIN6_PA1
+
+int irda_iomux_init(void)
+{
+       int ret = 0;
+
+       //irda irq pin
+       ret = gpio_request(IRDA_IRQ_PIN, NULL);
+       if(ret != 0)
+       {
+       gpio_free(IRDA_IRQ_PIN);
+       printk(">>>>>> IRDA_IRQ_PIN gpio_request err \n ");
+       }
+       gpio_pull_updown(IRDA_IRQ_PIN, PullDisable);
+       gpio_direction_input(IRDA_IRQ_PIN);
+
+       return 0;
+}
+
+int irda_iomux_deinit(void)
+{
+       gpio_free(IRDA_IRQ_PIN);
+       return 0;
+}
+
+static struct irda_info rk29_irda_info = {
+       .intr_pin = IRDA_IRQ_PIN,
+       .iomux_init = irda_iomux_init,
+       .iomux_deinit = irda_iomux_deinit,
+       //.irda_pwr_ctl = bu92747guw_power_ctl,
+};
+
+static struct platform_device irda_device = {
+#ifdef CONFIG_RK_IRDA_NET
+                       .name   = "rk_irda",
+#else
+                       .name = "bu92747_irda",
+#endif
+    .id                  = -1,
+       .dev            = {
+               .platform_data  = &rk29_irda_info,
+       }
+};
+#endif
+
+
 
 
 static struct platform_device *devices[] __initdata = {
@@ -546,6 +593,9 @@ static struct platform_device *devices[] __initdata = {
 #ifdef CONFIG_LEDS_GPIO_PLATFORM
        &rk29_device_gpio_leds,
 #endif
+#ifdef CONFIG_RK_IRDA
+       &irda_device,
+#endif
 
 
 };

diff --git a/arch/arm/plat-rk/include/plat/board.h b/arch/arm/plat-rk/include/plat/board.h
index a75fc54886ea88bc21ab721175f4db2e11b337d6..190134d35651c2a7d5ca4da0bde90089c24ee976 100755 (executable)
--- a/arch/arm/plat-rk/include/plat/board.h
+++ b/arch/arm/plat-rk/include/plat/board.h
@@ -112,6 +112,13 @@ struct cm3217_platform_data {
        void    (*exit_platform_hw)(void);
 };
 
+struct irda_info{
+    u32 intr_pin;
+    int (*iomux_init)(void);
+    int (*iomux_deinit)(void);
+    int (*irda_pwr_ctl)(int en);
+};
+
 
 
 #define BOOT_MODE_NORMAL               0