Merge tag 'devicetree-fixes-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull DeviceTree fixes from Rob Herring:

 - fix build for !OF providing empty of_find_device_by_node

 - fix Abracon vendor prefix

 - sync dtx_diff include paths (again)

 - a stm32h7 clock binding doc fix

* tag 'devicetree-fixes-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: clk: stm32h7: fix clock-cell size
  scripts/dtc: dtx_diff - 2nd update of include dts paths to match build
  dt-bindings: fix vendor prefix for Abracon
  of: provide inline helper for of_find_device_by_node

1 files changed, 9 insertions, 13 deletions

diff --git a/scripts/dtc/dtx_diff b/scripts/dtc/dtx_diff
index f9a3d8d23c64..8c4fbad2055e 100755
--- a/scripts/dtc/dtx_diff
+++ b/scripts/dtc/dtx_diff
@@ -86,6 +86,7 @@ eod
 compile_to_dts() {
 
         dtx="$1"
+        dtc_include="$2"
 
         if [ -d "${dtx}" ] ; then
 
@@ -113,7 +114,7 @@ compile_to_dts() {
                 # -----  input is DTS (source)
 
                 if ( cpp ${cpp_flags} -x assembler-with-cpp ${dtx} \
-                        | ${DTC} -I dts ) ; then
+                        | ${DTC} ${dtc_include} -I dts ) ; then
                         return
                 fi
 
@@ -320,18 +321,13 @@ fi
 
 cpp_flags="\
         -nostdinc                                  \
-        -I${srctree}/arch/${ARCH}/boot/dts         \
         -I${srctree}/scripts/dtc/include-prefixes  \
-        -I${srctree}/drivers/of/testcase-data      \
         -undef -D__DTS__"
 
-dtc_flags="\
-        -i ${srctree}/arch/${ARCH}/boot/dts/ \
-        -i ${srctree}/kernel/dts             \
-        ${dtx_path_1_dtc_include}            \
-        ${dtx_path_2_dtc_include}"
-
-DTC="${DTC} ${dtc_flags} -O dts -qq -f ${dtc_sort} -o -"
+DTC="\
+        ${DTC}                                     \
+        -i ${srctree}/scripts/dtc/include-prefixes \
+        -O dts -qq -f ${dtc_sort} -o -"
 
 
 # -----  do the diff or decompile
@@ -339,11 +335,11 @@ DTC="${DTC} ${dtc_flags} -O dts -qq -f ${dtc_sort} -o -"
 if (( ${cmd_diff} )) ; then
 
         diff ${diff_flags} --label "${dtx_file_1}" --label "${dtx_file_2}" \
-                <(compile_to_dts "${dtx_file_1}") \
-                <(compile_to_dts "${dtx_file_2}")
+                <(compile_to_dts "${dtx_file_1}" "${dtx_path_1_dtc_include}") \
+                <(compile_to_dts "${dtx_file_2}" "${dtx_path_2_dtc_include}")
 
 else
 
-        compile_to_dts "${dtx_file_1}"
+        compile_to_dts "${dtx_file_1}" "${dtx_path_1_dtc_include}"
 
 fi