Commit 151768f3 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branches 'clk-x86', 'clk-stm', 'clk-amlogic' and 'clk-allwinner' into clk-next 

* clk-x86:
  clk: x86: Fix clk_gate_flags for RV_CLK_GATE
  clk: x86: Use dynamic con_id string during clk registration
  ACPI: APD: Add a fmw property clk-name
  drivers: acpi: acpi_apd: Remove unused device property "is-rv"
  x86: clk: clk-fch: Add support for newer family of AMD's SOC
  clk: Introduce clk-tps68470 driver
  platform/x86: int3472: Deal with probe ordering issues
  platform/x86: int3472: Pass tps68470_regulator_platform_data to the tps68470-regulator MFD-cell
  platform/x86: int3472: Pass tps68470_clk_platform_data to the tps68470-regulator MFD-cell
  platform/x86: int3472: Add get_sensor_adev_and_name() helper
  platform/x86: int3472: Split into 2 drivers
  platform_data: Add linux/platform_data/tps68470.h file
  i2c: acpi: Add i2c_acpi_new_device_by_fwnode() function
  i2c: acpi: Use acpi_dev_ready_for_enumeration() helper
  ACPI: delay enumeration of devices with a _DEP pointing to an INT3472 device

* clk-stm:
  clk: stm32: Fix ltdc's clock turn off by clk_disable_unused() after system enter shell

* clk-amlogic:
  clk: meson: gxbb: Fix the SDM_EN bit for MPLL0 on GXBB

* clk-allwinner:
  clk: sunxi-ng: Add support for the D1 SoC clocks
  clk: sunxi-ng: gate: Add macros for gates with fixed dividers
  clk: sunxi-ng: mux: Add macros using clk_parent_data and clk_hw
  clk: sunxi-ng: mp: Add macros using clk_parent_data and clk_hw
  clk: sunxi-ng: div: Add macros using clk_parent_data and clk_hw
  dt-bindings: clk: Add compatibles for D1 CCUs
  clk: sunxi-ng: Allow the CCU core to be built as a module
  clk: sunxi-ng: Convert early providers to platform drivers
  clk: sunxi-ng: Allow drivers to be built as modules
  clk: sunxi-ng: Export symbols used by CCU drivers
parents 270bbc72 1fdaaa13 6fc058a7 c1001a62 4f1e19b6

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ properties: 
      - allwinner,sun8i-v3-ccu

      - allwinner,sun8i-v3s-ccu

      - allwinner,sun9i-a80-ccu

      - allwinner,sun20i-d1-ccu

      - allwinner,sun20i-d1-r-ccu

      - allwinner,sun50i-a64-ccu

      - allwinner,sun50i-a64-r-ccu

      - allwinner,sun50i-a100-ccu
@@ -79,6 +81,7 @@ if: 
      enum:

        - allwinner,sun8i-a83t-r-ccu

        - allwinner,sun8i-h3-r-ccu

        - allwinner,sun20i-d1-r-ccu

        - allwinner,sun50i-a64-r-ccu

        - allwinner,sun50i-a100-r-ccu

        - allwinner,sun50i-h6-r-ccu
@@ -99,6 +102,7 @@ else: 
    properties:

      compatible:

        enum:

          - allwinner,sun20i-d1-ccu

          - allwinner,sun50i-a100-ccu

          - allwinner,sun50i-h6-ccu

          - allwinner,sun50i-h616-ccu

drivers/acpi/acpi_apd.c

