From 54e55eaf2fbd0b26f2a000efe705f4985e79455d Mon Sep 17 00:00:00 2001 From: phc Date: Thu, 7 Apr 2011 11:19:48 +0800 Subject: [PATCH] RK29 Mobile SDK: enable pppd driver; refresh the 23d driver to be the same as ChinaOne --- arch/arm/configs/rk29_phonesdk_defconfig | 14 +++++++++++++- arch/arm/mach-rk29/board-rk29-phonesdk.c | 8 ++++---- drivers/misc/mtk23d.c | 14 ++------------ 3 files changed, 19 insertions(+), 17 deletions(-) mode change 100644 => 100755 drivers/misc/mtk23d.c diff --git a/arch/arm/configs/rk29_phonesdk_defconfig b/arch/arm/configs/rk29_phonesdk_defconfig index b6b9ec3e9522..eed4c4625d91 100755 --- a/arch/arm/configs/rk29_phonesdk_defconfig +++ b/arch/arm/configs/rk29_phonesdk_defconfig @@ -752,8 +752,20 @@ CONFIG_BCM4329=y # CONFIG_USB_USBNET is not set # CONFIG_USB_HSO is not set # CONFIG_WAN is not set -# CONFIG_PPP is not set +CONFIG_PPP=y +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=y +CONFIG_PPP_SYNC_TTY=y +CONFIG_PPP_DEFLATE=y +CONFIG_PPP_BSDCOMP=y +# CONFIG_PPP_MPPE is not set +# CONFIG_PPPOE is not set +# CONFIG_PPPOL2TP is not set +# CONFIG_PPPOLAC is not set +# CONFIG_PPPOPNS is not set # CONFIG_SLIP is not set +CONFIG_SLHC=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk.c b/arch/arm/mach-rk29/board-rk29-phonesdk.c index 2d1390c9eb74..58f3c53c2b99 100755 --- a/arch/arm/mach-rk29/board-rk29-phonesdk.c +++ b/arch/arm/mach-rk29/board-rk29-phonesdk.c @@ -2134,10 +2134,10 @@ static struct platform_device rk29_device_pwm_regulator = { #if defined(CONFIG_MTK23D) struct rk2818_23d_data rk2818_23d_info = { .bp_power = RK29_PIN0_PA0, - //.bp_reset = TCA6424_P11, - //.bp_statue = RK2818_PIN_PH7,//input high bp sleep; - //.ap_statue = RK2818_PIN_PA4,//output high ap sleep; - //.ap_bp_wakeup = RK2818_PIN_PF5, //output AP wake up BP used rising edge; + .bp_reset = RK29_PIN0_PA1, + .bp_statue = RK29_PIN0_PA3,//input high bp sleep; + .ap_statue = RK29_PIN0_PA2,//output high ap sleep; + .ap_bp_wakeup = RK29_PIN0_PA4, //output AP wake up BP used rising edge; //.bp_ap_wakeup = RK2818_PIN_PE0,//input BP wake up AP }; struct platform_device rk2818_device_mtk23d = { diff --git a/drivers/misc/mtk23d.c b/drivers/misc/mtk23d.c old mode 100644 new mode 100755 index 4bc69ebfe60a..4a7efebfd1cc --- a/drivers/misc/mtk23d.c +++ b/drivers/misc/mtk23d.c @@ -115,15 +115,14 @@ static int mtk23d_open(struct inode *inode, struct file *file) int ret = 0; -#if 0 //phc gpio_direction_output(pdata->bp_power, GPIO_HIGH); gpio_direction_input(pdata->bp_statue); - rk2818_mux_api_set(CXGPIO_HSADC_SEL_NAME, 0); + //rk2818_mux_api_set(CXGPIO_HSADC_SEL_NAME, 0); gpio_direction_output(pdata->ap_statue, GPIO_LOW); - rk2818_mux_api_set(GPIOF5_APWM3_DPWM3_NAME,0); + //rk2818_mux_api_set(GPIOF5_APWM3_DPWM3_NAME,0); gpio_direction_output(pdata->ap_bp_wakeup, GPIO_LOW); mdelay(100); //rk2818_mux_api_set(GPIOE_SPI1_FLASH_SEL_NAME, IOMUXA_GPIO1_A3B7); @@ -138,10 +137,6 @@ static int mtk23d_open(struct inode *inode, struct file *file) //INIT_WORK(&mt6223d_data->work, bpwakeup_work_func_work); device_init_wakeup(&pdev, 1); -#endif - gpio_direction_output(pdata->bp_power, GPIO_HIGH); - mdelay(2000); - gpio_set_value(pdata->bp_power, GPIO_LOW); return 0; } @@ -189,7 +184,6 @@ static int mtk23d_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, mt6223d_data); -#if 0 //phc result = gpio_request(pdata->bp_statue, "mtk23d"); if (result) { printk("failed to request BP_STATUS gpio\n"); @@ -212,15 +206,11 @@ static int mtk23d_probe(struct platform_device *pdev) printk("failed to request BP_RESET gpio\n"); goto err2; } -#endif // phc - result = gpio_request(pdata->bp_power, "mtk23d"); if (result) { printk("failed to request BP_POW_EN gpio\n"); goto err1; } - - #if 0 gpio_direction_output(pdata->bp_power, GPIO_HIGH); -- 2.34.1