projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dc5f736
)
rk32 dts: fix lcdc node some warning
author
zwl
<zwl@rock-chips.com>
Mon, 16 Jun 2014 09:10:51 +0000
(17:10 +0800)
committer
zwl
<zwl@rock-chips.com>
Mon, 16 Jun 2014 09:10:51 +0000
(17:10 +0800)
arch/arm/boot/dts/rk3288-chrome.dts
patch
|
blob
|
history
arch/arm/boot/dts/rk3288-p977.dts
patch
|
blob
|
history
arch/arm/boot/dts/rk3288-p977_8846.dts
patch
|
blob
|
history
arch/arm/boot/dts/rk3288-tb.dts
patch
|
blob
|
history
arch/arm/boot/dts/rk3288-tesco.dts
patch
|
blob
|
history
diff --git
a/arch/arm/boot/dts/rk3288-chrome.dts
b/arch/arm/boot/dts/rk3288-chrome.dts
index 486589cf02f6be6dcf42e03a7ec24bf5271b76f8..2ca87dbcbab861ac8fa307688c1e97ed95019b90 100755
(executable)
--- a/
arch/arm/boot/dts/rk3288-chrome.dts
+++ b/
arch/arm/boot/dts/rk3288-chrome.dts
@@
-479,10
+479,10
@@
/*lcdc1 as PRMRY(LCD),lcdc0 as EXTEND(HDMI)*/
&lcdc1 {
status = "okay";
/*lcdc1 as PRMRY(LCD),lcdc0 as EXTEND(HDMI)*/
&lcdc1 {
status = "okay";
+ rockchip,mirror = <NO_MIRROR>;
rockchip,cabc_mode = <0>;
power_ctr: power_ctr {
rockchip,debug = <0>;
rockchip,cabc_mode = <0>;
power_ctr: power_ctr {
rockchip,debug = <0>;
- rockchip,mirror = <NO_MIRROR>;
lcd_en:lcd_en {
rockchip,power_type = <GPIO>;
gpios = <&gpio7 GPIO_A3 GPIO_ACTIVE_HIGH>;
lcd_en:lcd_en {
rockchip,power_type = <GPIO>;
gpios = <&gpio7 GPIO_A3 GPIO_ACTIVE_HIGH>;
@@
-490,7
+490,7
@@
};
lcd_cs:lcd_cs {
};
lcd_cs:lcd_cs {
-rockchip,power_type = <GPIO>;
+
rockchip,power_type = <GPIO>;
gpios = <&gpio7 GPIO_A4 GPIO_ACTIVE_HIGH>;
rockchip,delay = <10>;
};
gpios = <&gpio7 GPIO_A4 GPIO_ACTIVE_HIGH>;
rockchip,delay = <10>;
};
diff --git
a/arch/arm/boot/dts/rk3288-p977.dts
b/arch/arm/boot/dts/rk3288-p977.dts
index 4a57db59a7c452631756e118e26e3dcbc7e3b6f9..9fb25cfeaa8acf391bfc9be941048d40672dac07 100755
(executable)
--- a/
arch/arm/boot/dts/rk3288-p977.dts
+++ b/
arch/arm/boot/dts/rk3288-p977.dts
@@
-449,10
+449,10
@@
/*lcdc1 as PRMRY(LCD),lcdc0 as EXTEND(HDMI)*/
&lcdc1 {
status = "okay";
/*lcdc1 as PRMRY(LCD),lcdc0 as EXTEND(HDMI)*/
&lcdc1 {
status = "okay";
+ rockchip,mirror = <NO_MIRROR>;
rockchip,cabc_mode = <0>;
power_ctr: power_ctr {
rockchip,debug = <0>;
rockchip,cabc_mode = <0>;
power_ctr: power_ctr {
rockchip,debug = <0>;
- rockchip,mirror = <NO_MIRROR>;
/*
lcd_en:lcd_en {
rockchip,power_type = <GPIO>;
/*
lcd_en:lcd_en {
rockchip,power_type = <GPIO>;
diff --git
a/arch/arm/boot/dts/rk3288-p977_8846.dts
b/arch/arm/boot/dts/rk3288-p977_8846.dts
index 174ce74f7f6ea201dbc85f6b5e77b9723188d74b..b1dd447b7c60a936a8863596fca8eabcc99a7e8c 100755
(executable)
--- a/
arch/arm/boot/dts/rk3288-p977_8846.dts
+++ b/
arch/arm/boot/dts/rk3288-p977_8846.dts
@@
-508,11
+508,11
@@
/*lcdc1 as PRMRY(LCD),lcdc0 as EXTEND(HDMI)*/
&lcdc1 {
status = "okay";
/*lcdc1 as PRMRY(LCD),lcdc0 as EXTEND(HDMI)*/
&lcdc1 {
status = "okay";
+ rockchip,mirror = <NO_MIRROR>;
rockchip,cabc_mode = <0>;
power_ctr: power_ctr {
rockchip,debug = <0>;
rockchip,cabc_mode = <0>;
power_ctr: power_ctr {
rockchip,debug = <0>;
- rockchip,mirror = <NO_MIRROR>;
-
+
lcd_en:lcd_en {
rockchip,power_type = <GPIO>;
gpios = <&gpio7 GPIO_A3 GPIO_ACTIVE_HIGH>;
lcd_en:lcd_en {
rockchip,power_type = <GPIO>;
gpios = <&gpio7 GPIO_A3 GPIO_ACTIVE_HIGH>;
diff --git
a/arch/arm/boot/dts/rk3288-tb.dts
b/arch/arm/boot/dts/rk3288-tb.dts
index fd1162bc99c028ce7dde4c7a1a7fe57f71e74f11..6fa9837227de88abd093115ca1ec5054f62686ca 100755
(executable)
--- a/
arch/arm/boot/dts/rk3288-tb.dts
+++ b/
arch/arm/boot/dts/rk3288-tb.dts
@@
-579,10
+579,10
@@
/*lcdc1 as PRMRY(LCD),lcdc0 as EXTEND(HDMI)*/
&lcdc1 {
status = "okay";
/*lcdc1 as PRMRY(LCD),lcdc0 as EXTEND(HDMI)*/
&lcdc1 {
status = "okay";
+ rockchip,mirror = <NO_MIRROR>;
rockchip,cabc_mode = <0>;
power_ctr: power_ctr {
rockchip,debug = <0>;
rockchip,cabc_mode = <0>;
power_ctr: power_ctr {
rockchip,debug = <0>;
- rockchip,mirror = <NO_MIRROR>;
lcd_en:lcd_en {
rockchip,power_type = <GPIO>;
gpios = <&gpio7 GPIO_A3 GPIO_ACTIVE_HIGH>;
lcd_en:lcd_en {
rockchip,power_type = <GPIO>;
gpios = <&gpio7 GPIO_A3 GPIO_ACTIVE_HIGH>;
@@
-590,7
+590,7
@@
};
lcd_cs:lcd_cs {
};
lcd_cs:lcd_cs {
-rockchip,power_type = <GPIO>;
+
rockchip,power_type = <GPIO>;
gpios = <&gpio7 GPIO_A4 GPIO_ACTIVE_HIGH>;
rockchip,delay = <10>;
};
gpios = <&gpio7 GPIO_A4 GPIO_ACTIVE_HIGH>;
rockchip,delay = <10>;
};
diff --git
a/arch/arm/boot/dts/rk3288-tesco.dts
b/arch/arm/boot/dts/rk3288-tesco.dts
index c10b0c195977cb63991589a4e77c3784fbee7694..69d7db985b9926b944ba6f4b3d09100853f23986 100755
(executable)
--- a/
arch/arm/boot/dts/rk3288-tesco.dts
+++ b/
arch/arm/boot/dts/rk3288-tesco.dts
@@
-445,10
+445,11
@@
/*lcdc1 as PRMRY(LCD),lcdc0 as EXTEND(HDMI)*/
&lcdc1 {
status = "okay";
/*lcdc1 as PRMRY(LCD),lcdc0 as EXTEND(HDMI)*/
&lcdc1 {
status = "okay";
+ rockchip,mirror = <NO_MIRROR>;
rockchip,cabc_mode = <0>;
power_ctr: power_ctr {
rockchip,debug = <0>;
rockchip,cabc_mode = <0>;
power_ctr: power_ctr {
rockchip,debug = <0>;
- rockchip,mirror = <NO_MIRROR>;
+
lcd_en:lcd_en {
rockchip,power_type = <GPIO>;
gpios = <&gpio7 GPIO_A3 GPIO_ACTIVE_HIGH>;
lcd_en:lcd_en {
rockchip,power_type = <GPIO>;
gpios = <&gpio7 GPIO_A3 GPIO_ACTIVE_HIGH>;