* [PATCH 1/9] clk: vt8500: Fix "fix device clock divisor calculations"
2013-03-05 22:16 [PATCH 0/9] fixes for ARM build regressions in 3.9-rc1 Arnd Bergmann
@ 2013-03-05 22:16 ` Arnd Bergmann
2013-03-05 22:16 ` [PATCH 2/9] Revert parts of "hlist: drop the node parameter from iterators" Arnd Bergmann
` (7 subsequent siblings)
8 siblings, 0 replies; 28+ messages in thread
From: Arnd Bergmann @ 2013-03-05 22:16 UTC (permalink / raw)
To: linux-arm-kernel
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.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Tony Prisk <linux@prisktech.co.nz>
Cc: Mike Turquette <mturquette@linaro.org>
---
drivers/clk/clk-vt8500.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clk/clk-vt8500.c b/drivers/clk/clk-vt8500.c
index b5538bb..09c6331 100644
--- a/drivers/clk/clk-vt8500.c
+++ b/drivers/clk/clk-vt8500.c
@@ -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)
--
1.8.1.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 2/9] Revert parts of "hlist: drop the node parameter from iterators"
2013-03-05 22:16 [PATCH 0/9] fixes for ARM build regressions in 3.9-rc1 Arnd Bergmann
2013-03-05 22:16 ` [PATCH 1/9] clk: vt8500: Fix "fix device clock divisor calculations" Arnd Bergmann
@ 2013-03-05 22:16 ` Arnd Bergmann
2013-03-05 22:16 ` [PATCH 3/9] mfd: remove __exit_p annotation for twl4030_madc_remove Arnd Bergmann
` (6 subsequent siblings)
8 siblings, 0 replies; 28+ messages in thread
From: Arnd Bergmann @ 2013-03-05 22:16 UTC (permalink / raw)
To: linux-arm-kernel
commit 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.
Cc: Peter Senna Tschudin <peter.senna@gmail.com>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
kernel/smpboot.c | 2 +-
net/9p/trans_virtio.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/smpboot.c b/kernel/smpboot.c
index b9bde57..d4abac2 100644
--- a/kernel/smpboot.c
+++ b/kernel/smpboot.c
@@ -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) {
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 74dea37..de2e950 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -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
--
1.8.1.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 3/9] mfd: remove __exit_p annotation for twl4030_madc_remove
2013-03-05 22:16 [PATCH 0/9] fixes for ARM build regressions in 3.9-rc1 Arnd Bergmann
2013-03-05 22:16 ` [PATCH 1/9] clk: vt8500: Fix "fix device clock divisor calculations" Arnd Bergmann
2013-03-05 22:16 ` [PATCH 2/9] Revert parts of "hlist: drop the node parameter from iterators" Arnd Bergmann
@ 2013-03-05 22:16 ` Arnd Bergmann
2013-03-06 1:01 ` Tony Lindgren
2013-03-05 22:16 ` [PATCH 4/9] usb: gadget: fix omap_udc build errors Arnd Bergmann
` (5 subsequent siblings)
8 siblings, 1 reply; 28+ messages in thread
From: Arnd Bergmann @ 2013-03-05 22:16 UTC (permalink / raw)
To: linux-arm-kernel
4740f73fe5 "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.
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/mfd/twl4030-madc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/twl4030-madc.c b/drivers/mfd/twl4030-madc.c
index 88ff9dc..942b666 100644
--- a/drivers/mfd/twl4030-madc.c
+++ b/drivers/mfd/twl4030-madc.c
@@ -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,
--
1.8.1.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 3/9] mfd: remove __exit_p annotation for twl4030_madc_remove
2013-03-05 22:16 ` [PATCH 3/9] mfd: remove __exit_p annotation for twl4030_madc_remove Arnd Bergmann
@ 2013-03-06 1:01 ` Tony Lindgren
0 siblings, 0 replies; 28+ messages in thread
From: Tony Lindgren @ 2013-03-06 1:01 UTC (permalink / raw)
To: linux-arm-kernel
* Arnd Bergmann <arnd@arndb.de> [130305 14:23]:
> 4740f73fe5 "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.
Acked-by: Tony Lindgren <tony@atomide.com>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 4/9] usb: gadget: fix omap_udc build errors
2013-03-05 22:16 [PATCH 0/9] fixes for ARM build regressions in 3.9-rc1 Arnd Bergmann
` (2 preceding siblings ...)
2013-03-05 22:16 ` [PATCH 3/9] mfd: remove __exit_p annotation for twl4030_madc_remove Arnd Bergmann
@ 2013-03-05 22:16 ` Arnd Bergmann
2013-03-05 22:22 ` Felipe Balbi
2013-03-05 22:16 ` [PATCH 5/9] ARM: omap1: add back missing includes Arnd Bergmann
` (4 subsequent siblings)
8 siblings, 1 reply; 28+ messages in thread
From: Arnd Bergmann @ 2013-03-05 22:16 UTC (permalink / raw)
To: linux-arm-kernel
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 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.
Cc: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/usb/gadget/omap_udc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 06be85c..f844565 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -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);
--
1.8.1.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 4/9] usb: gadget: fix omap_udc build errors
2013-03-05 22:16 ` [PATCH 4/9] usb: gadget: fix omap_udc build errors Arnd Bergmann
@ 2013-03-05 22:22 ` Felipe Balbi
2013-03-06 0:44 ` Greg Kroah-Hartman
0 siblings, 1 reply; 28+ messages in thread
From: Felipe Balbi @ 2013-03-05 22:22 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Tue, Mar 05, 2013 at 11:16:44PM +0100, Arnd Bergmann wrote:
> 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 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.
>
> Cc: Felipe Balbi <balbi@ti.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/usb/gadget/omap_udc.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
> index 06be85c..f844565 100644
> --- a/drivers/usb/gadget/omap_udc.c
> +++ b/drivers/usb/gadget/omap_udc.c
> @@ -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);
good catch, thanks. I'll queue it for v3.6-rc3. Make sure to Cc
linux-usb for anything under drivers/usb/ though
--
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>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 4/9] usb: gadget: fix omap_udc build errors
2013-03-05 22:22 ` Felipe Balbi
@ 2013-03-06 0:44 ` Greg Kroah-Hartman
2013-03-06 8:05 ` Felipe Balbi
0 siblings, 1 reply; 28+ messages in thread
From: Greg Kroah-Hartman @ 2013-03-06 0:44 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Mar 06, 2013 at 12:22:24AM +0200, Felipe Balbi wrote:
> Hi,
>
> On Tue, Mar 05, 2013 at 11:16:44PM +0100, Arnd Bergmann wrote:
> > 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 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.
> >
> > Cc: Felipe Balbi <balbi@ti.com>
> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> > drivers/usb/gadget/omap_udc.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
> > index 06be85c..f844565 100644
> > --- a/drivers/usb/gadget/omap_udc.c
> > +++ b/drivers/usb/gadget/omap_udc.c
> > @@ -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);
>
> 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
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 4/9] usb: gadget: fix omap_udc build errors
2013-03-06 0:44 ` Greg Kroah-Hartman
@ 2013-03-06 8:05 ` Felipe Balbi
0 siblings, 0 replies; 28+ messages in thread
From: Felipe Balbi @ 2013-03-06 8:05 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Wed, Mar 06, 2013 at 08:44:25AM +0800, Greg Kroah-Hartman wrote:
> On Wed, Mar 06, 2013 at 12:22:24AM +0200, Felipe Balbi wrote:
> > Hi,
> >
> > On Tue, Mar 05, 2013 at 11:16:44PM +0100, Arnd Bergmann wrote:
> > > 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 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.
> > >
> > > Cc: Felipe Balbi <balbi@ti.com>
> > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > > ---
> > > drivers/usb/gadget/omap_udc.c | 3 ++-
> > > 1 file changed, 2 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
> > > index 06be85c..f844565 100644
> > > --- a/drivers/usb/gadget/omap_udc.c
> > > +++ b/drivers/usb/gadget/omap_udc.c
> > > @@ -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);
> >
> > 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 :)
right
> I can take this patch right now, if you ack it.
ok thanks:
Acked-by: Felipe Balbi <balbi@ti.com>
--
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>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 5/9] ARM: omap1: add back missing includes
2013-03-05 22:16 [PATCH 0/9] fixes for ARM build regressions in 3.9-rc1 Arnd Bergmann
` (3 preceding siblings ...)
2013-03-05 22:16 ` [PATCH 4/9] usb: gadget: fix omap_udc build errors Arnd Bergmann
@ 2013-03-05 22:16 ` Arnd Bergmann
2013-03-05 22:27 ` Arnd Bergmann
2013-03-05 22:16 ` [PATCH 6/9] [media] ir-rx51: fix clock API related build issues Arnd Bergmann
` (3 subsequent siblings)
8 siblings, 1 reply; 28+ messages in thread
From: Arnd Bergmann @ 2013-03-05 22:16 UTC (permalink / raw)
To: linux-arm-kernel
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.h and mach/hardware.h
in all files that need them for an OMAP1 allyesconfig build.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Tony Lindgren <tony@atomide.com>
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(+)
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index 702d580..512b33a 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -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"
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 0dac3d2..99ee4d7 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -47,6 +47,7 @@
#include <mach/hardware.h>
#include <mach/usb.h>
+#include <mach/irqs.h>
#include "common.h"
#include "board-h2.h"
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 8b2f712..403efcc 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -31,6 +31,7 @@
#include <mach/tc.h>
#include <mach/mux.h>
#include <mach/flash.h>
+#include <mach/irqs.h>
#include <mach/hardware.h>
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index 9732a98..b31e77c 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -43,6 +43,7 @@
#include <mach/hardware.h>
#include <mach/usb.h>
+#include <mach/irqs.h>
#include "common.h"
#include "dma.h"
diff --git a/drivers/video/omap/lcd_ams_delta.c b/drivers/video/omap/lcd_ams_delta.c
index ed4cad8..7539276 100644
--- a/drivers/video/omap/lcd_ams_delta.c
+++ b/drivers/video/omap/lcd_ams_delta.c
@@ -28,6 +28,7 @@
#include <linux/gpio.h>
#include <mach/board-ams-delta.h>
+#include <mach/hardware.h>
#include "omapfb.h"
diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c
index 3aa62da..cad2338 100644
--- a/drivers/video/omap/lcd_osk.c
+++ b/drivers/video/omap/lcd_osk.c
@@ -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)
--
1.8.1.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 5/9] ARM: omap1: add back missing includes
2013-03-05 22:16 ` [PATCH 5/9] ARM: omap1: add back missing includes Arnd Bergmann
@ 2013-03-05 22:27 ` Arnd Bergmann
2013-03-06 0:59 ` Tony Lindgren
0 siblings, 1 reply; 28+ messages in thread
From: Arnd Bergmann @ 2013-03-05 22:27 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 05 March 2013, Arnd Bergmann wrote:
> 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.h and mach/hardware.h
> in all files that need them for an OMAP1 allyesconfig build.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Tony Lindgren <tony@atomide.com>
> 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(+)
I saw that Tony has already addressed the latter two changes, but
did not see a fix for the four board files.
Arnd
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 5/9] ARM: omap1: add back missing includes
2013-03-05 22:27 ` Arnd Bergmann
@ 2013-03-06 0:59 ` Tony Lindgren
2013-03-06 11:23 ` Arnd Bergmann
0 siblings, 1 reply; 28+ messages in thread
From: Tony Lindgren @ 2013-03-06 0:59 UTC (permalink / raw)
To: linux-arm-kernel
* Arnd Bergmann <arnd@arndb.de> [130305 14:31]:
> On Tuesday 05 March 2013, Arnd Bergmann wrote:
> > 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.h and mach/hardware.h
> > in all files that need them for an OMAP1 allyesconfig build.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Cc: Tony Lindgren <tony@atomide.com>
> > 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(+)
>
> 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 <tony@atomide.com>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 5/9] ARM: omap1: add back missing includes
2013-03-06 0:59 ` Tony Lindgren
@ 2013-03-06 11:23 ` Arnd Bergmann
2013-03-06 17:44 ` Tony Lindgren
0 siblings, 1 reply; 28+ messages in thread
From: Arnd Bergmann @ 2013-03-06 11:23 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday 06 March 2013, Tony Lindgren wrote:
> * Arnd Bergmann <arnd@arndb.de> [130305 14:31]:
> > On Tuesday 05 March 2013, Arnd Bergmann wrote:
> > > 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.h and mach/hardware.h
> > > in all files that need them for an OMAP1 allyesconfig build.
> > >
> > > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > > Cc: Tony Lindgren <tony@atomide.com>
> > > 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(+)
> >
> > 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 <tony@atomide.com>
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
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 5/9] ARM: omap1: add back missing includes
2013-03-06 11:23 ` Arnd Bergmann
@ 2013-03-06 17:44 ` Tony Lindgren
0 siblings, 0 replies; 28+ messages in thread
From: Tony Lindgren @ 2013-03-06 17:44 UTC (permalink / raw)
To: linux-arm-kernel
* Arnd Bergmann <arnd@arndb.de> [130306 03:27]:
> On Wednesday 06 March 2013, Tony Lindgren wrote:
> > * Arnd Bergmann <arnd@arndb.de> [130305 14:31]:
> > > On Tuesday 05 March 2013, Arnd Bergmann wrote:
> > > > 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.h and mach/hardware.h
> > > > in all files that need them for an OMAP1 allyesconfig build.
> > > >
> > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > > > Cc: Tony Lindgren <tony@atomide.com>
> > > > 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(+)
> > >
> > > 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 <tony@atomide.com>
>
> 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.
OK sounds good to me.
Tony
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 6/9] [media] ir-rx51: fix clock API related build issues
2013-03-05 22:16 [PATCH 0/9] fixes for ARM build regressions in 3.9-rc1 Arnd Bergmann
` (4 preceding siblings ...)
2013-03-05 22:16 ` [PATCH 5/9] ARM: omap1: add back missing includes Arnd Bergmann
@ 2013-03-05 22:16 ` Arnd Bergmann
2013-03-06 0:23 ` Mauro Carvalho Chehab
2013-03-05 22:16 ` [PATCH 7/9] [media] s5p-fimc: fix s5pv210 build Arnd Bergmann
` (2 subsequent siblings)
8 siblings, 1 reply; 28+ messages in thread
From: Arnd Bergmann @ 2013-03-05 22:16 UTC (permalink / raw)
To: linux-arm-kernel
OMAP1 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.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Timo Kokkonen <timo.t.kokkonen@iki.fi>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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(-)
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index a0daa2f..ea133e5 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -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();
diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c
index 8ead492..d1364a1 100644
--- a/drivers/media/rc/ir-rx51.c
+++ b/drivers/media/rc/ir-rx51.c
@@ -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;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 6/9] [media] ir-rx51: fix clock API related build issues
2013-03-05 22:16 ` [PATCH 6/9] [media] ir-rx51: fix clock API related build issues Arnd Bergmann
@ 2013-03-06 0:23 ` Mauro Carvalho Chehab
2013-03-06 1:09 ` Tony Lindgren
0 siblings, 1 reply; 28+ messages in thread
From: Mauro Carvalho Chehab @ 2013-03-06 0:23 UTC (permalink / raw)
To: linux-arm-kernel
Em Tue, 5 Mar 2013 23:16:46 +0100
Arnd Bergmann <arnd@arndb.de> escreveu:
> OMAP1 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.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
>From my side:
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
> Cc: Timo Kokkonen <timo.t.kokkonen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 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(-)
>
> diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
> index a0daa2f..ea133e5 100644
> --- a/arch/arm/plat-omap/dmtimer.c
> +++ b/arch/arm/plat-omap/dmtimer.c
> @@ -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();
> diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c
> index 8ead492..d1364a1 100644
> --- a/drivers/media/rc/ir-rx51.c
> +++ b/drivers/media/rc/ir-rx51.c
> @@ -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;
>
--
Cheers,
Mauro
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 6/9] [media] ir-rx51: fix clock API related build issues
2013-03-06 0:23 ` Mauro Carvalho Chehab
@ 2013-03-06 1:09 ` Tony Lindgren
2013-03-06 6:22 ` Timo Kokkonen
0 siblings, 1 reply; 28+ messages in thread
From: Tony Lindgren @ 2013-03-06 1:09 UTC (permalink / raw)
To: linux-arm-kernel
* Mauro Carvalho Chehab <mchehab@redhat.com> [130305 16:28]:
> Em Tue, 5 Mar 2013 23:16:46 +0100
> Arnd Bergmann <arnd@arndb.de> escreveu:
>
> > OMAP1 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.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
>
> From my side:
> Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
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.
> > --- a/arch/arm/plat-omap/dmtimer.c
> > +++ b/arch/arm/plat-omap/dmtimer.c
> > @@ -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();
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
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 6/9] [media] ir-rx51: fix clock API related build issues
2013-03-06 1:09 ` Tony Lindgren
@ 2013-03-06 6:22 ` Timo Kokkonen
2013-03-06 17:16 ` Tony Lindgren
0 siblings, 1 reply; 28+ messages in thread
From: Timo Kokkonen @ 2013-03-06 6:22 UTC (permalink / raw)
To: linux-arm-kernel
On 03.05 2013 17:09:53, Tony Lindgren wrote:
> * Mauro Carvalho Chehab <mchehab@redhat.com> [130305 16:28]:
> > Em Tue, 5 Mar 2013 23:16:46 +0100
> > Arnd Bergmann <arnd@arndb.de> escreveu:
> >
> > > OMAP1 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.
> > >
> > > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > > Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
> >
> > From my side:
> > Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
>
> 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.
>
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
> > > --- a/arch/arm/plat-omap/dmtimer.c
> > > +++ b/arch/arm/plat-omap/dmtimer.c
> > > @@ -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();
>
> 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
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 6/9] [media] ir-rx51: fix clock API related build issues
2013-03-06 6:22 ` Timo Kokkonen
@ 2013-03-06 17:16 ` Tony Lindgren
0 siblings, 0 replies; 28+ messages in thread
From: Tony Lindgren @ 2013-03-06 17:16 UTC (permalink / raw)
To: linux-arm-kernel
* Timo Kokkonen <timo.t.kokkonen@iki.fi> [130305 22:26]:
> On 03.05 2013 17:09:53, Tony Lindgren wrote:
> > * Mauro Carvalho Chehab <mchehab@redhat.com> [130305 16:28]:
> > > Em Tue, 5 Mar 2013 23:16:46 +0100
> > > Arnd Bergmann <arnd@arndb.de> escreveu:
> > >
> > > > OMAP1 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.
> > > >
> > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > > > Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
> > >
> > > From my side:
> > > Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
> >
> > 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.
> >
>
> 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.
> 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
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 7/9] [media] s5p-fimc: fix s5pv210 build
2013-03-05 22:16 [PATCH 0/9] fixes for ARM build regressions in 3.9-rc1 Arnd Bergmann
` (5 preceding siblings ...)
2013-03-05 22:16 ` [PATCH 6/9] [media] ir-rx51: fix clock API related build issues Arnd Bergmann
@ 2013-03-05 22:16 ` Arnd Bergmann
2013-03-06 23:48 ` Kukjin Kim
2013-03-05 22:16 ` [PATCH 8/9] iommu: OMAP: build only on OMAP2+ Arnd Bergmann
2013-03-05 22:16 ` [PATCH 9/9] ARM: spear3xx: Use correct pl080 header file Arnd Bergmann
8 siblings, 1 reply; 28+ messages in thread
From: Arnd Bergmann @ 2013-03-05 22:16 UTC (permalink / raw)
To: linux-arm-kernel
56bc911 "[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.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
---
arch/arm/mach-s5pv210/mach-goni.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 3a38f7b..e373de4 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -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
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 7/9] [media] s5p-fimc: fix s5pv210 build
2013-03-05 22:16 ` [PATCH 7/9] [media] s5p-fimc: fix s5pv210 build Arnd Bergmann
@ 2013-03-06 23:48 ` Kukjin Kim
0 siblings, 0 replies; 28+ messages in thread
From: Kukjin Kim @ 2013-03-06 23:48 UTC (permalink / raw)
To: linux-arm-kernel
Arnd Bergmann wrote:
>
> 56bc911 "[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.
>
I'm fine if this can be fixed soon.
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
> ---
> arch/arm/mach-s5pv210/mach-goni.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-
> s5pv210/mach-goni.c
> index 3a38f7b..e373de4 100644
> --- a/arch/arm/mach-s5pv210/mach-goni.c
> +++ b/arch/arm/mach-s5pv210/mach-goni.c
> @@ -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
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 8/9] iommu: OMAP: build only on OMAP2+
2013-03-05 22:16 [PATCH 0/9] fixes for ARM build regressions in 3.9-rc1 Arnd Bergmann
` (6 preceding siblings ...)
2013-03-05 22:16 ` [PATCH 7/9] [media] s5p-fimc: fix s5pv210 build Arnd Bergmann
@ 2013-03-05 22:16 ` Arnd Bergmann
2013-03-06 1:10 ` Tony Lindgren
2013-03-09 18:02 ` Joerg Roedel
2013-03-05 22:16 ` [PATCH 9/9] ARM: spear3xx: Use correct pl080 header file Arnd Bergmann
8 siblings, 2 replies; 28+ messages in thread
From: Arnd Bergmann @ 2013-03-05 22:16 UTC (permalink / raw)
To: linux-arm-kernel
The OMAP IOMMU driver intentionally fails to build on OMAP1
platforms, so we should not allow enabling it there.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: iommu at lists.linux-foundation.org
Cc: Ohad Ben-Cohen <ohad@wizery.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Omar Ramirez Luna <omar.luna@linaro.org>
---
drivers/iommu/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 5c514d07..c332fb9 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -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
--
1.8.1.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 8/9] iommu: OMAP: build only on OMAP2+
2013-03-05 22:16 ` [PATCH 8/9] iommu: OMAP: build only on OMAP2+ Arnd Bergmann
@ 2013-03-06 1:10 ` Tony Lindgren
2013-03-09 18:02 ` Joerg Roedel
1 sibling, 0 replies; 28+ messages in thread
From: Tony Lindgren @ 2013-03-06 1:10 UTC (permalink / raw)
To: linux-arm-kernel
* Arnd Bergmann <arnd@arndb.de> [130305 14:21]:
> The OMAP IOMMU driver intentionally fails to build on OMAP1
> platforms, so we should not allow enabling it there.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Joerg Roedel <joro@8bytes.org>
> Cc: iommu at lists.linux-foundation.org
> Cc: Ohad Ben-Cohen <ohad@wizery.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Omar Ramirez Luna <omar.luna@linaro.org>
Makes sense, I doubt that anybody will work on omap1 version
at this point:
Acked-by: Tony Lindgren <tony@atomide.com>
> ---
> drivers/iommu/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
> index 5c514d07..c332fb9 100644
> --- a/drivers/iommu/Kconfig
> +++ b/drivers/iommu/Kconfig
> @@ -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
> --
> 1.8.1.2
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 8/9] iommu: OMAP: build only on OMAP2+
2013-03-05 22:16 ` [PATCH 8/9] iommu: OMAP: build only on OMAP2+ Arnd Bergmann
2013-03-06 1:10 ` Tony Lindgren
@ 2013-03-09 18:02 ` Joerg Roedel
1 sibling, 0 replies; 28+ messages in thread
From: Joerg Roedel @ 2013-03-09 18:02 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Mar 05, 2013 at 11:16:48PM +0100, Arnd Bergmann wrote:
> The OMAP IOMMU driver intentionally fails to build on OMAP1
> platforms, so we should not allow enabling it there.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Joerg Roedel <joro@8bytes.org>
> Cc: iommu at lists.linux-foundation.org
> Cc: Ohad Ben-Cohen <ohad@wizery.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Omar Ramirez Luna <omar.luna@linaro.org>
Applied to iommu/fixes, thanks Arnd.
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 9/9] ARM: spear3xx: Use correct pl080 header file
2013-03-05 22:16 [PATCH 0/9] fixes for ARM build regressions in 3.9-rc1 Arnd Bergmann
` (7 preceding siblings ...)
2013-03-05 22:16 ` [PATCH 8/9] iommu: OMAP: build only on OMAP2+ Arnd Bergmann
@ 2013-03-05 22:16 ` Arnd Bergmann
2013-03-05 23:13 ` Viresh Kumar
8 siblings, 1 reply; 28+ messages in thread
From: Arnd Bergmann @ 2013-03-05 22:16 UTC (permalink / raw)
To: linux-arm-kernel
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)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Alessandro Rubini <rubini@gnudd.com>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
---
arch/arm/mach-spear3xx/spear3xx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c
index f9d754f..d2b3937 100644
--- a/arch/arm/mach-spear3xx/spear3xx.c
+++ b/arch/arm/mach-spear3xx/spear3xx.c
@@ -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>
--
1.8.1.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 9/9] ARM: spear3xx: Use correct pl080 header file
2013-03-05 22:16 ` [PATCH 9/9] ARM: spear3xx: Use correct pl080 header file Arnd Bergmann
@ 2013-03-05 23:13 ` Viresh Kumar
2013-03-11 22:34 ` Arnd Bergmann
0 siblings, 1 reply; 28+ messages in thread
From: Viresh Kumar @ 2013-03-05 23:13 UTC (permalink / raw)
To: linux-arm-kernel
On 6 March 2013 06:16, Arnd Bergmann <arnd@arndb.de> wrote:
> 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)
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Alessandro Rubini <rubini@gnudd.com>
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> ---
> 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 :)
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 9/9] ARM: spear3xx: Use correct pl080 header file
2013-03-05 23:13 ` Viresh Kumar
@ 2013-03-11 22:34 ` Arnd Bergmann
2013-03-12 0:53 ` Viresh Kumar
0 siblings, 1 reply; 28+ messages in thread
From: Arnd Bergmann @ 2013-03-11 22:34 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 05 March 2013, Viresh Kumar wrote:
> On 6 March 2013 06:16, Arnd Bergmann <arnd@arndb.de> wrote:
> > 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)
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Cc: Alessandro Rubini <rubini@gnudd.com>
> > Cc: Viresh Kumar <viresh.kumar@linaro.org>
> > ---
> > 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 :)
Are you going to send a pull request for that one then? Another -rc has
just passed with the platform being broken.
Arnd
^ permalink raw reply [flat|nested] 28+ messages in thread