PCI: Move Rohm vendor ID to generic list

PATCH In review Andy Shevchenko 6 participants 6 messages Nov 7, 2018 – Feb 1, 2019

Subsystems (10)

Network drivers USB PCI GPIO +6 more subsystems

lore

Share & tools

lore

Andy Shevchenko

author

2018-11-07 19:59 UTC #0 lore raw

PATCH 1/1 PCI: Move Rohm vendor ID to generic list

Move the Rohm vendor ID to pci_ids.h from dozen of drivers.

Signed-off-by Andy Shevchenko <[email protected]>

---

I believe the best chance to get it merged and be less intrusive to ongoing work is through PCI subsystem as a _fix_ for v4.20.

 drivers/dma/pch_dma.c                                | 1 -
 drivers/gpio/gpio-ml-ioh.c                           | 2 --
 drivers/gpio/gpio-pch.c                              | 1 -
 drivers/i2c/busses/i2c-eg20t.c                       | 1 -
 drivers/misc/pch_phub.c                              | 1 -
 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 7 ++-----
 drivers/spi/spi-topcliff-pch.c                       | 1 -
 drivers/tty/serial/pch_uart.c                        | 2 --
 drivers/usb/gadget/udc/pch_udc.c                     | 1 -
 include/linux/pci_ids.h                              | 2 ++
 10 files changed, 4 insertions(+), 15 deletions(-)

drivers/dma/pch_dma.c +0 -1

index afd8f27bda96..538b6e0e17bb 100644
@@ -972,7 +972,6 @@ static void pch_dma_remove(struct pci_dev *pdev)
 }
 
 /* PCI Device ID of DMA device */
-#define PCI_VENDOR_ID_ROHM             0x10DB
 #define PCI_DEVICE_ID_EG20T_PCH_DMA_8CH        0x8810
 #define PCI_DEVICE_ID_EG20T_PCH_DMA_4CH        0x8815
 #define PCI_DEVICE_ID_ML7213_DMA1_8CH	0x8026

drivers/gpio/gpio-ml-ioh.c +0 -2

index 51c7d1b84c2e..0c076dce9e17 100644
@@ -31,8 +31,6 @@
 
 #define IOH_IRQ_BASE		0
 
-#define PCI_VENDOR_ID_ROHM             0x10DB
-
 struct ioh_reg_comn {
 	u32	ien;
 	u32	istatus;

drivers/gpio/gpio-pch.c +0 -1

index ffce0ab912ed..8c7f3d20e30e 100644
@@ -524,7 +524,6 @@ static int pch_gpio_resume(struct pci_dev *pdev)
 #define pch_gpio_resume NULL
 #endif
 
-#define PCI_VENDOR_ID_ROHM             0x10DB
 static const struct pci_device_id pch_gpio_pcidev_id[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8803) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8014) },

drivers/i2c/busses/i2c-eg20t.c +0 -1

index 835d54ac2971..231675b10376 100644
@@ -177,7 +177,6 @@ static wait_queue_head_t pch_event;
 static DEFINE_MUTEX(pch_mutex);
 
 /* Definition for ML7213 by LAPIS Semiconductor */
-#define PCI_VENDOR_ID_ROHM		0x10DB
 #define PCI_DEVICE_ID_ML7213_I2C	0x802D
 #define PCI_DEVICE_ID_ML7223_I2C	0x8010
 #define PCI_DEVICE_ID_ML7831_I2C	0x8817

drivers/misc/pch_phub.c +0 -1

index 540845651b8c..309703e9c42e 100644
@@ -64,7 +64,6 @@
 #define CLKCFG_UARTCLKSEL			(1 << 18)
 
 /* Macros for ML7213 */
-#define PCI_VENDOR_ID_ROHM			0x10db
 #define PCI_DEVICE_ID_ROHM_ML7213_PHUB		0x801A
 
 /* Macros for ML7223 */

drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +2 -5

index 43c0c10dfeb7..3a4225837049 100644
@@ -27,7 +27,6 @@
 #define DRV_VERSION     "1.01"
 const char pch_driver_version[] = DRV_VERSION;
 
-#define PCI_DEVICE_ID_INTEL_IOH1_GBE	0x8802		/* Pci device ID */
 #define PCH_GBE_MAR_ENTRIES		16
 #define PCH_GBE_SHORT_PKT		64
 #define DSC_INIT16			0xC000

