embeded-sourcecoder
diff --git a/‎arch/arm/mach-mvebu/Kconfig
Lines changed: 0 additions & 1 deletion b/‎arch/arm/mach-mvebu/Kconfig
Lines changed: 0 additions & 1 deletion
diff --git a/‎drivers/of/Kconfig
Lines changed: 0 additions & 16 deletions b/‎drivers/of/Kconfig
Lines changed: 0 additions & 16 deletions
diff --git a/‎drivers/of/Makefile
Lines changed: 0 additions & 2 deletions b/‎drivers/of/Makefile
Lines changed: 0 additions & 2 deletions
diff --git a/‎drivers/of/address.c
Lines changed: 3 additions & 5 deletions b/‎drivers/of/address.c
Lines changed: 3 additions & 5 deletions
@@ -10,7 +10,6 @@ menuconfig ARCH_MVEBU
 	select ZONE_DMA if ARM_LPAE
 	select GPIOLIB
 	select PCI_QUIRKS if PCI
-	select OF_ADDRESS_PCI
 
 if ARCH_MVEBU
 
 
@@ -62,10 +62,6 @@ config OF_DYNAMIC
 config OF_ADDRESS
 	def_bool y
 	depends on !SPARC && HAS_IOMEM
-	select OF_ADDRESS_PCI if PCI
-
-config OF_ADDRESS_PCI
-	bool
 
 config OF_IRQ
 	def_bool y
@@ -82,18 +78,6 @@ config OF_MDIO
 	help
 	  OpenFirmware MDIO bus (Ethernet PHY) accessors
 
-config OF_PCI
-	def_tristate PCI
-	depends on PCI
-	help
-	  OpenFirmware PCI bus accessors
-
-config OF_PCI_IRQ
-	def_tristate PCI
-	depends on OF_PCI && OF_IRQ
-	help
-	  OpenFirmware PCI IRQ routing helpers
-
 config OF_RESERVED_MEM
 	depends on OF_EARLY_FLATTREE
 	bool
 
@@ -10,8 +10,6 @@ obj-$(CONFIG_OF_IRQ)    += irq.o
 obj-$(CONFIG_OF_NET)	+= of_net.o
 obj-$(CONFIG_OF_UNITTEST) += unittest.o
 obj-$(CONFIG_OF_MDIO)	+= of_mdio.o
-obj-$(CONFIG_OF_PCI)	+= of_pci.o
-obj-$(CONFIG_OF_PCI_IRQ)  += of_pci_irq.o
 obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
 obj-$(CONFIG_OF_RESOLVE)  += resolver.o
 obj-$(CONFIG_OF_OVERLAY) += overlay.o
 
@@ -96,7 +96,7 @@ static unsigned int of_bus_default_get_flags(const __be32 *addr)
 	return IORESOURCE_MEM;
 }
 
-#ifdef CONFIG_OF_ADDRESS_PCI
+#ifdef CONFIG_PCI
 /*
  * PCI bus specific translator
  */
@@ -171,9 +171,7 @@ static int of_bus_pci_translate(__be32 *addr, u64 offset, int na)
 {
 	return of_bus_default_translate(addr + 1, offset, na - 1);
 }
-#endif /* CONFIG_OF_ADDRESS_PCI */
 
-#ifdef CONFIG_PCI
 const __be32 *of_get_pci_address(struct device_node *dev, int bar_no, u64 *size,
 			unsigned int *flags)
 {
@@ -426,7 +424,7 @@ static unsigned int of_bus_isa_get_flags(const __be32 *addr)
  */
 
 static struct of_bus of_busses[] = {
-#ifdef CONFIG_OF_ADDRESS_PCI
+#ifdef CONFIG_PCI
 	/* PCI */
 	{
 		.name = "pci",
@@ -437,7 +435,7 @@ static struct of_bus of_busses[] = {
 		.translate = of_bus_pci_translate,
 		.get_flags = of_bus_pci_get_flags,
 	},
-#endif /* CONFIG_OF_ADDRESS_PCI */
+#endif /* CONFIG_PCI */
 	/* ISA */
 	{
 		.name = "isa",
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ static unsigned int of_bus_default_get_flags(const __be32 *addr)`
`96`	`96`	`return IORESOURCE_MEM;`
`97`	`97`	`}`
`98`	`98`
`99`		`-#ifdef CONFIG_OF_ADDRESS_PCI`
	`99`	`+#ifdef CONFIG_PCI`
`100`	`100`	`/*`
`101`	`101`	`* PCI bus specific translator`
`102`	`102`	`*/`
`@@ -171,9 +171,7 @@ static int of_bus_pci_translate(__be32 *addr, u64 offset, int na)`
`171`	`171`	`{`
`172`	`172`	`return of_bus_default_translate(addr + 1, offset, na - 1);`
`173`	`173`	`}`
`174`		`-#endif /* CONFIG_OF_ADDRESS_PCI */`
`175`	`174`
`176`		`-#ifdef CONFIG_PCI`
`177`	`175`	`const __be32 of_get_pci_address(struct device_node dev, int bar_no, u64 *size,`
`178`	`176`	`unsigned int *flags)`
`179`	`177`	`{`
`@@ -426,7 +424,7 @@ static unsigned int of_bus_isa_get_flags(const __be32 *addr)`
`426`	`424`	`*/`
`427`	`425`
`428`	`426`	`static struct of_bus of_busses[] = {`
`429`		`-#ifdef CONFIG_OF_ADDRESS_PCI`
	`427`	`+#ifdef CONFIG_PCI`
`430`	`428`	`/* PCI */`
`431`	`429`	`{`
`432`	`430`	`.name = "pci",`
`@@ -437,7 +435,7 @@ static struct of_bus of_busses[] = {`
`437`	`435`	`.translate = of_bus_pci_translate,`
`438`	`436`	`.get_flags = of_bus_pci_get_flags,`
`439`	`437`	`},`
`440`		`-#endif /* CONFIG_OF_ADDRESS_PCI */`
	`438`	`+#endif /* CONFIG_PCI */`
`441`	`439`	`/* ISA */`
`442`	`440`	`{`
`443`	`441`	`.name = "isa",`