Merge branches 'acpi-video' and 'acpi-soc' (99e4d89a) · Commits · 戴 / test

arch/x86/Kconfig

+11 −0

Original line number	Diff line number	Diff line
		@@ -496,6 +496,17 @@ config X86_INTEL_LPSS
		things like clock tree (common clock framework) and pincontrol
		which are needed by the LPSS peripheral drivers.

		config X86_AMD_PLATFORM_DEVICE
		bool "AMD ACPI2Platform devices support"
		depends on ACPI
		select COMMON_CLK
		select PINCTRL
		---help---
		Select to interpret AMD specific ACPI device to platform device
		such as I2C, UART, GPIO found on AMD Carrizo and later chipsets.
		I2C and UART depend on COMMON_CLK to set clock. GPIO driver is
		implemented under PINCTRL subsystem.

		config IOSF_MBI
		tristate "Intel SoC IOSF Sideband support for SoC platforms"
		depends on PCI

drivers/acpi/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ acpi-$(CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC) += processor_pdc.o
		acpi-y += ec.o
		acpi-$(CONFIG_ACPI_DOCK) += dock.o
		acpi-y += pci_root.o pci_link.o pci_irq.o
		acpi-y += acpi_lpss.o
		acpi-y += acpi_lpss.o acpi_apd.o
		acpi-y += acpi_platform.o
		acpi-y += acpi_pnp.o
		acpi-y += int340x_thermal.o

drivers/acpi/acpi_apd.c

0 → 100644

+150 −0

Original line number	Diff line number	Diff line
		/*
		* AMD ACPI support for ACPI2platform device.
		*
		* Copyright (c) 2014,2015 AMD Corporation.
		* Authors: Ken Xue <Ken.Xue@amd.com>
		* Wu, Jeff <Jeff.Wu@amd.com>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/

		#include <linux/clk-provider.h>
		#include <linux/platform_device.h>
		#include <linux/pm_domain.h>
		#include <linux/clkdev.h>
		#include <linux/acpi.h>
		#include <linux/err.h>
		#include <linux/clk.h>
		#include <linux/pm.h>

		#include "internal.h"

		ACPI_MODULE_NAME("acpi_apd");
		struct apd_private_data;

		/**
		* ACPI_APD_SYSFS : add device attributes in sysfs
		* ACPI_APD_PM : attach power domain to device
		*/
		#define ACPI_APD_SYSFS BIT(0)
		#define ACPI_APD_PM BIT(1)

		/**
		* struct apd_device_desc - a descriptor for apd device
		* @flags: device flags like %ACPI_APD_SYSFS, %ACPI_APD_PM
		* @fixed_clk_rate: fixed rate input clock source for acpi device;
		* 0 means no fixed rate input clock source
		* @setup: a hook routine to set device resource during create platform device
		*
		* Device description defined as acpi_device_id.driver_data
		*/
		struct apd_device_desc {
		unsigned int flags;
		unsigned int fixed_clk_rate;
		int (setup)(struct apd_private_data pdata);
		};

		struct apd_private_data {
		struct clk *clk;
		struct acpi_device *adev;
		const struct apd_device_desc *dev_desc;
		};

		#ifdef CONFIG_X86_AMD_PLATFORM_DEVICE
		#define APD_ADDR(desc) ((unsigned long)&desc)

		static int acpi_apd_setup(struct apd_private_data *pdata)
		{
		const struct apd_device_desc *dev_desc = pdata->dev_desc;
		struct clk *clk = ERR_PTR(-ENODEV);

		if (dev_desc->fixed_clk_rate) {
		clk = clk_register_fixed_rate(&pdata->adev->dev,
		dev_name(&pdata->adev->dev),
		NULL, CLK_IS_ROOT,
		dev_desc->fixed_clk_rate);
		clk_register_clkdev(clk, NULL, dev_name(&pdata->adev->dev));
		pdata->clk = clk;
		}

		return 0;
		}

		static struct apd_device_desc cz_i2c_desc = {
		.setup = acpi_apd_setup,
		.fixed_clk_rate = 133000000,
		};

		static struct apd_device_desc cz_uart_desc = {
		.setup = acpi_apd_setup,
		.fixed_clk_rate = 48000000,
		};

		#else

		#define APD_ADDR(desc) (0UL)

		#endif /* CONFIG_X86_AMD_PLATFORM_DEVICE */

		/**
		* Create platform device during acpi scan attach handle.
		* Return value > 0 on success of creating device.
		*/
		static int acpi_apd_create_device(struct acpi_device *adev,
		const struct acpi_device_id *id)
		{
		const struct apd_device_desc dev_desc = (void )id->driver_data;
		struct apd_private_data *pdata;
		struct platform_device *pdev;
		int ret;

		if (!dev_desc) {
		pdev = acpi_create_platform_device(adev);
		return IS_ERR_OR_NULL(pdev) ? PTR_ERR(pdev) : 1;
		}

		pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
		if (!pdata)
		return -ENOMEM;

		pdata->adev = adev;
		pdata->dev_desc = dev_desc;

		if (dev_desc->setup) {
		ret = dev_desc->setup(pdata);
		if (ret)
		goto err_out;
		}

		adev->driver_data = pdata;
		pdev = acpi_create_platform_device(adev);
		if (!IS_ERR_OR_NULL(pdev))
		return 1;

		ret = PTR_ERR(pdev);
		adev->driver_data = NULL;

		err_out:
		kfree(pdata);
		return ret;
		}

		static const struct acpi_device_id acpi_apd_device_ids[] = {
		/* Generic apd devices */
		{ "AMD0010", APD_ADDR(cz_i2c_desc) },
		{ "AMD0020", APD_ADDR(cz_uart_desc) },
		{ "AMD0030", },
		{ }
		};

		static struct acpi_scan_handler apd_handler = {
		.ids = acpi_apd_device_ids,
		.attach = acpi_apd_create_device,
		};

		void __init acpi_apd_init(void)
		{
		acpi_scan_add_handler(&apd_handler);
		}

drivers/acpi/acpi_lpss.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,7 @@ static struct lpss_device_desc lpt_dev_desc = {
		};

		static struct lpss_device_desc lpt_i2c_dev_desc = {
		.flags = LPSS_CLK \| LPSS_CLK_GATE \| LPSS_LTR,
		.flags = LPSS_CLK \| LPSS_LTR,
		.prv_offset = 0x800,
		};

		@@ -334,6 +334,8 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
		pdata->mmio_size = resource_size(&rentry->res);
		pdata->mmio_base = ioremap(rentry->res.start,
		pdata->mmio_size);
		if (!pdata->mmio_base)
		goto err_out;
		break;
		}

drivers/acpi/internal.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,8 @@ static inline void acpi_debugfs_init(void) { return; }
		#endif
		void acpi_lpss_init(void);

		void acpi_apd_init(void);

		acpi_status acpi_hotplug_schedule(struct acpi_device *adev, u32 src);
		bool acpi_queue_hotplug_work(struct work_struct *work);
		void acpi_device_hotplug(struct acpi_device *adev, u32 src);

Admin message