Merge pull request #3837 from Memphiz/wetekfixes

[WeTek_Play] - fix typo and restore powerled access
This commit is contained in:
Stephan Raue 2015-01-25 18:05:05 +01:00
commit 92ab45346b
2 changed files with 26 additions and 0 deletions

View File

@ -0,0 +1,14 @@
diff --git a/drivers/amlogic/amports/amvideocap.c b/drivers/amlogic/amports/amvideocap.c
index 8d43335..d4b2ccb 100755
--- a/drivers/amlogic/amports/amvideocap.c
+++ b/drivers/amlogic/amports/amvideocap.c
@@ -275,8 +275,8 @@ static ssize_t amvideocap_YUV_to_RGB(struct amvideocap_private *priv, u32 cur_i
ge2d_config.src_para.x_rev = 0;
ge2d_config.src_para.y_rev = 0;
ge2d_config.src_para.color = 0;
- ge2d_config.src_para.top = input_x;
- ge2d_config.src_para.left = input_y;
+ ge2d_config.src_para.left = input_x;
+ ge2d_config.src_para.top = input_y;
ge2d_config.src_para.width = input_width;
ge2d_config.src_para.height = input_height;

View File

@ -0,0 +1,12 @@
--- a/arch/arm/boot/dts/amlogic/wetek_play.dtd 2015-01-25 17:18:35.065137487 +0100
+++ b/arch/arm/boot/dts/amlogic/wetek_play.dtd 2015-01-25 17:18:09.601138239 +0100
@@ -1427,4 +1427,9 @@
reserve-memory = <0x00a00000>; // 1920 * 1088 * 4 = 8,355,840
reserve-iomap = "true";
};
+
+powerled{
+ compatible = "amlogic,wetekplay-led";
+ label = "wetek:blue:powerled";
+};
}; /* end of / */