Changeset 17167

Timestamp:

06/01/11 19:14:57 (2 years ago)

Author:

BrainSlayer

Message:

fix power enable

Location:

src/linux/laguna/linux-2.6.39/arch/arm/mach-cns3xxx

Files:

• include/mach/cns3xxx.h (modified) (1 diff)
• include/mach/gpio.h (modified) (1 diff)
• laguna.c (modified) (5 diffs)

src/linux/laguna/linux-2.6.39/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h

@@ -147 +147 @@
 #define TIMER1_2_INTERRUPT_MASK_OFFSET          0x38
 
+
 #define TIMER_FREERUN_OFFSET                    0x40
 #define TIMER_FREERUN_CONTROL_OFFSET            0x44

src/linux/laguna/linux-2.6.39/arch/arm/mach-cns3xxx/include/mach/gpio.h

@@ -47 +47 @@
 #define CNS3XXX_GPIO_SET            0x10
 #define CNS3XXX_GPIO_CLEAR          0x14
+
+
+static inline void gpio_line_config(u8 line, u32 direction)
+{
+        u32 reg;
+        if (direction) {
+                if (line < 32) {
+                        reg = __raw_readl(CNS3XXX_GPIOA_BASE_VIRT + CNS3XXX_GPIO_DIR);
+                        reg |= (1 << line);
+                        __raw_writel(reg, CNS3XXX_GPIOA_BASE_VIRT + CNS3XXX_GPIO_DIR);
+                } else {
+                        reg = __raw_readl(CNS3XXX_GPIOB_BASE_VIRT + CNS3XXX_GPIO_DIR);
+                        reg |= (1 << (line - 32));
+                        __raw_writel(reg, CNS3XXX_GPIOB_BASE_VIRT + CNS3XXX_GPIO_DIR);          
+                }
+        } else {
+                if (line < 32) {
+                        reg = __raw_readl(CNS3XXX_GPIOA_BASE_VIRT + CNS3XXX_GPIO_DIR);
+                        reg &= ~(1 << line);
+                        __raw_writel(reg, CNS3XXX_GPIOA_BASE_VIRT + CNS3XXX_GPIO_DIR);
+                } else {
+                        reg = __raw_readl(CNS3XXX_GPIOB_BASE_VIRT + CNS3XXX_GPIO_DIR);
+                        reg &= ~(1 << (line - 32));
+                        __raw_writel(reg, CNS3XXX_GPIOB_BASE_VIRT + CNS3XXX_GPIO_DIR);          
+                }
+        }
+}
+
 
 static inline void gpio_line_get(u8 line, int *value)

src/linux/laguna/linux-2.6.39/arch/arm/mach-cns3xxx/laguna.c

@@ -49 +49 @@
 #endif
 #include <mach/pm.h>
+#include <mach/gpio.h>
 #include "core.h"
 #include "devices.h"
@@ -631 +632 @@
                 cns3xxx_pcie_init(pcie_bitmap);
 
+                gpio_line_set(3, 1);
+                gpio_line_config(3, CNS3XXX_GPIO_OUT);
+                gpio_set_value(3, 1);
+
                 if (strncmp(laguna_info.model, "GW2380", 6) == 0)
                 {
@@ -657 +662 @@
                 }else{
                 if (laguna_info.config_bitmap & (USB0_LOAD)) {
+
+                        printk(KERN_EMERG "power up USB0\n");
                         cns3xxx_pwr_power_up(1 << PM_PLL_HM_PD_CTRL_REG_OFFSET_PLL_USB);
 
@@ -675 +682 @@
 
                 if (laguna_info.config_bitmap & (USB1_LOAD)) {
+                        printk(KERN_EMERG "power up ehci/ohci\n");
                         platform_device_register(&cns3xxx_usb_ehci_device);
                         platform_device_register(&cns3xxx_usb_ohci_device);
@@ -836 +844 @@
                 else if (strncmp(laguna_info.model, "GW2380", 6) == 0) {
                         laguna_gpio_leds[0].gpio = 107;
-                        laguna_gpio_leds_data.num_leds = 1;
+                        laguna_gpio_leds[1].gpio = 106;
+                        laguna_gpio_leds_data.num_leds = 2;
                         platform_device_register(&laguna_gpio_leds_device);
                 }