diff options
author | Dave Airlie <airlied@redhat.com> | 2015-05-20 16:23:53 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-05-20 16:23:53 +1000 |
commit | bdcddf95e82b1c4e370fc1196b1f4f50f775dab4 (patch) | |
tree | ef2af2b3faee1f8e8287ca45d265809f56fbd0f6 /arch/arm/boot/dts/omap3-n900.dts | |
parent | 91d9f9856f91c82ac6289a0fff65dd12cfa07e34 (diff) | |
parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) |
Backmerge v4.1-rc4 into into drm-next
We picked up a silent conflict in amdkfd with drm-fixes and drm-next,
backmerge v4.1-rc5 and fix the conflicts
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/drm_irq.c
Diffstat (limited to 'arch/arm/boot/dts/omap3-n900.dts')
-rw-r--r-- | arch/arm/boot/dts/omap3-n900.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index a29315833ecd..5c16145920ea 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -498,6 +498,8 @@ DRVDD-supply = <&vmmc2>; IOVDD-supply = <&vio>; DVDD-supply = <&vio>; + + ai3x-micbias-vg = <1>; }; tlv320aic3x_aux: tlv320aic3x@19 { @@ -509,6 +511,8 @@ DRVDD-supply = <&vmmc2>; IOVDD-supply = <&vio>; DVDD-supply = <&vio>; + + ai3x-micbias-vg = <2>; }; tsl2563: tsl2563@29 { |