@@ -37,11 +36,9 @@ const char pch_driver_version[] = DRV_VERSION;
 #define PCH_GBE_PCI_BAR			1
 #define PCH_GBE_RESERVE_MEMORY		0x200000	/* 2MB */
 
-/* Macros for ML7223 */
-#define PCI_VENDOR_ID_ROHM			0x10db
-#define PCI_DEVICE_ID_ROHM_ML7223_GBE		0x8013
+#define PCI_DEVICE_ID_INTEL_IOH1_GBE		0x8802
 
-/* Macros for ML7831 */
+#define PCI_DEVICE_ID_ROHM_ML7223_GBE		0x8013
 #define PCI_DEVICE_ID_ROHM_ML7831_GBE		0x8802
 
 #define PCH_GBE_TX_WEIGHT         64

drivers/spi/spi-topcliff-pch.c +0 -1

index 97d137591b18..d794180e83dc 100644
@@ -92,7 +92,6 @@
 #define PCH_MAX_SPBR		1023
 
 /* Definition for ML7213/ML7223/ML7831 by LAPIS Semiconductor */
-#define PCI_VENDOR_ID_ROHM		0x10DB
 #define PCI_DEVICE_ID_ML7213_SPI	0x802c
 #define PCI_DEVICE_ID_ML7223_SPI	0x800F
 #define PCI_DEVICE_ID_ML7831_SPI	0x8816

drivers/tty/serial/pch_uart.c +0 -2

index cb85002a10d8..d04108e7503a 100644
@@ -192,8 +192,6 @@ enum {
 #define PCH_UART_HAL_LOOP		(PCH_UART_MCR_LOOP)
 #define PCH_UART_HAL_AFE		(PCH_UART_MCR_AFE)
 
-#define PCI_VENDOR_ID_ROHM		0x10DB
-
 #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
 
 #define DEFAULT_UARTCLK   1843200 /*   1.8432 MHz */

drivers/usb/gadget/udc/pch_udc.c +0 -1

index afaea11ec771..5b6f2b9eaa5f 100644
@@ -368,7 +368,6 @@ struct pch_udc_dev {
 #define PCI_DEVICE_ID_INTEL_QUARK_X1000_UDC	0x0939
 #define PCI_DEVICE_ID_INTEL_EG20T_UDC		0x8808
 
-#define PCI_VENDOR_ID_ROHM		0x10DB
 #define PCI_DEVICE_ID_ML7213_IOH_UDC	0x801D
 #define PCI_DEVICE_ID_ML7831_IOH_UDC	0x8808

include/linux/pci_ids.h +2 -0

index 69f0abe1ba1a..7fc8d79260e6 100644
@@ -1137,6 +1137,8 @@
 #define PCI_VENDOR_ID_TCONRAD		0x10da
 #define PCI_DEVICE_ID_TCONRAD_TOKENRING	0x0508
 
+#define PCI_VENDOR_ID_ROHM		0x10db
+
 #define PCI_VENDOR_ID_NVIDIA			0x10de
 #define PCI_DEVICE_ID_NVIDIA_TNT		0x0020
 #define PCI_DEVICE_ID_NVIDIA_TNT2		0x0028

Signature · 1 line

2.19.1

Greg Kroah-Hartman

maintainer

2018-11-08 10:07 UTC #1 lore raw

Quoted 7 lines · Andy Shevchenko

Move the Rohm vendor ID to pci_ids.h from dozen of drivers.
Signed-off-by Andy Shevchenko <[email protected]>
---
I believe the best chance to get it merged and be less intrusive to ongoing work is through PCI subsystem as a _fix_ for v4.20.

What? Why? Who cares?

This can trickle in over the next year or never, as it isn't a bugfix, or "necessary" at all. Just add it to pci_ids.h and when that gets merged, you can try to remove it from the individual drivers if it really is annoying to you.

But this is _NOT_ a fix for anything, don't try to mask it as one, that feels like "crying wolf" here :(

thanks,

greg k-h

Andy Shevchenko

2018-11-08 12:19 UTC #2 lore raw

Quoted 12 lines · Greg Kroah-Hartman

Quoted 7 lines · Andy Shevchenko
Move the Rohm vendor ID to pci_ids.h from dozen of drivers.
Signed-off-by Andy Shevchenko <[email protected]>
---
I believe the best chance to get it merged and be less intrusive to ongoing work is through PCI subsystem as a _fix_ for v4.20.
What? Why? Who cares?

Quoted 8 lines

This can trickle in over the next year or never, as it isn't a bugfix, or "necessary" at all. Just add it to pci_ids.h and when that gets merged, you can try to remove it from the individual drivers if it really is annoying to you.
But this is _NOT_ a fix for anything, don't try to mask it as one, that feels like "crying wolf" here :(

It doesn't fix anything, indeed. But since it touches 9 drivers simultaneously, it might be easier to push it earlier, or other way around — at the end of the cycle.
OTOH, I don't think there would be conflicts if it goes normal way through PCI subsystem.

Signature · 2 lines

With Best Regards,
Andy Shevchenko

Mark Brown

maintainer Acked-by on v1 1/1

2018-11-08 14:34 UTC #3 lore raw

In reply to Andy Shevchenko

Quoted 3 lines · Andy Shevchenko

Move the Rohm vendor ID to pci_ids.h from dozen of drivers.
Signed-off-by Andy Shevchenko <[email protected]>

Acked-by Mark Brown <[email protected]>

Linus Walleij

Acked-by on v1 1/1

2018-11-15 11:08 UTC #4 lore raw

In reply to Andy Shevchenko

Quoted 3 lines · Andy Shevchenko

Move the Rohm vendor ID to pci_ids.h from dozen of drivers.
Signed-off-by Andy Shevchenko <[email protected]>

Acked-by Linus Walleij <[email protected]>

Please merge it in a way that doesn't upset Greg! :)

Yours,
Linus Walleij

Bjorn Helgaas

2019-02-01 23:32 UTC #5 lore raw

In reply to Andy Shevchenko

Quoted 3 lines · Andy Shevchenko

Move the Rohm vendor ID to pci_ids.h from dozen of drivers.
Signed-off-by Andy Shevchenko <[email protected]>

I applied this to pci/misc for v5.1 with acks from Mark and Linus W. I did change "dozen" to "several" just for truth-in-advertising :)

Quoted 157 lines

---

I believe the best chance to get it merged and be less intrusive to ongoing work is through PCI subsystem as a _fix_ for v4.20.

 drivers/dma/pch_dma.c                                | 1 -
 drivers/gpio/gpio-ml-ioh.c                           | 2 --
 drivers/gpio/gpio-pch.c                              | 1 -
 drivers/i2c/busses/i2c-eg20t.c                       | 1 -
 drivers/misc/pch_phub.c                              | 1 -
 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 7 ++-----
 drivers/spi/spi-topcliff-pch.c                       | 1 -
 drivers/tty/serial/pch_uart.c                        | 2 --
 drivers/usb/gadget/udc/pch_udc.c                     | 1 -
 include/linux/pci_ids.h                              | 2 ++
 10 files changed, 4 insertions(+), 15 deletions(-)

drivers/dma/pch_dma.c +0 -1

index afd8f27bda96..538b6e0e17bb 100644
@@ -972,7 +972,6 @@ static void pch_dma_remove(struct pci_dev *pdev)
 }
 
 /* PCI Device ID of DMA device */
