diff mbox series

omap5: Fix DSI base address and clocks

Message ID 20200818095100.25412-1-dave@ds0.me
State New
Headers show
Series omap5: Fix DSI base address and clocks | expand

Commit Message

David Shah Aug. 18, 2020, 9:51 a.m. UTC
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.

Signed-off-by: David Shah <dave@ds0.me>
---
 arch/arm/boot/dts/omap5.dtsi | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

Comments

H. Nikolaus Schaller Aug. 18, 2020, 9:58 a.m. UTC | #1
> Am 18.08.2020 um 11:51 schrieb David Shah <dave@ds0.me>:
> 
> 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.

For me it also works if HDMI is not disabled.
So IMHO this comment is misleading.

Otherwise,

Tested-by: H. Nikolaus Schaller <hns@goldelico.com>

> 
> Signed-off-by: David Shah <dave@ds0.me>
> ---
> arch/arm/boot/dts/omap5.dtsi | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
> index c96e19a15c52..849a2dd9fef7 100644
> --- a/arch/arm/boot/dts/omap5.dtsi
> +++ b/arch/arm/boot/dts/omap5.dtsi
> @@ -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";
> 					};
> 				};
> 
> -- 
> 2.28.0
> 
> _______________________________________________
> https://projects.goldelico.com/p/gta04-kernel/
> Letux-kernel mailing list
> Letux-kernel@openphoenux.org
> http://lists.goldelico.com/mailman/listinfo.cgi/letux-kernel
Tony Lindgren Aug. 19, 2020, 5:58 a.m. UTC | #2
* H. Nikolaus Schaller <hns@goldelico.com> [200818 09:58]:
> 
> > Am 18.08.2020 um 11:51 schrieb David Shah <dave@ds0.me>:
> > 
> > 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.
> 
> For me it also works if HDMI is not disabled.
> So IMHO this comment is misleading.
> 
> Otherwise,
> 
> Tested-by: H. Nikolaus Schaller <hns@goldelico.com>

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
David Shah Aug. 19, 2020, 8:39 a.m. UTC | #3
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

On Wed, 2020-08-19 at 08:58 +0300, Tony Lindgren wrote:
> * H. Nikolaus Schaller <hns@goldelico.com> [200818 09:58]:
> > > Am 18.08.2020 um 11:51 schrieb David Shah <dave@ds0.me>:
> > > 
> > > 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.
> > 
> > For me it also works if HDMI is not disabled.
> > So IMHO this comment is misleading.
> > 
> > Otherwise,
> > 
> > Tested-by: H. Nikolaus Schaller <hns@goldelico.com>
> 
> 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
> Letux-kernel@openphoenux.org
> http://lists.goldelico.com/mailman/listinfo.cgi/letux-kernel
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index c96e19a15c52..849a2dd9fef7 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -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";
 					};
 				};