Merge tag 'soc-arm-7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC board file updates from Arnd Bergmann:
 "These are mostly smaller cleanups for the remaining platform code in
  arch/arm/, the most notable one being the conversion of the
  s3c/crag6410 board to use software nodes for GPIO references in place
  of plain GPIO numbers.

  The earlier plan was to drop the deprecated (since 7.3) board files
  here, which would have been a much larger set of changes, but that is
  now deferred to 7.5"

* tag 'soc-arm-7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  MAINTAINERS: Drop arm64 dts/intel path from ARM/SOCFPGA ARCHITECTURE
  ARM: tegra: Fix Trun -> Turn typo
  ARM: vexpress: fix device_node refcount leak in vexpress_smp_dt_prepare_cpus()
  ARM: vexpress: fix device_node refcount leak in vexpress_flags_set()
  MAINTAINERS: Change ARM Visconti5 architecture maintenance status to Odd Fixes
  ARM: mvebu: fix Cortex-A9 errata selection for Armada 38x
  ARM: OMAP2+: remove unused ctrl_module_wkup_44xx.h header
  ARM: EXYNOS: Replace __ASSEMBLY__ with __ASSEMBLER__
  ARM: s3c: crag6410: use software nodes/properties to set up GPIO keys
  Input: samsung-keypad - remove support for platform data
  ARM: s3c: crag6410: switch keypad device to software properties
  ARM: s3c: register and attach software nodes for Samsung gpio_chips
  Input: samsung-keypad - handle compact binding
  dt-bindings: input: samsung,s3c6410-keypad: introduce compact binding
  ARM: imx6q: remove KSZ9021 PHY fixup
  ARM: imx: Fix suspend/resume crash with Clang CFI
  ARM: OMAP2+: Replace __ASSEMBLY__ with __ASSEMBLER__
  soc: imx: Replace __ASSEMBLY__ with __ASSEMBLER__ in header file
  ARM: imx: Replace __ASSEMBLY__ with __ASSEMBLER__
  MAINTAINERS: Add git tree for TI K3 ARCHITECTURE

1 files changed, 50 insertions, 3 deletions

diff --git a/Documentation/devicetree/bindings/input/samsung,s3c6410-keypad.yaml b/Documentation/devicetree/bindings/input/samsung,s3c6410-keypad.yaml
index a53569aa0ee7..2498c62444a1 100644
--- a/Documentation/devicetree/bindings/input/samsung,s3c6410-keypad.yaml
+++ b/Documentation/devicetree/bindings/input/samsung,s3c6410-keypad.yaml
@@ -37,6 +37,10 @@ properties:
 
   wakeup-source: true
 
+  keypad,num-columns: true
+  keypad,num-rows: true
+  linux,keymap: true
+
   linux,input-no-autorepeat:
     type: boolean
     description:
@@ -81,12 +85,33 @@ patternProperties:
       - keypad,row
       - linux,code
 
+dependencies:
+  linux,keymap: [ "keypad,num-columns", "keypad,num-rows" ]
+
 required:
   - compatible
   - reg
   - interrupts
-  - samsung,keypad-num-columns
-  - samsung,keypad-num-rows
+
+allOf:
+  - $ref: input.yaml#
+  - $ref: matrix-keymap.yaml#
+  - if:
+      required:
+        - linux,keymap
+    then:
+      properties:
+        samsung,keypad-num-columns: false
+        samsung,keypad-num-rows: false
+      patternProperties:
+        '^key-[0-9a-z]+$': false
+    else:
+      properties:
+        keypad,num-columns: false
+        keypad,num-rows: false
+      required:
+        - samsung,keypad-num-columns
+        - samsung,keypad-num-rows
 
 additionalProperties: false
 
@@ -94,8 +119,9 @@ examples:
   - |
     #include <dt-bindings/clock/exynos4.h>
     #include <dt-bindings/interrupt-controller/arm-gic.h>
+    #include <dt-bindings/input/input.h>
 
-    keypad@100a0000 {
+    keypad1@100a0000 {
         compatible = "samsung,s5pv210-keypad";
         reg = <0x100a0000 0x100>;
         interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
@@ -119,3 +145,24 @@ examples:
             linux,code = <3>;
         };
     };
+  - |
+    #include <dt-bindings/clock/exynos4.h>
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+    #include <dt-bindings/input/input.h>
+
+    keypad2@100a0000 {
+        compatible = "samsung,s5pv210-keypad";
+        reg = <0x100a0000 0x100>;
+        interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&clock CLK_KEYIF>;
+        clock-names = "keypad";
+
+        keypad,num-rows = <2>;
+        keypad,num-columns = <8>;
+        linux,keymap = <
+          MATRIX_KEY(0, 3, 2)
+          MATRIX_KEY(0, 4, 3)
+        >;
+        linux,input-no-autorepeat;
+        wakeup-source;
+    };