Test/glk bobba regression #4764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

plbossart wants to merge 256 commits into thesofproject:topic/sof-dev from plbossart:test/glk-bobba-regression

Documentation/devicetree/bindings/sound/audio-graph-port.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,12 @@ definitions: @@
         properties:
           mclk-fs:
             $ref: simple-card.yaml#/definitions/mclk-fs
+          playback-only:
+            description: port connection used only for playback
+            $ref: /schemas/types.yaml#/definitions/flag
+          capture-only:
+            description: port connection used only for capture
+            $ref: /schemas/types.yaml#/definitions/flag
       endpoint-base:
         allOf:
@@ Expand Down @@

Documentation/devicetree/bindings/sound/fsl,xcvr.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,10 @@ properties: @@
           - const: txfifo
       interrupts:
-        maxItems: 1
+        items:
+          - description: WAKEUPMIX Audio XCVR Interrupt 1
+          - description: WAKEUPMIX Audio XCVR Interrupt 2
+        minItems: 1
       clocks:
         items:
@@ Expand Down Expand Up / @@ -78,6 +81,23 @@ required: @@
       - dma-names
       - resets
+    allOf:
+      - if:
+          properties:
+            compatible:
+              contains:
+                enum:
+                  - fsl,imx93-xcvr
+        then:
+          properties:
+            interrupts:
+              minItems: 2
+              maxItems: 2
+        else:
+          properties:
+            interrupts:
+              maxItems: 1
     additionalProperties: false
     examples:
@@ Expand Down @@

Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ allOf: @@
     properties:
       compatible:
         enum:
+          - mediatek,mt8188-es8326
           - mediatek,mt8188-mt6359-evb
           - mediatek,mt8188-nau8825
           - mediatek,mt8188-rt5682s
@@ Expand Down @@

Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,12 +11,18 @@ maintainers: @@
     properties:
       compatible:
-        enum:
-          - qcom,sc7280-lpass-rx-macro
-          - qcom,sm8250-lpass-rx-macro
-          - qcom,sm8450-lpass-rx-macro
-          - qcom,sm8550-lpass-rx-macro
-          - qcom,sc8280xp-lpass-rx-macro
+        oneOf:
+          - enum:
+              - qcom,sc7280-lpass-rx-macro
+              - qcom,sm8250-lpass-rx-macro
+              - qcom,sm8450-lpass-rx-macro
+              - qcom,sm8550-lpass-rx-macro
+              - qcom,sc8280xp-lpass-rx-macro
+          - items:
+              - enum:
+                  - qcom,sm8650-lpass-rx-macro
+                  - qcom,x1e80100-lpass-rx-macro
+              - const: qcom,sm8550-lpass-rx-macro
       reg:
         maxItems: 1
@@ Expand Down Expand Up / @@ -96,8 +102,9 @@ allOf: @@
       - if:
           properties:
             compatible:
-              enum:
-                - qcom,sm8550-lpass-rx-macro
+              contains:
+                enum:
+                  - qcom,sm8550-lpass-rx-macro
         then:
           properties:
             clocks:
@@ Expand Down @@

Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,13 +11,19 @@ maintainers: @@
     properties:
       compatible:
-        enum:
-          - qcom,sc7280-lpass-tx-macro
-          - qcom,sm6115-lpass-tx-macro
-          - qcom,sm8250-lpass-tx-macro
-          - qcom,sm8450-lpass-tx-macro
-          - qcom,sm8550-lpass-tx-macro
-          - qcom,sc8280xp-lpass-tx-macro
+        oneOf:
+          - enum:
+              - qcom,sc7280-lpass-tx-macro
+              - qcom,sm6115-lpass-tx-macro
+              - qcom,sm8250-lpass-tx-macro
+              - qcom,sm8450-lpass-tx-macro
+              - qcom,sm8550-lpass-tx-macro
+              - qcom,sc8280xp-lpass-tx-macro
+          - items:
+              - enum:
+                  - qcom,sm8650-lpass-tx-macro
+                  - qcom,x1e80100-lpass-tx-macro
+              - const: qcom,sm8550-lpass-tx-macro
       reg:
         maxItems: 1
