Commit 6d7ddd80 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1ab1a19d 5549d1e3

arch/arm64/boot/dts/qcom/sa8155p-adp.dts

+13 −17
Original line number Diff line number Diff line
@@ -367,6 +367,16 @@ queue0 { 
	};

};



&pmm8155au_1_gpios {

	pmm8155au_1_sdc2_cd: sdc2-cd-default-state {

		pins = "gpio4";

		function = "normal";

		input-enable;

		bias-pull-up;

		power-source = <0>;

	};

};



&qupv3_id_1 {

	status = "okay";

};
@@ -384,10 +394,10 @@ &remoteproc_cdsp { 
&sdhc_2 {

	status = "okay";



	cd-gpios = <&tlmm 4 GPIO_ACTIVE_LOW>;

	cd-gpios = <&pmm8155au_1_gpios 4 GPIO_ACTIVE_LOW>;

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc2_on>;

	pinctrl-1 = <&sdc2_off>;

	pinctrl-0 = <&sdc2_on &pmm8155au_1_sdc2_cd>;

	pinctrl-1 = <&sdc2_off &pmm8155au_1_sdc2_cd>;

	vqmmc-supply = <&vreg_l13c_2p96>; /* IO line power */

	vmmc-supply = <&vreg_l17a_2p96>;  /* Card power line */

	bus-width = <4>;
@@ -505,13 +515,6 @@ data-pins { 
			bias-pull-up;		/* pull up */

			drive-strength = <16>;	/* 16 MA */

		};



		sd-cd-pins {

			pins = "gpio96";

			function = "gpio";

			bias-pull-up;		/* pull up */

			drive-strength = <2>;	/* 2 MA */

		};

	};



	sdc2_off: sdc2-off-state {
@@ -532,13 +535,6 @@ data-pins { 
			bias-pull-up;		/* pull up */

			drive-strength = <2>;	/* 2 MA */

		};



		sd-cd-pins {

			pins = "gpio96";

			function = "gpio";

			bias-pull-up;		/* pull up */

			drive-strength = <2>;	/* 2 MA */

		};

	};



	usb2phy_ac_en1_default: usb2phy-ac-en1-default-state {

drivers/cache/sifive_ccache.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int __init sifive_ccache_init(void) 
	struct device_node *np;

	struct resource res;

	const struct of_device_id *match;

	unsigned long quirks;

	unsigned long quirks __maybe_unused;

	int rc;



	np = of_find_matching_node_and_match(NULL, sifive_ccache_ids, &match);

drivers/firmware/microchip/mpfs-auto-update.c

+5 −3
Original line number Diff line number Diff line
@@ -206,10 +206,12 @@ static int mpfs_auto_update_verify_image(struct fw_upload *fw_uploader) 
	if (ret | response->resp_status) {

		dev_warn(priv->dev, "Verification of Upgrade Image failed!\n");

		ret = ret ? ret : -EBADMSG;

		goto free_message;

	}



	dev_info(priv->dev, "Verification of Upgrade Image passed!\n");



free_message:

	devm_kfree(priv->dev, message);

free_response:

	devm_kfree(priv->dev, response);
@@ -265,7 +267,7 @@ static int mpfs_auto_update_set_image_address(struct mpfs_auto_update_priv *priv 
	       AUTO_UPDATE_DIRECTORY_WIDTH);

	memset(buffer + AUTO_UPDATE_BLANK_DIRECTORY, 0x0, AUTO_UPDATE_DIRECTORY_WIDTH);



	dev_info(priv->dev, "Writing the image address (%x) to the flash directory (%llx)\n",

	dev_info(priv->dev, "Writing the image address (0x%x) to the flash directory (0x%llx)\n",

		 image_address, directory_address);



	ret = mtd_write(priv->flash, 0x0, erase_size, &bytes_written, (u_char *)buffer);
@@ -313,7 +315,7 @@ static int mpfs_auto_update_write_bitstream(struct fw_upload *fw_uploader, const 
	erase.len = round_up(size, (size_t)priv->flash->erasesize);

	erase.addr = image_address;



	dev_info(priv->dev, "Erasing the flash at address (%x)\n", image_address);

	dev_info(priv->dev, "Erasing the flash at address (0x%x)\n", image_address);

	ret = mtd_erase(priv->flash, &erase);

	if (ret)

		goto out;
@@ -323,7 +325,7 @@ static int mpfs_auto_update_write_bitstream(struct fw_upload *fw_uploader, const 
	 * will do all of that itself - including verifying that the bitstream

	 * is valid.

	 */

	dev_info(priv->dev, "Writing the image to the flash at address (%x)\n", image_address);

	dev_info(priv->dev, "Writing the image to the flash at address (0x%x)\n", image_address);

	ret = mtd_write(priv->flash, (loff_t)image_address, size, &bytes_written, data);

	if (ret)

		goto out;