diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-07-09 06:45:18 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-06-04 02:02:14 -0400 |
commit | 95c1cd13927ce00fde1714170c780c72ea352fbb (patch) | |
tree | e7b6561ca5a6e78556c02194f2d310cf5ce586c8 | |
parent | 403ee909e44a6cf41060ce02899c07f5907d6af5 (diff) |
arm/dts: dra7.dtsi: add DSS support
DRA7xxx contains a very similar DSS to OMAP5. The main differences are:
* no DSI or RFBI support.
* 1 or 2 dedicated video PLLs.
* need to do additional configuration to the DRA7 CONTROL module.
DRA72xx has only one video PLL, and DRA74xx has two.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: devicetree@vger.kernel.org
Acked-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/boot/dts/dra7.dtsi | 38 | ||||
-rw-r--r-- | arch/arm/boot/dts/dra72x.dtsi | 11 | ||||
-rw-r--r-- | arch/arm/boot/dts/dra74x.dtsi | 15 |
3 files changed, 64 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 387c76ca41f9..8f1e25bcecbd 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi | |||
@@ -1474,6 +1474,44 @@ | |||
1474 | clocks = <&sys_clkin1>; | 1474 | clocks = <&sys_clkin1>; |
1475 | status = "disabled"; | 1475 | status = "disabled"; |
1476 | }; | 1476 | }; |
1477 | |||
1478 | dss: dss@58000000 { | ||
1479 | compatible = "ti,dra7-dss"; | ||
1480 | /* 'reg' defined in dra72x.dtsi and dra74x.dtsi */ | ||
1481 | /* 'clocks' defined in dra72x.dtsi and dra74x.dtsi */ | ||
1482 | status = "disabled"; | ||
1483 | ti,hwmods = "dss_core"; | ||
1484 | /* CTRL_CORE_DSS_PLL_CONTROL */ | ||
1485 | syscon-pll-ctrl = <&scm_conf 0x538>; | ||
1486 | #address-cells = <1>; | ||
1487 | #size-cells = <1>; | ||
1488 | ranges; | ||
1489 | |||
1490 | dispc@58001000 { | ||
1491 | compatible = "ti,dra7-dispc"; | ||
1492 | reg = <0x58001000 0x1000>; | ||
1493 | interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; | ||
1494 | ti,hwmods = "dss_dispc"; | ||
1495 | clocks = <&dss_dss_clk>; | ||
1496 | clock-names = "fck"; | ||
1497 | /* CTRL_CORE_SMA_SW_1 */ | ||
1498 | syscon-pol = <&scm_conf 0x534>; | ||
1499 | }; | ||
1500 | |||
1501 | hdmi: encoder@58060000 { | ||
1502 | compatible = "ti,dra7-hdmi"; | ||
1503 | reg = <0x58040000 0x200>, | ||
1504 | <0x58040200 0x80>, | ||
1505 | <0x58040300 0x80>, | ||
1506 | <0x58060000 0x19000>; | ||
1507 | reg-names = "wp", "pll", "phy", "core"; | ||
1508 | interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; | ||
1509 | status = "disabled"; | ||
1510 | ti,hwmods = "dss_hdmi"; | ||
1511 | clocks = <&dss_48mhz_clk>, <&dss_hdmi_clk>; | ||
1512 | clock-names = "fck", "sys_clk"; | ||
1513 | }; | ||
1514 | }; | ||
1477 | }; | 1515 | }; |
1478 | 1516 | ||
1479 | thermal_zones: thermal-zones { | 1517 | thermal_zones: thermal-zones { |
diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi index 03d742f8d572..eaca143faa77 100644 --- a/arch/arm/boot/dts/dra72x.dtsi +++ b/arch/arm/boot/dts/dra72x.dtsi | |||
@@ -34,3 +34,14 @@ | |||
34 | interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>; | 34 | interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>; |
35 | }; | 35 | }; |
36 | }; | 36 | }; |
37 | |||
38 | &dss { | ||
39 | reg = <0x58000000 0x80>, | ||
40 | <0x58004054 0x4>, | ||
41 | <0x58004300 0x20>; | ||
42 | reg-names = "dss", "pll1_clkctrl", "pll1"; | ||
43 | |||
44 | clocks = <&dss_dss_clk>, | ||
45 | <&dss_video1_clk>; | ||
46 | clock-names = "fck", "video1_clk"; | ||
47 | }; | ||
diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi index cc560a70926f..fa995d0ca1f2 100644 --- a/arch/arm/boot/dts/dra74x.dtsi +++ b/arch/arm/boot/dts/dra74x.dtsi | |||
@@ -73,3 +73,18 @@ | |||
73 | }; | 73 | }; |
74 | }; | 74 | }; |
75 | }; | 75 | }; |
76 | |||
77 | &dss { | ||
78 | reg = <0x58000000 0x80>, | ||
79 | <0x58004054 0x4>, | ||
80 | <0x58004300 0x20>, | ||
81 | <0x58005054 0x4>, | ||
82 | <0x58005300 0x20>; | ||
83 | reg-names = "dss", "pll1_clkctrl", "pll1", | ||
84 | "pll2_clkctrl", "pll2"; | ||
85 | |||
86 | clocks = <&dss_dss_clk>, | ||
87 | <&dss_video1_clk>, | ||
88 | <&dss_video2_clk>; | ||
89 | clock-names = "fck", "video1_clk", "video2_clk"; | ||
90 | }; | ||