mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-09 07:23:14 +00:00
Merge branches 'misc', 'drv_cleanup', 'devm-cleanup' and 'ti-soc' of .git into next
This commit is contained in:
commit
e7cd7886ef
@ -8056,8 +8056,8 @@ F: drivers/platform/x86/thinkpad_acpi.c
|
|||||||
TI BANDGAP AND THERMAL DRIVER
|
TI BANDGAP AND THERMAL DRIVER
|
||||||
M: Eduardo Valentin <eduardo.valentin@ti.com>
|
M: Eduardo Valentin <eduardo.valentin@ti.com>
|
||||||
L: linux-pm@vger.kernel.org
|
L: linux-pm@vger.kernel.org
|
||||||
S: Maintained
|
S: Supported
|
||||||
F: drivers/staging/omap-thermal/
|
F: drivers/thermal/ti-soc-thermal/
|
||||||
|
|
||||||
TI FLASH MEDIA INTERFACE DRIVER
|
TI FLASH MEDIA INTERFACE DRIVER
|
||||||
M: Alex Dubov <oakad@yahoo.com>
|
M: Alex Dubov <oakad@yahoo.com>
|
||||||
|
@ -118,8 +118,6 @@ source "drivers/staging/gdm72xx/Kconfig"
|
|||||||
|
|
||||||
source "drivers/staging/csr/Kconfig"
|
source "drivers/staging/csr/Kconfig"
|
||||||
|
|
||||||
source "drivers/staging/ti-soc-thermal/Kconfig"
|
|
||||||
|
|
||||||
source "drivers/staging/silicom/Kconfig"
|
source "drivers/staging/silicom/Kconfig"
|
||||||
|
|
||||||
source "drivers/staging/ced1401/Kconfig"
|
source "drivers/staging/ced1401/Kconfig"
|
||||||
|
@ -52,7 +52,6 @@ obj-$(CONFIG_ANDROID) += android/
|
|||||||
obj-$(CONFIG_USB_WPAN_HCD) += ozwpan/
|
obj-$(CONFIG_USB_WPAN_HCD) += ozwpan/
|
||||||
obj-$(CONFIG_WIMAX_GDM72XX) += gdm72xx/
|
obj-$(CONFIG_WIMAX_GDM72XX) += gdm72xx/
|
||||||
obj-$(CONFIG_CSR_WIFI) += csr/
|
obj-$(CONFIG_CSR_WIFI) += csr/
|
||||||
obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/
|
|
||||||
obj-$(CONFIG_NET_VENDOR_SILICOM) += silicom/
|
obj-$(CONFIG_NET_VENDOR_SILICOM) += silicom/
|
||||||
obj-$(CONFIG_CED1401) += ced1401/
|
obj-$(CONFIG_CED1401) += ced1401/
|
||||||
obj-$(CONFIG_DRM_IMX) += imx-drm/
|
obj-$(CONFIG_DRM_IMX) += imx-drm/
|
||||||
|
@ -169,4 +169,7 @@ config INTEL_POWERCLAMP
|
|||||||
enforce idle time which results in more package C-state residency. The
|
enforce idle time which results in more package C-state residency. The
|
||||||
user interface is exposed via generic thermal framework.
|
user interface is exposed via generic thermal framework.
|
||||||
|
|
||||||
|
menu "Texas Instruments thermal drivers"
|
||||||
|
source "drivers/thermal/ti-soc-thermal/Kconfig"
|
||||||
|
endmenu
|
||||||
endif
|
endif
|
||||||
|
@ -23,4 +23,4 @@ obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o
|
|||||||
obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o
|
obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o
|
||||||
obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o
|
obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o
|
||||||
obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o
|
obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o
|
||||||
|
obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/
|
||||||
|
@ -169,21 +169,11 @@ static int armada_thermal_probe(struct platform_device *pdev)
|
|||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
if (!res) {
|
|
||||||
dev_err(&pdev->dev, "Failed to get platform resource\n");
|
|
||||||
return -ENODEV;
|
|
||||||
}
|
|
||||||
|
|
||||||
priv->sensor = devm_ioremap_resource(&pdev->dev, res);
|
priv->sensor = devm_ioremap_resource(&pdev->dev, res);
|
||||||
if (IS_ERR(priv->sensor))
|
if (IS_ERR(priv->sensor))
|
||||||
return PTR_ERR(priv->sensor);
|
return PTR_ERR(priv->sensor);
|
||||||
|
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
||||||
if (!res) {
|
|
||||||
dev_err(&pdev->dev, "Failed to get platform resource\n");
|
|
||||||
return -ENODEV;
|
|
||||||
}
|
|
||||||
|
|
||||||
priv->control = devm_ioremap_resource(&pdev->dev, res);
|
priv->control = devm_ioremap_resource(&pdev->dev, res);
|
||||||
if (IS_ERR(priv->control))
|
if (IS_ERR(priv->control))
|
||||||
return PTR_ERR(priv->control);
|
return PTR_ERR(priv->control);
|
||||||
@ -210,7 +200,6 @@ static int armada_thermal_exit(struct platform_device *pdev)
|
|||||||
platform_get_drvdata(pdev);
|
platform_get_drvdata(pdev);
|
||||||
|
|
||||||
thermal_zone_device_unregister(armada_thermal);
|
thermal_zone_device_unregister(armada_thermal);
|
||||||
platform_set_drvdata(pdev, NULL);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -134,25 +134,16 @@ static int dove_thermal_probe(struct platform_device *pdev)
|
|||||||
struct resource *res;
|
struct resource *res;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
||||||
if (!res) {
|
|
||||||
dev_err(&pdev->dev, "Failed to get platform resource\n");
|
|
||||||
return -ENODEV;
|
|
||||||
}
|
|
||||||
|
|
||||||
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
|
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
|
||||||
if (!priv)
|
if (!priv)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
priv->sensor = devm_ioremap_resource(&pdev->dev, res);
|
priv->sensor = devm_ioremap_resource(&pdev->dev, res);
|
||||||
if (IS_ERR(priv->sensor))
|
if (IS_ERR(priv->sensor))
|
||||||
return PTR_ERR(priv->sensor);
|
return PTR_ERR(priv->sensor);
|
||||||
|
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
||||||
if (!res) {
|
|
||||||
dev_err(&pdev->dev, "Failed to get platform resource\n");
|
|
||||||
return -ENODEV;
|
|
||||||
}
|
|
||||||
priv->control = devm_ioremap_resource(&pdev->dev, res);
|
priv->control = devm_ioremap_resource(&pdev->dev, res);
|
||||||
if (IS_ERR(priv->control))
|
if (IS_ERR(priv->control))
|
||||||
return PTR_ERR(priv->control);
|
return PTR_ERR(priv->control);
|
||||||
@ -182,7 +173,6 @@ static int dove_thermal_exit(struct platform_device *pdev)
|
|||||||
platform_get_drvdata(pdev);
|
platform_get_drvdata(pdev);
|
||||||
|
|
||||||
thermal_zone_device_unregister(dove_thermal);
|
thermal_zone_device_unregister(dove_thermal);
|
||||||
platform_set_drvdata(pdev, NULL);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -925,11 +925,6 @@ static int exynos_tmu_probe(struct platform_device *pdev)
|
|||||||
INIT_WORK(&data->irq_work, exynos_tmu_work);
|
INIT_WORK(&data->irq_work, exynos_tmu_work);
|
||||||
|
|
||||||
data->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
data->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
if (!data->mem) {
|
|
||||||
dev_err(&pdev->dev, "Failed to get platform resource\n");
|
|
||||||
return -ENOENT;
|
|
||||||
}
|
|
||||||
|
|
||||||
data->base = devm_ioremap_resource(&pdev->dev, data->mem);
|
data->base = devm_ioremap_resource(&pdev->dev, data->mem);
|
||||||
if (IS_ERR(data->base))
|
if (IS_ERR(data->base))
|
||||||
return PTR_ERR(data->base);
|
return PTR_ERR(data->base);
|
||||||
@ -1001,7 +996,6 @@ static int exynos_tmu_probe(struct platform_device *pdev)
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
err_clk:
|
err_clk:
|
||||||
platform_set_drvdata(pdev, NULL);
|
|
||||||
clk_unprepare(data->clk);
|
clk_unprepare(data->clk);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@ -1016,8 +1010,6 @@ static int exynos_tmu_remove(struct platform_device *pdev)
|
|||||||
|
|
||||||
clk_unprepare(data->clk);
|
clk_unprepare(data->clk);
|
||||||
|
|
||||||
platform_set_drvdata(pdev, NULL);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -75,16 +75,11 @@ static int kirkwood_thermal_probe(struct platform_device *pdev)
|
|||||||
struct kirkwood_thermal_priv *priv;
|
struct kirkwood_thermal_priv *priv;
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
|
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
||||||
if (!res) {
|
|
||||||
dev_err(&pdev->dev, "Failed to get platform resource\n");
|
|
||||||
return -ENODEV;
|
|
||||||
}
|
|
||||||
|
|
||||||
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
|
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
|
||||||
if (!priv)
|
if (!priv)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
priv->sensor = devm_ioremap_resource(&pdev->dev, res);
|
priv->sensor = devm_ioremap_resource(&pdev->dev, res);
|
||||||
if (IS_ERR(priv->sensor))
|
if (IS_ERR(priv->sensor))
|
||||||
return PTR_ERR(priv->sensor);
|
return PTR_ERR(priv->sensor);
|
||||||
@ -108,7 +103,6 @@ static int kirkwood_thermal_exit(struct platform_device *pdev)
|
|||||||
platform_get_drvdata(pdev);
|
platform_get_drvdata(pdev);
|
||||||
|
|
||||||
thermal_zone_device_unregister(kirkwood_thermal);
|
thermal_zone_device_unregister(kirkwood_thermal);
|
||||||
platform_set_drvdata(pdev, NULL);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -389,11 +389,6 @@ static int rcar_thermal_probe(struct platform_device *pdev)
|
|||||||
* platform has IRQ support.
|
* platform has IRQ support.
|
||||||
* Then, drier use common register
|
* Then, drier use common register
|
||||||
*/
|
*/
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, mres++);
|
|
||||||
if (!res) {
|
|
||||||
dev_err(dev, "Could not get platform resource\n");
|
|
||||||
return -ENODEV;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = devm_request_irq(dev, irq->start, rcar_thermal_irq, 0,
|
ret = devm_request_irq(dev, irq->start, rcar_thermal_irq, 0,
|
||||||
dev_name(dev), common);
|
dev_name(dev), common);
|
||||||
@ -405,6 +400,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
|
|||||||
/*
|
/*
|
||||||
* rcar_has_irq_support() will be enabled
|
* rcar_has_irq_support() will be enabled
|
||||||
*/
|
*/
|
||||||
|
res = platform_get_resource(pdev, IORESOURCE_MEM, mres++);
|
||||||
common->base = devm_ioremap_resource(dev, res);
|
common->base = devm_ioremap_resource(dev, res);
|
||||||
if (IS_ERR(common->base))
|
if (IS_ERR(common->base))
|
||||||
return PTR_ERR(common->base);
|
return PTR_ERR(common->base);
|
||||||
@ -487,8 +483,6 @@ static int rcar_thermal_remove(struct platform_device *pdev)
|
|||||||
rcar_thermal_irq_disable(priv);
|
rcar_thermal_irq_disable(priv);
|
||||||
}
|
}
|
||||||
|
|
||||||
platform_set_drvdata(pdev, NULL);
|
|
||||||
|
|
||||||
pm_runtime_put_sync(dev);
|
pm_runtime_put_sync(dev);
|
||||||
pm_runtime_disable(dev);
|
pm_runtime_disable(dev);
|
||||||
|
|
||||||
|
@ -104,7 +104,7 @@ static int spear_thermal_probe(struct platform_device *pdev)
|
|||||||
struct thermal_zone_device *spear_thermal = NULL;
|
struct thermal_zone_device *spear_thermal = NULL;
|
||||||
struct spear_thermal_dev *stdev;
|
struct spear_thermal_dev *stdev;
|
||||||
struct device_node *np = pdev->dev.of_node;
|
struct device_node *np = pdev->dev.of_node;
|
||||||
struct resource *stres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
struct resource *res;
|
||||||
int ret = 0, val;
|
int ret = 0, val;
|
||||||
|
|
||||||
if (!np || !of_property_read_u32(np, "st,thermal-flags", &val)) {
|
if (!np || !of_property_read_u32(np, "st,thermal-flags", &val)) {
|
||||||
@ -112,11 +112,6 @@ static int spear_thermal_probe(struct platform_device *pdev)
|
|||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!stres) {
|
|
||||||
dev_err(&pdev->dev, "memory resource missing\n");
|
|
||||||
return -ENODEV;
|
|
||||||
}
|
|
||||||
|
|
||||||
stdev = devm_kzalloc(&pdev->dev, sizeof(*stdev), GFP_KERNEL);
|
stdev = devm_kzalloc(&pdev->dev, sizeof(*stdev), GFP_KERNEL);
|
||||||
if (!stdev) {
|
if (!stdev) {
|
||||||
dev_err(&pdev->dev, "kzalloc fail\n");
|
dev_err(&pdev->dev, "kzalloc fail\n");
|
||||||
@ -124,12 +119,10 @@ static int spear_thermal_probe(struct platform_device *pdev)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Enable thermal sensor */
|
/* Enable thermal sensor */
|
||||||
stdev->thermal_base = devm_ioremap(&pdev->dev, stres->start,
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
resource_size(stres));
|
stdev->thermal_base = devm_ioremap_resource(&pdev->dev, res);
|
||||||
if (!stdev->thermal_base) {
|
if (IS_ERR(stdev->thermal_base))
|
||||||
dev_err(&pdev->dev, "ioremap failed\n");
|
return PTR_ERR(stdev->thermal_base);
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
stdev->clk = devm_clk_get(&pdev->dev, NULL);
|
stdev->clk = devm_clk_get(&pdev->dev, NULL);
|
||||||
if (IS_ERR(stdev->clk)) {
|
if (IS_ERR(stdev->clk)) {
|
||||||
@ -174,7 +167,6 @@ static int spear_thermal_exit(struct platform_device *pdev)
|
|||||||
struct spear_thermal_dev *stdev = spear_thermal->devdata;
|
struct spear_thermal_dev *stdev = spear_thermal->devdata;
|
||||||
|
|
||||||
thermal_zone_device_unregister(spear_thermal);
|
thermal_zone_device_unregister(spear_thermal);
|
||||||
platform_set_drvdata(pdev, NULL);
|
|
||||||
|
|
||||||
/* Disable SPEAr Thermal Sensor */
|
/* Disable SPEAr Thermal Sensor */
|
||||||
actual_mask = readl_relaxed(stdev->thermal_base);
|
actual_mask = readl_relaxed(stdev->thermal_base);
|
||||||
|
Loading…
Reference in New Issue
Block a user