Commit Graph

52 Commits (1c25206bafadfe486f5bdef9f7d79fec755992c3)

Author SHA1 Message Date
Felix Fietkau 20421d29a6 atheros: update macroses names
Use AR2315_ prefix for macroses specific to AR2315/AR2316/AR2317 chips,
use AR5312_ prefix for macroses specific to AR5312/AR2312/AR2313 chips,
and use AR231X_ prefix for common macroses.

This patch should not cause any functional changes, only make clear
which macros is common and which macros is specific.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41701 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:55 +00:00
Felix Fietkau 3859f87475 atheros[uart]: pass only physical I/O mem address to 8250 driver
Pass only physical address to 8250 serial port driver and set flag to
remap I/O memory inside the driver. Also fix AR5312 UART base address
definition, which seems specified already mapped.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41700 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:52 +00:00
Felix Fietkau 4294c6bb6c atheros[uart]: use 32-bit aligned I/O
Use 32-bit aligned I/O and update base UART address (remove +3 offset).

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41699 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:49 +00:00
Felix Fietkau 6c0e82e860 atheros[ar231x-eth]: pass PHY I/O memory via device resources
Pass PHY I/O memory region via platform resources and remap them
unconditionally.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41698 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:46 +00:00
Felix Fietkau ca397ef820 atheros[ar231x-eth]: pass phys address of I/O memory via platform res
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41697 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:43 +00:00
Felix Fietkau a740ee4ca3 atheros: simplify gpiolib realization
Each SoCs generation has own independent gpiolib realization, so we
have no reason to keep these realizations in semiuniversal form.
Following modifications are made:
 * Remove valid_mask field
 * Remove ar231x_gpio_chip structure
 * Rename AR2315_GPIO_CR to AR2315_GPIO_DIR
 * Fix count of AR5312 GPIOs
 * Simplify gpio_chip methods realization

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41696 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:39 +00:00
Felix Fietkau 7a33951800 atheros: use irq_set_chained_handler()
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41695 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:36 +00:00
Felix Fietkau b4c90d72b1 atheros: simplify AR2315 misc IRQ (un)masking
Currently AR5312 misc IRQ numbers are used for AR2315+ chips, what cause
us to use switch-case to map IRQ number to ISR bit. Introduce AR2315
specific misc IRQs set and simplify interrupt (un)mask operation.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41694 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:33 +00:00
Felix Fietkau 382ba6ab0c atheros: rename some interrupt control handlers
Rename interrupt control handlers to be consistent with operation names
and add IRQ chips names.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41693 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:30 +00:00
Felix Fietkau 8c1855e6d5 atheros: move AR2315 misc IRQ dispatching to separate function
Align code with AR5312 realization.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41692 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:26 +00:00
Felix Fietkau c3be065643 atheros: pass UART IRQ number via function argument
UART IRQ number could be different for different SoCs, so make them
configurable.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41691 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:23 +00:00
Felix Fietkau 213e2a57b6 atheros[ar231x-eth]: move driver to atheros subdirectory
Move driver code to respective vendor subdirectory and fix config
symbol name.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41690 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:19 +00:00
Felix Fietkau d945d89a9c atheros[ar231x-eth]: update MAC and PHY reset method
Pass reset_set and reset_clear callback functions pointers via
platform_data instead of reset register address.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41689 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:16 +00:00
Felix Fietkau 9a025dd5c6 atheros[ar2315-wdt]: update I/O handling
* Pass iomem and IRQ via platform device resources
 * Remap iomem and use iowrite32 accessor function

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41688 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:13 +00:00
Felix Fietkau fcf32e702a atheros[ar2315-wdt]: update interrupt handling
Acknowledge watchdog interrupt in arch irq dispatcher and remove odd
watchdog enable call from probe function.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41687 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:10 +00:00
Felix Fietkau fb557d90cc atheros: use correct address space and pointer type for register access
Make sparse happy :)

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41686 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:07 +00:00
Felix Fietkau 75cfa4a0c2 atheros[ar2315-wdt]: rename config symbol
Rename config symbol to AR2315_WDT to avoid confusion with other Atheros
SoCs.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41685 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:36:03 +00:00
Felix Fietkau c02c7b6d67 atheros[ar2315-wdt]: update initialization
* update driver id to be consistent with other ar231x drivers
 * remove odd module_{init,exit}
 * add module metadata (description, name, etc.)

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41684 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-17 16:35:59 +00:00
John Crispin e688f6b8c4 atheros[ar2315-spiflash]: remove duplicated definitions
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41325 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-24 18:13:47 +00:00
John Crispin f5183b03f7 atheros[ar2315-spiflash]: update driver id
Make id more specific and consistent with others platform drivers.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41324 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-24 18:13:43 +00:00
John Crispin c0fea1303e atheros[ar2315-spiflash]: make local variables and functions static
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41323 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-24 18:13:39 +00:00
John Crispin 4685d67062 atheros[ar2315-spiflash]: I/O fixes
Directly use ioread/iowrite functions to avoid odd dependency. And
carefully annotate I/O memory pointers.

