mfd: intel_msic: Use DEFINE_RES_IRQ() macro
PATCH 1/7 mfd: intel_msic: Use DEFINE_RES_IRQ() macro
Instead of open coding each data structure with IRQ resources, use dedicated macro.
In one case use DEFINE_RES_IRQ_NAMED() and DEFINE_RES_MEM_NAMED().
No functional change intended.
--- drivers/mfd/intel_msic.c | 44 +++++++++------------------------------- 1 file changed, 10 insertions(+), 34 deletions(-)
drivers/mfd/intel_msic.c +10 -34
@@ -54,68 +54,44 @@ struct intel_msic { };static struct resource msic_touch_resources[] = { - { - .flags =IORESOURCE_IRQ , - }, +DEFINE_RES_IRQ (0 ), };static struct resource msic_adc_resources[] = { - { - .flags =IORESOURCE_IRQ , - }, +DEFINE_RES_IRQ (0 ), };static struct resource msic_battery_resources[] = { - { - .flags =IORESOURCE_IRQ , - }, +DEFINE_RES_IRQ (0 ), };static struct resource msic_gpio_resources[] = { - { - .flags =IORESOURCE_IRQ , - }, +DEFINE_RES_IRQ (0 ), };static struct resource msic_audio_resources[] = { - { - .name ="IRQ" , - .flags =IORESOURCE_IRQ , - }, +DEFINE_RES_IRQ_NAMED (0 ,"IRQ" ),/* * We will pass IRQ_BASE to the driver now but this can be removed * when/if the driver starts to use intel_msic_irq_read(). */ - { - .name ="IRQ_BASE" , - .flags =IORESOURCE_MEM , - .start =MSIC_IRQ_STATUS_ACCDET , - .end =MSIC_IRQ_STATUS_ACCDET , - }, +DEFINE_RES_MEM_NAMED (MSIC_IRQ_STATUS_ACCDET ,1 ,"IRQ_BASE" ), };static struct resource msic_hdmi_resources[] = { - { - .flags =IORESOURCE_IRQ , - }, +DEFINE_RES_IRQ (0 ), };static struct resource msic_thermal_resources[] = { - { - .flags =IORESOURCE_IRQ , - }, +DEFINE_RES_IRQ (0 ), };static struct resource msic_power_btn_resources[] = { - { - .flags =IORESOURCE_IRQ , - }, +DEFINE_RES_IRQ (0 ), };static struct resource msic_ocd_resources[] = { - { - .flags =IORESOURCE_IRQ , - }, +DEFINE_RES_IRQ (0 ), };/*
Signature · 1 line
2.18.0
PATCH 2/7 mfd: intel_soc_pmic_crc: Use DEFINE_RES_IRQ_NAMED() macro
Instead of open coding each data structure with IRQ resources, use dedicated macro.
No functional change intended.
--- drivers/mfd/intel_soc_pmic_crc.c | 35 +++++--------------------------- 1 file changed, 5 insertions(+), 30 deletions(-)
drivers/mfd/intel_soc_pmic_crc.c +5 -30
@@ -36,48 +36,23 @@#define CRYSTAL_COVE_IRQ_VHDMIOCP 6static struct resource gpio_resources[] = { - { - .name ="GPIO" , - .start =CRYSTAL_COVE_IRQ_GPIO , - .end =CRYSTAL_COVE_IRQ_GPIO , - .flags =IORESOURCE_IRQ , - }, +DEFINE_RES_IRQ_NAMED (CRYSTAL_COVE_IRQ_GPIO ,"GPIO" ), };static struct resource pwrsrc_resources[] = { - { - .name ="PWRSRC" , - .start =CRYSTAL_COVE_IRQ_PWRSRC , - .end =CRYSTAL_COVE_IRQ_PWRSRC , - .flags =IORESOURCE_IRQ , - }, +DEFINE_RES_IRQ_NAMED (CRYSTAL_COVE_IRQ_PWRSRC ,"PWRSRC" ), };static struct resource adc_resources[] = { - { - .name ="ADC" , - .start =CRYSTAL_COVE_IRQ_ADC , - .end =CRYSTAL_COVE_IRQ_ADC , - .flags =IORESOURCE_IRQ , - }, +DEFINE_RES_IRQ_NAMED (CRYSTAL_COVE_IRQ_ADC ,"ADC" ), };static struct resource thermal_resources[] = { - { - .name ="THERMAL" , - .start =CRYSTAL_COVE_IRQ_THRM , - .end =CRYSTAL_COVE_IRQ_THRM , - .flags =IORESOURCE_IRQ , - }, +DEFINE_RES_IRQ_NAMED (CRYSTAL_COVE_IRQ_THRM ,"THERMAL" ), };static struct resource bcu_resources[] = { - { - .name ="BCU" , - .start =CRYSTAL_COVE_IRQ_BCU , - .end =CRYSTAL_COVE_IRQ_BCU , - .flags =IORESOURCE_IRQ , - }, +DEFINE_RES_IRQ_NAMED (CRYSTAL_COVE_IRQ_BCU ,"BCU" ), };static struct mfd_cell crystal_cove_byt_dev[] = {
Signature · 1 line
2.18.0
Re: [PATCH v1 2/7] mfd: intel_soc_pmic_crc: Use DEFINE_RES_IRQ_NAMED() macro
Quoted 6 lines · Andy Shevchenko
Instead of open coding each data structure with IRQ resources, use dedicated macro.
No functional change intended.
Signed-off-by Andy Shevchenko <[email protected]>
Lee Jones
AppliedRe: [PATCH v1 2/7] mfd: intel_soc_pmic_crc: Use DEFINE_RES_IRQ_NAMED() macro
In reply to Andy ShevchenkoQuoted 9 lines · Andy Shevchenko
Instead of open coding each data structure with IRQ resources, use dedicated macro.
No functional change intended.
Signed-off-by Andy Shevchenko <[email protected]>--- drivers/mfd/intel_soc_pmic_crc.c | 35 +++++--------------------------- 1 file changed, 5 insertions(+), 30 deletions(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH 3/7 mfd: intel_soc_pmic_crc: Use REGMAP_IRQ_REG() macro
In reply to Andy ShevchenkoInstead of open coding each data structure with regmap IRQresources, use dedicated macro.
No functional change intended.
--- drivers/mfd/intel_soc_pmic_crc.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-)
drivers/mfd/intel_soc_pmic_crc.c +7 -21
@@ -109,27 +109,13 @@ static const struct regmap_config crystal_cove_regmap_config = { };static const struct regmap_irq crystal_cove_irqs[] = { - [CRYSTAL_COVE_IRQ_PWRSRC ] = { - .mask =BIT (CRYSTAL_COVE_IRQ_PWRSRC ), - }, - [CRYSTAL_COVE_IRQ_THRM ] = { - .mask =BIT (CRYSTAL_COVE_IRQ_THRM ), - }, - [CRYSTAL_COVE_IRQ_BCU ] = { - .mask =BIT (CRYSTAL_COVE_IRQ_BCU ), - }, - [CRYSTAL_COVE_IRQ_ADC ] = { - .mask =BIT (CRYSTAL_COVE_IRQ_ADC ), - }, - [CRYSTAL_COVE_IRQ_CHGR ] = { - .mask =BIT (CRYSTAL_COVE_IRQ_CHGR ), - }, - [CRYSTAL_COVE_IRQ_GPIO ] = { - .mask =BIT (CRYSTAL_COVE_IRQ_GPIO ), - }, - [CRYSTAL_COVE_IRQ_VHDMIOCP ] = { - .mask =BIT (CRYSTAL_COVE_IRQ_VHDMIOCP ), - }, +REGMAP_IRQ_REG (CRYSTAL_COVE_IRQ_PWRSRC ,0 ,BIT (CRYSTAL_COVE_IRQ_PWRSRC )), +REGMAP_IRQ_REG (CRYSTAL_COVE_IRQ_THRM ,0 ,BIT (CRYSTAL_COVE_IRQ_THRM )), +REGMAP_IRQ_REG (CRYSTAL_COVE_IRQ_BCU ,0 ,BIT (CRYSTAL_COVE_IRQ_BCU )), +REGMAP_IRQ_REG (CRYSTAL_COVE_IRQ_ADC ,0 ,BIT (CRYSTAL_COVE_IRQ_ADC )), +REGMAP_IRQ_REG (CRYSTAL_COVE_IRQ_CHGR ,0 ,BIT (CRYSTAL_COVE_IRQ_CHGR )), +REGMAP_IRQ_REG (CRYSTAL_COVE_IRQ_GPIO ,0 ,BIT (CRYSTAL_COVE_IRQ_GPIO )), +REGMAP_IRQ_REG (CRYSTAL_COVE_IRQ_VHDMIOCP ,0 ,BIT (CRYSTAL_COVE_IRQ_VHDMIOCP )), };static const struct regmap_irq_chip crystal_cove_irq_chip = {
Signature · 1 line
2.18.0
Re: [PATCH v1 3/7] mfd: intel_soc_pmic_crc: Use REGMAP_IRQ_REG() macro
Quoted 6 lines · Andy Shevchenko
Instead of open coding each data structure with regmap IRQresources, use dedicated macro.
No functional change intended.
Signed-off-by Andy Shevchenko <[email protected]>
Lee Jones
AppliedRe: [PATCH v1 3/7] mfd: intel_soc_pmic_crc: Use REGMAP_IRQ_REG() macro
In reply to Andy ShevchenkoQuoted 9 lines · Andy Shevchenko
Instead of open coding each data structure with regmap IRQresources, use dedicated macro.
No functional change intended.
Signed-off-by Andy Shevchenko <[email protected]>--- drivers/mfd/intel_soc_pmic_crc.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH 4/7 mfd: intel_soc_pmic_bxtwc: Chain power button IRQs as well
In reply to Andy ShevchenkoPower button IRQ actually has a second level of interrupts to distinguish between UI and POWER buttons. Moreover, current implementation looks awkward in approach to handle second level IRQs by first level related IRQ chip.
To address above issues, split power button IRQ to be chained as well.
--- drivers/mfd/intel_soc_pmic_bxtwc.c | 41 ++++++++++++++++++++++-------- include/linux/mfd/intel_soc_pmic.h | 1 + 2 files changed, 32 insertions(+), 10 deletions(-)
drivers/mfd/intel_soc_pmic_bxtwc.c +31 -10
@@ -31,8 +31,8 @@/* Interrupt Status Registers */ #define BXTWC_IRQLVL1 0x4E02 -#define BXTWC_PWRBTNIRQ 0x4E03 +#define BXTWC_PWRBTNIRQ 0x4E03#define BXTWC_THRM0IRQ 0x4E04#define BXTWC_THRM1IRQ 0x4E05#define BXTWC_THRM2IRQ 0x4E06
@@ -47,10 +47,9 @@/* Interrupt MASK Registers */ #define BXTWC_MIRQLVL1 0x4E0E -#define BXTWC_MPWRTNIRQ 0x4E0F -#define BXTWC_MIRQLVL1_MCHGR BIT(5) +#define BXTWC_MPWRBTNIRQ 0x4E0F#define BXTWC_MTHRM0IRQ 0x4E12#define BXTWC_MTHRM1IRQ 0x4E13#define BXTWC_MTHRM2IRQ 0x4E14
@@ -66,9 +65,7 @@/* Whiskey Cove PMIC share same ACPI ID between different platforms */ #define BROXTON_PMIC_WC_HRV 4 -/* Manage in two IRQ chips since mask registers are not consecutive */ enum bxtwc_irqs { -/* Level 1 */ BXTWC_PWRBTN_LVL1_IRQ =0 ,BXTWC_TMU_LVL1_IRQ ,BXTWC_THRM_LVL1_IRQ ,
@@ -77,9 +74,11 @@ enum bxtwc_irqs {BXTWC_CHGR_LVL1_IRQ ,BXTWC_GPIO_LVL1_IRQ , BXTWC_CRIT_LVL1_IRQ, +}; -/* Level 2 */ - BXTWC_PWRBTN_IRQ, +enum bxtwc_irqs_pwrbtn { +BXTWC_PWRBTN_IRQ =0 , +BXTWC_UIBTN_IRQ , }; enum bxtwc_irqs_bcu {
@@ -113,7 +112,10 @@ static const struct regmap_irq bxtwc_regmap_irqs[] = {REGMAP_IRQ_REG (BXTWC_CHGR_LVL1_IRQ ,0 ,BIT (5 )),REGMAP_IRQ_REG (BXTWC_GPIO_LVL1_IRQ ,0 ,BIT (6 )), REGMAP_IRQ_REG(BXTWC_CRIT_LVL1_IRQ, 0, BIT(7)), - REGMAP_IRQ_REG(BXTWC_PWRBTN_IRQ, 1, 0x03), +}; + +static const struct regmap_irq bxtwc_regmap_irqs_pwrbtn[] = { +REGMAP_IRQ_REG (BXTWC_PWRBTN_IRQ ,0 ,0x01 ), }; static const struct regmap_irq bxtwc_regmap_irqs_bcu[] = {
@@ -125,7 +127,7 @@ static const struct regmap_irq bxtwc_regmap_irqs_adc[] = { };static const struct regmap_irq bxtwc_regmap_irqs_chgr[] = { -REGMAP_IRQ_REG (BXTWC_USBC_IRQ ,0 ,BIT (5 )), +REGMAP_IRQ_REG (BXTWC_USBC_IRQ ,0 ,0x20 ),REGMAP_IRQ_REG (BXTWC_CHGR0_IRQ ,0 ,0x1f ),REGMAP_IRQ_REG (BXTWC_CHGR1_IRQ ,1 ,0x1f ), };
@@ -144,7 +146,16 @@ static struct regmap_irq_chip bxtwc_regmap_irq_chip = { .mask_base = BXTWC_MIRQLVL1, .irqs = bxtwc_regmap_irqs, .num_irqs = ARRAY_SIZE(bxtwc_regmap_irqs), - .num_regs = 2, + .num_regs = 1, +}; + +static struct regmap_irq_chip bxtwc_regmap_irq_chip_pwrbtn = { + .name ="bxtwc_irq_chip_pwrbtn" , + .status_base =BXTWC_PWRBTNIRQ , + .mask_base =BXTWC_MPWRBTNIRQ , + .irqs = bxtwc_regmap_irqs_pwrbtn, + .num_irqs =ARRAY_SIZE (bxtwc_regmap_irqs_pwrbtn), + .num_regs =1 , };static struct regmap_irq_chip bxtwc_regmap_irq_chip_tmu = {
@@ -472,6 +483,16 @@ static int bxtwc_probe(struct platform_device *pdev)return ret; } + ret =bxtwc_add_chained_irq_chip (pmic, pmic->irq_chip_data, +BXTWC_PWRBTN_LVL1_IRQ , +IRQF_ONESHOT , + &bxtwc_regmap_irq_chip_pwrbtn, + &pmic->irq_chip_data_pwrbtn); +if (ret) { +dev_err (&pdev->dev,"Failed to add PWRBTN IRQ chip\n" ); +return ret; + } + ret = bxtwc_add_chained_irq_chip(pmic, pmic->irq_chip_data, BXTWC_TMU_LVL1_IRQ, IRQF_ONESHOT,
include/linux/mfd/intel_soc_pmic.h +1 -0
@@ -25,6 +25,7 @@ struct intel_soc_pmic {int irq;struct regmap *regmap;struct regmap_irq_chip_data *irq_chip_data; +struct regmap_irq_chip_data *irq_chip_data_pwrbtn;struct regmap_irq_chip_data *irq_chip_data_tmu;struct regmap_irq_chip_data *irq_chip_data_bcu;struct regmap_irq_chip_data *irq_chip_data_adc;
Signature · 1 line
2.18.0
Re: [PATCH v1 4/7] mfd: intel_soc_pmic_bxtwc: Chain power button IRQs as well
Quoted 8 lines · Andy Shevchenko
Power button IRQ actually has a second level of interrupts to distinguish between UI and POWER buttons. Moreover, current implementation looks awkward in approach to handle second level IRQs by first level related IRQ chip.
To address above issues, split power button IRQ to be chained as well.
Signed-off-by Andy Shevchenko <[email protected]>
Lee Jones
AppliedRe: [PATCH v1 4/7] mfd: intel_soc_pmic_bxtwc: Chain power button IRQs as well
In reply to Andy ShevchenkoQuoted 5 lines · Andy Shevchenko
Power button IRQ actually has a second level of interrupts to distinguish between UI and POWER buttons. Moreover, current implementation looks awkward in approach to handle second level IRQs by first level related IRQ chip.
Quoted 7 lines
To address above issues, split power button IRQ to be chained as well.
Signed-off-by Andy Shevchenko <[email protected]>--- drivers/mfd/intel_soc_pmic_bxtwc.c | 41 ++++++++++++++++++++++-------- include/linux/mfd/intel_soc_pmic.h | 1 + 2 files changed, 32 insertions(+), 10 deletions(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH 5/7 mfd: Sort headers alphabetically for Intel PMIC drivers
In reply to Andy ShevchenkoSort headers alphabetically for better maintenance.
No functional change.
--- drivers/mfd/intel_soc_pmic_bxtwc.c | 5 +++-- drivers/mfd/intel_soc_pmic_core.c | 13 +++++++------ drivers/mfd/intel_soc_pmic_crc.c | 3 ++- 3 files changed, 12 insertions(+), 9 deletions(-)
drivers/mfd/intel_soc_pmic_bxtwc.c +3 -2
@@ -13,15 +13,16 @@* more details. */ -#include <linux/module.h> #include <linux/acpi.h> -#include <linux/err.h> #include <linux/delay.h> +#include <linux/err.h> #include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/mfd/core.h> #include <linux/mfd/intel_soc_pmic.h> #include <linux/mfd/intel_soc_pmic_bxtwc.h> +#include <linux/module.h> +#include <asm/intel_pmc_ipc.h> /* PMIC device registers */
drivers/mfd/intel_soc_pmic_core.c +7 -6
@@ -16,16 +16,17 @@* Author: Zhu, Lejun <[email protected]> */ -#include <linux/module.h> -#include <linux/mfd/core.h> +#include <linux/acpi.h> +#include <linux/gpio/consumer.h> +#include <linux/gpio/machine.h> #include <linux/i2c.h> #include <linux/interrupt.h> -#include <linux/gpio/consumer.h> -#include <linux/acpi.h> -#include <linux/regmap.h> +#include <linux/module.h> +#include <linux/mfd/core.h> #include <linux/mfd/intel_soc_pmic.h> -#include <linux/gpio/machine.h> #include <linux/pwm.h> +#include <linux/regmap.h> +#include "intel_soc_pmic_core.h" /* Crystal Cove PMIC shares same ACPI ID between different platforms */
drivers/mfd/intel_soc_pmic_crc.c +2 -1
@@ -16,10 +16,11 @@* Author: Zhu, Lejun <[email protected]> */ -#include <linux/mfd/core.h> #include <linux/interrupt.h> #include <linux/regmap.h> +#include <linux/mfd/core.h> #include <linux/mfd/intel_soc_pmic.h> +#include "intel_soc_pmic_core.h" #define CRYSTAL_COVE_MAX_REGISTER 0xC6
Signature · 1 line
2.18.0
Re: [PATCH v1 5/7] mfd: Sort headers alphabetically for Intel PMIC drivers
Quoted 5 lines · Andy Shevchenko
Sort headers alphabetically for better maintenance.
No functional change.
Signed-off-by Andy Shevchenko <[email protected]>
Lee Jones
AppliedRe: [PATCH v1 5/7] mfd: Sort headers alphabetically for Intel PMIC drivers
In reply to Andy ShevchenkoQuoted 10 lines · Andy Shevchenko
Sort headers alphabetically for better maintenance.
No functional change.
Signed-off-by Andy Shevchenko <[email protected]>--- drivers/mfd/intel_soc_pmic_bxtwc.c | 5 +++-- drivers/mfd/intel_soc_pmic_core.c | 13 +++++++------ drivers/mfd/intel_soc_pmic_crc.c | 3 ++- 3 files changed, 12 insertions(+), 9 deletions(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH 6/7 mfd: Convert Intel PMIC drivers to use SPDX identifier
In reply to Andy ShevchenkoReduce size of duplicated comments by switching to use SPDX identifier.
No functional change.
--- drivers/mfd/intel_msic.c | 5 +---- drivers/mfd/intel_soc_pmic_bxtwc.c | 10 +--------- drivers/mfd/intel_soc_pmic_chtdc_ti.c | 5 +---- drivers/mfd/intel_soc_pmic_chtwc.c | 5 +---- drivers/mfd/intel_soc_pmic_core.c | 12 ++---------- drivers/mfd/intel_soc_pmic_core.h | 12 ++---------- drivers/mfd/intel_soc_pmic_crc.c | 12 ++---------- include/linux/mfd/intel_msic.h | 7 ++----- include/linux/mfd/intel_soc_pmic.h | 12 ++---------- include/linux/mfd/intel_soc_pmic_bxtwc.h | 10 +--------- 10 files changed, 15 insertions(+), 75 deletions(-)
drivers/mfd/intel_msic.c +1 -4
@@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Driver for Intel MSIC * * Copyright (C) 2011, Intel Corporation * Author: Mika Westerberg <[email protected]> -* -* 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/err.h>
drivers/mfd/intel_soc_pmic_bxtwc.c +1 -9
@@ -1,16 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * MFD core driver for Intel Broxton Whiskey Cove PMIC * * Copyright (C) 2015 Intel Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. */ #include <linux/acpi.h>
drivers/mfd/intel_soc_pmic_chtdc_ti.c +1 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Device access for Dollar Cove TI PMIC *
@@ -6,10 +7,6 @@* * Cleanup and forward-ported * Copyright (c) 2017 Takashi Iwai <[email protected]> -* -* 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/acpi.h>
drivers/mfd/intel_soc_pmic_chtwc.c +1 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * MFD core driver for Intel Cherrytrail Whiskey Cove PMIC *
@@ -5,10 +6,6 @@* * Based on various non upstream patches to support the CHT Whiskey Cove PMIC: * Copyright (C) 2013-2015 Intel Corporation. All rights reserved. -* -* 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/acpi.h>
drivers/mfd/intel_soc_pmic_core.c +2 -10
@@ -1,17 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* -* intel_soc_pmic_core.c - Intel SoC PMIC MFD Driver +* Intel SoC PMIC MFD Driver * * Copyright (C) 2013, 2014 Intel Corporation. All rights reserved. * -* 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. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* * Author: Yang, Bin <[email protected]> * Author: Zhu, Lejun <[email protected]> */
drivers/mfd/intel_soc_pmic_core.h +2 -10
@@ -1,17 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* -* intel_soc_pmic_core.h - Intel SoC PMIC MFD Driver +* Intel SoC PMIC MFD Driver * * Copyright (C) 2012-2014 Intel Corporation. All rights reserved. * -* 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. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* * Author: Yang, Bin <[email protected]> * Author: Zhu, Lejun <[email protected]> */
drivers/mfd/intel_soc_pmic_crc.c +2 -10
@@ -1,17 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* -* intel_soc_pmic_crc.c - Device access for Crystal Cove PMIC +* Device access for Crystal Cove PMIC * * Copyright (C) 2013, 2014 Intel Corporation. All rights reserved. * -* 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. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* * Author: Yang, Bin <[email protected]> * Author: Zhu, Lejun <[email protected]> */
include/linux/mfd/intel_msic.h +2 -5
@@ -1,12 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* -* include/linux/mfd/intel_msic.h - Core interface for Intel MSIC +* Core interface for Intel MSIC * * Copyright (C) 2011, Intel Corporation * Author: Mika Westerberg <[email protected]> -* -* 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. */ #ifndef __LINUX_MFD_INTEL_MSIC_H__
include/linux/mfd/intel_soc_pmic.h +2 -10
@@ -1,17 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* -* intel_soc_pmic.h - Intel SoC PMIC Driver +* Intel SoC PMIC Driver * * Copyright (C) 2012-2014 Intel Corporation. All rights reserved. * -* 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. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* * Author: Yang, Bin <[email protected]> * Author: Zhu, Lejun <[email protected]> */
include/linux/mfd/intel_soc_pmic_bxtwc.h +1 -9
@@ -1,16 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Header file for Intel Broxton Whiskey Cove PMIC * * Copyright (C) 2015 Intel Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. */ #ifndef __INTEL_BXTWC_H__
Signature · 1 line
2.18.0
Re: [PATCH v1 6/7] mfd: Convert Intel PMIC drivers to use SPDX identifier
Quoted 5 lines · Andy Shevchenko
Reduce size of duplicated comments by switching to use SPDX identifier.
No functional change.
Signed-off-by Andy Shevchenko <[email protected]>
Lee Jones
AppliedRe: [PATCH v1 6/7] mfd: Convert Intel PMIC drivers to use SPDX identifier
In reply to Andy ShevchenkoQuoted 5 lines · Andy Shevchenko
Reduce size of duplicated comments by switching to use SPDX identifier.
No functional change.
Signed-off-by Andy Shevchenko <[email protected]>
Quoted 12 lines
--- drivers/mfd/intel_msic.c | 5 +---- drivers/mfd/intel_soc_pmic_bxtwc.c | 10 +--------- drivers/mfd/intel_soc_pmic_chtdc_ti.c | 5 +---- drivers/mfd/intel_soc_pmic_chtwc.c | 5 +---- drivers/mfd/intel_soc_pmic_core.c | 12 ++---------- drivers/mfd/intel_soc_pmic_core.h | 12 ++---------- drivers/mfd/intel_soc_pmic_crc.c | 12 ++---------- include/linux/mfd/intel_msic.h | 7 ++----- include/linux/mfd/intel_soc_pmic.h | 12 ++---------- include/linux/mfd/intel_soc_pmic_bxtwc.h | 10 +--------- 10 files changed, 15 insertions(+), 75 deletions(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH 7/7 MAINTAINERS: Add myself as designated reviewer of Intel MFD PMIC
In reply to Andy ShevchenkoThere are few Intel MFD PMIC device drivers which I would like to review.
Note, Intel MSIC is old system controller that based mostly on PMIC integrated in it. Thus, I included it as well.
--- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+)
MAINTAINERS +8 -0
@@ -7484,6 +7484,14 @@ F: drivers/platform/x86/intel_punit_ipc.c F: arch/x86/include/asm/intel_pmc_ipc.h F: arch/x86/include/asm/intel_punit_ipc.h +INTEL MULTIFUNCTION PMIC DEVICE DRIVERS +R: Andy Shevchenko <[email protected]> +S: Maintained +F: drivers/mfd/intel_msic.c +F: drivers/mfd/intel_soc_pmic* +F: include/linux/mfd/intel_msic.h +F: include/linux/mfd/intel_soc_pmic* + INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT M: Stanislav Yakovlev <[email protected]> L: [email protected]
Signature · 1 line
2.18.0
Re: [PATCH v1 7/7] MAINTAINERS: Add myself as designated reviewer of Intel MFD PMIC
Quoted 5 lines · Andy Shevchenko
There are few Intel MFD PMIC device drivers which I would like to review.
Note, Intel MSIC is old system controller that based mostly on PMIC integrated in it. Thus, I included it as well.
Good idea.
Quoted 1 line
Signed-off-by Andy Shevchenko <[email protected]>
Lee Jones
AppliedRe: [PATCH v1 7/7] MAINTAINERS: Add myself as designated reviewer of Intel MFD PMIC
In reply to Andy ShevchenkoQuoted 10 lines · Andy Shevchenko
There are few Intel MFD PMIC device drivers which I would like to review.
Note, Intel MSIC is old system controller that based mostly on PMIC integrated in it. Thus, I included it as well.
Signed-off-by Andy Shevchenko <[email protected]>--- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Quoted 8 lines · Andy Shevchenko
Instead of open coding each data structure with IRQ resources, use dedicated macro.
In one case use
DEFINE_RES_IRQ_NAMED()andDEFINE_RES_MEM_NAMED().No functional change intended.
Signed-off-by Andy Shevchenko <[email protected]>
Lee Jones
AppliedQuoted 11 lines · Andy Shevchenko
Instead of open coding each data structure with IRQ resources, use dedicated macro.
In one case use
DEFINE_RES_IRQ_NAMED()andDEFINE_RES_MEM_NAMED().No functional change intended.
Signed-off-by Andy Shevchenko <[email protected]>--- drivers/mfd/intel_msic.c | 44 +++++++++------------------------------- 1 file changed, 10 insertions(+), 34 deletions(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog