initial adaptions for mainline kernel

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

5 files changed, 37 insertions, 41 deletions

diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk
index 28f76d7..348f2a4 100755
--- a/BoardCommonConfig.mk
+++ b/BoardCommonConfig.mk
@@ -107,11 +107,6 @@ BOARD_USE_CSC_FIMC := false
 # Include an expanded selection of fonts
 EXTENDED_FONT_FOOTPRINT := true
 
-# Logging
-TARGET_USES_LOGD := false
-
-BOARD_USES_LEGACY_MMAP := true
-
 # RIL
 BOARD_MOBILEDATA_INTERFACE_NAME := "pdp0"
 
@@ -123,12 +118,12 @@ BOARD_WPA_SUPPLICANT_DRIVER      := NL80211
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd
 BOARD_HOSTAPD_DRIVER             := NL80211
 BOARD_HOSTAPD_PRIVATE_LIB        := lib_driver_cmd_bcmdhd
-WIFI_DRIVER_MODULE_PATH          := "/system/lib/modules/dhd.ko"
-WIFI_DRIVER_FW_PATH_PARAM        := "/sys/module/dhd/parameters/firmware_path"
+WIFI_DRIVER_MODULE_PATH          := "/system/lib/modules/brcmfmac.ko"
+#WIFI_DRIVER_FW_PATH_PARAM        := "/sys/module/dhd/parameters/firmware_path"
 WIFI_DRIVER_FW_PATH_STA          := "/vendor/firmware/bcmdhd_sta.bin"
 WIFI_DRIVER_FW_PATH_AP           := "/vendor/firmware/bcmdhd_apsta.bin"
 WIFI_DRIVER_FW_PATH_P2P          := "/vendor/firmware/bcmdhd_p2p.bin"
-WIFI_DRIVER_MODULE_NAME          := "dhd"
+WIFI_DRIVER_MODULE_NAME          := "brcmfmac"
 WIFI_DRIVER_MODULE_ARG           := "firmware_path=/vendor/firmware/bcmdhd_sta.bin nvram_path=/vendor/firmware/nvram_net.txt"
 WIFI_DRIVER_MODULE_AP_ARG        := "firmware_path=/vendor/firmware/bcmdhd_apsta.bin nvram_path=/vendor/firmware/nvram_net.txt"
 WIFI_BAND                        := 802_11_ABG
@@ -158,7 +153,7 @@ BOARD_SEPOLICY_DIRS += device/samsung/smdk4412-common/selinux
 
 # Charging mode
 BOARD_CHARGING_MODE_BOOTING_LPM := /sys/class/power_supply/battery/batt_lp_charging
-BOARD_BATTERY_DEVICE_NAME := "battery"
+BOARD_BATTERY_DEVICE_NAME := "max170xx_battery"
 BOARD_CHARGER_ENABLE_SUSPEND := true
 RED_LED_PATH := /sys/class/leds/led_r/brightness
 GREEN_LED_PATH := /sys/class/leds/led_g/brightness
diff --git a/libhealthd/healthd_board_exynos4.cpp b/libhealthd/healthd_board_exynos4.cpp
index 7d51c13..4da3226 100644
--- a/libhealthd/healthd_board_exynos4.cpp
+++ b/libhealthd/healthd_board_exynos4.cpp
@@ -20,14 +20,14 @@
 void
 healthd_board_init(struct healthd_config *config)
 {
-    config->batteryCapacityPath    = "/sys/class/power_supply/battery/capacity";
-    config->batteryStatusPath      = "/sys/class/power_supply/battery/status";
-    config->batteryVoltagePath     = "/sys/class/power_supply/battery/voltage_now";
-    config->batteryCurrentNowPath  = "/sys/class/power_supply/battery/current_now";
-    config->batteryPresentPath     = "/sys/class/power_supply/battery/present";
-    config->batteryHealthPath      = "/sys/class/power_supply/battery/health";
-    config->batteryTemperaturePath = "/sys/class/power_supply/battery/temp";
-    config->batteryTechnologyPath  = "/sys/class/power_supply/battery/technology";
+    config->batteryCapacityPath    = "/sys/class/power_supply/max170xx_battery/capacity";
+    config->batteryStatusPath      = "/sys/class/power_supply/max77693-charger/status";
+    config->batteryVoltagePath     = "/sys/class/power_supply/max170xx_battery/voltage_now";
+    config->batteryCurrentNowPath  = "/sys/class/power_supply/max170xx_battery/current_now";
+    config->batteryPresentPath     = "/sys/class/power_supply/max170xx_battery/present";
+    config->batteryHealthPath      = "/sys/class/power_supply/max170xx_battery/health";
+    config->batteryTemperaturePath = "/sys/class/power_supply/max170xx_battery/temp";
+    config->batteryTechnologyPath  = "/sys/class/power_supply/max170xx_battery/technology";
     // others use defaults
 }
 
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 5fe6b51..e290ec7 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -98,27 +98,27 @@
         than the size of the config_autoBrightnessLevels array.
     -->
     <integer-array name="config_autoBrightnessLcdBacklightValues">
-        <item>40</item>
-        <item>50</item>
-        <item>60</item>
-        <item>70</item>
-        <item>80</item>
-        <item>90</item>
-        <item>100</item>
-        <item>110</item>
-        <item>120</item>
-        <item>130</item>
-        <item>140</item>
-        <item>150</item>
-        <item>160</item>
-        <item>170</item>
-        <item>185</item>
-        <item>200</item>
-        <item>215</item>
-        <item>225</item>
-        <item>235</item>
-        <item>245</item>
-        <item>255</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+        <item>16</item>
+        <item>17</item>
+        <item>18</item>
+        <item>19</item>
+        <item>20</item>
+        <item>21</item>
+        <item>22</item>
+        <item>23</item>
+        <item>24</item>
     </integer-array>
 
     <!-- Array of output values for button backlight corresponding to the LUX values
diff --git a/rootdir/init.smdk4x12.rc b/rootdir/init.smdk4x12.rc
index ecc91a2..3975533 100755
--- a/rootdir/init.smdk4x12.rc
+++ b/rootdir/init.smdk4x12.rc
@@ -375,6 +375,7 @@ on post-fs-data
 
 on boot
     mount debugfs /sys/kernel/debug /sys/kernel/debug
+    chmod 0775  /sys/kernel/debug
 
     setprop ro.build.product smdk4x12
     setprop ro.product.device smdk4x12
diff --git a/rootdir/ueventd.smdk4x12.rc b/rootdir/ueventd.smdk4x12.rc
index 541eabb..f2efa79 100644
--- a/rootdir/ueventd.smdk4x12.rc
+++ b/rootdir/ueventd.smdk4x12.rc
@@ -81,8 +81,8 @@
 /dev/ttyUSB2              0666   system     system
 /dev/hsic*                0660   system     radio
 /dev/usb/lp*              0660   system     usb
-/dev/block/mmcblk0p4	  0660	 system	    radio
-/dev/block/mmcblk0p7	  0660	 system	    radio
+/dev/block/mmcblk1p4	  0660	 system	    radio
+/dev/block/mmcblk1p7	  0660	 system	    radio
 
 /dev/ttySAC*	          0660	 root	    system
 /dev/umts*                0660   system     radio
@@ -101,5 +101,5 @@
 /dev/ssp_sensorhub        0660   system     input
 
 # t0lte
-/dev/block/mmcblk0p10     0660   system     radio
+/dev/block/mmcblk1p10     0660   system     radio
 /dev/mdm                  0660   system     system