-#define PCI_VENDOR_ID_ROHM             0x10DB
 #define PCI_DEVICE_ID_EG20T_PCH_DMA_8CH        0x8810
 #define PCI_DEVICE_ID_EG20T_PCH_DMA_4CH        0x8815
 #define PCI_DEVICE_ID_ML7213_DMA1_8CH	0x8026

drivers/gpio/gpio-ml-ioh.c +0 -2

index 51c7d1b84c2e..0c076dce9e17 100644
@@ -31,8 +31,6 @@
 
 #define IOH_IRQ_BASE		0
 
-#define PCI_VENDOR_ID_ROHM             0x10DB
-
 struct ioh_reg_comn {
 	u32	ien;
 	u32	istatus;

drivers/gpio/gpio-pch.c +0 -1

index ffce0ab912ed..8c7f3d20e30e 100644
@@ -524,7 +524,6 @@ static int pch_gpio_resume(struct pci_dev *pdev)
 #define pch_gpio_resume NULL
 #endif
 
-#define PCI_VENDOR_ID_ROHM             0x10DB
 static const struct pci_device_id pch_gpio_pcidev_id[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8803) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8014) },

drivers/i2c/busses/i2c-eg20t.c +0 -1

index 835d54ac2971..231675b10376 100644
@@ -177,7 +177,6 @@ static wait_queue_head_t pch_event;
 static DEFINE_MUTEX(pch_mutex);
 
 /* Definition for ML7213 by LAPIS Semiconductor */
