summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuman Anna <s-anna@ti.com>2015-03-12 00:38:38 +0100
committerTony Lindgren <tony@atomide.com>2015-03-16 23:30:28 +0100
commite5ed5b60272871786b1c5434079925bc60d771b7 (patch)
treee77c1915b045675f80a33a3994691328b803b781
parentARM: dts: omap3: Add missing dmas for crypto (diff)
downloadlinux-e5ed5b60272871786b1c5434079925bc60d771b7.tar.xz
linux-e5ed5b60272871786b1c5434079925bc60d771b7.zip
ARM: OMAP2+: Fix socbus family info for AM33xx devices
The family information in the soc-bus data is currently not classified properly for AM33xx devices, and a read of /sys/bus/soc/devices/soc0/family currently shows "Unknown". Fix the same. Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/id.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 2a2f4d56e4c8..25f1beea453e 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -720,6 +720,8 @@ static const char * __init omap_get_family(void)
return kasprintf(GFP_KERNEL, "OMAP4");
else if (soc_is_omap54xx())
return kasprintf(GFP_KERNEL, "OMAP5");
+ else if (soc_is_am33xx() || soc_is_am335x())
+ return kasprintf(GFP_KERNEL, "AM33xx");
else if (soc_is_am43xx())
return kasprintf(GFP_KERNEL, "AM43xx");
else if (soc_is_dra7xx())