omap5: Fix DSI base address and clocks
PATCH 1/1 omap5: Fix DSI base address and clocks
DSI was not probing due to base address off by 0x1000, and sys_clk missing.
With this patch, the Pyra display works if HDMI is disabled in the device tree.
--- arch/arm/boot/dts/omap5.dtsi | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
arch/arm/boot/dts/omap5.dtsi +11 -9
@@ -388,11 +388,11 @@ rfbi: encoder@0 { }; }; - target-module@5000 { + target-module@4000 { compatible = "ti,sysc-omap2", "ti,sysc"; - reg = <0x5000 0x4>, - <0x5010 0x4>, - <0x5014 0x4>; + reg = <0x4000 0x4>, + <0x4010 0x4>, + <0x4014 0x4>; reg-names = "rev", "sysc", "syss"; ti,sysc-sidle = <SYSC_IDLE_FORCE>, <SYSC_IDLE_NO>,
@@ -404,7 +404,7 @@ SYSC_OMAP2_SOFTRESET | ti,syss-mask = <1>; #address-cells = <1>; #size-cells = <1>; - ranges = <0 0x5000 0x1000>; + ranges = <0 0x4000 0x1000>; dsi1: encoder@0 { compatible = "ti,omap5-dsi";
@@ -414,8 +414,9 @@ dsi1: encoder@0 { reg-names = "proto", "phy", "pll"; interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; - clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>; - clock-names = "fck"; + clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>, + <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 10>; + clock-names = "fck", "sys_clk"; }; };
@@ -445,8 +446,9 @@ dsi2: encoder@0 { reg-names = "proto", "phy", "pll"; interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; - clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>; - clock-names = "fck"; + clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>, + <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 10>; + clock-names = "fck", "sys_clk"; }; };
Signature · 1 line
2.28.0
Quoted 8 lines
Am 18.08.2020 um 11:51 schrieb David Shah <[email protected]>:
DSI was not probing due to base address off by
0x1000, andsys_clkmissing.With this patch, the Pyra display works if HDMI is disabled in the device tree.
For me it also works if HDMI is not disabled.
So IMHO this comment is misleading.
Otherwise,
Quoted 67 lines
Signed-off-by David Shah <[email protected]>---
arch/arm/boot/dts/omap5.dtsi| 20 +++++++++++---------1 file changed, 11 insertions(+), 9 deletions(-)arch/arm/boot/dts/omap5.dtsi +11
-9@@ -388,11 +388,11 @@ rfbi: encoder@0 { }; }; - target-module@5000 { + target-module@4000 { compatible = "ti,sysc-omap2", "ti,sysc"; - reg = <0x5000 0x4>, - <0x5010 0x4>, - <0x5014 0x4>; + reg = <0x4000 0x4>, + <0x4010 0x4>, + <0x4014 0x4>; reg-names = "rev", "sysc", "syss"; ti,sysc-sidle = <SYSC_IDLE_FORCE>, <SYSC_IDLE_NO>,@@ -404,7 +404,7 @@ SYSC_OMAP2_SOFTRESET | ti,syss-mask = <1>; #address-cells = <1>; #size-cells = <1>; - ranges = <0 0x5000 0x1000>; + ranges = <0 0x4000 0x1000>; dsi1: encoder@0 { compatible = "ti,omap5-dsi";@@ -414,8 +414,9 @@ dsi1: encoder@0 { reg-names = "proto", "phy", "pll"; interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; - clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>; - clock-names = "fck"; + clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>, + <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 10>; + clock-names = "fck", "sys_clk"; }; };@@ -445,8 +446,9 @@ dsi2: encoder@0 { reg-names = "proto", "phy", "pll"; interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; - clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>; - clock-names = "fck"; + clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>, + <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 10>; + clock-names = "fck", "sys_clk"; }; };Signature · 7 lines
2.28.0 _______________________________________________ https://projects.goldelico.com/p/gta04-kernel/ Letux-kernel mailing list [email protected] http://lists.goldelico.com/mailman/listinfo.cgi/letux-kernel
Quoted 9 lines · H. Nikolaus Schaller
Quoted 8 lines
Am 18.08.2020 um 11:51 schrieb David Shah <[email protected]>:
DSI was not probing due to base address off by
0x1000, andsys_clkmissing.With this patch, the Pyra display works if HDMI is disabled in the device tree.
Quoted 6 lines
For me it also works if HDMI is not disabled.
So IMHO this comment is misleading.Otherwise,
Tested-by H. Nikolaus Schaller <[email protected]>
Thanks pushed out into fixes. Looks like I missed removing the HDMI disabled comment part but seems like that's not critical and don't want to redo the branch after pushing out.
Regards,
Tony
In any case the HDMI bug has reappeared while testing 5.9-rc1, although I can get the display to work by doing 'modprobe omapdrm' even if HDMI is enabled (as before it loads automatically if HDMI is disabled).
Best
David
Quoted 30 lines · Tony Lindgren
Quoted 10 lines · H. Nikolaus Schaller
Quoted 9 lines
Am 18.08.2020 um 11:51 schrieb David Shah <[email protected]>:
DSI was not probing due to base address off by
0x1000, andsys_clk
missing.With this patch, the Pyra display works if HDMI is disabled in the
device tree.Quoted 6 lines
For me it also works if HDMI is not disabled.
So IMHO this comment is misleading.Otherwise,
Tested-by H. Nikolaus Schaller <[email protected]>Thanks pushed out into fixes. Looks like I missed removing the HDMI disabled comment part but seems like that's not critical and don't want to redo the branch after pushing out.
Regards,
Tony
_______________________________________________
https://projects.goldelico.com/p/gta04-kernel/
Letux-kernel mailing list
[email protected]
http://lists.goldelico.com/mailman/listinfo.cgi/letux-kernel
PATCH 1/1 omap5: Fix DSI base address and clocks
In reply to David ShahSorry, meant to send this to the device tree list as well as the OMAP one for review too.
David
-------- Forwarded Message --------
From: David Shah <[email protected]>
To: [email protected], [email protected], [email protected], [email protected]
Subject: [PATCH] omap5: Fix DSI base address and clocks
Date: Tue, 18 Aug 2020 10:51:00 +0100
DSI was not probing due to base address off by 0x1000, and sys_clk missing.
With this patch, the Pyra display works if HDMI is disabled in the device tree.
--- arch/arm/boot/dts/omap5.dtsi | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
(quoted diff) +0 -0
b/arch/arm/boot/dts/omap5.dtsi
index c96e19a15c52..849a2dd9fef7 100644
arch/arm/boot/dts/omap5.dtsi +1 -1
@@ -388,11 +388,11 @@ rfbi: encoder@0 { }; }; - target-module@5000 { + target-module@4000 { compatible = "ti,sysc-omap2",
"ti,sysc";
- reg = <0x5000 0x4>,
- <0x5010 0x4>,
- <0x5014 0x4>;
+ reg = <0x4000 0x4>,
+ <0x4010 0x4>,
+ <0x4014 0x4>;
reg-names = "rev", "sysc",
"syss";
ti,sysc-sidle =
<SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>,
@@ -404,7 +404,7 @@ SYSC_OMAP2_SOFTRESET |
ti,syss-mask = <1>; #address-cells = <1>; #size-cells = <1>;
- ranges = <0 0x5000 0x1000>;
+ ranges = <0 0x4000 0x1000>;
dsi1: encoder@0 {
compatible = "ti,omap5-
dsi";
@@ -414,8 +414,9 @@ dsi1: encoder@0 {
reg-names = "proto",
"phy", "pll";
interrupts = <GIC_SPI
53 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
- clocks = <&dss_clkctrlOMAP5_DSS_CORE_CLKCTRL 8>;
- clock-names = "fck";
+ clocks = <&dss_clkctrlOMAP5_DSS_CORE_CLKCTRL 8>,
+ <&dss_clkctrlOMAP5_DSS_CORE_CLKCTRL 10>;
+ clock-names = "fck",
"sys_clk";
};
};
@@ -445,8 +446,9 @@ dsi2: encoder@0 {
reg-names = "proto",
"phy", "pll";
interrupts = <GIC_SPI
55 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
- clocks = <&dss_clkctrlOMAP5_DSS_CORE_CLKCTRL 8>;
- clock-names = "fck";
+ clocks = <&dss_clkctrlOMAP5_DSS_CORE_CLKCTRL 8>,
+ <&dss_clkctrlOMAP5_DSS_CORE_CLKCTRL 10>;
+ clock-names = "fck",
"sys_clk";
};
};
Signature · 6 lines
2.28.0 _______________________________________________ Kernel mailing list [email protected] http://pyra-handheld.com/cgi-bin/mailman/listinfo/kernel