@@ Expand Down Expand Up / @@ -118,8 +124,9 @@ allOf: @@
       - if:
           properties:
             compatible:
-              enum:
-                - qcom,sm8550-lpass-tx-macro
+              contains:
+                enum:
+                  - qcom,sm8550-lpass-tx-macro
         then:
           properties:
             clocks:
@@ Expand Down @@

Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,12 +11,18 @@ maintainers: @@
     properties:
       compatible:
-        enum:
-          - qcom,sc7280-lpass-va-macro
-          - qcom,sm8250-lpass-va-macro
-          - qcom,sm8450-lpass-va-macro
-          - qcom,sm8550-lpass-va-macro
-          - qcom,sc8280xp-lpass-va-macro
+        oneOf:
+          - enum:
+              - qcom,sc7280-lpass-va-macro
+              - qcom,sm8250-lpass-va-macro
+              - qcom,sm8450-lpass-va-macro
+              - qcom,sm8550-lpass-va-macro
+              - qcom,sc8280xp-lpass-va-macro
+          - items:
+              - enum:
+                  - qcom,sm8650-lpass-va-macro
+                  - qcom,x1e80100-lpass-va-macro
+              - const: qcom,sm8550-lpass-va-macro
       reg:
         maxItems: 1
@@ Expand Down @@

Documentation/devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,12 +11,18 @@ maintainers: @@
     properties:
       compatible:
-        enum:
-          - qcom,sc7280-lpass-wsa-macro
-          - qcom,sm8250-lpass-wsa-macro
-          - qcom,sm8450-lpass-wsa-macro
-          - qcom,sm8550-lpass-wsa-macro
-          - qcom,sc8280xp-lpass-wsa-macro
+        oneOf:
+          - enum:
+              - qcom,sc7280-lpass-wsa-macro
+              - qcom,sm8250-lpass-wsa-macro
+              - qcom,sm8450-lpass-wsa-macro
+              - qcom,sm8550-lpass-wsa-macro
+              - qcom,sc8280xp-lpass-wsa-macro
+          - items:
+              - enum:
+                  - qcom,sm8650-lpass-wsa-macro
+                  - qcom,x1e80100-lpass-wsa-macro
+              - const: qcom,sm8550-lpass-wsa-macro
       reg:
         maxItems: 1
@@ Expand Down Expand Up / @@ -94,8 +100,9 @@ allOf: @@
       - if:
           properties:
             compatible:
-              enum:
-                - qcom,sm8550-lpass-wsa-macro
+              contains:
+                enum:
+                  - qcom,sm8550-lpass-wsa-macro
         then:
           properties:
             clocks:
@@ Expand Down @@

Documentation/devicetree/bindings/sound/qcom,sm8250.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ properties: @@
           - items:
               - enum:
                   - qcom,sm8550-sndcard
+                  - qcom,sm8650-sndcard
               - const: qcom,sm8450-sndcard
           - enum:
               - qcom,apq8016-sbc-sndcard
@@ Expand All / @@ -34,6 +35,7 @@ properties: @@
               - qcom,sdm845-sndcard
               - qcom,sm8250-sndcard
               - qcom,sm8450-sndcard
+              - qcom,x1e80100-sndcard
       audio-routing:
         $ref: /schemas/types.yaml#/definitions/non-unique-string-array
@@ Expand Down @@

MAINTAINERS

-Original file line number
+Diff line change
@@ Expand Up / @@ -8273,11 +8273,14 @@ L: linux-input@vger.kernel.org @@
     S:	Maintained
     F:	drivers/input/joystick/fsia6b.c
-    FOCUSRITE SCARLETT GEN 2/3 MIXER DRIVER
+    FOCUSRITE SCARLETT2 MIXER DRIVER (Scarlett Gen 2+ and Clarett)
     M:	Geoffrey D. Bennett <g@b4.vu>
     L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
     S:	Maintained
-    T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
+    W:	https://github.com/geoffreybennett/scarlett-gen2
+    B:	https://github.com/geoffreybennett/scarlett-gen2/issues
+    T:	git https://github.com/geoffreybennett/scarlett-gen2.git
+    F:	include/uapi/sound/scarlett2.h
     F:	sound/usb/mixer_scarlett2.c
     FORCEDETH GIGABIT ETHERNET DRIVER
