mfd: lpc_ich: Add Device IDs for Intel Apollo Lake PCH
Subsystems (2)
PATCH 1/2 mfd: lpc_ich: Add Device IDs for Intel Apollo Lake PCH
Adding Intel codename Apollo Lake platform device IDs for PCH.
--- drivers/mfd/lpc_ich.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/mfd/lpc_ich.c +6 -0
@@ -216,6 +216,7 @@ enum lpc_chipsets {LPC_BRASWELL ,/* Braswell SoC */ LPC_LEWISBURG ,/* Lewisburg */ LPC_9S ,/* 9 Series */ + LPC_APL, /* Apollo Lake SoC */ }; static struct lpc_ich_info lpc_chipset_info[] = {
@@ -533,6 +534,10 @@ static struct lpc_ich_info lpc_chipset_info[] = { .iTCO_version = 2, .gpio_version = ICH_V5_GPIO, }, + [LPC_APL] = { + .name = "Apollo Lake SoC", + .iTCO_version = 5, + }, };/*
@@ -681,6 +686,7 @@ static const struct pci_device_id lpc_ich_ids[] = { { PCI_VDEVICE(INTEL, 0x3b14), LPC_3420}, { PCI_VDEVICE(INTEL, 0x3b16), LPC_3450}, { PCI_VDEVICE(INTEL, 0x5031), LPC_EP80579}, + { PCI_VDEVICE(INTEL, 0x5ae8), LPC_APL}, { PCI_VDEVICE(INTEL, 0x8c40), LPC_LPT}, { PCI_VDEVICE(INTEL, 0x8c41), LPC_LPT}, { PCI_VDEVICE(INTEL, 0x8c42), LPC_LPT},
Signature · 1 line
2.11.0
PATCH 2/2 mfd: lpc_ich: Remove useless comments in core part
First of all, remove stalled references to datasheets. If someone knows the document numbers, it would be added later.
Second, remove FSF snail address since it's subject to change. Actual information can be found on FSF site on the internet.
--- drivers/mfd/lpc_ich.c | 15 --------------- 1 file changed, 15 deletions(-)
drivers/mfd/lpc_ich.c +0 -15
@@ -20,10 +20,6 @@* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * -* You should have received a copy of the GNU General Public License -* along with this program; see the file COPYING. If not, write to -* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -* * This driver supports the following I/O Controller hubs: * (See the intel documentation on http://developer.intel.com.) * document number 290655-003, 290677-014: 82801AA (ICH), 82801AB (ICHO)
@@ -45,17 +41,6 @@* document number 322169-001, 322170-003: 5 Series, 3400 Series (PCH) * document number 320066-003, 320257-008: EP80597 (IICH) * document number 324645-001, 324646-001: Cougar Point (CPT) -* document number TBD : Patsburg (PBG) -* document number TBD : DH89xxCC -* document number TBD : Panther Point -* document number TBD : Lynx Point -* document number TBD : Lynx Point-LP -* document number TBD : Wellsburg -* document number TBD : Avoton SoC -* document number TBD : Coleto Creek -* document number TBD : Wildcat Point-LP -* document number TBD : 9 Series -* document number TBD : Lewisburg */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
Signature · 1 line
2.11.0
Quoted 2 lines · Andy Shevchenko
Adding Intel codename Apollo Lake platform device IDs for PCH.
Ah, now this is in conflict with Mika's SPI-NOR patchset. It's strange I have no such conflict locally. Seems linux-next missed that series / tree somehow.
Quoted 40 lines
Signed-off-by Tan Jui Nee <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>--- drivers/mfd/lpc_ich.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/mfd/lpc_ich.c +6
-1@@ -216,6 +216,7 @@ enum lpc_chipsets {LPC_BRASWELL ,/* Braswell SoC */ LPC_LEWISBURG ,/* Lewisburg */ LPC_9S ,/* 9 Series */ + LPC_APL, /* Apollo Lake SoC */ }; static struct lpc_ich_info lpc_chipset_info[] = {@@ -533,6 +534,10 @@ static struct lpc_ich_info lpc_chipset_info[] = { .iTCO_version = 2, .gpio_version = ICH_V5_GPIO, }, + [LPC_APL] = { + .name = "Apollo Lake SoC", + .iTCO_version = 5, + }, };/* @@ -681,6 +686,7 @@ static const struct pci_device_id lpc_ich_ids[] = { { PCI_VDEVICE(INTEL, 0x3b14), LPC_3420}, { PCI_VDEVICE(INTEL, 0x3b16), LPC_3450}, { PCI_VDEVICE(INTEL, 0x5031), LPC_EP80579}, + { PCI_VDEVICE(INTEL, 0x5ae8), LPC_APL}, { PCI_VDEVICE(INTEL, 0x8c40), LPC_LPT}, { PCI_VDEVICE(INTEL, 0x8c41), LPC_LPT}, { PCI_VDEVICE(INTEL, 0x8c42), LPC_LPT}, --2.11.0
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 1 line · Andy Shevchenko
Adding Intel codename Apollo Lake platform device IDs for PCH.
Didn't this originate from Tan Jui Nee and not from you? Please make sure you have the correct From: here and the other patch as well.
You can use 'git commit --amend --author' for fixing it.
Quoted 5 lines · Mika Westerberg
Quoted 1 line · Andy Shevchenko
Adding Intel codename Apollo Lake platform device IDs for PCH.
Didn't this originate from Tan Jui Nee and not from you? Please make sure you have the correct From: here and the other patch as well.
Oh, right, thanks. I changed a lot in the whole series, though this one must keep original authorship. I will fix this as well.
Signature · 2 lines
With Best Regards, Andy Shevchenko