Minor OMAP DTS fixes
cover Minor OMAP DTS fixes
Hi Tony, Benoit,
This series includes couple of minor fixes in the OMAP DTS files. The patches are based on 3.15-rc2.
The first patch fixes the only WARN_ON trace present during kernel boot on OMAP5 uEVM, and this has been present since some time now.
[ 0.045578] ------------[ cut here ]------------ [ 0.045598] WARNING: CPU: 0 PID: 1 at arch/arm/mach-omap2/omap_hwmod.c:2538 _init+0x1c0/0x3dc() [ 0.045605] omap_hwmod: mailbox: doesn't have mpu register target base [ 0.045611] Modules linked in: [ 0.045625] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.15.0-rc2-00001-gb5e85a0 #45 [ 0.045653] [<c0015724>] (unwind_backtrace) from [<c00120f4>] (show_stack+0x10/0x14) [ 0.045672] [<c00120f4>] (show_stack) from [<c05a1ccc>] (dump_stack+0x78/0x94) [ 0.045686] [<c05a1ccc>] (dump_stack) from [<c0042a74>] (warn_slowpath_common+0x6c/0x8c) [ 0.045698] [<c0042a74>] (warn_slowpath_common) from [<c0042b28>] (warn_slowpath_fmt+0x30/0x40) [ 0.045710] [<c0042b28>] (warn_slowpath_fmt) from [<c0803b40>] (_init+0x1c0/0x3dc) [ 0.045724] [<c0803b40>] (_init) from [<c0029c8c>] (omap_hwmod_for_each+0x34/0x5c) [ 0.045736] [<c0029c8c>] (omap_hwmod_for_each) from [<c08042b0>] (__omap_hwmod_setup_all+0x24/0x40) [ 0.045748] [<c08042b0>] (__omap_hwmod_setup_all) from [<c00088b8>] (do_one_initcall+0x34/0x160) [ 0.045761] [<c00088b8>] (do_one_initcall) from [<c07f7bf4>] (kernel_init_freeable+0xfc/0x1c8) [ 0.045772] [<c07f7bf4>] (kernel_init_freeable) from [<c059c4f4>] (kernel_init+0x8/0xe4) [ 0.045784] [<c059c4f4>] (kernel_init) from [<c000eaa8>] (ret_from_fork+0x14/0x2c) [ 0.045826] ---[ end trace c25fc521f2569d3c ]---
The last patch eliminates the following traces on AM3517 based boards.
[ 0.418496] platform iva.2: Cannot lookup hwmod 'iva' [ 0.454352] platform 48094000.mailbox: Cannot lookup hwmod 'mailbox' [ 0.460610] platform 480bd400.mmu: Cannot lookup hwmod 'mmu_isp' [ 0.464065] platform 480c9000.smartreflex: Cannot lookup hwmod 'smartreflex_mpu_iva'
There are a few other such traces remaining, but these are all on valid nodes.
[ 0.420275] platform 480c5000.aes: Cannot lookup hwmod 'aes' [ 0.462403] platform 480c3000.sham: Cannot lookup hwmod 'sham' [ 0.463246] platform 480cb000.smartreflex: Cannot lookup hwmod 'smartreflex_core' [ 0.477243] platform 480ab000.usb_otg_hs: Cannot lookup hwmod 'usb_otg_hs'
regards
Suman
Suman Anna (3):
ARM: dts: OMAP5: Add mailbox dt node to fix boot warning
ARM: dts: OMAP2: Fix interrupts for OMAP2420 mailbox
ARM: dts: AM3517: Disable absent IPs inherited from OMAP3
arch/arm/boot/dts/am3517.dtsi | 16 ++++++++++++++++ arch/arm/boot/dts/omap2.dtsi | 7 ------- arch/arm/boot/dts/omap2420.dtsi | 8 ++++++++ arch/arm/boot/dts/omap2430.dtsi | 7 +++++++ arch/arm/boot/dts/omap3.dtsi | 2 +- arch/arm/boot/dts/omap5.dtsi | 7 +++++++ 6 files changed, 39 insertions(+), 8 deletions(-)
Signature · 1 line
1.9.2
PATCH 1/3 ARM: dts: OMAP5: Add mailbox dt node to fix boot warning
Add the mailbox device DT node for OMAP5 SoC. The OMAP5 mailbox IP is identical to that used in OMAP4.
The OMAP5 hwmod data no longer publishes the module address space, so this patch fixes the WARN_ON backtrace associated with the following trace during the kernel boot:
"omap_hwmod: mailbox: doesn't have mpu register target base".
--- arch/arm/boot/dts/omap5.dtsi | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/boot/dts/omap5.dtsi +7 -0
@@ -630,6 +630,13 @@ status = "disabled"; }; + mailbox: mailbox at 4a0f4000 { + compatible = "ti,omap4-mailbox"; + reg = <0x4a0f4000 0x200>; + interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; + ti,hwmods = "mailbox"; + }; + timer1: timer at 4ae18000 { compatible = "ti,omap5430-timer"; reg = <0x4ae18000 0x80>;
Signature · 1 line
1.9.2
PATCH 2/3 ARM: dts: OMAP2: Fix interrupts for OMAP2420 mailbox
In reply to Suman AnnaThe mailbox module is capable of generating two interrupts to MPU in OMAP2420, compared to one in OMAP2430. The second interrupt is to handle interrupts from the additional IVA processor present only on OMAP2420.
Move the current common mailbox DT node into the SoC specific files to allow the above differentiation. Also, added back the interrupt-names on OMAP2420, that were previously defined in hwmod data.
--- arch/arm/boot/dts/omap2.dtsi | 7 ------- arch/arm/boot/dts/omap2420.dtsi | 8 ++++++++ arch/arm/boot/dts/omap2430.dtsi | 7 +++++++ 3 files changed, 15 insertions(+), 7 deletions(-)
arch/arm/boot/dts/omap2.dtsi +0 -7
@@ -71,13 +71,6 @@ interrupts = <58>; }; - mailbox: mailbox at 48094000 { - compatible = "ti,omap2-mailbox"; - ti,hwmods = "mailbox"; - reg = <0x48094000 0x200>; - interrupts = <26>; - }; - intc: interrupt-controller at 1 { compatible = "ti,omap2-intc"; interrupt-controller;
arch/arm/boot/dts/omap2420.dtsi +8 -0
@@ -125,6 +125,14 @@ dma-names = "tx", "rx"; }; + mailbox: mailbox at 48094000 { + compatible = "ti,omap2-mailbox"; + reg = <0x48094000 0x200>; + interrupts = <26>, <34>; + interrupt-names = "dsp", "iva"; + ti,hwmods = "mailbox"; + }; + timer1: timer at 48028000 { compatible = "ti,omap2420-timer"; reg = <0x48028000 0x400>;
arch/arm/boot/dts/omap2430.dtsi +7 -0
@@ -216,6 +216,13 @@ dma-names = "tx", "rx"; }; + mailbox: mailbox at 48094000 { + compatible = "ti,omap2-mailbox"; + reg = <0x48094000 0x200>; + interrupts = <26>; + ti,hwmods = "mailbox"; + }; + timer1: timer at 49018000 { compatible = "ti,omap2420-timer"; reg = <0x49018000 0x400>;
Signature · 1 line
1.9.2
PATCH 3/3 ARM: dts: AM3517: Disable absent IPs inherited from OMAP3
In reply to Suman AnnaAM3517 inherits OMAP3 dts file, but does not have all the IPs that are present on OMAP3. This patch disables the following absent IPs for AM3517: Mailbox, IVA, MMU_ISP, MPU_IVA SmartReflex.
A label had to be added for IVA node in omap3.dtsi to be able to get a reference to the node for disabling.
--- arch/arm/boot/dts/am3517.dtsi | 16 ++++++++++++++++ arch/arm/boot/dts/omap3.dtsi | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-)
arch/arm/boot/dts/am3517.dtsi +16 -0
@@ -62,5 +62,21 @@ }; }; +&iva { + status = "disabled"; +}; + +&mailbox { + status = "disabled"; +}; + +&mmu_isp { + status = "disabled"; +}; + +&smartreflex_mpu_iva { + status = "disabled"; +}; + /include/ "am35xx-clocks.dtsi" /include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"
arch/arm/boot/dts/omap3.dtsi +1 -1
@@ -61,7 +61,7 @@ ti,hwmods = "mpu"; }; - iva { + iva: iva { compatible = "ti,iva2.2"; ti,hwmods = "iva";
Signature · 1 line
1.9.2
cover Minor OMAP DTS fixes
In reply to Suman AnnaQuoted 31 lines · Suman Anna
Hi Tony, Benoit,
This series includes couple of minor fixes in the OMAP DTS files. The patches are based on 3.15-rc2.
The first patch fixes the only
WARN_ONtrace present during kernel boot on OMAP5 uEVM, and this has been present since some time now.[ 0.045578] ------------[ cut here ]------------ [ 0.045598] WARNING: CPU: 0 PID: 1 at arch/arm/mach-omap2/omap_hwmod.c:2538 _init+0x1c0/0x3dc() [ 0.045605] omap_hwmod: mailbox: doesn't have mpu register target base [ 0.045611] Modules linked in: [ 0.045625] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.15.0-rc2-00001-gb5e85a0 #45 [ 0.045653] [<c0015724>] (unwind_backtrace) from [<c00120f4>] (show_stack+0x10/0x14) [ 0.045672] [<c00120f4>] (show_stack) from [<c05a1ccc>] (dump_stack+0x78/0x94) [ 0.045686] [<c05a1ccc>] (dump_stack) from [<c0042a74>] (warn_slowpath_common+0x6c/0x8c) [ 0.045698] [<c0042a74>] (warn_slowpath_common) from [<c0042b28>] (warn_slowpath_fmt+0x30/0x40) [ 0.045710] [<c0042b28>] (warn_slowpath_fmt) from [<c0803b40>] (_init+0x1c0/0x3dc) [ 0.045724] [<c0803b40>] (_init) from [<c0029c8c>] (omap_hwmod_for_each+0x34/0x5c) [ 0.045736] [<c0029c8c>] (omap_hwmod_for_each) from [<c08042b0>] (__omap_hwmod_setup_all+0x24/0x40) [ 0.045748] [<c08042b0>] (__omap_hwmod_setup_all) from [<c00088b8>] (do_one_initcall+0x34/0x160) [ 0.045761] [<c00088b8>] (do_one_initcall) from [<c07f7bf4>] (kernel_init_freeable+0xfc/0x1c8) [ 0.045772] [<c07f7bf4>] (kernel_init_freeable) from [<c059c4f4>] (kernel_init+0x8/0xe4) [ 0.045784] [<c059c4f4>] (kernel_init) from [<c000eaa8>] (ret_from_fork+0x14/0x2c) [ 0.045826] ---[ end trace c25fc521f2569d3c ]---The last patch eliminates the following traces on AM3517 based boards.
[ 0.418496] platform iva.2: Cannot lookup hwmod 'iva' [ 0.454352] platform 48094000.mailbox: Cannot lookup hwmod 'mailbox' [ 0.460610] platform 480bd400.mmu: Cannot lookup hwmod 'mmu_isp' [ 0.464065] platform 480c9000.smartreflex: Cannot lookup hwmod 'smartreflex_mpu_iva'
Quoted 5 lines
There are a few other such traces remaining, but these are all on valid nodes.
[ 0.420275] platform 480c5000.aes: Cannot lookup hwmod 'aes' [ 0.462403] platform 480c3000.sham: Cannot lookup hwmod 'sham' [ 0.463246] platform 480cb000.smartreflex: Cannot lookup hwmod 'smartreflex_core' [ 0.477243] platform 480ab000.usb_otg_hs: Cannot lookup hwmod 'usb_otg_hs'
Thanks applying all three into omap-for-v3.15/fixes-v2 with patch updated with the above warnings. Next time, please include the warnings into the patch description, just leave out the time stamps.
Regards,
Tony
cover Minor OMAP DTS fixes
Tony,
Quoted 38 lines · Tony Lindgren
Quoted 31 lines · Suman Anna
Hi Tony, Benoit,
This series includes couple of minor fixes in the OMAP DTS files. The patches are based on 3.15-rc2.
The first patch fixes the only
WARN_ONtrace present during kernel boot on OMAP5 uEVM, and this has been present since some time now.[ 0.045578] ------------[ cut here ]------------ [ 0.045598] WARNING: CPU: 0 PID: 1 at arch/arm/mach-omap2/omap_hwmod.c:2538 _init+0x1c0/0x3dc() [ 0.045605] omap_hwmod: mailbox: doesn't have mpu register target base [ 0.045611] Modules linked in: [ 0.045625] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.15.0-rc2-00001-gb5e85a0 #45 [ 0.045653] [<c0015724>] (unwind_backtrace) from [<c00120f4>] (show_stack+0x10/0x14) [ 0.045672] [<c00120f4>] (show_stack) from [<c05a1ccc>] (dump_stack+0x78/0x94) [ 0.045686] [<c05a1ccc>] (dump_stack) from [<c0042a74>] (warn_slowpath_common+0x6c/0x8c) [ 0.045698] [<c0042a74>] (warn_slowpath_common) from [<c0042b28>] (warn_slowpath_fmt+0x30/0x40) [ 0.045710] [<c0042b28>] (warn_slowpath_fmt) from [<c0803b40>] (_init+0x1c0/0x3dc) [ 0.045724] [<c0803b40>] (_init) from [<c0029c8c>] (omap_hwmod_for_each+0x34/0x5c) [ 0.045736] [<c0029c8c>] (omap_hwmod_for_each) from [<c08042b0>] (__omap_hwmod_setup_all+0x24/0x40) [ 0.045748] [<c08042b0>] (__omap_hwmod_setup_all) from [<c00088b8>] (do_one_initcall+0x34/0x160) [ 0.045761] [<c00088b8>] (do_one_initcall) from [<c07f7bf4>] (kernel_init_freeable+0xfc/0x1c8) [ 0.045772] [<c07f7bf4>] (kernel_init_freeable) from [<c059c4f4>] (kernel_init+0x8/0xe4) [ 0.045784] [<c059c4f4>] (kernel_init) from [<c000eaa8>] (ret_from_fork+0x14/0x2c) [ 0.045826] ---[ end trace c25fc521f2569d3c ]---The last patch eliminates the following traces on AM3517 based boards.
[ 0.418496] platform iva.2: Cannot lookup hwmod 'iva' [ 0.454352] platform 48094000.mailbox: Cannot lookup hwmod 'mailbox' [ 0.460610] platform 480bd400.mmu: Cannot lookup hwmod 'mmu_isp' [ 0.464065] platform 480c9000.smartreflex: Cannot lookup hwmod 'smartreflex_mpu_iva'Quoted 5 lines
There are a few other such traces remaining, but these are all on valid nodes.
[ 0.420275] platform 480c5000.aes: Cannot lookup hwmod 'aes' [ 0.462403] platform 480c3000.sham: Cannot lookup hwmod 'sham' [ 0.463246] platform 480cb000.smartreflex: Cannot lookup hwmod 'smartreflex_core' [ 0.477243] platform 480ab000.usb_otg_hs: Cannot lookup hwmod 'usb_otg_hs'
Quoted 4 lines
Thanks applying all three into omap-for-v3.15/fixes-v2 with patch updated with the above warnings. Next time, please include the warnings into the patch description, just leave out the time stamps.
Thanks. I have mentioned the warning for the OMAP5 one very briefly, and wasn't sure if I needed to copy the entire backtrace, but will remember to include them in the future.
regards
Suman