n31: EIC, GPIO, PMIC keys, I2C, USB gadget

Documentation/devicetree/bindings/display/panel/apple,n31-panel.yaml

@@ -0,0 +1,67 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/display/panel/apple,n31-panel.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Apple iPod nano 7th generation display panel
+
+maintainers:
+  - Andrew Green <me@andrewgreen.ca>
+
+description: |
+  The 240x432 DCS command-mode panel of the Apple iPod nano 7th generation
+  (N31), on a MIPI DSI link from the S5L8740 display controller. Two panel
+  variants exist and are told apart by the first byte of manufacturer
+  register 0xA1; the driver reads it and picks the initialisation sequence.
+
+allOf:
+  - $ref: panel-common.yaml#
+
+properties:
+  compatible:
+    const: apple,n31-panel
+
+  reg:
+    maxItems: 1
+
+  reset-gpios:
+    maxItems: 1
+    description: Panel reset, SoC pad 15, released before the rail comes up.
+
+  enable-gpios:
+    maxItems: 1
+    description: |
+      Panel enable, SoC pad 14, driven high after the initialisation
+      sequence and low before the power-off sequence.
+
+  power-supply:
+    description: The panel's rail, PMU_LDO_7 on the D1830 PMIC.
+
+  backlight: true
+
+required:
+  - compatible
+  - reg
+  - reset-gpios
+  - power-supply
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/gpio/gpio.h>
+
+    dsi {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        panel@0 {
+            compatible = "apple,n31-panel";
+            reg = <0>;
+            reset-gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+            enable-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
+            power-supply = <&display_rail>;
+            backlight = <&backlight>;
+        };
+    };

Documentation/devicetree/bindings/display/samsung/samsung,s5l8740-lcdif.yaml

@@ -0,0 +1,83 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/display/samsung,s5l8740-lcdif.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Samsung S5L8740 display controller
+
+maintainers:
+  - Andrew Green <me@andrewgreen.ca>
+
+description: |
+  The display path of the S5L8740 (Apple iPod nano 7th generation) is four
+  blocks that only make sense together. The LCDIF carries pixels to a DCS
+  command-mode panel over a MIPI DSI host. The frame itself is composed
+  from DRAM by a layer compositor and pushed through the LCDIF transfer
+  gate, which the driver cycles once per frame. An LCDIF reset has to
+  cycle two gates in the clock controller, which is why that block is a
+  named window here rather than a clock phandle: the clock controller
+  binding for this SoC does not expose those gates.
+
+  The DSI host window makes the node a MIPI DSI host; the panel is its
+  child, on channel 0, described by its own binding.
+
+properties:
+  compatible:
+    const: samsung,s5l8740-lcdif
+
+  reg:
+    items:
+      - description: LCDIF register window
+      - description: clock controller window (two gates cycled on reset)
+      - description: MIPI DSI host window
+      - description: layer compositor window
+
+  reg-names:
+    items:
+      - const: lcdif
+      - const: clkcon
+      - const: dsi
+      - const: compositor
+
+  "#address-cells":
+    const: 1
+
+  "#size-cells":
+    const: 0
+
+patternProperties:
+  "^panel@0$":
+    type: object
+    $ref: panel/apple,n31-panel.yaml#
+    unevaluatedProperties: false
+
+required:
+  - compatible
+  - reg
+  - reg-names
+  - "#address-cells"
+  - "#size-cells"
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/gpio/gpio.h>
+
+    display@38300000 {
+        compatible = "samsung,s5l8740-lcdif";
+        reg = <0x38300000 0x10000>, <0x3c500000 0x100>,
+              <0x3d800000 0x1000>, <0x38900000 0x2000>;
+        reg-names = "lcdif", "clkcon", "dsi", "compositor";
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        panel@0 {
+            compatible = "apple,n31-panel";
+            reg = <0>;
+            reset-gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+            enable-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
+            power-supply = <&display_rail>;
+        };
+    };

arch/arm/boot/dts/samsung/Makefile

@@ -50,7 +50,8 @@ dtb-$(CONFIG_ARCH_S3C64XX) += \
 dtb-$(CONFIG_ARCH_S5L87XX) += \
 	s5l8702-n46.dtb \
 	s5l8723-n20.dtb \
-	s5l8740-n31.dtb
+	s5l8740-n31.dtb \
+	s5l8740-n31-nodrm.dtb
 dtb-$(CONFIG_ARCH_S5PV210) += \
 	s5pv210-aquila.dtb \
 	s5pv210-fascinate4g.dtb \

arch/arm/boot/dts/samsung/s5l8702-n46.dts

@@ -91,7 +91,7 @@
 		};
 
 		usbotg: usb@38400000 {
-			compatible = "apple,s5l87xx-usb";
+			compatible = "apple,s5l8702-usb", "apple,s5l87xx-usb";
 			reg = <0x38400000 0x40000>;
 			interrupt-parent = <&vic0>;
 			interrupts = <19>;