Commit f0429816 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "A small number fixes this time, mostly touching actual code:

   - Add platform device for i.MX System Reset Controller (SRC) to
     fix a regression caused by fw_devlink change

   - A fixup for a boot regression caused by my own rework for the
     Qualcomm SCM driver

   - Multiple bugfixes for the Arm FFA and optee firmware drivers,
     addressing problems when they are built as a loadable module

   - Four dts bugfixes for the Broadcom SoC used in Raspberry pi,
     addressing VEC (video encoder), MDIO bus controller
     #address-cells/#size-cells, SDIO voltage and PCIe host bridge
     dtc warnings"

* tag 'arm-soc-fixes-5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: imx: register reset controller from a platform driver
  iommu/arm: fix ARM_SMMU_QCOM compilation
  ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address
  ARM: dts: bcm2711-rpi-4-b: Fix pcie0's unit address formatting
  tee: optee: Fix missing devices unregister during optee_remove
  ARM: dts: bcm2711-rpi-4-b: fix sd_io_1v8_reg regulator states
  ARM: dts: bcm2711: fix MDIO #address- and #size-cells
  ARM: dts: bcm283x: Fix VEC address for BCM2711
  firmware: arm_ffa: Fix __ffa_devices_unregister
  firmware: arm_ffa: Add missing remove callback to ffa_bus_type
parents 5a7ee55b 011ace4a

arch/arm/boot/dts/bcm2711-rpi-4-b.dts

+6 −5
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ 
		regulator-always-on;

		regulator-settling-time-us = <5000>;

		gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>;

		states = <1800000 0x1

			  3300000 0x0>;

		states = <1800000 0x1>,

			 <3300000 0x0>;

		status = "okay";

	};
@@ -217,15 +217,16 @@ 
};



&pcie0 {

	pci@1,0 {

	pci@0,0 {

		device_type = "pci";

		#address-cells = <3>;

		#size-cells = <2>;

		ranges;



		reg = <0 0 0 0 0>;



		usb@1,0 {

			reg = <0x10000 0 0 0 0>;

		usb@0,0 {

			reg = <0 0 0 0 0>;

			resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;

		};

	};

arch/arm/boot/dts/bcm2711.dtsi

+10 −2
Original line number Diff line number Diff line
@@ -300,6 +300,14 @@ 
			status = "disabled";

		};



		vec: vec@7ec13000 {

			compatible = "brcm,bcm2711-vec";

			reg = <0x7ec13000 0x1000>;

			clocks = <&clocks BCM2835_CLOCK_VEC>;

			interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		dvp: clock@7ef00000 {

			compatible = "brcm,brcm2711-dvp";

			reg = <0x7ef00000 0x10>;
@@ -532,8 +540,8 @@ 
				compatible = "brcm,genet-mdio-v5";

				reg = <0xe14 0x8>;

				reg-names = "mdio";

				#address-cells = <0x0>;

				#size-cells = <0x1>;

				#address-cells = <0x1>;

				#size-cells = <0x0>;

			};

		};

	};

arch/arm/boot/dts/bcm2835-common.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -106,6 +106,14 @@ 
			status = "okay";

		};



		vec: vec@7e806000 {

			compatible = "brcm,bcm2835-vec";

			reg = <0x7e806000 0x1000>;

			clocks = <&clocks BCM2835_CLOCK_VEC>;

			interrupts = <2 27>;

			status = "disabled";

		};



		pixelvalve@7e807000 {

			compatible = "brcm,bcm2835-pixelvalve2";

			reg = <0x7e807000 0x100>;

arch/arm/boot/dts/bcm283x.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -464,14 +464,6 @@ 
			status = "disabled";

		};



		vec: vec@7e806000 {

			compatible = "brcm,bcm2835-vec";

			reg = <0x7e806000 0x1000>;

			clocks = <&clocks BCM2835_CLOCK_VEC>;

			interrupts = <2 27>;

			status = "disabled";

		};



		usb: usb@7e980000 {

			compatible = "brcm,bcm2835-usb";

			reg = <0x7e980000 0x10000>;

arch/arm/mach-imx/src.c

+31 −9
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/iopoll.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/platform_device.h>

#include <linux/reset-controller.h>

#include <linux/smp.h>

#include <asm/smp_plat.h>
@@ -81,11 +82,6 @@ static const struct reset_control_ops imx_src_ops = { 
	.reset = imx_src_reset_module,

};



static struct reset_controller_dev imx_reset_controller = {

	.ops = &imx_src_ops,

	.nr_resets = ARRAY_SIZE(sw_reset_bits),

};



static void imx_gpcv2_set_m_core_pgc(bool enable, u32 offset)

{

	writel_relaxed(enable, gpc_base + offset);
@@ -177,10 +173,6 @@ void __init imx_src_init(void) 
	src_base = of_iomap(np, 0);

	WARN_ON(!src_base);



	imx_reset_controller.of_node = np;

	if (IS_ENABLED(CONFIG_RESET_CONTROLLER))

		reset_controller_register(&imx_reset_controller);



	/*

	 * force warm reset sources to generate cold reset

	 * for a more reliable restart
@@ -214,3 +206,33 @@ void __init imx7_src_init(void) 
	if (!gpc_base)

		return;

}



static const struct of_device_id imx_src_dt_ids[] = {

	{ .compatible = "fsl,imx51-src" },

	{ /* sentinel */ }

};



static int imx_src_probe(struct platform_device *pdev)

{

	struct reset_controller_dev *rcdev;



	rcdev = devm_kzalloc(&pdev->dev, sizeof(*rcdev), GFP_KERNEL);

	if (!rcdev)

		return -ENOMEM;



	rcdev->ops = &imx_src_ops;

	rcdev->dev = &pdev->dev;

	rcdev->of_node = pdev->dev.of_node;

	rcdev->nr_resets = ARRAY_SIZE(sw_reset_bits);



	return devm_reset_controller_register(&pdev->dev, rcdev);

}



static struct platform_driver imx_src_driver = {

	.driver = {

		.name = "imx-src",

		.of_match_table = imx_src_dt_ids,

	},

	.probe = imx_src_probe,

};

builtin_platform_driver(imx_src_driver);