From 9f5ad54b69092d88862a9fc48f26384303368981 Mon Sep 17 00:00:00 2001 From: blogic Date: Fri, 14 Dec 2007 21:49:03 +0000 Subject: made the danube pmu f00 generic git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9759 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/danube/files/drivers/char/danube_led.c | 22 ++-------------------- .../linux/danube/files/drivers/net/danube_mii0.c | 6 +++--- 2 files changed, 5 insertions(+), 23 deletions(-) (limited to 'target/linux/danube/files/drivers') diff --git a/target/linux/danube/files/drivers/char/danube_led.c b/target/linux/danube/files/drivers/char/danube_led.c index 38ac4c170..86a92d599 100644 --- a/target/linux/danube/files/drivers/char/danube_led.c +++ b/target/linux/danube/files/drivers/char/danube_led.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #define DANUBE_LED_CLK_EDGE DANUBE_LED_FALLING //#define DANUBE_LED_CLK_EDGE DANUBE_LED_RISING @@ -87,24 +87,6 @@ danube_led_setup_gpio (void) } } -static void -danube_led_enable (void) -{ - int err = 1000000; - - writel(readl(DANUBE_PMU_PWDCR) & ~DANUBE_PMU_PWDCR_LED, DANUBE_PMU_PWDCR); - while (--err && (readl(DANUBE_PMU_PWDSR) & DANUBE_PMU_PWDCR_LED)) {} - - if (!err) - panic("Activating LED in PMU failed!"); -} - -static inline void -danube_led_disable (void) -{ - writel(readl(DANUBE_PMU_PWDCR) | DANUBE_PMU_PWDCR_LED, DANUBE_PMU_PWDCR); -} - static int led_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { @@ -187,7 +169,7 @@ danube_led_init (void) writel(readl(DANUBE_LED_CON0) | DANUBE_LED_ADSL_SRC, DANUBE_LED_CON0); /* per default, the leds are turned on */ - danube_led_enable(); + danube_pmu_enable(DANUBE_PMU_PWDCR_LED); danube_led_major = register_chrdev(0, "danube_led", &danube_led_fops); diff --git a/target/linux/danube/files/drivers/net/danube_mii0.c b/target/linux/danube/files/drivers/net/danube_mii0.c index 63a7febbf..354ccc36d 100644 --- a/target/linux/danube/files/drivers/net/danube_mii0.c +++ b/target/linux/danube/files/drivers/net/danube_mii0.c @@ -44,6 +44,7 @@ #include #include #include +#include static struct net_device danube_mii0_dev; static unsigned char u_boot_ethaddr[MAX_ADDR_LEN]; @@ -372,9 +373,8 @@ switch_init (struct net_device *dev) static void danube_sw_chip_init (int mode) { - writel(readl(DANUBE_PMU_PWDCR) & ~DANUBE_PMU_PWDCR_DMA, DANUBE_PMU_PWDCR); - writel(readl(DANUBE_PMU_PWDCR) & ~DANUBE_PMU_PWDCR_PPE, DANUBE_PMU_PWDCR); - wmb(); + danube_pmu_enable(DANUBE_PMU_PWDCR_DMA); + danube_pmu_enable(DANUBE_PMU_PWDCR_PPE); if(mode == REV_MII_MODE) writel((readl(DANUBE_PPE32_CFG) & PPE32_MII_MASK) | PPE32_MII_REVERSE, DANUBE_PPE32_CFG); -- cgit v1.2.3