shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "rk312x:lvds: add pull down lcdc io when the first time of system suspend"

Browse Source 
This reverts commit ab3978515a.
This commit is contained in:
zwl
2014-09-22 21:09:46 +08:00
parent ab3978515a
commit aee15a2c77
4 changed files with 0 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boot/dts/rk3126-86v.dts
View File

@@ -185,14 +185,6 @@
pinctrl-names = "lcdc", "sleep";
pinctrl-0 = <&lcdc0_lcdc_d>;
pinctrl-1 = <&lcdc0_lcdc_gpio>;
lcdc-gpios = <&gpio2 GPIO_B4 GPIO_ACTIVE_LOW
&gpio2 GPIO_B5 GPIO_ACTIVE_LOW
&gpio2 GPIO_B6 GPIO_ACTIVE_LOW
&gpio2 GPIO_B7 GPIO_ACTIVE_LOW
&gpio2 GPIO_C0 GPIO_ACTIVE_LOW
&gpio2 GPIO_C1 GPIO_ACTIVE_LOW
&gpio2 GPIO_C2 GPIO_ACTIVE_LOW
&gpio2 GPIO_C3 GPIO_ACTIVE_LOW>;
};
&lcdc {

8
arch/arm/boot/dts/rk3126-sdk.dts
View File

@@ -52,14 +52,6 @@
pinctrl-names = "lcdc", "sleep";
pinctrl-0 = <&lcdc0_lcdc_d>;
pinctrl-1 = <&lcdc0_lcdc_gpio>;
lcdc-gpios = <&gpio2 GPIO_B4 GPIO_ACTIVE_LOW
&gpio2 GPIO_B5 GPIO_ACTIVE_LOW
&gpio2 GPIO_B6 GPIO_ACTIVE_LOW
&gpio2 GPIO_B7 GPIO_ACTIVE_LOW
&gpio2 GPIO_C0 GPIO_ACTIVE_LOW
&gpio2 GPIO_C1 GPIO_ACTIVE_LOW
&gpio2 GPIO_C2 GPIO_ACTIVE_LOW
&gpio2 GPIO_C3 GPIO_ACTIVE_LOW>;
};
&lcdc {

8
arch/arm/boot/dts/rk3128-sdk.dts
View File

@@ -36,14 +36,6 @@
pinctrl-names = "lcdc", "sleep";
pinctrl-0 = <&lcdc0_lcdc_d>;
pinctrl-1 = <&lcdc0_lcdc_gpio>;
lcdc-gpios = <&gpio2 GPIO_B4 GPIO_ACTIVE_LOW
&gpio2 GPIO_B5 GPIO_ACTIVE_LOW
&gpio2 GPIO_B6 GPIO_ACTIVE_LOW
&gpio2 GPIO_B7 GPIO_ACTIVE_LOW
&gpio2 GPIO_C0 GPIO_ACTIVE_LOW
&gpio2 GPIO_C1 GPIO_ACTIVE_LOW
&gpio2 GPIO_C2 GPIO_ACTIVE_LOW
&gpio2 GPIO_C3 GPIO_ACTIVE_LOW>;
};
&lcdc {

45
drivers/video/rockchip/transmitter/rk31xx_lvds.c
View File

@@ -27,12 +27,6 @@
#include <linux/rockchip/grf.h>
#include "rk31xx_lvds.h"
#ifdef CONFIG_OF
#include <linux/of.h>
#include <linux/of_platform.h>
#include <linux/of_gpio.h>
#endif
#define grf_readl(offset) readl_relaxed(RK_GRF_VIRT + offset)
#define grf_writel(v,offset) \
@@ -112,44 +106,6 @@ static int rk31xx_lvds_pwr_off(void)
return 0;
}
static int rk31xx_lvds_pull_down_io(void)
{
int gpio;
int i = 0, gpio_nums = 0, val = 0;
enum of_gpio_flags flags;
char gpio_name[20] = {0};
struct rk_lvds_device *lvds = rk31xx_lvds;
static bool pull_down = false;
if (unlikely(!lvds) || !lvds->sys_state)
return 0;
if (pull_down)
return 0;
gpio_nums = of_gpio_named_count(lvds->dev->of_node, "lcdc-gpios");
if (gpio_nums > 0) {
for (i = 0; i < gpio_nums; i++) {
gpio = of_get_named_gpio_flags(lvds->dev->of_node,
"lcdc-gpios", i, &flags);
if (!gpio_is_valid(gpio))
continue;
val = !(flags & OF_GPIO_ACTIVE_LOW);
sprintf(gpio_name, "lcdc-gpio%d", i);
if (!gpio_request(gpio, gpio_name)) {
gpio_direction_output(gpio, val);
msleep(1);
} else {
dev_err(lvds->dev, "request %s gpio fail!\n",
gpio_name);
}
}
}
pull_down = true;
return 0;
}
static int rk31xx_lvds_disable(void)
{
struct rk_lvds_device *lvds = rk31xx_lvds;
@@ -171,7 +127,6 @@ static int rk31xx_lvds_disable(void)
pinctrl_select_state(lvds->pins->p,
lvds->pins->sleep_state);
}
rk31xx_lvds_pull_down_io();
}
#endif
lvds->sys_state = false;