diff --git a/data/devices/CMakeLists.txt b/data/devices/CMakeLists.txt
index 1f0daaf51..1983500e7 100644
--- a/data/devices/CMakeLists.txt
+++ b/data/devices/CMakeLists.txt
@@ -73,6 +73,9 @@ set(files
     zoji.yml
     zte.yml
     zuk.yml
+    s7edge.yml
+    samsung.yml
+    samsung[1].yml
 )
 
 set(target_file "${CMAKE_CURRENT_BINARY_DIR}/devices.json")
diff --git a/data/devices/s7edge.yml b/data/devices/s7edge.yml
new file mode 100644
index 000000000..5ba2003e8
--- /dev/null
+++ b/data/devices/s7edge.yml
@@ -0,0 +1,60 @@
+---
+- name: Samsung Galaxy S7 Flat/Edge (Exynos)
+  id: herolte
+  codenames:
+    # Regular variant
+    - herolte
+    - heroltexx
+    - heroltebmc
+    - heroltektt
+    - heroltelgt
+    - herolteskt
+    # Edge variant
+    - hero2lte
+    - hero2ltexx
+    - hero2ltebmc
+    - hero2ltektt
+    - hero2ltelgt
+    - hero2lteskt
+  architecture: arm64-v8a
+
+  block_devs:
+    base_dirs:
+      - /dev/block/platform/15570000.ufs/by-name
+      - /dev/block/platform/155a0000.ufs/by-name
+    system:
+      - /dev/block/platform/15570000.ufs/by-name/SYSTEM
+      - /dev/block/platform/155a0000.ufs/by-name/SYSTEM
+      - /dev/block/sda14
+    cache:
+      - /dev/block/platform/15570000.ufs/by-name/CACHE
+      - /dev/block/platform/155a0000.ufs/by-name/CACHE
+      - /dev/block/sda15
+    data:
+      - /dev/block/platform/15570000.ufs/by-name/USERDATA
+      - /dev/block/platform/155a0000.ufs/by-name/USERDATA
+      - /dev/block/sda18
+    boot:
+      - /dev/block/platform/15570000.ufs/by-name/BOOT
+      - /dev/block/platform/155a0000.ufs/by-name/BOOT
+      - /dev/block/sda5
+    recovery:
+      - /dev/block/platform/15570000.ufs/by-name/RECOVERY
+      - /dev/block/platform/155a0000.ufs/by-name/RECOVERY
+      - /dev/block/sda6
+    extra:
+      - /dev/block/platform/15570000.ufs/by-name/RADIO
+      - /dev/block/platform/155a0000.ufs/by-name/RADIO
+      - /dev/block/sda8
+
+  boot_ui:
+    supported: true
+    flags:
+      - TW_HAS_DOWNLOAD_MODE
+    graphics_backends:
+      - fbdev
+    brightness_path: /sys/devices/13900000.dsim/backlight/panel/brightness
+    max_brightness: 255
+    default_brightness: 162
+    pixel_format: ABGR_8888
+    theme: portrait_hdpi
\ No newline at end of file
diff --git a/data/devices/samsung[1].yml b/data/devices/samsung[1].yml
new file mode 100644
index 000000000..99a4b9ba1
--- /dev/null
+++ b/data/devices/samsung[1].yml
@@ -0,0 +1,65 @@
+---
+- name: samsung SM-N950F
+  id: greatlte
+  codenames:
+      - SM-N950F
+      - greatlte
+      - hero2lte
+  architecture: 
+  block_devs:
+    base_dirs:
+      - /dev/block/platform/155a0000.ufs/by-num
+    system:
+      - /dev/block/platform/155a0000.ufs/by-name/SYSTEM
+      - /dev/block/sda14
+    cache:
+      - /dev/block/platform/155a0000.ufs/by-name/CACHE
+      - /dev/block/sda15
+    data:
+      - /dev/block/platform/155a0000.ufs/by-name/USERDATA
+      - /dev/block/sda18
+    boot:
+      - /dev/block/platform/155a0000.ufs/by-name/BOOT
+      - /dev/block/sda5
+    recovery:
+      - /dev/block/platform/155a0000.ufs/by-name/RECOVERY
+      - /dev/block/sda6
+    extra:
+      - /dev/block/mmcblk0p1
+      - /dev/block/platform/155a0000.ufs/by-name/CP_DEBUG
+      - /dev/block/platform/155a0000.ufs/by-name/EFS
+      - /dev/block/platform/155a0000.ufs/by-name/OTA
+      - /dev/block/platform/155a0000.ufs/by-name/RADIO
+      - /dev/block/platform/155a0000.ufs/by-num/p1
+      - /dev/block/platform/155a0000.ufs/by-num/p10
+      - /dev/block/platform/155a0000.ufs/by-num/p11
+      - /dev/block/platform/155a0000.ufs/by-num/p12
+      - /dev/block/platform/155a0000.ufs/by-num/p13
+      - /dev/block/platform/155a0000.ufs/by-num/p14
+      - /dev/block/platform/155a0000.ufs/by-num/p15
+      - /dev/block/platform/155a0000.ufs/by-num/p16
+      - /dev/block/platform/155a0000.ufs/by-num/p17
+      - /dev/block/platform/155a0000.ufs/by-num/p18
+      - /dev/block/platform/155a0000.ufs/by-num/p2
+      - /dev/block/platform/155a0000.ufs/by-num/p3
+      - /dev/block/platform/155a0000.ufs/by-num/p4
+      - /dev/block/platform/155a0000.ufs/by-num/p5
+      - /dev/block/platform/155a0000.ufs/by-num/p6
+      - /dev/block/platform/155a0000.ufs/by-num/p7
+      - /dev/block/platform/155a0000.ufs/by-num/p8
+      - /dev/block/platform/155a0000.ufs/by-num/p9
+      - /dev/block/mmcblk1
+      - /dev/block/mmcblk1p1
+ 
+  boot_ui:
+    supported: true
+    flags:
+      - TW_GRAPHICS_FORCE_USE_LINELENGTH
+    brightness_path: 
+    max_brightness: 255
+    default_brightness: 168
+    cpu_temp_path: /sys/devices/virtual/thermal/thermal_zone0/temp
+    battery_path: /sys/class/power_supply/battery/capacity
+    graphics_backends:
+      - fbdev
+    theme: portrait_hdpi