Singed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41322 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-24 18:13:35 +00:00
John Crispin 6c193cf529 atheros[ar2315-spiflash]: make spiflash header local
We do not need global access to it, so move it from arch include to the
mtd subdir.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41321 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-24 18:13:31 +00:00
John Crispin f6f6b0e18c atheros[ar2315-spiflash]: pass I/O mem regions via resources
Pass I/O memory regions (flash read and MMR) via platform device
resources array and use them inside spiflash driver.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41320 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-24 18:13:27 +00:00
John Crispin 477a08a4da atheros[ar231x-pci]: do not touch iomem_resource ranges
Moving the start of IO mem to 0x10000000 leads to allocation conflict
with SPI flash memory region, which starts at 0x08000000.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41319 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-24 18:13:22 +00:00
John Crispin 859fb40fa1 atheros[ar2315-spiflash]: print detected flash size
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41318 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-24 18:13:17 +00:00
John Crispin cd83a37b6e atheros[ar2315]: don't detect flash size during board initialization
We should not detect actual flash size during board initialization to
find board config at the end of the flash, just use large enough mapping
size (currently 128 mbit). If mapping size is larger than the actual
flash size, than flash will simply be mapped multiple times. This change
simplifies code by removing duplication and saves about 200 bytes of
uncompressed kernel :)