@@ Expand Down @@

arch/arm/boot/dts/nvidia/tegra20-colibri.dtsi

-Original file line number
+Diff line change
@@ Expand Up / @@ -446,7 +446,7 @@ @@
     	tegra_ac97: ac97@70002000 {
     		status = "okay";
     		nvidia,codec-reset-gpio =
-    			<&gpio TEGRA_GPIO(V, 0) GPIO_ACTIVE_HIGH>;
+    			<&gpio TEGRA_GPIO(V, 0) GPIO_ACTIVE_LOW>;
     		nvidia,codec-sync-gpio =
     			<&gpio TEGRA_GPIO(P, 0) GPIO_ACTIVE_HIGH>;
     	};
@@ Expand Down @@

arch/arm/mach-s3c/mach-crag6410-module.c

-Original file line number
+Diff line change
@@ Expand Up / @@ -32,9 +32,18 @@ @@
     #include "crag6410.h"
+    static struct gpiod_lookup_table wm0010_gpiod_table = {
+    	.dev_id = "spi0.0", /* SPI device name */
+    	.table = {
+    		/* Active high for Glenfarclas Rev 2 */
+    		GPIO_LOOKUP("GPION", 6,
+    			    "reset", GPIO_ACTIVE_HIGH),
+    		{ },
+    	},
+    };
     static struct wm0010_pdata wm0010_pdata = {
-    	.gpio_reset = S3C64XX_GPN(6),
-    	.reset_active_high = 1, /* Active high for Glenfarclas Rev 2 */
+    	/* Intentionally left blank */
     };
     static struct spi_board_info wm1253_devs[] = {
@@ Expand All / @@ -61,10 +70,19 @@ static struct spi_board_info balblair_devs[] = { @@
     	},
     };
