github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 15:41:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Fixes for omaps that were not considered urgent for the -rc series.

Browse Source 
Just minor build fixes, removal of dead code, and a patch to
 use the die ID for increasing boot time entropy.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJSWIVkAAoJEBvUPslcq6VzTnIP/0ESo8J0mhNc/HSKLFMea78B
 5RatLlaImKUkS2+vRe17zU5dZxVHKrSAHd+YpET4oA/0h5fAKOiUoHhZnUR06T9b
 5T6zFUxGjTxJUxR5QpSCPxWMJG0Q4o/ARYQOaDAwhkOJlTIRjh+0UfLq/RadVKjT
 QgDe04xybf/7IiJYnoT5KLCqcv/F8XWTh/2vikOxA+UJMey0LNqI8mPnuTsu9NjU
 pRP5ykLZ59FdLh9c/XO3PPgE0e3CASH57+QKoZDU1ptfF7yxRHqTs7KTU/fE+rnr
 v1WGVMVcZrm78aRt/D0b6Zy2ZAhIaD8+Eu6Bg/xdjDjNtUXYxu8rcZ/80QRgMQFp
 N/YKBPj95OC4lAwRwSxYF5oOPUVvIt1QkhbiG4Sc01FYidS/n2I+4uFhtTNBN0J8
 qr+3ARjwpZNVolBpbJXKL/ugJ8ppewPf2AdfVqmJEKnwwxJ/zsWX+UQ0pgrHpyXN
 WKVE63CYjagdQGS0LsseUgCkKPuDPsKTM3SCrli0KTzMdXuDebrspy0p+uf+vUFm
 14xjUpG/x35l5dov8rY2j/uL1ICr+OwXspb6budSQxDUNm1JM9GSsweWgLDWXMD3
 5i+RnFCKAp8QcbLwSE+lYLxH4yrIG6DY+mSoaZC3XclLObnNxMePNDKVizSCsqwx
 T1/BQouAcPq05Er1Y2a7
 =OIb7
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.13/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes-non-critical

From Tony Lindgren:
Fixes for omaps that were not considered urgent for the -rc series.
Just minor build fixes, removal of dead code, and a patch to
use the die ID for increasing boot time entropy.

* tag 'omap-for-v3.13/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: mach-omap1: Fix omap1510_fpga_init_irq() implicit declarations.
  ARM: OMAP1: fix incorrect placement of __initdata tag
  ARM: OMAP: remove deprecated IRQF_DISABLED
  ARM: OMAP2+: throw the die id into the entropy pool

Signed-off-by: Kevin Hilman <khilman@linaro.org>
This commit is contained in:
Kevin Hilman 2013-10-14 15:25:21 -07:00
commit 20b2f1ac85
11 changed files with 49 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-omap1/common.h
View File

@ -46,6 +46,9 @@ static inline void omap7xx_map_io(void)
void omap1510_fpga_init_irq(void);
void omap15xx_map_io(void);
#else
static inline void omap1510_fpga_init_irq(void)
{
}
static inline void omap15xx_map_io(void)
{
}

3
arch/arm/mach-omap1/fpga.c
View File

