Merge pull request #11 from lissyx/merge_sony_lmr1_20160607

Merge sony lmr1 20160607
mozilla-b2g · Jun 7, 2016 · f2d79be · f2d79be
2 parents 7adaac9 + 3fdb348
commit f2d79be
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/device.mk b/device.mk
@@ -17,7 +17,7 @@ DEVICE_PACKAGE_OVERLAYS += \
 
 # Device etc
 PRODUCT_COPY_FILES := \
-    device/sony/tianchi/rootdir/system/etc/sensor_def_qcomdev.conf:system/etc/sensor_def_qcomdev.conf \
+    device/sony/tianchi/rootdir/system/etc/sensors/sensor_def_qcomdev.conf:system/etc/sensors/sensor_def_qcomdev.conf \
     device/sony/tianchi/rootdir/system/etc/mixer_paths.xml:system/etc/mixer_paths.xml \
     device/sony/tianchi/rootdir/system/etc/thermanager.xml:system/etc/thermanager.xml \
     device/sony/tianchi/rootdir/system/etc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf \
@@ -65,4 +65,4 @@ PRODUCT_PROPERTY_OVERRIDES := \
 
 # Inherit from those products. Most specific first.
 $(call inherit-product, device/sony/yukon/platform.mk)
-$(call inherit-product-if-exists, vendor/sony/tianchi/tianchi-vendor.mk)
+$(call inherit-product-if-exists, vendor/sony/yukon-tianchi/tianchi-vendor.mk)
diff --git a/rootdir/system/etc/sensor_def_qcomdev.conf → ...ystem/etc/sensors/sensor_def_qcomdev.conf b/rootdir/system/etc/sensor_def_qcomdev.conf → ...ystem/etc/sensors/sensor_def_qcomdev.conf
diff --git a/rootdir/system/etc/thermanager.xml b/rootdir/system/etc/thermanager.xml
@@ -44,7 +44,7 @@
 		</resource>
 
 		<!-- device-specific -->
-		<resource name="backlight" type="sysfs">/sys/class/leds/wled:backlight/max_brightness</resource>
+		<resource name="backlight" type="sysfs">/sys/class/leds/lcd-backlight/max_brightness</resource>
 
 		<resource name="kgsl-3d0" type="sysfs">/sys/class/kgsl/kgsl-3d0/max_gpuclk</resource>
 		<resource name="usb" type="sysfs">/sys/class/power_supply/usb/current_max</resource>