+    static struct gpiod_lookup_table wm5100_gpiod_table = {
+    	.dev_id = "1-001a", /* Device 001a on I2C bus 1 */
+    	.table = {
+    		GPIO_LOOKUP("GPION", 7,
+    			    "wlf,ldo1ena", GPIO_ACTIVE_HIGH),
+    		GPIO_LOOKUP("wm5100", 3,
+    			    "hp-pol", GPIO_ACTIVE_HIGH),
+    		{ },
+    	},
+    };
     static struct wm5100_pdata wm5100_pdata = {
-    	.ldo_ena = S3C64XX_GPN(7),
     	.irq_flags = IRQF_TRIGGER_HIGH,
-    	.gpio_base = CODEC_GPIO_BASE,
     	.in_mode = {
     		WM5100_IN_DIFF,
@@ Expand All / @@ -73,7 +91,6 @@ static struct wm5100_pdata wm5100_pdata = { @@
     		WM5100_IN_SE,
     	},
-    	.hp_pol = CODEC_GPIO_BASE + 3,
     	.jack_modes = {
     		{ WM5100_MICDET_MICBIAS3, 0, 0 },
     		{ WM5100_MICDET_MICBIAS2, 1, 1 },
@@ Expand Down Expand Up @@
     	},
     };
+    static struct gpiod_lookup_table wm8996_gpiod_table = {
+    	.dev_id = "1-001a", /* Device 001a on I2C bus 1 */
+    	.table = {
+    		GPIO_LOOKUP("GPION", 7,
+    			    "wlf,ldo1ena", GPIO_ACTIVE_HIGH),
+    		{ },
+    	},
+    };
     static struct wm8996_pdata wm8996_pdata __initdata = {
-    	.ldo_ena = S3C64XX_GPN(7),
-    	.gpio_base = CODEC_GPIO_BASE,
     	.micdet_def = 1,
     	.inl_mode = WM8996_DIFFERRENTIAL_1,
     	.inr_mode = WM8996_DIFFERRENTIAL_1,
@@ Expand Down Expand Up / @@ -296,12 +320,20 @@ static const struct i2c_board_info wm6230_i2c_devs[] = { @@
     };
     static struct wm2200_pdata wm2200_pdata = {
-    	.ldo_ena = S3C64XX_GPN(7),
     	.gpio_defaults = {
     		[2] = 0x0005,  /* GPIO3 24.576MHz output clock */
     	},
     };
+    static struct gpiod_lookup_table wm2200_gpiod_table = {
+    	.dev_id = "1-003a", /* Device 003a on I2C bus 1 */
+    	.table = {
+    		GPIO_LOOKUP("GPION", 7,
+    			    "wlf,ldo1ena", GPIO_ACTIVE_HIGH),
+    		{ },
+    	},
+    };
     static const struct i2c_board_info wm2200_i2c[] = {
     	{ I2C_BOARD_INFO("wm2200", 0x3a),
     	  .platform_data = &wm2200_pdata, },
@@ Expand Down Expand Up / @@ -337,18 +369,21 @@ static const struct { @@
     	{ .id = 0x21, .rev = 0xff, .name = "1275-EV1 Mortlach" },
     	{ .id = 0x25, .rev = 0xff, .name = "1274-EV1 Glencadam" },
     	{ .id = 0x31, .rev = 0xff, .name = "1253-EV1 Tomatin",
-    	  .spi_devs = wm1253_devs, .num_spi_devs = ARRAY_SIZE(wm1253_devs) },
+    	  .spi_devs = wm1253_devs, .num_spi_devs = ARRAY_SIZE(wm1253_devs),
+    	  .gpiod_table = &wm0010_gpiod_table },
     	{ .id = 0x32, .rev = 0xff, .name = "XXXX-EV1 Caol Illa" },
     	{ .id = 0x33, .rev = 0xff, .name = "XXXX-EV1 Oban" },
     	{ .id = 0x34, .rev = 0xff, .name = "WM0010-6320-CS42 Balblair",
     	  .spi_devs = balblair_devs,
     	  .num_spi_devs = ARRAY_SIZE(balblair_devs) },
     	{ .id = 0x39, .rev = 0xff, .name = "1254-EV1 Dallas Dhu",
-    	  .i2c_devs = wm1254_devs, .num_i2c_devs = ARRAY_SIZE(wm1254_devs) },
+    	  .i2c_devs = wm1254_devs, .num_i2c_devs = ARRAY_SIZE(wm1254_devs),
+    	  .gpiod_table = &wm8996_gpiod_table },
     	{ .id = 0x3a, .rev = 0xff, .name = "1259-EV1 Tobermory",
     	  .i2c_devs = wm1259_devs, .num_i2c_devs = ARRAY_SIZE(wm1259_devs) },
     	{ .id = 0x3b, .rev = 0xff, .name = "1255-EV1 Kilchoman",
-    	  .i2c_devs = wm1255_devs, .num_i2c_devs = ARRAY_SIZE(wm1255_devs) },
+    	  .i2c_devs = wm1255_devs, .num_i2c_devs = ARRAY_SIZE(wm1255_devs),
+    	  .gpiod_table = &wm5100_gpiod_table },
     	{ .id = 0x3c, .rev = 0xff, .name = "1273-EV1 Longmorn" },
     	{ .id = 0x3d, .rev = 0xff, .name = "1277-EV1 Littlemill",
     	  .i2c_devs = wm1277_devs, .num_i2c_devs = ARRAY_SIZE(wm1277_devs),
@@ Expand All / @@ -362,7 +397,8 @@ static const struct { @@
     	  .num_spi_devs = ARRAY_SIZE(wm5102_spi_devs),
     	  .gpiod_table = &wm5102_gpiod_table },
     	{ .id = 0x3f, .rev = -1, .name = "WM2200-6271-CS90-M-REV1",
-    	  .i2c_devs = wm2200_i2c, .num_i2c_devs = ARRAY_SIZE(wm2200_i2c) },
+    	  .i2c_devs = wm2200_i2c, .num_i2c_devs = ARRAY_SIZE(wm2200_i2c),
+    	  .gpiod_table = &wm2200_gpiod_table },
     };
     static int wlf_gf_module_probe(struct i2c_client *i2c)
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Test/glk bobba regression #4764

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!