+9 −2
Original line number Diff line number Diff line
@@ -87,8 +87,15 @@ static int fch_misc_setup(struct apd_private_data *pdata) 
	if (ret < 0)

		return -ENOENT;



	if (!acpi_dev_get_property(adev, "is-rv", ACPI_TYPE_INTEGER, &obj))

		clk_data->is_rv = obj->integer.value;

	if (!acpi_dev_get_property(adev, "clk-name", ACPI_TYPE_STRING, &obj)) {

		clk_data->name = devm_kzalloc(&adev->dev, obj->string.length,

					      GFP_KERNEL);



		strcpy(clk_data->name, obj->string.pointer);

	} else {

		/* Set default name to mclk if entry missing in firmware */

		clk_data->name = "mclk";

	}



	list_for_each_entry(rentry, &resource_list, node) {

		clk_data->base = devm_ioremap(&adev->dev, rentry->res->start,

drivers/acpi/scan.c

+33 −4
Original line number Diff line number Diff line
@@ -797,6 +797,12 @@ static const char * const acpi_ignore_dep_ids[] = { 
	NULL

};



/* List of HIDs for which we honor deps of matching ACPI devs, when checking _DEP lists. */

static const char * const acpi_honor_dep_ids[] = {

	"INT3472", /* Camera sensor PMIC / clk and regulator info */

	NULL

};



static struct acpi_device *acpi_bus_get_parent(acpi_handle handle)

{

	struct acpi_device *device = NULL;
@@ -1762,10 +1768,14 @@ static void acpi_scan_dep_init(struct acpi_device *adev) 
	struct acpi_dep_data *dep;



	list_for_each_entry(dep, &acpi_dep_list, node) {

		if (dep->consumer == adev->handle)

		if (dep->consumer == adev->handle) {

			if (dep->honor_dep)

				adev->flags.honor_deps = 1;



			adev->dep_unmet++;

		}

	}

}



void acpi_device_add_finalize(struct acpi_device *device)

{
@@ -1967,7 +1977,7 @@ static u32 acpi_scan_check_dep(acpi_handle handle, bool check_dep) 
	for (count = 0, i = 0; i < dep_devices.count; i++) {

		struct acpi_device_info *info;

		struct acpi_dep_data *dep;

		bool skip;

		bool skip, honor_dep;



		status = acpi_get_object_info(dep_devices.handles[i], &info);

		if (ACPI_FAILURE(status)) {
@@ -1976,6 +1986,7 @@ static u32 acpi_scan_check_dep(acpi_handle handle, bool check_dep) 
		}



		skip = acpi_info_matches_ids(info, acpi_ignore_dep_ids);

		honor_dep = acpi_info_matches_ids(info, acpi_honor_dep_ids);

		kfree(info);



		if (skip)
@@ -1989,6 +2000,7 @@ static u32 acpi_scan_check_dep(acpi_handle handle, bool check_dep) 


		dep->supplier = dep_devices.handles[i];

		dep->consumer = handle;

		dep->honor_dep = honor_dep;



		mutex_lock(&acpi_dep_list_lock);

		list_add_tail(&dep->node , &acpi_dep_list);
@@ -2155,8 +2167,8 @@ static void acpi_bus_attach(struct acpi_device *device, bool first_pass) 
		register_dock_dependent_device(device, ejd);



	acpi_bus_get_status(device);

	/* Skip devices that are not present. */

	if (!acpi_device_is_present(device)) {

	/* Skip devices that are not ready for enumeration (e.g. not present) */

	if (!acpi_dev_ready_for_enumeration(device)) {

		device->flags.initialized = false;

		acpi_device_clear_enumerated(device);

		device->flags.power_manageable = 0;
@@ -2318,6 +2330,23 @@ void acpi_dev_clear_dependencies(struct acpi_device *supplier) 
}

EXPORT_SYMBOL_GPL(acpi_dev_clear_dependencies);



/**

 * acpi_dev_ready_for_enumeration - Check if the ACPI device is ready for enumeration

 * @device: Pointer to the &struct acpi_device to check

 *

 * Check if the device is present and has no unmet dependencies.

 *

 * Return true if the device is ready for enumeratino. Otherwise, return false.

 */

bool acpi_dev_ready_for_enumeration(const struct acpi_device *device)

{

	if (device->flags.honor_deps && device->dep_unmet)

		return false;



	return acpi_device_is_present(device);

}

EXPORT_SYMBOL_GPL(acpi_dev_ready_for_enumeration);



/**

 * acpi_dev_get_first_consumer_dev - Return ACPI device dependent on @supplier

 * @supplier: Pointer to the dependee device

drivers/clk/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -169,6 +169,14 @@ config COMMON_CLK_CDCE706 
	help

	  This driver supports TI CDCE706 programmable 3-PLL clock synthesizer.



config COMMON_CLK_TPS68470

	tristate "Clock Driver for TI TPS68470 PMIC"

	depends on I2C

	depends on INTEL_SKL_INT3472 || COMPILE_TEST

	select REGMAP_I2C

	help

	  This driver supports the clocks provided by the TPS68470 PMIC.



config COMMON_CLK_CDCE925

	tristate "Clock driver for TI CDCE913/925/937/949 devices"

	depends on I2C

drivers/clk/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ obj-$(CONFIG_COMMON_CLK_SI570) += clk-si570.o 
obj-$(CONFIG_COMMON_CLK_STM32F)		+= clk-stm32f4.o

obj-$(CONFIG_COMMON_CLK_STM32H7)	+= clk-stm32h7.o

obj-$(CONFIG_COMMON_CLK_STM32MP157)	+= clk-stm32mp1.o

obj-$(CONFIG_COMMON_CLK_TPS68470)      += clk-tps68470.o

obj-$(CONFIG_CLK_TWL6040)		+= clk-twl6040.o

obj-$(CONFIG_ARCH_VT8500)		+= clk-vt8500.o

obj-$(CONFIG_COMMON_CLK_VC5)		+= clk-versaclock5.o
@@ -111,7 +112,7 @@ obj-$(CONFIG_PLAT_SPEAR) += spear/ 
obj-y					+= sprd/

obj-$(CONFIG_ARCH_STI)			+= st/

obj-$(CONFIG_ARCH_SUNXI)		+= sunxi/

obj-$(CONFIG_SUNXI_CCU)			+= sunxi-ng/

obj-y					+= sunxi-ng/

obj-$(CONFIG_ARCH_TEGRA)		+= tegra/

obj-y					+= ti/

obj-$(CONFIG_CLK_UNIPHIER)		+= uniphier/