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

rk312x dts: move lcdc pinctrl and screen from dtsi to dts

Browse Source
This commit is contained in:
zwl
2014-08-07 18:02:57 +08:00
parent c7f72ac604
commit 2669a870f4
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
#include "rk312x-sdk.dtsi"
#include "lcd-b101ew05.dtsi"
/ {
compatible = "rockchip,rk3126";
@@ -11,9 +12,17 @@
};
};
&rk_screen {
display-timings = <&disp_timings>;
};
&lcdc {
status = "okay";
pinctrl-names = "default", "gpio";
pinctrl-0 = <&lcdc0_lcdc>;
pinctrl-1 = <&lcdc0_gpio>;
power_ctr: power_ctr {
rockchip,debug = <0>;
lcd_en: lcd_en {

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

@@ -1,4 +1,5 @@
#include "rk312x-sdk.dtsi"
#include "lcd-b101ew05.dtsi"
/ {
compatible = "rockchip,rk3128";
@@ -11,9 +12,17 @@
};
};
&rk_screen {
display-timings = <&disp_timings>;
};
&lcdc {
status = "okay";
pinctrl-names = "default", "gpio";
pinctrl-0 = <&lcdc0_lcdc>;
pinctrl-1 = <&lcdc0_gpio>;
power_ctr: power_ctr {
rockchip,debug = <0>;
lcd_cs: lcd_cs {

5
arch/arm/boot/dts/rk312x-sdk.dtsi
View File

@@ -1,7 +1,6 @@
/dts-v1/;
#include "rk312x.dtsi"
#include "lcd-b101ew05.dtsi"
/ {
fiq-debugger {
@@ -208,10 +207,6 @@
rockchip,uboot-logo-on = <0>;
};
&rk_screen {
display-timings = <&disp_timings>;
};
&hdmi {
status = "okay";
};

3
arch/arm/boot/dts/rk312x.dtsi
View File

@@ -630,9 +630,6 @@
rockchip,prop = <PRMRY>;
reg = <0x1010e000 0x2000>;
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default", "gpio";
pinctrl-0 = <&lcdc0_lcdc>;
pinctrl-1 = <&lcdc0_gpio>;
clocks = <&clk_gates6 0>, <&dclk_lcdc0>, <&clk_gates6 1>, <&sclk_lcdc0>;
clock-names = "aclk_lcdc", "dclk_lcdc", "hclk_lcdc", "sclk";
rockchip,iommu-enabled = <1>;