diff options
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r-- | arch/arm/plat-omap/common.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/dma.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/sram.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-omap/usb.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index dd8708ad0a7..7987aa6e95f 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c | |||
@@ -73,7 +73,7 @@ static const void *get_config(u16 tag, size_t len, int skip, size_t *len_out) | |||
73 | } | 73 | } |
74 | if (info != NULL) { | 74 | if (info != NULL) { |
75 | /* Check the length as a lame attempt to check for | 75 | /* Check the length as a lame attempt to check for |
76 | * binary inconsistancy. */ | 76 | * binary inconsistency. */ |
77 | if (len != NO_LENGTH_CHECK) { | 77 | if (len != NO_LENGTH_CHECK) { |
78 | /* Word-align len */ | 78 | /* Word-align len */ |
79 | if (len & 0x03) | 79 | if (len & 0x03) |
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 55a4d3be16b..88d5b6d9f95 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
@@ -1172,7 +1172,7 @@ static void set_b1_regs(void) | |||
1172 | break; | 1172 | break; |
1173 | default: | 1173 | default: |
1174 | BUG(); | 1174 | BUG(); |
1175 | return; /* Supress warning about uninitialized vars */ | 1175 | return; /* Suppress warning about uninitialized vars */ |
1176 | } | 1176 | } |
1177 | 1177 | ||
1178 | if (omap_dma_in_1510_mode()) { | 1178 | if (omap_dma_in_1510_mode()) { |
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index bc46f33aede..1f23f0459e5 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c | |||
@@ -59,8 +59,8 @@ extern unsigned long omapfb_reserve_sram(unsigned long sram_pstart, | |||
59 | 59 | ||
60 | /* | 60 | /* |
61 | * Depending on the target RAMFS firewall setup, the public usable amount of | 61 | * Depending on the target RAMFS firewall setup, the public usable amount of |
62 | * SRAM varies. The default accessable size for all device types is 2k. A GP | 62 | * SRAM varies. The default accessible size for all device types is 2k. A GP |
63 | * device allows ARM11 but not other initators for full size. This | 63 | * device allows ARM11 but not other initiators for full size. This |
64 | * functionality seems ok until some nice security API happens. | 64 | * functionality seems ok until some nice security API happens. |
65 | */ | 65 | */ |
66 | static int is_sram_locked(void) | 66 | static int is_sram_locked(void) |
@@ -71,7 +71,7 @@ static int is_sram_locked(void) | |||
71 | type = __raw_readl(VA_CONTROL_STAT) & TYPE_MASK; | 71 | type = __raw_readl(VA_CONTROL_STAT) & TYPE_MASK; |
72 | 72 | ||
73 | if (type == GP_DEVICE) { | 73 | if (type == GP_DEVICE) { |
74 | /* RAMFW: R/W access to all initators for all qualifier sets */ | 74 | /* RAMFW: R/W access to all initiators for all qualifier sets */ |
75 | if (cpu_is_omap242x()) { | 75 | if (cpu_is_omap242x()) { |
76 | __raw_writel(0xFF, VA_REQINFOPERM0); /* all q-vects */ | 76 | __raw_writel(0xFF, VA_REQINFOPERM0); /* all q-vects */ |
77 | __raw_writel(0xCFDE, VA_READPERM0); /* all i-read */ | 77 | __raw_writel(0xCFDE, VA_READPERM0); /* all i-read */ |
diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c index 25489aafb11..a5aedf964b8 100644 --- a/arch/arm/plat-omap/usb.c +++ b/arch/arm/plat-omap/usb.c | |||
@@ -177,7 +177,7 @@ static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device) | |||
177 | 177 | ||
178 | /* NOTE: SPEED and SUSP aren't configured here. OTG hosts | 178 | /* NOTE: SPEED and SUSP aren't configured here. OTG hosts |
179 | * may be able to use I2C requests to set those bits along | 179 | * may be able to use I2C requests to set those bits along |
180 | * with VBUS switching and overcurrent detction. | 180 | * with VBUS switching and overcurrent detection. |
181 | */ | 181 | */ |
182 | 182 | ||
183 | if (cpu_class_is_omap1() && nwires != 6) | 183 | if (cpu_class_is_omap1() && nwires != 6) |