fixes for ARM build regressions in 3.9-rc1
Subsystems (15)
cover fixes for ARM build regressions in 3.9-rc1
This is the result of my my build tests on 3.9-rc1, mostly bugs that I had not caught before the merge window, or where the fix for some reason has not yet made it in.
I hope the subsystem maintainers can take care of applying these, for the arch/arm/mach-* patches I can either apply them directly to the arm-soc tree with an Ack or do a round-trip through the platform maintainer tree. I think Tony already has some of the OMAP1 fixes, so we should try not to duplicate them.
Arnd
Arnd Bergmann (9):
clk: vt8500: Fix "fix device clock divisor calculations" Revert parts of "hlist: drop the node parameter from iterators"
mfd: remove __exit_p annotation for twl4030_madc_remove
usb: gadget: fix omap_udc build errors
ARM: omap1: add back missing includes
[media] ir-rx51: fix clock API related build issues [media] s5p-fimc: fix s5pv210 build
iommu: OMAP: build only on OMAP2+
ARM: spear3xx: Use correct pl080 header file
arch/arm/mach-omap1/board-fsample.c | 1 + arch/arm/mach-omap1/board-h2.c | 1 + arch/arm/mach-omap1/board-perseus2.c | 1 + arch/arm/mach-omap1/board-sx1.c | 1 + arch/arm/mach-s5pv210/mach-goni.c | 2 +- arch/arm/mach-spear3xx/spear3xx.c | 2 +- arch/arm/plat-omap/dmtimer.c | 16 ++++++++-------- drivers/clk/clk-vt8500.c | 2 +- drivers/iommu/Kconfig | 2 +- drivers/media/rc/ir-rx51.c | 4 ++-- drivers/mfd/twl4030-madc.c | 2 +- drivers/usb/gadget/omap_udc.c | 3 ++- drivers/video/omap/lcd_ams_delta.c | 1 + drivers/video/omap/lcd_osk.c | 1 + kernel/smpboot.c | 2 +- net/9p/trans_virtio.c | 2 +- 16 files changed, 25 insertions(+), 18 deletions(-)
Signature · 1 line
1.8.1.2
PATCH 1/9 clk: vt8500: Fix "fix device clock divisor calculations"
Patch 72480014b8 "Fix device clock divisor calculations" was apparently rebased incorrectly before it got upstream, causing a build error.
Replacing the "prate" pointer with the local parent_rate is most likely the correct solution.
--- drivers/clk/clk-vt8500.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-vt8500.c +1 -1
@@ -157,7 +157,7 @@ static int vt8500_dclk_set_rate(struct clk_hw *hw, unsigned long rate, divisor = parent_rate / rate;/* If prate / rate would be decimal, incr the divisor */ -if (rate * divisor < *prate) +if (rate * divisor < parent_rate) divisor++;if (divisor == cdev->div_mask +1 )
Signature · 1 line
1.8.1.2
PATCH 2/9 Revert parts of "hlist: drop the node parameter from iterators"
In reply to Arnd Bergmanncommit b67bfe0d42 "hlist: drop the node parameter from iterators" did a lot of nice changes but also contains two small hunks that seem to have slipped in accidentally and have no apparent connection to the intent of the patch.
This reverts the two extraneous changes.
--- kernel/smpboot.c | 2 +- net/9p/trans_virtio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
kernel/smpboot.c +1 -1
@@ -131,7 +131,7 @@ static int smpboot_thread_fn(void *data)continue ; } -//BUG_ON(td->cpu != smp_processor_id()); +BUG_ON (td->cpu !=smp_processor_id ());/* Check for state change setup */ switch (td->status) {
net/9p/trans_virtio.c +1 -1
@@ -655,7 +655,7 @@ static struct p9_trans_module p9_virtio_trans = { .create = p9_virtio_create, .close = p9_virtio_close, .request = p9_virtio_request, -//.zc_request = p9_virtio_zc_request, + .zc_request = p9_virtio_zc_request, .cancel = p9_virtio_cancel,/* * We leave one entry for input and one entry for response
Signature · 1 line
1.8.1.2
PATCH 3/9 mfd: remove __exit_p annotation for twl4030_madc_remove
In reply to Arnd Bergmann4740f73fe5 "mfd: remove use of __devexit" removed the __devexit annotation on the twl4030_madc_remove function, but left an __exit_p() present on the pointer to this function. Using __exit_p was as wrong with the devexit in place as it is now, but now we get a gcc warning about an unused function.
In order for the twl4030_madc_remove to work correctly in built-in code, we have to remove the __exit_p.
--- drivers/mfd/twl4030-madc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/twl4030-madc.c +1 -1
@@ -800,7 +800,7 @@ static int twl4030_madc_remove(struct platform_device *pdev)static struct platform_driver twl4030_madc_driver = { .probe = twl4030_madc_probe, - .remove =__exit_p (twl4030_madc_remove), + .remove = twl4030_madc_remove, .driver = { .name ="twl4030_madc" , .owner =THIS_MODULE ,
Signature · 1 line
1.8.1.2
Re: [PATCH 3/9] mfd: remove __exit_p annotation for twl4030_madc_remove
Quoted 7 lines · Arnd Bergmann
4740f73fe5"mfd: remove use of__devexit" removed the__devexitannotation on thetwl4030_madc_removefunction, but left an__exit_p()present on the pointer to this function. Using__exit_pwas as wrong with the devexit in place as it is now, but now we get a gcc warning about an unused function.In order for the
twl4030_madc_removeto work correctly in built-in code, we have to remove the__exit_p.
PATCH 4/9 usb: gadget: fix omap_udc build errors
In reply to Arnd Bergmann1bf0cf6040 "usb: gadget: omap_udc: convert to udc_start/udc_stop" made some trivial changes but was missing a ';' character.
8c4cc00552 "ARM: OMAP1: DMA: Moving OMAP1 DMA channel definitions to mach-omap1" added a definition for OMAP_DMA_USB_W2FC_TX0 to the driver while making the header file it was defined in unavailable for drivers, but this driver actually needs OMAP_DMA_USB_W2FC_RX0 as well.
Both changes appear trivial, so let's add the missing semicolon and the macro definition.
--- drivers/usb/gadget/omap_udc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/gadget/omap_udc.c +2 -1
@@ -62,6 +62,7 @@#define DRIVER_VERSION "4 October 2004"#define OMAP_DMA_USB_W2FC_TX0 29 +#define OMAP_DMA_USB_W2FC_RX0 26/* * The OMAP UDC needs _very_ early endpoint setup: before enabling the
@@ -1310,7 +1311,7 @@ static int omap_pullup(struct usb_gadget *gadget, int is_on) }static int omap_udc_start (struct usb_gadget *g, - struct usb_gadget_driver *driver) +struct usb_gadget_driver *driver);static int omap_udc_stop (struct usb_gadget *g,struct usb_gadget_driver *driver);
Signature · 1 line
1.8.1.2
Re: [PATCH 4/9] usb: gadget: fix omap_udc build errors
Hi,
Quoted 32 lines · Arnd Bergmann
1bf0cf6040"usb: gadget:omap_udc: convert to udc_start/udc_stop" made some trivial changes but was missing a ';' character.
8c4cc00552"ARM: OMAP1: DMA: Moving OMAP1 DMA channel definitions to mach-omap1" added a definition forOMAP_DMA_USB_W2FC_TX0to the driver while making the header file it was defined in unavailable for drivers, but this driver actually needsOMAP_DMA_USB_W2FC_RX0as well.Both changes appear trivial, so let's add the missing semicolon and the macro definition.
Cc Felipe Balbi <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>--- drivers/usb/gadget/omap_udc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/usb/gadget/omap_udc.c +1
-0@@ -62,6 +62,7 @@#define DRIVER_VERSION "4 October 2004"#define OMAP_DMA_USB_W2FC_TX0 29 +#define OMAP_DMA_USB_W2FC_RX0 26/* * The OMAP UDC needs _very_ early endpoint setup: before enabling the
drivers/usb/gadget/omap_udc.c static int omap_pullup(struct usb_gadget *gadget, int is_on) · line 1314
Quoted 5 lines
drivers/usb/gadget/omap_udc.c +1
-1@@ -1310,7 +1311,7 @@ static int omap_pullup(struct usb_gadget *gadget, int is_on) }static int omap_udc_start (struct usb_gadget *g, -struct usb_gadget_driver *driver) +struct usb_gadget_driver *driver);
good catch, thanks. I'll queue it for v3.6-rc3. Make sure to Cc linux-usb for anything under drivers/usb/ though
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130306/773d75f5/attachment.sig>
Greg Kroah-Hartman
maintainerRe: [PATCH 4/9] usb: gadget: fix omap_udc build errors
Quoted 37 lines · Felipe Balbi
Hi,
Quoted 34 lines · Arnd Bergmann
1bf0cf6040"usb: gadget:omap_udc: convert to udc_start/udc_stop" made some trivial changes but was missing a ';' character.
8c4cc00552"ARM: OMAP1: DMA: Moving OMAP1 DMA channel definitions to mach-omap1" added a definition forOMAP_DMA_USB_W2FC_TX0to the driver while making the header file it was defined in unavailable for drivers, but this driver actually needsOMAP_DMA_USB_W2FC_RX0as well.Both changes appear trivial, so let's add the missing semicolon and the macro definition.
Cc Felipe Balbi <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>--- drivers/usb/gadget/omap_udc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/usb/gadget/omap_udc.c +1
-0@@ -62,6 +62,7 @@#define DRIVER_VERSION "4 October 2004"#define OMAP_DMA_USB_W2FC_TX0 29 +#define OMAP_DMA_USB_W2FC_RX0 26/* * The OMAP UDC needs _very_ early endpoint setup: before enabling the @@ -1310,7 +1311,7 @@ static int omap_pullup(struct usb_gadget *gadget, int is_on) }
Quoted 6 lines
drivers/usb/gadget/omap_udc.c static int omap_pullup(struct usb_gadget *gadget, int is_on) · line 1314
Quoted 3 lines
drivers/usb/gadget/omap_udc.c +1
-1static int omap_udc_start (struct usb_gadget *g, -struct usb_gadget_driver *driver) +struct usb_gadget_driver *driver);good catch, thanks. I'll queue it for v3.6-rc3. Make sure to Cc linux-usb for anything under
drivers/usb/though
I think you mean 3.9 :)
I can take this patch right now, if you ack it.
thanks,
greg k-h
Felipe Balbi
Acked-byRe: [PATCH 4/9] usb: gadget: fix omap_udc build errors
Hi,
Quoted 38 lines · Greg Kroah-Hartman
Quoted 37 lines · Felipe Balbi
Hi,
Quoted 34 lines · Arnd Bergmann
1bf0cf6040"usb: gadget:omap_udc: convert to udc_start/udc_stop" made some trivial changes but was missing a ';' character.
8c4cc00552"ARM: OMAP1: DMA: Moving OMAP1 DMA channel definitions to mach-omap1" added a definition forOMAP_DMA_USB_W2FC_TX0to the driver while making the header file it was defined in unavailable for drivers, but this driver actually needsOMAP_DMA_USB_W2FC_RX0as well.Both changes appear trivial, so let's add the missing semicolon and the macro definition.
Cc Felipe Balbi <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>--- drivers/usb/gadget/omap_udc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/usb/gadget/omap_udc.c +1
-0@@ -62,6 +62,7 @@#define DRIVER_VERSION "4 October 2004"#define OMAP_DMA_USB_W2FC_TX0 29 +#define OMAP_DMA_USB_W2FC_RX0 26/* * The OMAP UDC needs _very_ early endpoint setup: before enabling the @@ -1310,7 +1311,7 @@ static int omap_pullup(struct usb_gadget *gadget, int is_on) }
Quoted 8 lines
Quoted 6 lines
drivers/usb/gadget/omap_udc.c static int omap_pullup(struct usb_gadget *gadget, int is_on) · line 1314
Quoted 3 lines
drivers/usb/gadget/omap_udc.c +1
-1static int omap_udc_start (struct usb_gadget *g, -struct usb_gadget_driver *driver) +struct usb_gadget_driver *driver);good catch, thanks. I'll queue it for v3.6-rc3. Make sure to Cc linux-usb for anything under
drivers/usb/thoughI think you mean 3.9 :)
right
Quoted 1 line
I can take this patch right now, if you ack it.
ok thanks:
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130306/361e1fe6/attachment-0001.sig>
PATCH 5/9 ARM: omap1: add back missing includes
In reply to Arnd BergmannThe recent reorganization of OMAP header files caused a couple of files that used to be implicitly included now missing from OMAP1. This adds explicit inclusions of mach/irqs.h and mach/hardware.h in all files that need them for an OMAP1 allyesconfig build.
--- arch/arm/mach-omap1/board-fsample.c | 1 + arch/arm/mach-omap1/board-h2.c | 1 + arch/arm/mach-omap1/board-perseus2.c | 1 + arch/arm/mach-omap1/board-sx1.c | 1 + drivers/video/omap/lcd_ams_delta.c | 1 + drivers/video/omap/lcd_osk.c | 1 + 6 files changed, 6 insertions(+)
arch/arm/mach-omap1/board-fsample.c +1 -0
@@ -33,6 +33,7 @@#include <linux/platform_data/keypad-omap.h> #include <mach/hardware.h> +#include <mach/irqs.h> #include "iomap.h" #include "common.h"
arch/arm/mach-omap1/board-h2.c +1 -0
@@ -47,6 +47,7 @@#include <mach/hardware.h> #include <mach/usb.h> +#include <mach/irqs.h> #include "common.h" #include "board-h2.h"
arch/arm/mach-omap1/board-perseus2.c +1 -0
@@ -31,6 +31,7 @@#include <mach/tc.h> #include <mach/mux.h> #include <mach/flash.h> +#include <mach/irqs.h> #include <mach/hardware.h>
arch/arm/mach-omap1/board-sx1.c +1 -0
@@ -43,6 +43,7 @@#include <mach/hardware.h> #include <mach/usb.h> +#include <mach/irqs.h> #include "common.h" #include "dma.h"
drivers/video/omap/lcd_ams_delta.c +1 -0
@@ -28,6 +28,7 @@#include <linux/gpio.h> #include <mach/board-ams-delta.h> +#include <mach/hardware.h> #include "omapfb.h"
drivers/video/omap/lcd_osk.c +1 -0
@@ -25,6 +25,7 @@#include <asm/gpio.h> #include <mach/mux.h> +#include <mach/hardware.h> #include "omapfb.h" static int osk_panel_init (struct lcd_panel *panel,struct omapfb_device *fbdev)
Signature · 1 line
1.8.1.2
Re: [PATCH 5/9] ARM: omap1: add back missing includes
Quoted 8 lines · Arnd Bergmann
The recent reorganization of OMAP header files caused a couple of files that used to be implicitly included now missing from OMAP1. This adds explicit inclusions of
mach/irqs.handmach/hardware.hin all files that need them for an OMAP1 allyesconfig build.Signed-off-by Arnd Bergmann <[email protected]>Cc Tony Lindgren <[email protected]>Cc linux-omap at vger.kernel.org
Quoted 8 lines
--- arch/arm/mach-omap1/board-fsample.c | 1 + arch/arm/mach-omap1/board-h2.c | 1 + arch/arm/mach-omap1/board-perseus2.c | 1 + arch/arm/mach-omap1/board-sx1.c | 1 + drivers/video/omap/lcd_ams_delta.c | 1 + drivers/video/omap/lcd_osk.c | 1 + 6 files changed, 6 insertions(+)
I saw that Tony has already addressed the latter two changes, but did not see a fix for the four board files.
Arnd
Re: [PATCH 5/9] ARM: omap1: add back missing includes
Quoted 18 lines · Arnd Bergmann
Quoted 8 lines · Arnd Bergmann
The recent reorganization of OMAP header files caused a couple of files that used to be implicitly included now missing from OMAP1. This adds explicit inclusions of
mach/irqs.handmach/hardware.hin all files that need them for an OMAP1 allyesconfig build.Signed-off-by Arnd Bergmann <[email protected]>Cc Tony Lindgren <[email protected]>Cc linux-omap at vger.kernel.orgQuoted 8 lines
--- arch/arm/mach-omap1/board-fsample.c | 1 + arch/arm/mach-omap1/board-h2.c | 1 + arch/arm/mach-omap1/board-perseus2.c | 1 + arch/arm/mach-omap1/board-sx1.c | 1 + drivers/video/omap/lcd_ams_delta.c | 1 + drivers/video/omap/lcd_osk.c | 1 + 6 files changed, 6 insertions(+)
Quoted 2 lines
I saw that Tony has already addressed the latter two changes, but did not see a fix for the four board files.
Hmm I wonder why I have not seen the board-*.c related ones?
Anyways thanks for fixing those:
Re: [PATCH 5/9] ARM: omap1: add back missing includes
Quoted 19 lines · Tony Lindgren
Quoted 18 lines · Arnd Bergmann
Quoted 16 lines · Arnd Bergmann
The recent reorganization of OMAP header files caused a couple of files that used to be implicitly included now missing from OMAP1. This adds explicit inclusions of
mach/irqs.handmach/hardware.hin all files that need them for an OMAP1 allyesconfig build.Signed-off-by Arnd Bergmann <[email protected]>Cc Tony Lindgren <[email protected]>Cc linux-omap at vger.kernel.org--- arch/arm/mach-omap1/board-fsample.c | 1 + arch/arm/mach-omap1/board-h2.c | 1 + arch/arm/mach-omap1/board-perseus2.c | 1 + arch/arm/mach-omap1/board-sx1.c | 1 + drivers/video/omap/lcd_ams_delta.c | 1 + drivers/video/omap/lcd_osk.c | 1 + 6 files changed, 6 insertions(+)
Quoted 8 lines
Quoted 2 lines
I saw that Tony has already addressed the latter two changes, but did not see a fix for the four board files.
Hmm I wonder why I have not seen the board-*.c related ones?
Anyways thanks for fixing those:
Acked-by Tony Lindgren <[email protected]>
Actually I cannot reproduce them myself now, I think I'll just drop the patch for now, but will remember your Ack if the problem comes back. The patch would be needed if we decide to use SPARSE_IRQ on OMAP1.
Arnd
Tony Lindgren
maintainerRe: [PATCH 5/9] ARM: omap1: add back missing includes
Quoted 25 lines · Arnd Bergmann
Quoted 24 lines · Tony Lindgren
Quoted 18 lines · Arnd Bergmann
Quoted 8 lines · Arnd Bergmann
The recent reorganization of OMAP header files caused a couple of files that used to be implicitly included now missing from OMAP1. This adds explicit inclusions of
mach/irqs.handmach/hardware.hin all files that need them for an OMAP1 allyesconfig build.Signed-off-by Arnd Bergmann <[email protected]>Cc Tony Lindgren <[email protected]>Cc linux-omap at vger.kernel.orgQuoted 8 lines
--- arch/arm/mach-omap1/board-fsample.c | 1 + arch/arm/mach-omap1/board-h2.c | 1 + arch/arm/mach-omap1/board-perseus2.c | 1 + arch/arm/mach-omap1/board-sx1.c | 1 + drivers/video/omap/lcd_ams_delta.c | 1 + drivers/video/omap/lcd_osk.c | 1 + 6 files changed, 6 insertions(+)Quoted 2 lines
I saw that Tony has already addressed the latter two changes, but did not see a fix for the four board files.
Hmm I wonder why I have not seen the board-*.c related ones?
Quoted 8 lines
Quoted 3 lines
Anyways thanks for fixing those:
Acked-by Tony Lindgren <[email protected]>Actually I cannot reproduce them myself now, I think I'll just drop the patch for now, but will remember your Ack if the problem comes back. The patch would be needed if we decide to use
SPARSE_IRQon OMAP1.
OK sounds good to me.
Tony
PATCH 6/9 ir-rx51: fix clock API related build issues
In reply to Arnd BergmannOMAP1 no longer provides its own clock interfaces since patch a135eaae52 "ARM: OMAP: remove plat/clock.h". This is great, but we now have to convert the ir-rx51 driver to use the generic interface from linux/clk.h.
The driver also uses the omap_dm_timer_get_fclk() function, which is not exported for OMAP1, so we have to move the definition out of the OMAP2 specific section.
--- arch/arm/plat-omap/dmtimer.c | 16 ++++++++-------- drivers/media/rc/ir-rx51.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/plat-omap/dmtimer.c +8 -8
@@ -333,6 +333,14 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer) }EXPORT_SYMBOL_GPL (omap_dm_timer_get_irq); +struct clk *omap_dm_timer_get_fclk (struct omap_dm_timer *timer) +{ +if (timer) +return timer->fclk; +return NULL ; +} +EXPORT_SYMBOL_GPL (omap_dm_timer_get_fclk); +#if defined(CONFIG_ARCH_OMAP1 )#include <mach/hardware.h> /**
@@ -371,14 +379,6 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_modify_idlect_mask);#else -struct clk *omap_dm_timer_get_fclk (struct omap_dm_timer *timer) -{ -if (timer) -return timer->fclk; -return NULL ; -} -EXPORT_SYMBOL_GPL (omap_dm_timer_get_fclk); -__u32 omap_dm_timer_modify_idlect_mask (__u32 inputmask) {BUG ();
drivers/media/rc/ir-rx51.c +2 -2
@@ -25,9 +25,9 @@#include <linux/platform_device.h> #include <linux/sched.h> #include <linux/wait.h> +#include <linux/clk.h> #include <plat/dmtimer.h> -#include <plat/clock.h> #include <media/lirc.h> #include <media/lirc_dev.h>
@@ -209,7 +209,7 @@ static int lirc_rx51_init_port(struct lirc_rx51 *lirc_rx51) } clk_fclk =omap_dm_timer_get_fclk (lirc_rx51->pwm_timer); - lirc_rx51->fclk_khz = clk_fclk->rate /1000 ; + lirc_rx51->fclk_khz =clk_get_rate (clk_fclk) /1000 ;return 0 ;
Signature · 1 line
1.8.1.2
Re: [PATCH 6/9] [media] ir-rx51: fix clock API related build issues
Em Tue, 5 Mar 2013 23:16:46 +0100
Arnd Bergmann <[email protected]> escreveu:
Quoted 5 lines
OMAP1 no longer provides its own clock interfaces since patch
a135eaae52"ARM: OMAP: removeplat/clock.h". This is great, but we now have to convert the ir-rx51 driver to use the generic interface fromlinux/clk.h.
Quoted 8 lines
The driver also uses the
omap_dm_timer_get_fclk()function, which is not exported for OMAP1, so we have to move the definition out of the OMAP2 specific section.Signed-off-by Arnd Bergmann <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>From my side:
Quoted 68 lines
Cc Timo Kokkonen <[email protected]>Cc Tony Lindgren <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc linux-media at vger.kernel.org--- arch/arm/plat-omap/dmtimer.c | 16 ++++++++-------- drivers/media/rc/ir-rx51.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-)arch/arm/plat-omap/dmtimer.c +8
-8@@ -333,6 +333,14 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer) }EXPORT_SYMBOL_GPL (omap_dm_timer_get_irq); +struct clk *omap_dm_timer_get_fclk (struct omap_dm_timer *timer) +{ +if (timer) +return timer->fclk; +return NULL ; +} +EXPORT_SYMBOL_GPL (omap_dm_timer_get_fclk); +#if defined(CONFIG_ARCH_OMAP1 )#include <mach/hardware.h> /** @@ -371,14 +379,6 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_modify_idlect_mask);#else -struct clk *omap_dm_timer_get_fclk (struct omap_dm_timer *timer) -{ -if (timer) -return timer->fclk; -return NULL ; -} -EXPORT_SYMBOL_GPL (omap_dm_timer_get_fclk); -__u32 omap_dm_timer_modify_idlect_mask (__u32 inputmask) {BUG ();drivers/media/rc/ir-rx51.c +2
-2@@ -25,9 +25,9 @@#include <linux/platform_device.h> #include <linux/sched.h> #include <linux/wait.h> +#include <linux/clk.h> #include <plat/dmtimer.h> -#include <plat/clock.h> #include <media/lirc.h> #include <media/lirc_dev.h> @@ -209,7 +209,7 @@ static int lirc_rx51_init_port(struct lirc_rx51 *lirc_rx51) } clk_fclk =omap_dm_timer_get_fclk (lirc_rx51->pwm_timer); - lirc_rx51->fclk_khz = clk_fclk->rate /1000 ; + lirc_rx51->fclk_khz =clk_get_rate (clk_fclk) /1000 ;return 0 ;
Signature · 2 lines
Cheers, Mauro
Tony Lindgren
maintainerRe: [PATCH 6/9] [media] ir-rx51: fix clock API related build issues
Quoted 12 lines · Mauro Carvalho Chehab
Em Tue, 5 Mar 2013 23:16:46 +0100
Arnd Bergmann <[email protected]> escreveu:Quoted 9 lines
OMAP1 no longer provides its own clock interfaces since patch
a135eaae52"ARM: OMAP: removeplat/clock.h". This is great, but we now have to convert the ir-rx51 driver to use the generic interface fromlinux/clk.h.The driver also uses the
omap_dm_timer_get_fclk()function, which is not exported for OMAP1, so we have to move the definition out of the OMAP2 specific section.
Quoted 5 lines
Quoted 2 lines
Signed-off-by Arnd Bergmann <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>From my side:
There's just one issue, this driver most likely only needed on rx51 board.. So I suggest we just mark the driver depends on ARCH_OMAP2PLUS and let's drop this patch.
This driver is already disabled for ARCH_MULTIPLATFORM as we need to move dmtimer.c to drivers and have some minimal include/linux/timer-omap.h for it.
Quoted 21 lines
Quoted 21 lines
arch/arm/plat-omap/dmtimer.c +8
-0@@ -333,6 +333,14 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer) }EXPORT_SYMBOL_GPL (omap_dm_timer_get_irq); +struct clk *omap_dm_timer_get_fclk (struct omap_dm_timer *timer) +{ +if (timer) +return timer->fclk; +return NULL ; +} +EXPORT_SYMBOL_GPL (omap_dm_timer_get_fclk); +#if defined(CONFIG_ARCH_OMAP1 )#include <mach/hardware.h> /** @@ -371,14 +379,6 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_modify_idlect_mask);#else
Quoted 11 lines
arch/arm/plat-omap/dmtimer.c EXPORT_SYMBOL_GPL(omap_dm_timer_modify_idlect_mask); · line 384
Quoted 11 lines
arch/arm/plat-omap/dmtimer.c +0
-8-struct clk *omap_dm_timer_get_fclk (struct omap_dm_timer *timer) -{ -if (timer) -return timer->fclk; -return NULL ; -} -EXPORT_SYMBOL_GPL (omap_dm_timer_get_fclk); -__u32 omap_dm_timer_modify_idlect_mask (__u32 inputmask) {BUG ();
Then omap_dm_timer_get_fclk() won't work on omap1 as there's no separate functional clock. We probably should not even export this function eventually when things are fixed up.
Regards,
Tony
Re: [PATCH 6/9] [media] ir-rx51: fix clock API related build issues
Quoted 19 lines · Tony Lindgren
Quoted 12 lines · Mauro Carvalho Chehab
Em Tue, 5 Mar 2013 23:16:46 +0100
Arnd Bergmann <[email protected]> escreveu:Quoted 9 lines
OMAP1 no longer provides its own clock interfaces since patch
a135eaae52"ARM: OMAP: removeplat/clock.h". This is great, but we now have to convert the ir-rx51 driver to use the generic interface fromlinux/clk.h.The driver also uses the
omap_dm_timer_get_fclk()function, which is not exported for OMAP1, so we have to move the definition out of the OMAP2 specific section.Quoted 5 lines
Quoted 2 lines
Signed-off-by Arnd Bergmann <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>From my side:
Quoted 8 lines
There's just one issue, this driver most likely only needed on rx51 board.. So I suggest we just mark the driver depends on
ARCH_OMAP2PLUSand let's drop this patch.This driver is already disabled for
ARCH_MULTIPLATFORMas we need to movedmtimer.cto drivers and have some minimalinclude/linux/timer-omap.hfor it.
I've also had this cunning plan that if or when the PWM subsystem starts supporting the PWM output in OMAP3, I could convert this driver to generate the IR carrier wave through the PWM subsystem and then use HR timers to generate the pulses. I think that's much better approach than trying to depend on interfaces that are not easily available. Should be possible, but I haven't proven yet that it will work :)
Unfortunately I haven't got into executing on that plan yet. In addition to the challenge of scheduling some of my free time for doing this, my RX51 device is not enumerating the USB with the latest kernel and I haven't figured out that yet. And because of that, I haven't been able to get my user space running over nfsroot setup I've been using..
-Timo
Quoted 40 lines
Quoted 21 lines
Quoted 21 lines
arch/arm/plat-omap/dmtimer.c +8
-0@@ -333,6 +333,14 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer) }EXPORT_SYMBOL_GPL (omap_dm_timer_get_irq); +struct clk *omap_dm_timer_get_fclk (struct omap_dm_timer *timer) +{ +if (timer) +return timer->fclk; +return NULL ; +} +EXPORT_SYMBOL_GPL (omap_dm_timer_get_fclk); +#if defined(CONFIG_ARCH_OMAP1 )#include <mach/hardware.h> /** @@ -371,14 +379,6 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_modify_idlect_mask);#else Quoted 11 lines
arch/arm/plat-omap/dmtimer.c EXPORT_SYMBOL_GPL(omap_dm_timer_modify_idlect_mask); · line 384
Quoted 11 lines
arch/arm/plat-omap/dmtimer.c +0
-8-struct clk *omap_dm_timer_get_fclk (struct omap_dm_timer *timer) -{ -if (timer) -return timer->fclk; -return NULL ; -} -EXPORT_SYMBOL_GPL (omap_dm_timer_get_fclk); -__u32 omap_dm_timer_modify_idlect_mask (__u32 inputmask) {BUG ();Then
omap_dm_timer_get_fclk()won't work on omap1 as there's no separate functional clock. We probably should not even export this function eventually when things are fixed up.Regards,
Tony
Tony Lindgren
maintainerRe: [PATCH 6/9] [media] ir-rx51: fix clock API related build issues
Quoted 29 lines · Timo Kokkonen
Quoted 19 lines · Tony Lindgren
Quoted 12 lines · Mauro Carvalho Chehab
Em Tue, 5 Mar 2013 23:16:46 +0100
Arnd Bergmann <[email protected]> escreveu:Quoted 9 lines
OMAP1 no longer provides its own clock interfaces since patch
a135eaae52"ARM: OMAP: removeplat/clock.h". This is great, but we now have to convert the ir-rx51 driver to use the generic interface fromlinux/clk.h.The driver also uses the
omap_dm_timer_get_fclk()function, which is not exported for OMAP1, so we have to move the definition out of the OMAP2 specific section.Quoted 5 lines
Quoted 2 lines
Signed-off-by Arnd Bergmann <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>From my side:
Quoted 8 lines
There's just one issue, this driver most likely only needed on rx51 board.. So I suggest we just mark the driver depends on
ARCH_OMAP2PLUSand let's drop this patch.This driver is already disabled for
ARCH_MULTIPLATFORMas we need to movedmtimer.cto drivers and have some minimalinclude/linux/timer-omap.hfor it.
Quoted 7 lines
I've also had this cunning plan that if or when the PWM subsystem starts supporting the PWM output in OMAP3, I could convert this driver to generate the IR carrier wave through the PWM subsystem and then use HR timers to generate the pulses. I think that's much better approach than trying to depend on interfaces that are not easily available. Should be possible, but I haven't proven yet that it will work :)
Sounds good to me.
Quoted 6 lines
Unfortunately I haven't got into executing on that plan yet. In addition to the challenge of scheduling some of my free time for doing this, my RX51 device is not enumerating the USB with the latest kernel and I haven't figured out that yet. And because of that, I haven't been able to get my user space running over nfsroot setup I've been using..
Git bisect might help there. Maybe post the output and cc the usb people?
Regards,
Tony
PATCH 7/9 s5p-fimc: fix s5pv210 build
In reply to Arnd Bergmann56bc911 "[media] s5p-fimc: Redefine platform data structure for fimc-is" changed the bus_type member of struct fimc_source_info treewide, but got one instance wrong in mach-s5pv210, which was evidently not even build tested.
This adds the missing change to get s5pv210_defconfig to build again. Applies on the Mauro's media tree.
--- arch/arm/mach-s5pv210/mach-goni.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-s5pv210/mach-goni.c +1 -1
@@ -845,7 +845,7 @@ static struct fimc_source_info goni_camera_sensors[] = { .mux_id = 0, .flags =V4L2_MBUS_PCLK_SAMPLE_FALLING | V4L2_MBUS_VSYNC_ACTIVE_LOW, - .bus_type = FIMC_BUS_TYPE_ITU_601, + .fimc_bus_type = FIMC_BUS_TYPE_ITU_601, .board_info = &noon010pc30_board_info, .i2c_bus_num = 0, .clk_frequency = 16000000UL,
Signature · 1 line
1.8.1.2
RE: [PATCH 7/9] [media] s5p-fimc: fix s5pv210 build
Quoted 9 lines · Arnd Bergmann
56bc911 "[media] s5p-fimc: Redefine platform data structure for fimc-is" changed the
bus_typemember of structfimc_source_infotreewide, but got one instance wrong in mach-s5pv210, which was evidently not even build tested.This adds the missing change to get
s5pv210_defconfigto build again. Applies on the Mauro's media tree.
I'm fine if this can be fixed soon.
Quoted 4 lines
Signed-off-by Arnd Bergmann <[email protected]>Cc Sylwester Nawrocki <[email protected]>Cc Kyungmin Park <[email protected]>Cc Kukjin Kim <[email protected]>
Quoted 22 lines
Cc Mauro Carvalho Chehab <[email protected]>--- arch/arm/mach-s5pv210/mach-goni.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/mach- renamed from arch/arm/mach-s5pv210/mach-goni.c +0
-0
s5pv210/mach-goni.c
index 3a38f7b..e373de4 100644arch/arm/mach-s5pv210/mach-goni.c +1
-1@@ -845,7 +845,7 @@ static struct fimc_source_info goni_camera_sensors[] = { .mux_id = 0, .flags =V4L2_MBUS_PCLK_SAMPLE_FALLING | V4L2_MBUS_VSYNC_ACTIVE_LOW, - .bus_type = FIMC_BUS_TYPE_ITU_601, + .fimc_bus_type = FIMC_BUS_TYPE_ITU_601, .board_info = &noon010pc30_board_info, .i2c_bus_num = 0,.clk_frequency = 16000000UL,
--
1.8.1.2
PATCH 8/9 iommu: OMAP: build only on OMAP2+
In reply to Arnd BergmannThe OMAP IOMMU driver intentionally fails to build on OMAP1 platforms, so we should not allow enabling it there.
--- drivers/iommu/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/Kconfig +1 -1
@@ -130,7 +130,7 @@ config IRQ_REMAP # OMAP IOMMU support config OMAP_IOMMU bool "OMAP IOMMU Support" - depends on ARCH_OMAP + depends on ARCH_OMAP2PLUS select IOMMU_API config OMAP_IOVMM
Signature · 1 line
1.8.1.2
Re: [PATCH 8/9] iommu: OMAP: build only on OMAP2+
Quoted 9 lines · Arnd Bergmann
The OMAP IOMMU driver intentionally fails to build on OMAP1 platforms, so we should not allow enabling it there.
Signed-off-by Arnd Bergmann <[email protected]>Cc Joerg Roedel <[email protected]>Cc iommu at lists.linux-foundation.orgCc Ohad Ben-Cohen <[email protected]>Cc Tony Lindgren <[email protected]>Cc Omar Ramirez Luna <[email protected]>
Makes sense, I doubt that anybody will work on omap1 version at this point:
Quoted 20 lines
--- drivers/iommu/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/iommu/Kconfig +1
-1@@ -130,7 +130,7 @@ config IRQ_REMAP # OMAP IOMMU support config OMAP_IOMMU bool "OMAP IOMMU Support" - depends on ARCH_OMAP + depends on ARCH_OMAP2PLUS select IOMMU_API config OMAP_IOVMMSignature · 1 line
1.8.1.2
Re: [PATCH 8/9] iommu: OMAP: build only on OMAP2+
In reply to Arnd BergmannQuoted 9 lines · Arnd Bergmann
The OMAP IOMMU driver intentionally fails to build on OMAP1 platforms, so we should not allow enabling it there.
Signed-off-by Arnd Bergmann <[email protected]>Cc Joerg Roedel <[email protected]>Cc iommu at lists.linux-foundation.orgCc Ohad Ben-Cohen <[email protected]>Cc Tony Lindgren <[email protected]>Cc Omar Ramirez Luna <[email protected]>
Applied to iommu/fixes, thanks Arnd.
PATCH 9/9 ARM: spear3xx: Use correct pl080 header file
In reply to Arnd BergmannThe definitions have move around recently, causing build errors in spear3xx for all configurations:
spear3xx.c:47:5: error: 'PL080_BSIZE_16' undeclared here (not in a function) spear3xx.c:47:23: error: 'PL080_CONTROL_SB_SIZE_SHIFT' undeclared here (not in a function) spear3xx.c:48:22: error: 'PL080_CONTROL_DB_SIZE_SHIFT' undeclared here (not in a function)
--- arch/arm/mach-spear3xx/spear3xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-spear3xx/spear3xx.c +1 -1
@@ -14,7 +14,7 @@#define pr_fmt (fmt) "SPEAr3xx: " fmt#include <linux/amba/pl022.h> -#include <linux/amba/pl08x.h> +#include <linux/amba/pl080.h> #include <linux/io.h> #include <plat/pl080.h> #include <mach/generic.h>
Signature · 1 line
1.8.1.2
Re: [PATCH 9/9] ARM: spear3xx: Use correct pl080 header file
Quoted 7 lines · Arnd Bergmann
The definitions have move around recently, causing build errors in spear3xx for all configurations:
spear3xx.c:47:5: error: '
PL080_BSIZE_16' undeclared here (not in a function) spear3xx.c:47:23: error: 'PL080_CONTROL_SB_SIZE_SHIFT' undeclared here (not in a function) spear3xx.c:48:22: error: 'PL080_CONTROL_DB_SIZE_SHIFT' undeclared here (not in a function)
Quoted 6 lines
Signed-off-by Arnd Bergmann <[email protected]>Cc Alessandro Rubini <[email protected]>Cc Viresh Kumar <[email protected]>--- arch/arm/mach-spear3xx/spear3xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
You are a bit late in posting this.
We already got the same patch from Vipul yesterday :)
Re: [PATCH 9/9] ARM: spear3xx: Use correct pl080 header file
Quoted 15 lines · Viresh Kumar
Quoted 7 lines · Arnd Bergmann
The definitions have move around recently, causing build errors in spear3xx for all configurations:
spear3xx.c:47:5: error: '
PL080_BSIZE_16' undeclared here (not in a function) spear3xx.c:47:23: error: 'PL080_CONTROL_SB_SIZE_SHIFT' undeclared here (not in a function) spear3xx.c:48:22: error: 'PL080_CONTROL_DB_SIZE_SHIFT' undeclared here (not in a function)Quoted 6 lines
Signed-off-by Arnd Bergmann <[email protected]>Cc Alessandro Rubini <[email protected]>Cc Viresh Kumar <[email protected]>--- arch/arm/mach-spear3xx/spear3xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 2 lines
You are a bit late in posting this.
We already got the same patch from Vipul yesterday :)
Are you going to send a pull request for that one then? Another -rc has just passed with the platform being broken.
Arnd
Re: [PATCH 9/9] ARM: spear3xx: Use correct pl080 header file
Quoted 2 lines · Arnd Bergmann
Are you going to send a pull request for that one then? Another -rc has just passed with the platform being broken.
Probably you can just apply that patch, i am not planning to send a pull request for that one.