Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'soc-fixes-6.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann:
"These are a couple of last minute fixes that came in over the previous
week, addressing:
- A pin configuration bug on a qualcomm board that caused issues with
ethernet and mmc
- Two minor code fixes for misleading console output in the microchip
firmware driver
- A build warning in the sifive cache driver"
* tag 'soc-fixes-6.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
firmware: microchip: clarify that sizes and addresses are in hex
firmware: microchip: don't unconditionally print validation success
arm64: dts: qcom: sa8155p-adp: fix SDHC2 CD pin configuration
cache: sifive_ccache: Silence unused variable warning
+19
-21
+13
-17
arch/arm64/boot/dts/qcom/sa8155p-adp.dts
+13
-17
arch/arm64/boot/dts/qcom/sa8155p-adp.dts
···
367
367
};
368
368
};
369
369
370
+
&pmm8155au_1_gpios {
371
+
pmm8155au_1_sdc2_cd: sdc2-cd-default-state {
372
+
pins = "gpio4";
373
+
function = "normal";
374
+
input-enable;
375
+
bias-pull-up;
376
+
power-source = <0>;
377
+
};
378
+
};
379
+
370
380
&qupv3_id_1 {
371
381
status = "okay";
372
382
};
···
394
384
&sdhc_2 {
395
385
status = "okay";
396
386
397
-
cd-gpios = <&tlmm 4 GPIO_ACTIVE_LOW>;
387
+
cd-gpios = <&pmm8155au_1_gpios 4 GPIO_ACTIVE_LOW>;
398
388
pinctrl-names = "default", "sleep";
399
-
pinctrl-0 = <&sdc2_on>;
400
-
pinctrl-1 = <&sdc2_off>;
389
+
pinctrl-0 = <&sdc2_on &pmm8155au_1_sdc2_cd>;
390
+
pinctrl-1 = <&sdc2_off &pmm8155au_1_sdc2_cd>;
401
391
vqmmc-supply = <&vreg_l13c_2p96>; /* IO line power */
402
392
vmmc-supply = <&vreg_l17a_2p96>; /* Card power line */
403
393
bus-width = <4>;
···
515
505
bias-pull-up; /* pull up */
516
506
drive-strength = <16>; /* 16 MA */
517
507
};
518
-
519
-
sd-cd-pins {
520
-
pins = "gpio96";
521
-
function = "gpio";
522
-
bias-pull-up; /* pull up */
523
-
drive-strength = <2>; /* 2 MA */
524
-
};
525
508
};
526
509
527
510
sdc2_off: sdc2-off-state {
···
532
529
533
530
data-pins {
534
531
pins = "sdc2_data";
535
-
bias-pull-up; /* pull up */
536
-
drive-strength = <2>; /* 2 MA */
537
-
};
538
-
539
-
sd-cd-pins {
540
-
pins = "gpio96";
541
-
function = "gpio";
542
532
bias-pull-up; /* pull up */
543
533
drive-strength = <2>; /* 2 MA */
544
534
};
+1
-1
drivers/cache/sifive_ccache.c
+1
-1
drivers/cache/sifive_ccache.c
+5
-3
drivers/firmware/microchip/mpfs-auto-update.c
+5
-3
drivers/firmware/microchip/mpfs-auto-update.c
···
206
206
if (ret | response->resp_status) {
207
207
dev_warn(priv->dev, "Verification of Upgrade Image failed!\n");
208
208
ret = ret ? ret : -EBADMSG;
209
+
goto free_message;
209
210
}
210
211
211
212
dev_info(priv->dev, "Verification of Upgrade Image passed!\n");
212
213
214
+
free_message:
213
215
devm_kfree(priv->dev, message);
214
216
free_response:
215
217
devm_kfree(priv->dev, response);
···
267
265
AUTO_UPDATE_DIRECTORY_WIDTH);
268
266
memset(buffer + AUTO_UPDATE_BLANK_DIRECTORY, 0x0, AUTO_UPDATE_DIRECTORY_WIDTH);
269
267
270
-
dev_info(priv->dev, "Writing the image address (%x) to the flash directory (%llx)\n",
268
+
dev_info(priv->dev, "Writing the image address (0x%x) to the flash directory (0x%llx)\n",
271
269
image_address, directory_address);
272
270
273
271
ret = mtd_write(priv->flash, 0x0, erase_size, &bytes_written, (u_char *)buffer);
···
315
313
erase.len = round_up(size, (size_t)priv->flash->erasesize);
316
314
erase.addr = image_address;
317
315
318
-
dev_info(priv->dev, "Erasing the flash at address (%x)\n", image_address);
316
+
dev_info(priv->dev, "Erasing the flash at address (0x%x)\n", image_address);
319
317
ret = mtd_erase(priv->flash, &erase);
320
318
if (ret)
321
319
goto out;
···
325
323
* will do all of that itself - including verifying that the bitstream
326
324
* is valid.
327
325
*/
328
-
dev_info(priv->dev, "Writing the image to the flash at address (%x)\n", image_address);
326
+
dev_info(priv->dev, "Writing the image to the flash at address (0x%x)\n", image_address);
329
327
ret = mtd_write(priv->flash, (loff_t)image_address, size, &bytes_written, data);
330
328
if (ret)
331
329
goto out;