@ -135,8 +135,7 @@ static struct irq_chip omap_fpga_irq = {
* mask_ack routine for all of the FPGA interrupts has been changed from
* fpga_mask_ack_irq() to fpga_ack_irq() so that the specific FPGA interrupt
* being serviced is left unmasked. We can do this because the FPGA cascade
* interrupt is installed with the IRQF_DISABLED flag, which leaves all
* interrupts masked at the CPU while an FPGA interrupt handler executes.
* interrupt is run with all interrupts masked.
*
* Limited testing indicates that this workaround appears to be effective
* for the smc9194 Ethernet driver used on the Innovator. It should work

8
arch/arm/mach-omap1/gpio15xx.c
View File

@ -25,7 +25,7 @@
#define OMAP1510_GPIO_BASE 0xFFFCE000
/* gpio1 */
static struct __initdata resource omap15xx_mpu_gpio_resources[] = {
static struct resource omap15xx_mpu_gpio_resources[] __initdata = {
{
.start = OMAP1_MPUIO_VBASE,
.end = OMAP1_MPUIO_VBASE + SZ_2K - 1,
@ -48,7 +48,7 @@ static struct omap_gpio_reg_offs omap15xx_mpuio_regs = {
.irqctrl = OMAP_MPUIO_GPIO_INT_EDGE,
};
static struct __initdata omap_gpio_platform_data omap15xx_mpu_gpio_config = {
static struct omap_gpio_platform_data omap15xx_mpu_gpio_config __initdata = {
.is_mpuio = true,
.bank_width = 16,
.bank_stride = 1,
@ -66,7 +66,7 @@ static struct platform_device omap15xx_mpu_gpio = {
};
/* gpio2 */
static struct __initdata resource omap15xx_gpio_resources[] = {
static struct resource omap15xx_gpio_resources[] __initdata = {
{
.start = OMAP1510_GPIO_BASE,
.end = OMAP1510_GPIO_BASE + SZ_2K - 1,
@ -90,7 +90,7 @@ static struct omap_gpio_reg_offs omap15xx_gpio_regs = {
.pinctrl = OMAP1510_GPIO_PIN_CONTROL,
};
static struct __initdata omap_gpio_platform_data omap15xx_gpio_config = {
static struct omap_gpio_platform_data omap15xx_gpio_config __initdata = {
.bank_width = 16,
.regs = &omap15xx_gpio_regs,
};

22
arch/arm/mach-omap1/gpio16xx.c
View File

@ -31,7 +31,7 @@
#define SYSCONFIG_WORD 0x14
/* mpu gpio */
static struct __initdata resource omap16xx_mpu_gpio_resources[] = {
static struct resource omap16xx_mpu_gpio_resources[] __initdata = {
{
.start = OMAP1_MPUIO_VBASE,
.end = OMAP1_MPUIO_VBASE + SZ_2K - 1,
@ -54,7 +54,7 @@ static struct omap_gpio_reg_offs omap16xx_mpuio_regs = {
.irqctrl = OMAP_MPUIO_GPIO_INT_EDGE,
};
static struct __initdata omap_gpio_platform_data omap16xx_mpu_gpio_config = {
static struct omap_gpio_platform_data omap16xx_mpu_gpio_config __initdata = {
.is_mpuio = true,
.bank_width = 16,
.bank_stride = 1,
@ -72,7 +72,7 @@ static struct platform_device omap16xx_mpu_gpio = {
};
/* gpio1 */
static struct __initdata resource omap16xx_gpio1_resources[] = {
static struct resource omap16xx_gpio1_resources[] __initdata = {
{
.start = OMAP1610_GPIO1_BASE,
.end = OMAP1610_GPIO1_BASE + SZ_2K - 1,
@ -100,7 +100,7 @@ static struct omap_gpio_reg_offs omap16xx_gpio_regs = {
.edgectrl2 = OMAP1610_GPIO_EDGE_CTRL2,
};
static struct __initdata omap_gpio_platform_data omap16xx_gpio1_config = {
static struct omap_gpio_platform_data omap16xx_gpio1_config __initdata = {
.bank_width = 16,
.regs = &omap16xx_gpio_regs,
};
@ -116,7 +116,7 @@ static struct platform_device omap16xx_gpio1 = {
};
/* gpio2 */
static struct __initdata resource omap16xx_gpio2_resources[] = {
static struct resource omap16xx_gpio2_resources[] __initdata = {
{
.start = OMAP1610_GPIO2_BASE,
.end = OMAP1610_GPIO2_BASE + SZ_2K - 1,
@ -128,7 +128,7 @@ static struct __initdata resource omap16xx_gpio2_resources[] = {
},
};
static struct __initdata omap_gpio_platform_data omap16xx_gpio2_config = {
static struct omap_gpio_platform_data omap16xx_gpio2_config __initdata = {
.bank_width = 16,
.regs = &omap16xx_gpio_regs,
};
@ -144,7 +144,7 @@ static struct platform_device omap16xx_gpio2 = {
};
/* gpio3 */
static struct __initdata resource omap16xx_gpio3_resources[] = {
static struct resource omap16xx_gpio3_resources[] __initdata = {
{
.start = OMAP1610_GPIO3_BASE,
.end = OMAP1610_GPIO3_BASE + SZ_2K - 1,
@ -156,7 +156,7 @@ static struct __initdata resource omap16xx_gpio3_resources[] = {
},
};
static struct __initdata omap_gpio_platform_data omap16xx_gpio3_config = {
static struct omap_gpio_platform_data omap16xx_gpio3_config __initdata = {
.bank_width = 16,
.regs = &omap16xx_gpio_regs,
};
@ -172,7 +172,7 @@ static struct platform_device omap16xx_gpio3 = {
};
/* gpio4 */
static struct __initdata resource omap16xx_gpio4_resources[] = {
static struct resource omap16xx_gpio4_resources[] __initdata = {
{
.start = OMAP1610_GPIO4_BASE,
.end = OMAP1610_GPIO4_BASE + SZ_2K - 1,
@ -184,7 +184,7 @@ static struct __initdata resource omap16xx_gpio4_resources[] = {
},
};
static struct __initdata omap_gpio_platform_data omap16xx_gpio4_config = {
static struct omap_gpio_platform_data omap16xx_gpio4_config __initdata = {
.bank_width = 16,
.regs = &omap16xx_gpio_regs,
};
@ -199,7 +199,7 @@ static struct platform_device omap16xx_gpio4 = {
.resource = omap16xx_gpio4_resources,
};
static struct __initdata platform_device * omap16xx_gpio_dev[] = {
static struct platform_device *omap16xx_gpio_dev[] __initdata = {
&omap16xx_mpu_gpio,
&omap16xx_gpio1,
&omap16xx_gpio2,

30
arch/arm/mach-omap1/gpio7xx.c
View File

@ -30,7 +30,7 @@
#define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE
/* mpu gpio */
static struct __initdata resource omap7xx_mpu_gpio_resources[] = {
static struct resource omap7xx_mpu_gpio_resources[] __initdata = {
{
.start = OMAP1_MPUIO_VBASE,
.end = OMAP1_MPUIO_VBASE + SZ_2K - 1,
@ -53,7 +53,7 @@ static struct omap_gpio_reg_offs omap7xx_mpuio_regs = {
.irqctrl = OMAP_MPUIO_GPIO_INT_EDGE >> 1,
};
static struct __initdata omap_gpio_platform_data omap7xx_mpu_gpio_config = {
static struct omap_gpio_platform_data omap7xx_mpu_gpio_config __initdata = {
.is_mpuio = true,
.bank_width = 16,
.bank_stride = 2,
@ -71,7 +71,7 @@ static struct platform_device omap7xx_mpu_gpio = {
};
/* gpio1 */
static struct __initdata resource omap7xx_gpio1_resources[] = {
static struct resource omap7xx_gpio1_resources[] __initdata = {
{
.start = OMAP7XX_GPIO1_BASE,
.end = OMAP7XX_GPIO1_BASE + SZ_2K - 1,
@ -94,7 +94,7 @@ static struct omap_gpio_reg_offs omap7xx_gpio_regs = {
.irqctrl = OMAP7XX_GPIO_INT_CONTROL,
};
static struct __initdata omap_gpio_platform_data omap7xx_gpio1_config = {
static struct omap_gpio_platform_data omap7xx_gpio1_config __initdata = {
.bank_width = 32,
.regs = &omap7xx_gpio_regs,
};
@ -110,7 +110,7 @@ static struct platform_device omap7xx_gpio1 = {
};
/* gpio2 */
static struct __initdata resource omap7xx_gpio2_resources[] = {
static struct resource omap7xx_gpio2_resources[] __initdata = {
{
.start = OMAP7XX_GPIO2_BASE,
.end = OMAP7XX_GPIO2_BASE + SZ_2K - 1,
@ -122,7 +122,7 @@ static struct __initdata resource omap7xx_gpio2_resources[] = {
},
};
static struct __initdata omap_gpio_platform_data omap7xx_gpio2_config = {
static struct omap_gpio_platform_data omap7xx_gpio2_config __initdata = {
.bank_width = 32,
.regs = &omap7xx_gpio_regs,
};
@ -138,7 +138,7 @@ static struct platform_device omap7xx_gpio2 = {
};
/* gpio3 */
static struct __initdata resource omap7xx_gpio3_resources[] = {
static struct resource omap7xx_gpio3_resources[] __initdata = {
{
.start = OMAP7XX_GPIO3_BASE,
.end = OMAP7XX_GPIO3_BASE + SZ_2K - 1,
@ -150,7 +150,7 @@ static struct __initdata resource omap7xx_gpio3_resources[] = {
},
};
static struct __initdata omap_gpio_platform_data omap7xx_gpio3_config = {
static struct omap_gpio_platform_data omap7xx_gpio3_config __initdata = {
.bank_width = 32,
.regs = &omap7xx_gpio_regs,
};
@ -166,7 +166,7 @@ static struct platform_device omap7xx_gpio3 = {
};
/* gpio4 */
static struct __initdata resource omap7xx_gpio4_resources[] = {
static struct resource omap7xx_gpio4_resources[] __initdata = {
{
.start = OMAP7XX_GPIO4_BASE,
.end = OMAP7XX_GPIO4_BASE + SZ_2K - 1,
@ -178,7 +178,7 @@ static struct __initdata resource omap7xx_gpio4_resources[] = {
},
};
static struct __initdata omap_gpio_platform_data omap7xx_gpio4_config = {
static struct omap_gpio_platform_data omap7xx_gpio4_config __initdata = {
.bank_width = 32,
.regs = &omap7xx_gpio_regs,
};
@ -194,7 +194,7 @@ static struct platform_device omap7xx_gpio4 = {
};
/* gpio5 */
static struct __initdata resource omap7xx_gpio5_resources[] = {
static struct resource omap7xx_gpio5_resources[] __initdata = {
{
.start = OMAP7XX_GPIO5_BASE,
.end = OMAP7XX_GPIO5_BASE + SZ_2K - 1,
@ -206,7 +206,7 @@ static struct __initdata resource omap7xx_gpio5_resources[] = {
},
};
static struct __initdata omap_gpio_platform_data omap7xx_gpio5_config = {
static struct omap_gpio_platform_data omap7xx_gpio5_config __initdata = {
.bank_width = 32,
.regs = &omap7xx_gpio_regs,
};
@ -222,7 +222,7 @@ static struct platform_device omap7xx_gpio5 = {
};
/* gpio6 */
static struct __initdata resource omap7xx_gpio6_resources[] = {
static struct resource omap7xx_gpio6_resources[] __initdata = {
{
.start = OMAP7XX_GPIO6_BASE,
.end = OMAP7XX_GPIO6_BASE + SZ_2K - 1,
@ -234,7 +234,7 @@ static struct __initdata resource omap7xx_gpio6_resources[] = {
},
};
static struct __initdata omap_gpio_platform_data omap7xx_gpio6_config = {
static struct omap_gpio_platform_data omap7xx_gpio6_config __initdata = {
.bank_width = 32,
.regs = &omap7xx_gpio_regs,
};
@ -249,7 +249,7 @@ static struct platform_device omap7xx_gpio6 = {
.resource = omap7xx_gpio6_resources,
};
static struct __initdata platform_device * omap7xx_gpio_dev[] = {
static struct platform_device *omap7xx_gpio_dev[] __initdata = {
&omap7xx_mpu_gpio,
&omap7xx_gpio1,
&omap7xx_gpio2,

1
arch/arm/mach-omap1/pm.c
View File

@ -628,7 +628,6 @@ static irqreturn_t omap_wakeup_interrupt(int irq, void *dev)
static struct irqaction omap_wakeup_irq = {
.name = "peripheral wakeup",
.flags = IRQF_DISABLED,
.handler = omap_wakeup_interrupt
};

2
arch/arm/mach-omap1/time.c
View File

@ -160,7 +160,7 @@ static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id)
static struct irqaction omap_mpu_timer1_irq = {
.name = "mpu_timer1",
.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
.flags = IRQF_TIMER | IRQF_IRQPOLL,
.handler = omap_mpu_timer1_interrupt,
};

2
arch/arm/mach-omap1/timer32k.c
View File

@ -156,7 +156,7 @@ static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id)
static struct irqaction omap_32k_timer_irq = {
.name = "32KHz timer",
.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
.flags = IRQF_TIMER | IRQF_IRQPOLL,
.handler = omap_32k_timer_interrupt,
};

12
arch/arm/mach-omap2/id.c
View File

@ -18,6 +18,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/io.h>
#include <linux/random.h>
#include <linux/slab.h>
#ifdef CONFIG_SOC_BUS
@ -130,6 +131,17 @@ void omap_get_die_id(struct omap_die_id *odi)
odi->id_3 = read_tap_reg(OMAP_TAP_DIE_ID_3);
}
static int __init omap_feed_randpool(void)
{
struct omap_die_id odi;
/* Throw the die ID into the entropy pool at boot */
omap_get_die_id(&odi);
add_device_randomness(&odi, sizeof(odi));
return 0;
}
omap_device_initcall(omap_feed_randpool);
void __init omap2xxx_check_revision(void)
{
int i, j;

2
arch/arm/mach-omap2/timer.c
View File

@ -78,7 +78,7 @@ static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id)
static struct irqaction omap2_gp_timer_irq = {
.name = "gp_timer",
.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
.flags = IRQF_TIMER | IRQF_IRQPOLL,
.handler = omap2_gp_timer_interrupt,
};

1
arch/arm/plat-omap/dma.c
View File

@ -1965,7 +1965,6 @@ static irqreturn_t omap2_dma_irq_handler(int irq, void *dev_id)
static struct irqaction omap24xx_dma_irq = {
.name = "DMA",
.handler = omap2_dma_irq_handler,
.flags = IRQF_DISABLED
};
#else