[coreboot-gerrit] Change in coreboot[master]: soc/intel/skylake: Use common/blocks/uart code

[Martin Roth (Code Review)]

Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/19492 )

Change subject: soc/intel/skylake: Use common/blocks/uart code
......................................................................


soc/intel/skylake: Use common/blocks/uart code

Change-Id: I53ed687dc49524e001889f091825b2cc530546a3
Signed-off-by: Aamir Bohra <aamir.bohra at intel.com>
Reviewed-on: https://review.coreboot.org/19492
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
Reviewed-by: Aaron Durbin <adurbin at chromium.org>
---
M src/soc/intel/skylake/uart.c
1 file changed, 2 insertions(+), 28 deletions(-)

Approvals:
  Aaron Durbin: Looks good to me, approved
  build bot (Jenkins): Verified



diff --git a/src/soc/intel/skylake/uart.c b/src/soc/intel/skylake/uart.c
index 88bb784..07326d5 100644
--- a/src/soc/intel/skylake/uart.c
+++ b/src/soc/intel/skylake/uart.c
@@ -14,20 +14,17 @@
  * GNU General Public License for more details.
  */
 
-#include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
-#include <stdlib.h>
+#include <intelblocks/uart.h>
 #include <soc/iomap.h>
 #include <soc/pci_devs.h>
-#include <soc/ramstage.h>
 
 static int pch_uart_is_debug(struct device *dev)
 {
 	return dev->path.pci.devfn == PCH_DEVFN_UART2;
 }
 
-static void pch_uart_read_resources(struct device *dev)
+void pch_uart_read_resources(struct device *dev)
 {
 	pci_dev_read_resources(dev);
 
@@ -41,26 +38,3 @@
 			IORESOURCE_FIXED;
 	}
 }
-
-static struct device_operations device_ops = {
-	.read_resources		= &pch_uart_read_resources,
-	.set_resources		= &pci_dev_set_resources,
-	.enable_resources	= &pci_dev_enable_resources,
-	.ops_pci		= &soc_pci_ops,
-};
-
-static const unsigned short pci_device_ids[] = {
-	0x9d27, /* UART0 */
-	0x9d28, /* UART1 */
-	0x9d66, /* UART2 */
-	0xa127, /* KBL-H UART0 */
-	0xa128, /* KBL-H UART1 */
-	0xa166, /* KBL-H UART2 */
-	0
-};
-
-static const struct pci_driver pch_uart __pci_driver = {
-	.ops	 = &device_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
-	.devices = pci_device_ids,
-};

-- 
To view, visit https://review.coreboot.org/19492
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I53ed687dc49524e001889f091825b2cc530546a3
Gerrit-PatchSet: 8
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Aamir Bohra <aamir.bohra at intel.com>
Gerrit-Reviewer: Aaron Durbin <adurbin at chromium.org>
Gerrit-Reviewer: Barnali Sarkar <barnali.sarkar at intel.com>
Gerrit-Reviewer: Hannah Williams <hannah.williams at intel.com>
Gerrit-Reviewer: Martin Roth <martinroth at google.com>
Gerrit-Reviewer: Paul Menzel <paulepanter at users.sourceforge.net>
Gerrit-Reviewer: Rizwan Qureshi <rizwan.qureshi at intel.com>
Gerrit-Reviewer: Subrata Banik <subrata.banik at intel.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>