[GIT PULL] ARM: OMAP2+: hwmod data: a few more fixes for v3.13-rc
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Tony, The following changes since commit 374b105797c3d4f29c685f3be535c35f5689b30e: Linux 3.13-rc3 (2013-12-06 09:34:04 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git tags/for-v3.13-rc/hwmod-fixes-b for you to fetch changes up to 6d4c88304794442055eaea1c07f3c7b988b8c924: ARM: OMAP2+: hwmod_data: fix missing OMAP_INTC_START in irq data (2013-12-25 21:41:27 -0700) - A few OMAP hwmod fixes for v3.13-rc. One patch fixes some IRQ problems with GPMC, RNG, and ISP/IVA MMUs on OMAP2/3. The other fixes some problems with DEBUG_LL on DRA7xx. Basic build, boot, and PM test logs are available here: http://www.pwsan.com/omap/testlogs/hwmod_fixes_b_v3.13-rc/20131226021920/ - Rajendra Nayak (1): ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL Suman Anna (1): ARM: OMAP2+: hwmod_data: fix missing OMAP_INTC_START in irq data arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 4 ++-- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 6 +++--- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) vmlinux object size (delta in bytes from test_v3.13-rc3 (374b105797c3d4f29c685f3be535c35f5689b30e)): text data bsstotal kernel 0000 omap1_defconfig 0000 omap1_defconfig_1510innovator_only 0000 omap1_defconfig_5912osk_only 0000 omap2plus_defconfig 0000 omap2plus_defconfig_2430sdp_only 0000 omap2plus_defconfig_cpupm 0000 omap2plus_defconfig_n800_multi_omap2xxx 0000 omap2plus_defconfig_n800_only_a 0000 omap2plus_defconfig_no_pm 0000 omap2plus_defconfig_omap2_4_only 0000 omap2plus_defconfig_omap3_4_only 0000 rmk_omap3430_ldp_allnoconfig 0000 rmk_omap3430_ldp_oldconfig 0000 rmk_omap4430_sdp_allnoconfig 0000 rmk_omap4430_sdp_oldnoconfig Boot-time memory difference (delta in bytes from test_v3.13-rc3 (374b105797c3d4f29c685f3be535c35f5689b30e)) avail rsrvd high freed board kconfig (no differences) -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.15 (GNU/Linux) iQIcBAEBAgAGBQJSvAQQAAoJEMePsQ0LvSpLGJQP/2A1HM+I/Wy5Qe8q1yt9yCfj tkurkBgHUsdJv0rZjHN7cbLlyBV0yZ2OmKVi813drOeVo6/YfkFHwloJTLDe9h67 VLher5mFQmvB0IaSxpFmiRSg5UPtEovAMDs7jf6RD4woU4/8CQi9Jgbp04GnO6ro PVIDpKZFZG7ce/JR7pab5rNsx8i59KxdquHJWJeOVynY9BZvhB9Sx7EdRMV6uqYm 9rVYU35uSeS4M7sUuEm44LZtcs8VoSLRINS3j0B2JROR29q57FCb0PRL7fW0kGOF 0ixNmXuWm5STKe7JnDjw9RwanV9XR0spGkdHUUEsvY1o55il+TouHJvTEPsrutoC l/CaezQrzQldr7JdSgKIdkJDnBPFD+Ri4Bt8zZzMVI+/Xj/BvBU54k+9RihXJPUZ BZz7KE9N/iAJ7uDuQITY5BlmaGLo3mXXEBtG5ws8hQcaOqZ/wQbKAB6e8qM71FTU VhJ5WAA5uP84gkh/hJ2pZZYtJLslG9QHPjLg8NzuYwC/WCnsTkyrVG68Ns/j8Vbo FP01VfkGZsV2zA6vvWadXmqseN1jq6lg89pKwp31aZziqmz76cD6kV+CPCataYPq BcNDbQZ21mtnRLUdM2NldrV44U/Lk7GDVZUM+2L+JNBZGpE22UdcIwc4JJPvuOsx xGnYkOgdtP5ZblgY0ioB =z30o -END PGP SIGNATURE- -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: configs: Select USB PHY for AM335x SoC
Felipe, On Thu, Dec 12, 2013 at 12:14:29PM -0300, Ezequiel Garcia wrote: Enable this option as it's required to use USB on AM335x SoC. Signed-off-by: Ezequiel Garcia ezequiel.gar...@free-electrons.com --- arch/arm/configs/omap2plus_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 12c848e..e427b95 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -223,6 +223,7 @@ CONFIG_USB_TEST=y CONFIG_NOP_USB_XCEIV=y CONFIG_OMAP_USB2=y CONFIG_OMAP_USB3=y +CONFIG_AM335X_PHY_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DEBUG=y CONFIG_USB_GADGET_DEBUG_FILES=y -- 1.8.1.5 Maybe you can take this through your tree? -- Ezequiel García, Free Electrons Embedded Linux, Kernel and Android Engineering http://free-electrons.com -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/2] usb: musb: Rework USB and USB_GADGET dependency
This USB controller can work in as host-only, gadget-only or dual-role modes. Rework the dependency on the USB and USB_GADGET configs in order to allow building the driver when !USB or !USG_GADGET. Signed-off-by: Ezequiel Garcia ezequiel.gar...@free-electrons.com --- This is just a resend of a recently sent, standalone patch. drivers/usb/Kconfig | 4 ++-- drivers/usb/musb/Kconfig | 8 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 2642b8a..a34fb98 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -94,8 +94,6 @@ source drivers/usb/wusbcore/Kconfig source drivers/usb/host/Kconfig -source drivers/usb/musb/Kconfig - source drivers/usb/renesas_usbhs/Kconfig source drivers/usb/class/Kconfig @@ -106,6 +104,8 @@ source drivers/usb/image/Kconfig endif +source drivers/usb/musb/Kconfig + source drivers/usb/dwc3/Kconfig source drivers/usb/chipidea/Kconfig diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index 57dfc0c..a1d805f 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -6,7 +6,7 @@ # (M)HDRC = (Multipoint) Highspeed Dual-Role Controller config USB_MUSB_HDRC tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)' - depends on USB_GADGET + depends on (USB || USB_GADGET) help Say Y here if your system has a dual role high speed USB controller based on the Mentor Graphics silicon IP. Then @@ -35,21 +35,21 @@ choice config USB_MUSB_HOST bool Host only mode - depends on USB + depends on USB=y || USB=USB_MUSB_HDRC help Select this when you want to use MUSB in host mode only, thereby the gadget feature will be regressed. config USB_MUSB_GADGET bool Gadget only mode - depends on USB_GADGET + depends on USB_GADGET=y || USB_GADGET=USB_MUSB_HDRC help Select this when you want to use MUSB in gadget mode only, thereby the host feature will be regressed. config USB_MUSB_DUAL_ROLE bool Dual Role mode - depends on (USB USB_GADGET) + depends on ((USB=y || USB=USB_MUSB_HDRC) (USB_GADGET=y || USB_GADGET=USB_MUSB_HDRC)) help This is the default mode of working of MUSB controller where both host and gadget features are enabled. -- 1.8.1.5 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/2] musb: Rework USB and USB_GADGET config
I'm resending this configuration rework to include one more patch in the series, prior to the config change. The first patch removes the usb_disable() usage, allowing the build the module for gadget-only mode usage. Without the first patch, the build breaks when building for !USB USB_GADGET. Hope it looks better now. Ezequiel Garcia (2): usb: musb: Remove usb_disable() check in module_init() usb: musb: Rework USB and USB_GADGET dependency drivers/usb/Kconfig | 4 ++-- drivers/usb/musb/Kconfig | 8 drivers/usb/musb/musb_core.c | 17 + 3 files changed, 7 insertions(+), 22 deletions(-) -- 1.8.1.5 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/2] usb: musb: Remove usb_disable() check in module_init()
Removing the check to usb_disable() before registering the platform
driver allows to build this driver when !USB USB_GADGET, to be
used in gadget-only mode.
Also, use module_platform_driver() to register the platform driver.
Signed-off-by: Ezequiel Garcia ezequiel.gar...@free-electrons.com
---
drivers/usb/musb/musb_core.c | 17 +
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 4d4499b..74d547a 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2283,19 +2283,4 @@ static struct platform_driver musb_driver = {
.shutdown = musb_shutdown,
};
-/*-*/
-
-static int __init musb_init(void)
-{
- if (usb_disabled())
- return 0;
-
- return platform_driver_register(musb_driver);
-}
-module_init(musb_init);
-
-static void __exit musb_cleanup(void)
-{
- platform_driver_unregister(musb_driver);
-}
-module_exit(musb_cleanup);
+module_platform_driver(musb_driver);
--
1.8.1.5
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] usb: musb: Rework USB and USB_GADGET dependency
Hello. On 26-12-2013 16:24, Ezequiel Garcia wrote: This USB controller can work in as host-only, gadget-only or dual-role modes. Rework the dependency on the USB and USB_GADGET configs in order to allow building the driver when !USB or !USG_GADGET. Signed-off-by: Ezequiel Garcia ezequiel.gar...@free-electrons.com [...] diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index 57dfc0c..a1d805f 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -6,7 +6,7 @@ # (M)HDRC = (Multipoint) Highspeed Dual-Role Controller config USB_MUSB_HDRC tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)' - depends on USB_GADGET + depends on (USB || USB_GADGET) Parens are not needed here. Be consistent with other entries MUSB please. help Say Y here if your system has a dual role high speed USB controller based on the Mentor Graphics silicon IP. Then @@ -35,21 +35,21 @@ choice config USB_MUSB_HOST bool Host only mode - depends on USB + depends on USB=y || USB=USB_MUSB_HDRC help Select this when you want to use MUSB in host mode only, thereby the gadget feature will be regressed. config USB_MUSB_GADGET bool Gadget only mode - depends on USB_GADGET + depends on USB_GADGET=y || USB_GADGET=USB_MUSB_HDRC help Select this when you want to use MUSB in gadget mode only, thereby the host feature will be regressed. config USB_MUSB_DUAL_ROLE bool Dual Role mode - depends on (USB USB_GADGET) + depends on ((USB=y || USB=USB_MUSB_HDRC) (USB_GADGET=y || USB_GADGET=USB_MUSB_HDRC)) Outer parens are not needed either... WBR, Sergei -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: configs: Select USB PHY for AM335x SoC
On Thu, Dec 26, 2013 at 09:08:34AM -0300, Ezequiel Garcia wrote: Felipe, On Thu, Dec 12, 2013 at 12:14:29PM -0300, Ezequiel Garcia wrote: Enable this option as it's required to use USB on AM335x SoC. Signed-off-by: Ezequiel Garcia ezequiel.gar...@free-electrons.com --- arch/arm/configs/omap2plus_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 12c848e..e427b95 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -223,6 +223,7 @@ CONFIG_USB_TEST=y CONFIG_NOP_USB_XCEIV=y CONFIG_OMAP_USB2=y CONFIG_OMAP_USB3=y +CONFIG_AM335X_PHY_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DEBUG=y CONFIG_USB_GADGET_DEBUG_FILES=y -- 1.8.1.5 Maybe you can take this through your tree? sorry, no. This should go through Tony to avoid conflicting. -- balbi signature.asc Description: Digital signature
Re: [PATCH V5 0/4] DRIVERS: IRQCHIP: Add support for crossbar IP
Sricharan, On Wednesday 25 December 2013 11:52 PM, Sricharan R wrote: Hi Thomas, On Wednesday 18 December 2013 02:49 PM, Sricharan R wrote: Hi Thomas, On Tuesday 03 December 2013 03:57 PM, Sricharan R wrote: Some socs have a large number of interrupts requests to service the needs of its many peripherals and subsystems. All of the interrupt requests lines from the subsystems are not needed at the same time, so they have to be muxed to the controllers appropriately. In such places a interrupt controllers are preceded by an IRQ CROSSBAR that provides flexibility in muxing the device interrupt requests to the controller inputs. This series models the peripheral interrupts that can be routed through the crossbar to the GIC as 'routable-irqs'. The routable irqs are added in a separate linear domain inside the GIC. The registered routable domain's callback are invoked as a part of the GIC's callback, which in turn should allocate a free irq line and configure the IP accordingly. So every peripheral in the dts files mentions the fixed crossbar number as its interrupt. A free gic line for that gets allocated and configured when the peripheral interrupts are mapped. The minimal crossbar driver to track and allocate free GIC lines and configure the crossbar is added here, along with the DT bindings. V5: Addressed a comment from Mark Rutland mark.rutl...@arm.com, updated tags and rebased on 3.13-rc2 V4: Addressed a couple of comments and split the DTS file updates in to a separate series. V3: Addressed few more comments from Thomas Gleixner t...@linutronix.de Rebased patches 3,4,5,7 which updates the DTS file on top of below branch git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git for_3.13/dts Rebased patches 1,2,6 on top of 3.12 mainline Updated Commit tags V2: Addressed Thomas Gleixner t...@linutronix.de comments and Kumar Gala ga...@codeaurora.org Split updating the DRA7.dtsi file for adding the routable-irqs Previous discussions that led to this is at https://lkml.org/lkml/2013/9/18/540 The V1,V2,V3,V4 post of these patches is at [V1] https://lkml.org/lkml/2013/9/30/283 [V2] http://www.spinics.net/lists/linux-omap/msg99540.html [V3] http://www.kernelhub.org/?msg=356470p=2 [V4] http://www.spinics.net/lists/linux-doc/msg16726.html Sricharan R (4): DRIVERS: IRQCHIP: IRQ-GIC: Add support for routable irqs DRIVERS: IRQCHIP: CROSSBAR: Add support for Crossbar IP ARM: OMAP4+: Correct Wakeup-gen code to use physical irq number ARM: DRA: Enable Crossbar IP support for DRA7XX Documentation/devicetree/bindings/arm/gic.txt |6 + .../devicetree/bindings/arm/omap/crossbar.txt | 27 +++ arch/arm/mach-omap2/Kconfig|1 + arch/arm/mach-omap2/omap-wakeupgen.c |4 +- arch/arm/mach-omap2/omap4-common.c |2 + drivers/irqchip/Kconfig|8 + drivers/irqchip/Makefile |1 + drivers/irqchip/irq-crossbar.c | 208 drivers/irqchip/irq-gic.c | 81 +++- include/linux/irqchip/arm-gic.h|7 +- include/linux/irqchip/irq-crossbar.h | 11 ++ 11 files changed, 343 insertions(+), 13 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/omap/crossbar.txt create mode 100644 drivers/irqchip/irq-crossbar.c create mode 100644 include/linux/irqchip/irq-crossbar.h I have addressed all the comments on this series, can this be merged now ? Ping.. Thomas has already given his reviewed-by tag so the patches can be taken via arm-soc tree considering OMAP and GIC changes. Can you create a branch with all these patches applied and send it to Tony ? Tony, Will you able to pull this and send it up to arm-soc ? Regards, Santosh -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V5 2/4] DRIVERS: IRQCHIP: CROSSBAR: Add support for Crossbar IP
Hi,
On Tue, Dec 03, 2013 at 03:57:23PM +0530, Sricharan R wrote:
+static const struct of_device_id crossbar_match[] __initconst = {
+ { .compatible = ti,irq-crossbar },
+ {}
+};
+
+int irqcrossbar_init(void)
+{
+ struct device_node *np;
+ np = of_find_matching_node(NULL, crossbar_match);
+ if (!np)
+ return -ENODEV;
+
+ crossbar_of_init(np);
+ return 0;
+}
instead, please use IRQCHIP_DECLARE() then you won't need to expose this
symbol to be used by arch/arm/ code.
--
balbi
signature.asc
Description: Digital signature
Re: [PATCH] ARM: configs: Select USB PHY for AM335x SoC
On Thu, Dec 26, 2013 at 09:55:55AM -0600, Felipe Balbi wrote: On Thu, Dec 26, 2013 at 09:08:34AM -0300, Ezequiel Garcia wrote: Felipe, On Thu, Dec 12, 2013 at 12:14:29PM -0300, Ezequiel Garcia wrote: Enable this option as it's required to use USB on AM335x SoC. Signed-off-by: Ezequiel Garcia ezequiel.gar...@free-electrons.com --- arch/arm/configs/omap2plus_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 12c848e..e427b95 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -223,6 +223,7 @@ CONFIG_USB_TEST=y CONFIG_NOP_USB_XCEIV=y CONFIG_OMAP_USB2=y CONFIG_OMAP_USB3=y +CONFIG_AM335X_PHY_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DEBUG=y CONFIG_USB_GADGET_DEBUG_FILES=y -- 1.8.1.5 Maybe you can take this through your tree? sorry, no. This should go through Tony to avoid conflicting. Tony? -- Ezequiel García, Free Electrons Embedded Linux, Kernel and Android Engineering http://free-electrons.com -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
