Andres Salomon
a74ea43df1
of/promtree: allow DT device matching by fixing 'name' brokenness (v5)
...
Commit e2f2a93b , "of/promtree: add package-to-path support to pdt"
changed dp->name from using the 'name' property to using
package-to-path. This fixed /proc/device-tree creation by eliminating
conflicts between names (the 'name' property provides names like
'battery', whereas package-to-path provides names like
'/foo/bar/battery@0', which we stripped to 'battery@0'). However, it
also breaks of_device_id table matching.
The fix that we _really_ wanted was to keep dp->name based upon
the name property ('battery'), but based dp->full_name upon
package-to-path ('battery@0'). This patch does just that.
This changes all users (except SPARC) of promtree to use the full
result from package-to-path for full_name, rather than stripping the
directory out. In practice, the strings end up being exactly the
same; this change saves time, code, and memory.
SPARC continues to use the existing build_path_component() code.
v2: combine two patches and revert of_pdt_node_name to original version
v3: use dp->phandle instead of passing around node
v4: warn/bail out for non-sparc archs if pkg2path is not set
v5: split of_pdt_build_full_name into sparc & non-sparc versions
v6: Pass NULL to pkg2path before buf gets assigned.
Drop check for pkg2path hook on each and every node.
v7: Don't BUG() when unable to get the full_path; create a
known-unique name instead.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-03-02 13:45:19 -07:00
..
accessibility
acpi
Merge branch 'iomem' into release
2011-02-15 15:25:48 -05:00
amba
ata
libata: set queue DMA alignment to sector size for ATAPI too
2011-01-28 03:16:20 -05:00
atm
ATM, Solos PCI ADSL2+: Don't deref NULL pointer if net_ratelimit() and alloc_skb() interact badly.
2011-02-13 16:55:46 -08:00
auxdisplay
base
PM / Runtime: Don't enable interrupts while running in_interrupt
2011-01-25 20:50:07 +01:00
block
Merge branch 'for-linus' of git://neil.brown.name/md
2011-02-25 11:13:26 -08:00
bluetooth
Revert "Bluetooth: Enable USB autosuspend by default on btusb"
2011-02-23 19:42:03 -08:00
cdrom
cdrom: support devices that have check_events but not media_changed
2011-02-09 14:22:37 +01:00
char
Revert "TPM: Long default timeout fix"
2011-03-01 13:23:27 -08:00
clk
clocksource
drivers/clocksource/tcb_clksrc.c: fix init sequence
2011-01-26 10:50:04 +10:00
connector
cpufreq
cpuidle
crypto
dca
dio
dma
Merge branch 'imx' into dmaengine-fixes
2011-02-14 02:40:46 -08:00
edac
amd64_edac: Fix DIMMs per DCTs output
2011-02-10 14:41:49 +01:00
eisa
firewire
firmware
x86, dmi, debug: Log board name (when present) in dmesg/oops output
2011-02-15 04:20:57 +01:00
gpio
drivers/gpio/pca953x.c: add a mutex to fix race condition
2011-02-11 16:12:20 -08:00
gpu
Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into drm-fixes
2011-02-28 15:35:16 +10:00
hid
hwmon
hwmon: (adt7411) add MODULE_DEVICE_TABLE
2011-02-26 08:59:32 -08:00
i2c
i2c-omap: fixup commit cb527ede1b whitespace
2011-02-23 00:43:55 +00:00
ide
idle
fix a shutdown regression in intel_idle
2011-01-25 05:57:34 +10:00
ieee802154
infiniband
Merge branches 'nes' and 'qib' into for-next
2011-02-17 14:04:59 -08:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-02-23 14:44:25 -08:00
isdn
isdn: hisax: Use l2headersize() instead of dup (and buggy) func.
2011-02-15 12:18:09 -08:00
leds
leds: leds-pwm: return proper error if pwm_request failed
2011-01-26 10:49:58 +10:00
lguest
macintosh
mca
md
md: Fix - again - partition detection when array becomes active
2011-02-24 17:26:41 +11:00
media
Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2011-02-02 17:52:19 -08:00
memstick
workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'
2011-02-16 17:48:59 +01:00
message
[SCSI] mptfusion: Bump version 03.04.18
2011-02-12 12:51:21 -06:00
mfd
misc
workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'
2011-02-16 17:48:59 +01:00
mmc
ARM: mmci: round down the bytes transferred on error
2011-01-31 10:53:37 +00:00
mtd
workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'
2011-02-16 17:48:59 +01:00
net
Merge branch 'r8169-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6
2011-02-23 15:03:11 -08:00
nfc
drivers/nfc/pn544.c: add missing regulator
2011-02-25 15:07:36 -08:00
nubus
of
of/promtree: allow DT device matching by fixing 'name' brokenness (v5)
2011-03-02 13:45:19 -07:00
oprofile
parisc
parport
parport: make lockdep happy with waitlist_lock
2011-01-26 10:49:59 +10:00
pci
pci: use security_capable() when checking capablities during config space read
2011-02-15 19:06:31 +11:00
pcmcia
pcmcia: re-enable Zoomed Video support
2011-02-20 12:47:34 +01:00
platform
dell-laptop: Toggle the unsupported hardware killswitch
2011-02-21 17:06:21 -05:00
pnp
power
pps
pps: initialize ts_real properly
2011-02-25 15:07:37 -08:00
ps3
rapidio
rapidio: fix sysfs config attribute to access 16MB of maint space
2011-02-25 15:07:37 -08:00
regulator
regulator, mc13xxx: Remove pointless test for unsigned less than zero
2011-02-25 08:51:07 +00:00
rtc
drivers/rtc/rtc-ds3232.c: fix time range difference between linux and RTC chip
2011-02-25 15:07:37 -08:00
s390
[S390] dasd: correct device table
2011-02-17 13:13:58 +01:00
sbus
scsi
[SCSI] qla2xxx: Return DID_NO_CONNECT when FC device is lost.
2011-02-15 11:12:17 -06:00
sfi
sh
sn
spi
spi/pxa2xx pci: fix the release - remove race
2011-02-15 13:25:36 -07:00
ssb
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2011-02-08 12:03:54 -08:00
staging
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
2011-02-10 12:19:23 -08:00
target
[SCSI] target: fix use after free detected by SLUB poison
2011-02-12 12:32:41 -06:00
tc
telephony
thermal
ACPI: Fix build for CONFIG_NET unset
2011-02-28 18:00:31 -08:00
tty
Merge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-02-18 12:36:06 -08:00
uio
usb
of: Add missing of_address.h to xilinx ehci driver
2011-03-02 13:45:18 -07:00
uwb
vhost
vhost: rcu annotation fixup
2011-02-01 16:48:46 +02:00
video
console: rename acquire/release_console_sem() to console_lock/unlock()
2011-01-26 10:50:06 +10:00
virtio
vlynq
w1
drivers/w1/masters/omap_hdq.c: add missing clk_put
2011-02-11 16:12:20 -08:00
watchdog
m68knommu: Rename m548x_wdt.c to m54xx_wdt.c
2011-02-08 15:07:45 +10:00
xen
xen: suspend and resume system devices when running PVHVM
2011-02-17 10:31:20 +00:00
zorro
Kconfig
Makefile