Tested with Ubnt LS2 board equipped with STM 25p32v6p NOR flash (32 mbit).

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41317 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-24 18:13:13 +00:00
John Crispin b341c65b7b atheros[ar231x-eth]: merge patch
Merge 3_10-updates.patch into the ar2313_ethernet.patch since it contains
only one ethernet driver fix.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41316 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-24 18:13:09 +00:00
Felix Fietkau 08bd449e86 atheros: fix too short msleep
Use msleep(20) instead of msleep(10) to make code closer to reality
since msleep can sleep for up to 20ms even we request shorter delay.
All updated calls are located in PCI initialization routine which is
called only once upon device boot. So there should be no performance
issues caused by more longer delay.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41096 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:06:25 +00:00
Felix Fietkau 37006f3b37 atheros: shorten lines
Wrap lines over 80 chars or make them shorter by other ways.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41095 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:06:22 +00:00
Felix Fietkau 91443b20ca atheros: constify some static structures
Constify some static structures as suggested by checkpatch.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41094 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:06:18 +00:00
Felix Fietkau a1189cbd7d atheros: avoid __FUNCTION__ usage
Use __func__ instead of gcc specific __FUNCTION__ as suggested by
checkpatch.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41093 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:06:14 +00:00
Felix Fietkau 2a6e03d7ad atheros: trailing statements fixes
Move trailing statements to next line with indentation as suggested by
checkpatch.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41092 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:06:10 +00:00
Felix Fietkau f10e6fd9af atheros: spaces fixes
Add missed spaces and remove odd space as suggested by checkpatch.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41091 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:06:06 +00:00
Felix Fietkau 4348822245 atheros: indent fixes
Various indent fixes suggested by checkpatch: use tabs, use same level
of indentation for switch and case, correct indentation levels.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41090 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:06:03 +00:00
Felix Fietkau 3b68214e57 atheros: fix includes
Remove some unnecessary includes and use <linux/foo.h> instead of
<asm/foo.h> when it possible as suggested by checkpatch.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41089 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:05:58 +00:00
Felix Fietkau d5ce5c199b atheros: various printk(...) fixes
Use more particular functions dev_<level> or pr_<level>(...) insead of
direct printk(...) call. Add KERN_LEVEL to calls what missed it.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41088 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:05:55 +00:00
Felix Fietkau 7b39c76660 atheros: various braces fixes
Fix braces location, remove unnecessary empty lines before or after code
block, remove useless braces. All cases are detected by checkpatch.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41087 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:05:51 +00:00
Felix Fietkau 29a33c9e0a atheros: do not initialize statics to 0 or false
as suggested by checkpatch.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41086 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:05:47 +00:00
Felix Fietkau cea8debc60 atheros: remove trailing whitespace
as suggested by checkpatch.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41085 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:05:43 +00:00
Felix Fietkau 5bdef6a357 atheros: do not assignment in if condition
Remove assignments from if conditions as suggested by checkpatch.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41084 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:05:40 +00:00
Felix Fietkau 9206683f4b atheros: remove parentheses around return values
Remove parentheses around return values since return is no a function,
as suggested by checkpatch.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41083 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:05:36 +00:00
Felix Fietkau 19c6fdf34a atheros: parenthesis around complex macroses value
Use parenthesis around complex macroses value as suggested by
checkpatch.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41082 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:05:32 +00:00
Felix Fietkau bb7b461319 atheros: various comments fixes
Fix comment issues detected by checkpatch. Convert C99 // comments to
ordinary /* ... */ comments. Correct block comments style or convert
them to single line comments.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41081 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:05:28 +00:00
Felix Fietkau e17ca070e7 atheros: avoid CamelCase
Change fooBar variables names to foo_bar as suggested by checkpatch,
write few tables names in lower case and correctly place __initdata
keyword.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41080 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-10 09:05:25 +00:00
Felix Fietkau 797927ebec atheros: remove useless get_c0_compare_int fix
Remove get_c0_compare_int fix which is useless for latest kernels.

Tested on Ubnt Bullet2, which could successfully boot without this
workaround.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40593 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-29 16:19:36 +00:00
Gabor Juhos 56e1cd4a8e kernel: update 3.10 to 3.10.17
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38506 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-23 12:51:05 +00:00
Gabor Juhos 4459b613d0 atheros: fix kernel warning about usage of reset gpio
During a reset the gpiolib warns about using the reset gpio
without explicit requesting it before:

[  147.930000] ------------[ cut here ]------------
[  147.930000] WARNING: at drivers/gpio/gpiolib.c:103 gpio_ensure_requested+0x68/0xcc()
[  147.930000] autorequest GPIO-5
[  147.930000] Modules linked in: ath5k ath mac80211 ipv6 cfg80211 compat arc4 crypto_blkcipher aead gpio_button_hotplug
[  147.930000] Call Trace:
[  147.930000] [<8004e3bc>] dump_stack+0x8/0x34
[  147.930000] [<80058430>] warn_slowpath_common+0x78/0xa4
[  147.930000] [<800584e4>] warn_slowpath_fmt+0x2c/0x38
[  147.930000] [<80166f18>] gpio_ensure_requested+0x68/0xcc
[  147.930000] [<80167264>] gpio_direction_output+0xdc/0x168
[  147.930000] [<8004aba8>] ar2315_restart+0x28/0x54
[  147.930000] [<80069778>] sys_reboot+0x178/0x1c0
[  147.930000] [<80043670>] stack_done+0x20/0x40
[  147.930000]
[  147.930000] ---[ end trace 2c7a53d8549562d6 ]---

This is fixed with this patch by using another gpiolib api call
which includes the missing request.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38183 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-25 17:51:12 +00:00
Gabor Juhos 028cf4dc7c kernel/3.10: refresh all target patches
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38182 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-25 17:13:24 +00:00
Gabor Juhos 1b2ea64f5a kernel: update 3.10 to 3.10.9
Also refresh 3.10 patches.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37832 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-23 17:31:04 +00:00