Advertisement
Guest User

Untitled

a guest
Dec 20th, 2015
68
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.37 KB | None | 0 0
  1. From 14ed2526aeb35cc7a9b289dff20601f45dc263cd Mon Sep 17 00:00:00 2001
  2. From: Robert Nelson <robertcnelson@gmail.com>
  3. Date: Sun, 20 Dec 2015 18:06:19 -0600
  4. Subject: [PATCH 2/2] am335x-olimex-som: no regulator for voltdm
  5.  
  6. Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  7. ---
  8. arch/arm/boot/dts/am335x-olimex-som.dts | 2 +-
  9. arch/arm/mach-omap2/opp33xx_data.c | 4 ++++
  10. 2 files changed, 5 insertions(+), 1 deletion(-)
  11.  
  12. diff --git a/arch/arm/boot/dts/am335x-olimex-som.dts b/arch/arm/boot/dts/am335x-olimex-som.dts
  13. index 63879e4..e7ee978 100644
  14. --- a/arch/arm/boot/dts/am335x-olimex-som.dts
  15. +++ b/arch/arm/boot/dts/am335x-olimex-som.dts
  16. @@ -12,7 +12,7 @@
  17.  
  18. / {
  19. model = "Olimex AM335x SOM";
  20. - compatible = "ti,am33xx";
  21. + compatible = "ti,am335x-olimex-som", "ti,am33xx";
  22. };
  23.  
  24. &ldo3_reg {
  25. diff --git a/arch/arm/mach-omap2/opp33xx_data.c b/arch/arm/mach-omap2/opp33xx_data.c
  26. index c4f5e1e..0f77633 100644
  27. --- a/arch/arm/mach-omap2/opp33xx_data.c
  28. +++ b/arch/arm/mach-omap2/opp33xx_data.c
  29. @@ -14,6 +14,7 @@
  30. */
  31. #include <linux/io.h>
  32. #include <linux/module.h>
  33. +#include <linux/of.h>
  34.  
  35. #include "control.h"
  36. #include "omap_opp_data.h"
  37. @@ -82,6 +83,9 @@ int __init am33xx_opp_init(void)
  38. if (WARN(!soc_is_am33xx(), "Cannot init OPPs: unsupported SoC.\n"))
  39. return r;
  40.  
  41. + if (of_machine_is_compatible("ti,am335x-olimex-som"))
  42. + return r;
  43. +
  44. rev = omap_rev();
  45.  
  46. switch (rev) {
  47. --
  48. 2.6.4
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement