Hi,
Am 11.05.2015 um 11:00 schrieb Tomi Valkeinen tomi.valkeinen@ti.com:
On 11/05/15 11:25, Dr. H. Nikolaus Schaller wrote:
Hi Tomi,
Am 11.05.2015 um 10:13 schrieb Tomi Valkeinen tomi.valkeinen@ti.com:
Note that 4.1-rc1 does not have the problem you describe, as the omap5 dsi support is not in the mainline.
Really? I noticed the compile problem first when merging 4.1-rc1 into our 4.0 working tree. But maybe we already did carry along something influencing the patch sequence.
I didn't look at omap5, if it has similar dt nodes etc, but how the numbers come for omap4:
The register in question is CONTROL_DSIPHY 0x4A100618.
The previous way was using omap4_ctrl_pad_writel with this define:
#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_DSIPHY 0x0618
So presumably the control base is set to 0x4A100000.
The new code uses 'omap4_padconf_global' DT node as a base. So finding that from the omap4.dtsi, and looking at the offsets of that and its parent nodes, gives:
0x4a000000 + 0x100000 + 0x5a0
And the new offset in the display.c is:
#define OMAP4_DSIPHY_SYSCON_OFFSET 0x78
Which adds to:
0x4a000000 + 0x100000 + 0x5a0 + 0x78 = 0x4a100618
Ok. Looks reasonable.
Do you know which register it is for the OMAP5 and if something is different? Or can we simply assume the same offset?
If not I must dig into the 10k pages PDF of OMAP4&5…
On OMAP5 it's... hold for it... CONTROL_DSIPHY! ;)
The out-of-mainline "ARM: OMAP: add OMAP5 DSI muxing" patch adds the omap5 DSI handling, with the OMAP5 specific offset.
I made a quick patch, attached. Only compile tested, so no idea if it works.
Looks even better than my patch. I have merged yours into our 4.1-rc3 and now I can compile for the OMAP5 Pyra.
MIPI-DSI appears to work as well as with 4.0. No obvious differences found.
So I think you can add it to the 4.1 hot fixes.
BR, Nikolaus
Tomi <0001-fix-omap5-dsi-squash.patch>