-#define PCI_VENDOR_ID_ROHM		0x10DB
 #define PCI_DEVICE_ID_ML7213_I2C	0x802D
 #define PCI_DEVICE_ID_ML7223_I2C	0x8010
 #define PCI_DEVICE_ID_ML7831_I2C	0x8817

drivers/misc/pch_phub.c +0 -1

index 540845651b8c..309703e9c42e 100644
@@ -64,7 +64,6 @@
 #define CLKCFG_UARTCLKSEL			(1 << 18)
 
 /* Macros for ML7213 */
-#define PCI_VENDOR_ID_ROHM			0x10db
 #define PCI_DEVICE_ID_ROHM_ML7213_PHUB		0x801A
 
 /* Macros for ML7223 */

drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +2 -5

index 43c0c10dfeb7..3a4225837049 100644
@@ -27,7 +27,6 @@
 #define DRV_VERSION     "1.01"
 const char pch_driver_version[] = DRV_VERSION;
 
-#define PCI_DEVICE_ID_INTEL_IOH1_GBE	0x8802		/* Pci device ID */
 #define PCH_GBE_MAR_ENTRIES		16
 #define PCH_GBE_SHORT_PKT		64
 #define DSC_INIT16			0xC000

@@ -37,11 +36,9 @@ const char pch_driver_version[] = DRV_VERSION;
 #define PCH_GBE_PCI_BAR			1
 #define PCH_GBE_RESERVE_MEMORY		0x200000	/* 2MB */
 
-/* Macros for ML7223 */
-#define PCI_VENDOR_ID_ROHM			0x10db
-#define PCI_DEVICE_ID_ROHM_ML7223_GBE		0x8013
+#define PCI_DEVICE_ID_INTEL_IOH1_GBE		0x8802
 
-/* Macros for ML7831 */
+#define PCI_DEVICE_ID_ROHM_ML7223_GBE		0x8013
 #define PCI_DEVICE_ID_ROHM_ML7831_GBE		0x8802
 
 #define PCH_GBE_TX_WEIGHT         64

drivers/spi/spi-topcliff-pch.c +0 -1

index 97d137591b18..d794180e83dc 100644
@@ -92,7 +92,6 @@
 #define PCH_MAX_SPBR		1023
 
 /* Definition for ML7213/ML7223/ML7831 by LAPIS Semiconductor */
-#define PCI_VENDOR_ID_ROHM		0x10DB
 #define PCI_DEVICE_ID_ML7213_SPI	0x802c
 #define PCI_DEVICE_ID_ML7223_SPI	0x800F
 #define PCI_DEVICE_ID_ML7831_SPI	0x8816

drivers/tty/serial/pch_uart.c +0 -2

index cb85002a10d8..d04108e7503a 100644
@@ -192,8 +192,6 @@ enum {
 #define PCH_UART_HAL_LOOP		(PCH_UART_MCR_LOOP)
 #define PCH_UART_HAL_AFE		(PCH_UART_MCR_AFE)
 
-#define PCI_VENDOR_ID_ROHM		0x10DB
-
 #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
 
 #define DEFAULT_UARTCLK   1843200 /*   1.8432 MHz */

drivers/usb/gadget/udc/pch_udc.c +0 -1

index afaea11ec771..5b6f2b9eaa5f 100644
@@ -368,7 +368,6 @@ struct pch_udc_dev {
 #define PCI_DEVICE_ID_INTEL_QUARK_X1000_UDC	0x0939
 #define PCI_DEVICE_ID_INTEL_EG20T_UDC		0x8808
 
-#define PCI_VENDOR_ID_ROHM		0x10DB
 #define PCI_DEVICE_ID_ML7213_IOH_UDC	0x801D
 #define PCI_DEVICE_ID_ML7831_IOH_UDC	0x8808

include/linux/pci_ids.h +2 -0

index 69f0abe1ba1a..7fc8d79260e6 100644
@@ -1137,6 +1137,8 @@
 #define PCI_VENDOR_ID_TCONRAD		0x10da
 #define PCI_DEVICE_ID_TCONRAD_TOKENRING	0x0508
 
+#define PCI_VENDOR_ID_ROHM		0x10db
+
 #define PCI_VENDOR_ID_NVIDIA			0x10de
 #define PCI_DEVICE_ID_NVIDIA_TNT		0x0020
 #define PCI_DEVICE_ID_NVIDIA_TNT2		0x0028

Signature · 1 line

2.19.1