git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 4ae9a4c66cdcb8b5d4e4d904846f1b450dbcabb4 Mon Sep 17 00:00:00 2001
   2 From: Marek Szyprowski <m.szyprowski@samsung.com>
   3 Date: Fri, 21 Aug 2015 14:38:38 +0200
   4 Subject: ARM: dts: Add vbus regulator to USB2 phy nodes on exynos3250, exynos4210 and exynos4412 boards
   5
   6 From: Marek Szyprowski <m.szyprowski@samsung.com>
   7
   8 commit 4ae9a4c66cdcb8b5d4e4d904846f1b450dbcabb4 upstream.
   9
  10 Exynos USB2 PHY driver now supports VBUS regulator, so add it to all
  11 boards which have it available. This also fixes commit
  12 7eec1266751b ("ARM: dts: Add Maxim 77693 PMIC to exynos4412-trats2"),
  13 which added new regulators to Trats2 board, but without linking them to
  14 the consumers.
  15
  16 Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
  17 Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
  18 Fixes: 7eec1266751b ("ARM: dts: Add Maxim 77693 PMIC to exynos4412-trats2")
  19 Signed-off-by: Kukjin Kim <kgene@kernel.org>
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21
  22 ---
  23  arch/arm/boot/dts/exynos3250-monk.dts           |    1 +
  24  arch/arm/boot/dts/exynos3250-rinato.dts         |    1 +
  25  arch/arm/boot/dts/exynos4210-trats.dts          |    2 +-
  26  arch/arm/boot/dts/exynos4210-universal_c210.dts |    2 +-
  27  arch/arm/boot/dts/exynos4412-trats2.dts         |    1 +
  28  5 files changed, 5 insertions(+), 2 deletions(-)
  29
  30 --- a/arch/arm/boot/dts/exynos3250-monk.dts
  31 +++ b/arch/arm/boot/dts/exynos3250-monk.dts
  32 @@ -161,6 +161,7 @@
  33  };
  34
  35  &exynos_usbphy {
  36 +       vbus-supply = <&safeout_reg>;
  37         status = "okay";
  38  };
  39
  40 --- a/arch/arm/boot/dts/exynos3250-rinato.dts
  41 +++ b/arch/arm/boot/dts/exynos3250-rinato.dts
  42 @@ -153,6 +153,7 @@
  43
  44  &exynos_usbphy {
  45         status = "okay";
  46 +       vbus-supply = <&safeout_reg>;
  47  };
  48
  49  &hsotg {
  50 --- a/arch/arm/boot/dts/exynos4210-trats.dts
  51 +++ b/arch/arm/boot/dts/exynos4210-trats.dts
  52 @@ -251,6 +251,7 @@
  53
  54  &exynos_usbphy {
  55         status = "okay";
  56 +       vbus-supply = <&safe1_sreg>;
  57  };
  58
  59  &fimd {
  60 @@ -448,7 +449,6 @@
  61
  62                         safe1_sreg: ESAFEOUT1 {
  63                              regulator-name = "SAFEOUT1";
  64 -                            regulator-always-on;
  65                         };
  66
  67                         safe2_sreg: ESAFEOUT2 {
  68 --- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
  69 +++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
  70 @@ -248,6 +248,7 @@
  71
  72  &exynos_usbphy {
  73         status = "okay";
  74 +       vbus-supply = <&safeout1_reg>;
  75  };
  76
  77  &fimd {
  78 @@ -486,7 +487,6 @@
  79
  80                         safeout1_reg: ESAFEOUT1 {
  81                                 regulator-name = "SAFEOUT1";
  82 -                               regulator-always-on;
  83                         };
  84
  85                         safeout2_reg: ESAFEOUT2 {
  86 --- a/arch/arm/boot/dts/exynos4412-trats2.dts
  87 +++ b/arch/arm/boot/dts/exynos4412-trats2.dts
  88 @@ -391,6 +391,7 @@
  89  };
  90
  91  &exynos_usbphy {
  92 +       vbus-supply = <&esafeout1_reg>;
  93         status = "okay";
  94  };
  95