Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wip/stage sunxi 3.4/a20 #93

Closed
wants to merge 4,030 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4030 commits
Select commit Hold shift + click to select a range
91c1bf8
can: gw: use kmem_cache_free() instead of kfree()
Apr 9, 2013
678721a
rt2x00: rt2x00pci_regbusy_read() - only print register access failure…
rtg-canonical Feb 18, 2013
a7c079f
Linux 3.4.40
gregkh Apr 12, 2013
ba6e957
gpu: ion: fix kfree/list_del order
jpa468 Apr 15, 2013
dd541ae
ALSA: usb-audio: fix endianness bug in snd_nativeinstruments_*
eldad Apr 5, 2013
b43105d
ASoC: wm8903: Fix the bypass to HP/LINEOUT when no DAC or ADC is running
Apr 9, 2013
e264d3c
tracing: Fix double free when function profile init failed
Apr 1, 2013
e3573b2
PM / reboot: call syscore_shutdown() after disable_nonboot_cpus()
chenhuacai Apr 7, 2013
706d153
drm/i915: Use the correct size of the GTT for placing the per-process…
ickle Aug 24, 2012
b7dba0e
SCSI: libsas: fix handling vacant phy in sas_set_ex_phy()
ldorau Apr 3, 2013
e0b4cef
cifs: Allow passwords which begin with a delimitor
spuiuk Apr 9, 2013
eced4ec
target: Fix incorrect fallthrough of ALUA Standby/Offline/Transition …
Apr 10, 2013
7077c66
vfs: Revert spurious fix to spinning prevention in prune_icache_sb
Apr 13, 2013
e3a5505
kref: Implement kref_get_unless_zero v3
thomashvmw Nov 6, 2012
bff6627
udl: handle EDID failure properly.
airlied Apr 12, 2013
fdd9ce0
sched_clock: Prevent 64bit inatomicity on 32bit systems
KAGA-KOKO Apr 6, 2013
e082a17
x86, mm, paravirt: Fix vmalloc_fault oops during lazy MMU updates
Mar 23, 2013
7ad0908
x86, mm: Patch out arch_flush_lazy_mmu_mode() when running on bare metal
Mar 23, 2013
a7d5072
mtdchar: fix offset overflow detection
torvalds Sep 8, 2012
2931b31
kobject: fix kset_find_obj() race with concurrent last kobject_put()
torvalds Apr 13, 2013
880f56d
r8169: fix auto speed down issue
hayesorz Apr 13, 2013
06ce3e4
mtd: Disable mtdchar mmap on MMU systems
Oct 9, 2012
94402d1
Linux 3.4.41
gregkh Apr 17, 2013
c8a0118
f_fs: ffs_func_free: cleanup requests allocated by autoconfig
jacmet May 3, 2012
adfb519
gpu: ion: ion_chunk_heap: Zero chunk heap memory at creation time
Apr 1, 2013
6a3b630
ARM: convert build of appended dtb zImage to list of dtbs
colincross Apr 17, 2013
6460ff8
trace/events: fix gpu event timestamp formatting
Apr 19, 2013
357566d
net: wireless: bcmdhd: Prevent recursive call of cfg80211_sched_scan_…
Apr 23, 2013
9849aab
net: wireless: bcmdhd: Enable full scan on PNO event
Apr 24, 2013
ccf5d23
net: wireless: bcmdhd: Update to version 1.88.11
Apr 24, 2013
3ccc212
gpu: ion: Fix bug in ion shrinker
Apr 24, 2013
f6b2e06
android: configs: Initial commit of Android config fragments
Feb 6, 2013
816e2bb
ARM: Do 15e0d9e37c (ARM: pm: let platforms select cpu_suspend support…
Apr 8, 2013
1103607
hrtimer: Don't reinitialize a cpu_base lock on CPU_UP
Mar 20, 2013
4f969dd
can: sja1000: fix handling on dt properties on little endian systems
ch-f Apr 11, 2013
f42097f
hugetlbfs: add swap entry check in follow_hugetlb_page()
Apr 17, 2013
cf27674
kernel/signal.c: stop info leak via the tkill and the tgkill syscalls
ephox-gcc-plugins Apr 17, 2013
e3aa855
hfsplus: fix potential overflow in hfsplus_file_truncate()
dubeyko Apr 17, 2013
ce7d866
KVM: x86: fix for buffer overflow in handling of MSR_KVM_SYSTEM_TIME …
Mar 11, 2013
f6dfc74
KVM: x86: Convert MSR_KVM_SYSTEM_TIME to use gfn_to_hva_cache functio…
Feb 20, 2013
f56d137
KVM: Fix bounds checking in ioapic indirect register reads (CVE-2013-…
Feb 20, 2013
2a6b024
KVM: Allow cross page reads and writes from cached translations.
Mar 29, 2013
4105375
sched: Convert BUG_ON()s in try_to_wake_up_local() to WARN_ON_ONCE()s
htejun Mar 18, 2013
9c27582
ARM: 7696/1: Fix kexec by setting outer_cache.inv_all for Feroceon
Apr 10, 2013
bb93ad5
ARM: 7698/1: perf: fix group validation when using enable_on_exec
wildea01 Apr 12, 2013
563868a
ath9k_htc: accept 1.x firmware newer than 1.3
Apr 7, 2013
f4ec6e0
ath9k_hw: change AR9580 initvals to fix a stability issue
Apr 10, 2013
d6b8c33
ssb: implement spurious tone avoidance
rmilecki Apr 2, 2013
a3c2127
crypto: algif - suppress sending source address information in recvmsg
minipli Apr 7, 2013
da307d1
perf: Treat attr.config as u64 in perf_swevent_init()
rantala Apr 13, 2013
6b48c21
perf/x86: Fix offcore_rsp valid mask for SNB/IVB
Apr 16, 2013
726cc91
fbcon: fix locking harder
airlied Jan 25, 2013
c420060
vm: add vm_iomap_memory() helper function
torvalds Apr 16, 2013
ada37d8
vm: convert snd_pcm_lib_mmap_iomem() to vm_iomap_memory() helper
torvalds Apr 19, 2013
b67bca9
vm: convert fb_mmap to vm_iomap_memory() helper
torvalds Apr 19, 2013
5de41eb
vm: convert HPET mmap to vm_iomap_memory() helper
torvalds Apr 19, 2013
b00919c
vm: convert mtdchar mmap to vm_iomap_memory() helper
torvalds Apr 19, 2013
8fdeb71
Btrfs: make sure nbytes are right after log replay
Apr 5, 2013
a5a9e7c
Linux 3.4.42
gregkh Apr 26, 2013
2e745d3
cpufreq: interactive: fix uninitialized spinlock
Apr 16, 2013
0e473ae
ARM: fault: assume no context when IRQs are disabled during data abort.
jpa468 Apr 29, 2013
6bcd300
aio: fix possible invalid memory access when DEBUG is enabled
Apr 26, 2013
3ab8db7
TTY: do not update atime/mtime on read/write
Feb 15, 2013
c61642c
TTY: fix atime/mtime regression
Apr 26, 2013
bf6f841
sparc64: Fix race in TLB batch processing.
davem330 Apr 19, 2013
0e242b8
atm: update msg_namelen in vcc_recvmsg()
minipli Apr 7, 2013
0373095
ax25: fix info leak via msg_name in ax25_recvmsg()
minipli Apr 7, 2013
a776cc3
Bluetooth: fix possible info leak in bt_sock_recvmsg()
minipli Apr 7, 2013
2d97f68
Bluetooth: RFCOMM - Fix missing msg_namelen update in rfcomm_sock_rec…
minipli Apr 7, 2013
3300687
caif: Fix missing msg_namelen update in caif_seqpkt_recvmsg()
minipli Apr 7, 2013
d3dd629
irda: Fix missing msg_namelen update in irda_recvmsg_dgram()
minipli Apr 7, 2013
dbd9957
iucv: Fix missing msg_namelen update in iucv_sock_recvmsg()
minipli Apr 7, 2013
40aea04
llc: Fix missing msg_namelen update in llc_ui_recvmsg()
minipli Apr 7, 2013
cd5e3d9
netrom: fix info leak via msg_name in nr_recvmsg()
minipli Apr 7, 2013
1091d7d
NFC: llcp: fix info leaks via msg_name in llcp_sock_recvmsg()
minipli Apr 7, 2013
1a4dc01
rose: fix info leak via msg_name in rose_recvmsg()
minipli Apr 7, 2013
e979f54
tipc: fix info leaks via msg_name in recv_msg/recv_stream
minipli Apr 7, 2013
7b806e7
netrom: fix invalid use of sizeof in nr_recvmsg()
Apr 9, 2013
815b101
cbq: incorrect processing of high limits
VasilyAverin Apr 1, 2013
ef95e3d
net IPv6 : Fix broken IPv6 routing table after loopback down-up
0xba1a Apr 2, 2013
617f13b
net: count hw_addr syncs so that unsync works properly.
Apr 2, 2013
74595d0
atl1e: limit gso segment size to prevent generation of wrong ip lengt…
strssndktn Apr 2, 2013
643094a
bonding: fix bonding_masters race condition in bond unloading
Apr 6, 2013
2a11e5f
bonding: IFF_BONDING is not stripped on enslave failure
Apr 11, 2013
ba12001
af_unix: If we don't care about credentials coallesce all messages
ebiederm Apr 3, 2013
1ab6b2a
netfilter: don't reset nf_trace in nf_reset()
kaber Apr 5, 2013
f29e246
rtnetlink: Call nlmsg_parse() with correct header length
Apr 8, 2013
d0d7ee0
tcp: incoming connections might use wrong route under synflood
Apr 11, 2013
ca6ad5d
tcp: Reallocate headroom if it would overflow csum_start
tgraf Apr 11, 2013
d768ca1
esp4: fix error return code in esp_output()
Apr 13, 2013
a009d58
net: sctp: sctp_auth_key_put: use kzfree instead of kfree
Feb 7, 2013
7575f50
tcp: call tcp_replace_ts_recent() from tcp_ack()
Apr 19, 2013
4087320
net: rate-limit warn-bad-offload splats.
greearb Apr 19, 2013
ca4bf7c
net: fix incorrect credentials passing
torvalds Apr 19, 2013
1d0dd1d
net: drop dst before queueing fragments
Apr 16, 2013
b375a75
Linux 3.4.43
gregkh May 1, 2013
f8f24e6
lowmemorykiller: make default lowmemorykiller debug message useful
colincross May 3, 2013
4e217b8
sunxi:i2c: unify headers with name inification
wingrime Mar 30, 2013
b7428e8
sunxi:pm: Merge mach-sun[45]i/pm.
hramrach Mar 29, 2013
fa6a930
sunxi:pm: Remove superfluous functions from pm.c and reindent.
hramrach Mar 12, 2013
199d459
sunxi-sound: Merge sun5i sound support into sun4i code
jwrdegoede Feb 15, 2013
10d4e39
sunxi:dma: unify sun[45] dma
wingrime Apr 1, 2013
8a8bf2c
sunxi:nand: Add dma operation timeout
wingrime Apr 1, 2013
2e7cc33
Add support for interbyte delay in SPI transfers
theOzzieRat Mar 15, 2013
9b2a434
sunxi: Make avs compile.
hramrach Apr 2, 2013
3c82c89
sunxi: usb: introduce config hack to workaround lack of sunxi USB mod…
jkivilin Apr 11, 2013
c5b0367
disp: track layers created by ioctl.
hramrach Apr 17, 2013
2439ae6
sunxi: fix tty ddc compilation
wingrime Apr 14, 2013
3ba0428
Merge remote-tracking branch 'sunxi/mirror/android-3.4' into referenc…
amery May 4, 2013
d809212
Merge tag 'v3.4.43' into reference-3.4
amery May 4, 2013
6416f0b
Merge branch 'reference-3.4' into sunxi-3.4
amery May 4, 2013
b341bf8
sunxi: Fixup __devinit usage
hno Apr 29, 2013
af15afb
rtl8188eu: Add new wireless driver
jwrdegoede Apr 25, 2013
408c44f
rtl8189es: Add new wireless driver
jwrdegoede May 7, 2013
df1af62
rtl8723as: Add new wireless driver
npeacock Apr 25, 2013
307628e
rtxx7x: Add new wireless driver
npeacock Apr 25, 2013
66cdb2c
rtl818x: Hookup the new wireless drivers
jwrdegoede May 7, 2013
d4fba0e
wireless: Make the new drivers build with sunxi-3.4
jwrdegoede Apr 25, 2013
3970c5a
mmc-pm: Add support for a couple of new sdio wifi card types
theOzzieRat Apr 25, 2013
0feaa78
sunxi-mmc: Make sunximmc_rescan_card work if called before module-init
jwrdegoede May 14, 2013
20db948
rtl8189es: Make module auto-load
jwrdegoede May 12, 2013
8b9710f
rtl8723as: Make module auto-load
jwrdegoede May 14, 2013
be39452
sunxi-sound: Fix soc-audio.x should use snd_soc_register_card() warnings
jwrdegoede May 20, 2013
7dd978e
sunxi-sound: Move registration of hdmi-audio devices to sunxi-hdmi code
jwrdegoede May 20, 2013
76facd1
sunxi-sound: Cleanup spdif_used parsing
jwrdegoede May 20, 2013
ae50d31
sunxi-sound: Honor audio_used fex file setting
jwrdegoede May 20, 2013
7117947
sunxi-sound: Honor capture_used and playback_used
jwrdegoede May 20, 2013
c7d2331
sunxi-rfkill: Don't register a bluetooth rfkill device when there is …
jwrdegoede May 20, 2013
893b59b
1-wire bus platform device for sunxi platforms
zardam May 19, 2013
9b373da
rtc:rtc-sun5i: Chinese comments on RTC driver of sun5i translated to …
lxsameer May 28, 2013
f4c0d0c
sunxi-sound: Honor capture_used and playback_used
oliv3r May 29, 2013
d6d356f
ARM: 7668/1: fix memset-related crashes caused by recent GCC (4.7.2) …
idjelic Mar 6, 2013
e75be34
ARM: 7670/1: fix the memset fix
Mar 12, 2013
0fb8f79
sunxi: disambiguate sw_get_ic_ver()'s enum
amery Mar 22, 2013
9c96a3f
sunxi: soc-detect: move sw_get_ic_ver() to a separated module
amery Mar 23, 2013
1dce2de
sunxi:soc-detect: move sunxi_chip_id() out of core.c
amery Mar 23, 2013
01b2eb9
sunxi: don't assume SUNXI_VER_A10A == 0
amery Mar 22, 2013
0938c4e
sunxi: extend sw_get_ic_ver() to detect sun5i chips
amery Mar 23, 2013
1c2b0bd
sunxi:soc-detect: fix sw_get_ic_ver/sun5i bug
amery May 22, 2013
7073876
sunxi:soc-detect: print detected SoC the first time
amery Mar 23, 2013
4992226
sunxi: add sunxi_is_${soc_name}() macros
amery Mar 23, 2013
5620ab0
sunxi: implement sw_get_chip_id()
amery Mar 23, 2013
9c8cb43
sunxi:soc-detect: mark sw_get_ic_ver() as pure
amery Mar 23, 2013
b411e16
sunxi: bring sunxi_pr_chip_id() back, but using the ic_ver
amery Mar 25, 2013
396c87c
sunxi:soc-detect: rename sunxi_chip_id() to sunxi_brom_chip_id()
amery May 20, 2013
1ac05cf
sunxi:soc-detect: export sunxi_brom_chip_id()
amery May 20, 2013
7ad3fec
sunxi: introduce SUNXI_MACH_SUNnI defines using Allwinner's chipid va…
amery May 20, 2013
7e7848d
sunxi:soc-detect: introduce sunxi_sramc_chip_id()
amery May 20, 2013
ca529b9
sunxi:soc-detect: add cached/pure sunxi_chip_id() and sunxi_is_sunNi(…
amery May 20, 2013
0b80c99
sunxi:soc-detect: add extra debugging to sw_get_ic_ver() errors
amery May 20, 2013
93dfd67
sunxi:soc-detect: remove CONFIG_ARCH_SUNnI optimization
amery May 21, 2013
21f20c5
sunxi:soc-detect: dump SSE_IO_REG0 when failed to detect SoC too
amery May 22, 2013
7014cae
sunxi:soc-detect: clean register dumping code
amery May 22, 2013
89dbe5f
sunxi:soc-detect: add basic sun6i/A31 detection
amery May 22, 2013
0f00aee
sunxi:soc-detect: refactored SUNXI_VER_ values into something more us…
amery May 22, 2013
34b1781
SUN5I GPIO EINT definition and fix to irq search function
LorenzoNava Feb 20, 2013
3e8b768
gpio:sunxi: move eint table within the .c and using sunxi_is_foo()
amery Mar 24, 2013
aec8363
sunxi:soc-detect: rename sramc to sc (system control)
amery May 24, 2013
c9b3a45
sunxi: remove usage of machine_is_sunNi() in favour of sunxi_is_sunNi()
amery May 24, 2013
0384a87
sunxi:soc-detect: introduce CONFIG_SUNXI_MULTIPLATFORM
amery May 24, 2013
c00f1d7
sunxi:soc-detect: add initial A20 support
amery May 30, 2013
9958517
sunxi [soc-detect]: Fix detection of A10s
jwrdegoede May 28, 2013
4466b13
axp20: Do not load if the fex file says the board has an axp152
jwrdegoede May 28, 2013
d0b5d43
axp20: Rename axp20_core supply to Vcore
jwrdegoede Jun 3, 2013
c3d8c01
Revert "Add AXP 15 power module for A10s Chips"
jwrdegoede May 14, 2013
698f31f
Revert "axp15: Hookup the axp152 code"
jwrdegoede May 14, 2013
7ff9a04
axp152: New power/regulator driver for axp152 chips
jwrdegoede May 30, 2013
78bc0b2
sunxi: cpu-freq-table remove duplicate dvfs table entries
jwrdegoede Jun 3, 2013
d2d608e
sunxi: cpu-freq-table add sun5i dvfs table
jwrdegoede Jun 3, 2013
7257fa1
sunxi-hdmi: Try harder to get EDID
jwrdegoede Jun 3, 2013
641f67e
sun4i_wemac: Fix scheduling from atomic context oops on tx timeout
jwrdegoede Jun 4, 2013
1ec24ce
sun4i_wemac: Add support for the mii-phy being connected to PortD
jwrdegoede Jun 4, 2013
5b312a4
sun4i_wemac: Fix get_link() function
jwrdegoede Jun 4, 2013
da1eaa6
sun4i_wemac: Give the phy some time to settle after powering it on
jwrdegoede Jun 4, 2013
e7d46d2
sun4i_wemac: Use random parts of SID for MAC (if none is specified)
jwrdegoede Jun 4, 2013
e607003
sun4i_wemac: Add wemac_set_mac_addr() helper function
jwrdegoede Jun 4, 2013
887bf9f
rtl8188eu: Silence debug spew
jwrdegoede Jun 4, 2013
e8449f4
rtl8189es: Silence debug spew
jwrdegoede Jun 4, 2013
414f1ed
rtl8192cu: Silence debug spew
jwrdegoede Jun 5, 2013
a645e42
sunxi-disp: fb#_scaler_mode = 0 breaks interlaced modes, force to 1 f…
jwrdegoede Feb 15, 2013
54c0e20
sun4i_wemac: Do not use MAC from fex if it is 000000000000
jwrdegoede Jun 6, 2013
fba6140
sunxi-hdmi: Don't warn twice on an invalid EDID checksum
jwrdegoede Jun 6, 2013
1e1edbb
sunxi-rfkill: Add support for usb-rfkill
jwrdegoede Feb 15, 2013
8230d84
Add arch/arm/mach-sun7i directory
jwrdegoede Jun 21, 2013
d7d1100
sun7i: Hookup, make build and make run with serial console
jwrdegoede Jun 23, 2013
719abc4
sun7i: Switch to using soc-detect.c
jwrdegoede Jun 25, 2013
0a345cf
sun7i: Invert meaning of clk_reset reset parameter
jwrdegoede Jun 25, 2013
ca055b0
sunxi-mmc: Add support for A20
jwrdegoede Jun 24, 2013
e048811
sunxi-ehci/ohci: Add support for A20
jwrdegoede Jun 24, 2013
285a4f0
sunxi-hdmi-cec: Do not define own highres counter functionality
jwrdegoede Jun 28, 2013
9dc79b8
video-sunxi: Add A20 support
jwrdegoede Jun 28, 2013
983fda7
video-sunxi: Fix interlaced modes being broken with the scaler disabled
jwrdegoede Jun 28, 2013
67d5562
sunxi-nand-compat: Fix compiler warning
jwrdegoede Jun 28, 2013
f210269
sunxi: Unify platform.h
jwrdegoede Jun 30, 2013
f01c53f
i2c-sunxi: Add support for A20
jwrdegoede Jun 30, 2013
76c36ec
sunxi: Unify devices.c
jwrdegoede Jun 30, 2013
be5eabb
sun7i-cpufreq: Fix dvfs support
jwrdegoede Jun 30, 2013
236ab91
sun7i-cpufreq: Sanitize log output
jwrdegoede Jun 30, 2013
4c4553c
i2c-sunxi: Silence initialization
jwrdegoede Jun 30, 2013
7d474df
usb:sun4i:Rename sun4i_usb to sunxi_usb
techn Jun 27, 2013
41826ea
usb:sunxi:Merge sun5i_usb to sunxi_usb
techn Jun 27, 2013
95e472f
usb:sunxi:Import changes from Allwinner SDK. Unification part.
techn Jun 27, 2013
8242195
usb:sunxi:Import changes from Allwinner SDK. Minor bits.
techn Jun 27, 2013
1d524c5
usb:sunxi:Import changes from Allwinner SDK. Functionality.
techn Jun 27, 2013
b20c046
usb: add sys_config support
Nov 25, 2011
1ef1517
usb:sunxi:Fix "device not recognized" problem during android boot
techn Jun 27, 2013
f627f95
synaptics_i2c: fix earlysuspend.
hramrach Jun 4, 2013
1db41f5
sunxi rtxx7x: Weed out some Makefile junk.
hramrach May 31, 2013
76b6945
sunxi: Do not allow compat nand partition names to overflow alphabet.
hramrach Jun 25, 2013
02c9e0c
sunxi: Preliminary support for new nand partition scheme.
hramrach Jun 25, 2013
01e75a8
sunxi-hcd0: Cleanup Kconfig
jwrdegoede Jul 2, 2013
20e1fe8
wireless-drivers: Fix compilation without hcd0
jwrdegoede Jul 2, 2013
38209ac
sun7i: Remove super-standby support
jwrdegoede Jul 3, 2013
1916a53
sunxi-mmc: Add new sunxi-mmc driver from a20 code dump
jwrdegoede Jul 6, 2013
6a4d4e8
sunxi-mmc: hookup new sunxi-mci driver in buildsys and make it build …
jwrdegoede Jul 6, 2013
69bce7a
sunxi-rtc: Add sun7i support
jwrdegoede Jul 8, 2013
129cec3
sunxi: unify gpio.h
jwrdegoede Jul 8, 2013
6223362
sun7i: Document why we don't use the scu
jwrdegoede Jul 8, 2013
db70f78
sun7i: Remove super-standby support fixup
jwrdegoede Jul 8, 2013
e3edd33
sunxi: Don't log a useless error when we fail to get a gpio
jwrdegoede Jul 8, 2013
a7d6184
sunxi-video: check there is enough memory
jwrdegoede Jul 8, 2013
8716ab5
sunxi-video: Fix high res mode (>= 1920x1080) issues on sun5i and sun7i
jwrdegoede Jul 9, 2013
445ccb7
sunxi: Add dma-compat code
jwrdegoede Jul 11, 2013
3cab789
sunxi-sound-soc: Use new sunxi dma-compat code
jwrdegoede Jul 10, 2013
d720f10
sunxi-sound-soc: Add support for sun7i
jwrdegoede Jul 11, 2013
84f4221
sunxi-codec: Fix memleak on hw_free()
jwrdegoede Jul 11, 2013
c7d3ad5
sunxi-hdmi-audio: Fix un-support sample_rate errors
jwrdegoede Jul 12, 2013
ba2fe06
sun7i: Use high-res counter for sched-clock
jwrdegoede Jul 12, 2013
13b50c8
sun7i: Make early boot a bit more quiet
jwrdegoede Jul 12, 2013
87ef3a1
sunxi-sound-codec: Silence some uninteresting debug messages
jwrdegoede Jul 12, 2013
10cab40
sun4i_wemac: Don't use sid for mac address if it is all 0
jwrdegoede Jul 12, 2013
f88f40a
sun4i_wemac: Remove dead dma tx code
jwrdegoede Jul 12, 2013
5ed6531
sun4i_wemac: Remove dead ccmu code
jwrdegoede Jul 12, 2013
c455ba2
sun4i_wemac: Remove dead plat_data code
jwrdegoede Jul 12, 2013
f7373c9
sun4i_wemac: Remove dead eeprom code
jwrdegoede Jul 12, 2013
da59c37
sun4i_wemac: Remove dead internal phy code
jwrdegoede Jul 12, 2013
225a270
sun4i_wemac: Use new sunxi dma-compat code
jwrdegoede Jul 12, 2013
dd6b780
sun4i_wemac: Add sun7i (A20) support
jwrdegoede Jul 12, 2013
831ba0c
sun4i_wemac: Make driver init a bit more quiet
jwrdegoede Jul 12, 2013
233a65a
sunxi-sata: Add support for sun7i (A20)
jwrdegoede Jul 14, 2013
f7c3d7f
sunxi-usbc0: Fix sunxi-usbc0 never being enabled
jwrdegoede Jul 15, 2013
e0df1da
sunxi-usbc0: Properly power up vbus from pin_init when the gpio is in…
jwrdegoede Jul 15, 2013
646d60f
sunxi-usbc0: Properly intialize hcd0 when running in host-only mode
jwrdegoede Jul 15, 2013
8c8d8e8
sunxi-usbc0: Silence udc_probe error
jwrdegoede Jul 15, 2013
c9c75c0
sunxi-codec: Fix failing to load if there is no capture_used fex setting
jwrdegoede Jul 15, 2013
b8b7bed
sunxi-uart: Only look for 2 uarts on A13
jwrdegoede Jul 15, 2013
5a92219
sun7i: Update mach-type to match u-boot
jwrdegoede Jul 17, 2013
bceb03f
sunxi usb: Make HCD0 boolean.
hramrach May 31, 2013
2008906
sunxi: re-add the USB Kconfig hack broken by USB driver merge.
hramrach Jul 23, 2013
479a57f
sunxi: Fix compilation without ARM_ARCH_TIMER
Jul 19, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
sunxi: bring sunxi_pr_chip_id() back, but using the ic_ver
Signed-off-by: Alejandro Mery <amery@geeks.cl>
  • Loading branch information
amery committed Jul 8, 2013
commit b411e167906b85321fc5c41535626b607018ffa7
3 changes: 1 addition & 2 deletions arch/arm/plat-sunxi/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ void __init sw_core_map_io(void)
{
iotable_init(sw_io_desc, ARRAY_SIZE(sw_io_desc));

sunxi_pr_brom();
(void)sw_get_ic_ver();
sunxi_pr_chip_id();
}

#ifdef CONFIG_FB_SUNXI_RESERVED_MEM
Expand Down
1 change: 1 addition & 0 deletions arch/arm/plat-sunxi/include/plat/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ static inline void arch_idle(void)

/* BROM access only possible after iomap()s */
u32 sunxi_chip_id(void);
int sunxi_pr_chip_id(void);
int sunxi_pr_brom(void);

enum sw_ic_ver {
Expand Down
23 changes: 17 additions & 6 deletions arch/arm/plat-sunxi/soc-detect.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,21 @@ u32 sunxi_chip_id(void)
return 0;
}

static inline void _pr_ic_ver(enum sw_ic_ver ver)
int sunxi_pr_chip_id(void)
{
u32 chip_id = sunxi_chip_id();
enum sw_ic_ver ver = sw_get_ic_ver();
const char *soc_family = NULL;
const char *name = NULL;
int rev;

if (machine_is_sun4i())
soc_family = "sun4i";
else if (machine_is_sun5i())
soc_family = "sun5i";
else
soc_family = "sunNi?";

switch (ver) {
/* sun4i */
case SUNXI_VER_A10A:
Expand All @@ -103,12 +113,14 @@ static inline void _pr_ic_ver(enum sw_ic_ver ver)
name = "A10S";
rev = ver - SUNXI_VER_A10SA;
break;
case SUNXI_VER_UNKNOWN:
return;
default:
break;
}

pr_info("Allwinner %s revision %c detected.\n",
name, 'A' + rev);
pr_info("Allwinner %s revision %c (AW%u, %s) detected.\n",
name?name:"A??", 'A' + rev, chip_id, soc_family);

return name?1:0;
}

enum sw_ic_ver sw_get_ic_ver(void)
Expand Down Expand Up @@ -177,7 +189,6 @@ enum sw_ic_ver sw_get_ic_ver(void)
unknown:
ver = SUNXI_VER_UNKNOWN;
done:
_pr_ic_ver(ver);
return ver;
}
EXPORT_SYMBOL(sw_get_ic_ver);
Expand Down