gaoyang3513/SDK_RK3288
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[AIO-3288C] kernel->fix some drivers config

Browse Source
This commit is contained in:
sujl
2018-05-02 15:22:45 +08:00
parent d22c8be32f
commit 0803a8de76
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/drivers/firefly/Kconfig
View File

@ -4,4 +4,8 @@ config FIREFLY_RK3288_DEVICE_AIO
bool "select firefly rk3288 device aio" bool "select firefly rk3288 device aio"
default n default n
config FIREFLY_RK3288_DEVICE_AIO-3288C
bool "select firefly rk3288 device aio-3288c"
default n
endmenu endmenu

2
kernel/drivers/media/video/rk_camsys/camsys_drv.c
View File

@ -1323,7 +1323,7 @@ static int camsys_platform_probe(struct platform_device *pdev){
} }
} }
} }
#ifdef CONFIG_FIREFLY_RK3288_DEVICE_AIO #if defined(CONFIG_FIREFLY_RK3288_DEVICE_AIO) || defined(CONFIG_FIREFLY_RK3288_DEVICE_AIO_3288C)
dvppower_io = of_get_named_gpio_flags(dev->of_node, "gpios-dvppower", 0, &flags); dvppower_io = of_get_named_gpio_flags(dev->of_node, "gpios-dvppower", 0, &flags);
camsys_trace(1, "gpios-dvppower: %d", dvppower_io); camsys_trace(1, "gpios-dvppower: %d", dvppower_io);
if(gpio_is_valid(dvppower_io)){ if(gpio_is_valid(dvppower_io)){

19
kernel/drivers/usb/dwc_otg_310/usbdev_rk32.c
View File

@ -1064,6 +1064,25 @@ static int rk_usb_control_probe(struct platform_device *pdev)
mdelay(2); mdelay(2);
gpio_direction_output(control_usb->host_gpios->gpio, 1); gpio_direction_output(control_usb->host_gpios->gpio, 1);
} }
#if defined(CONFIG_FIREFLY_RK3288_DEVICE_AIO_3288C)
gpio = of_get_named_gpio(np, "host_en_gpio", 0);
if (!gpio_is_valid(gpio)) {
dev_err(&pdev->dev, "invalid host en gpio%d\n", gpio);
} else {
err = devm_gpio_request(&pdev->dev, gpio, "host_en_gpio");
if (err) {
dev_err(&pdev->dev,
"failed to request GPIO%d for host_drv\n",
gpio);
ret = err;
goto out;
}
gpio_direction_output(gpio, 0);
mdelay(2);
gpio_direction_output(gpio, 1);
}
#endif
control_usb->otg_gpios = control_usb->otg_gpios =
devm_kzalloc(&pdev->dev, sizeof(struct gpio), GFP_KERNEL); devm_kzalloc(&pdev->dev, sizeof(struct gpio), GFP_KERNEL);