powerpc: kill PPC_OF
Subsystems (15)
cover powerpc: kill PPC_OF
Hi,
This patch series tries to kill the PPC_OF.
Kevin Hao (15):
PCI: introduce pci_device_to_OF_node() for !CONFIG_OF
sata_svw: remove the dependency on PPC_OF
fbdev: aty128fb: replace PPC_OF with PPC
fbdev: radeon: replace PPC_OF with PPC
fbdev: imsttfb: remove the dependency on PPC_OF
fbdev: nvidia: remove the dependency on PPC_OF
fbdev: riva: remove the dependency on PPC_OF
fbdev: remove the unnecessary includes of ppc specific header files
fbdev: kconfig: replace PPC_OF with PPC
gpio: kconfig: replace PPC_OF with PPC
mmc: kconfig: replace PPC_OF with PPC
mtd: kconfig: replace PPC_OF with PPC
tty: kconfig: remove the superfluous dependency on PPC_OF
usb: kconfig: replace PPC_OF with PPC
powerpc: kill PPC_OF
arch/powerpc/Kconfig | 3 --- arch/powerpc/Kconfig.debug | 2 +- arch/powerpc/kernel/Makefile | 4 ++-- drivers/ata/sata_svw.c | 11 +---------- drivers/gpio/Kconfig | 2 +- drivers/mmc/host/Kconfig | 4 ++-- drivers/mtd/nand/Kconfig | 2 +- drivers/tty/serial/Kconfig | 4 ++-- drivers/usb/host/Kconfig | 8 ++++---- drivers/video/fbdev/Kconfig | 4 ++-- drivers/video/fbdev/aty/aty128fb.c | 4 ++-- drivers/video/fbdev/aty/radeon_base.c | 24 ++++++++++++------------ drivers/video/fbdev/aty/radeon_monitor.c | 20 ++++++++++---------- drivers/video/fbdev/aty/radeon_pm.c | 16 ++++++++-------- drivers/video/fbdev/aty/radeonfb.h | 4 ++-- drivers/video/fbdev/core/fbmon.c | 4 ---- drivers/video/fbdev/imsttfb.c | 4 ---- drivers/video/fbdev/nvidia/Makefile | 3 +-- drivers/video/fbdev/nvidia/nv_of.c | 3 --- drivers/video/fbdev/nvidia/nv_proto.h | 8 -------- drivers/video/fbdev/nvidia/nvidia.c | 4 ---- drivers/video/fbdev/riva/fbdev.c | 17 +++++++---------- include/linux/pci.h | 2 ++ 23 files changed, 60 insertions(+), 97 deletions(-)
Signature · 1 line
1.9.3
PATCH 1/15 PCI: introduce pci_device_to_OF_node() for !CONFIG_OF
So we can avoid the ugly #ifdef in some drivers.
--- include/linux/pci.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/pci.h +2 -0
@@ -1863,6 +1863,8 @@ static inline void pci_set_of_node(struct pci_dev *dev) { }static inline void pci_release_of_node (struct pci_dev *dev) { }static inline void pci_set_bus_of_node (struct pci_bus *bus) { }static inline void pci_release_bus_of_node (struct pci_bus *bus) { } +static inline struct device_node * +pci_device_to_OF_node (const struct pci_dev *pdev) {return NULL ; }#endif /* CONFIG_OF */ #ifdef CONFIG_EEH
Signature · 1 line
1.9.3
Michael Ellerman
reviewerRe: [PATCH 01/15] PCI: introduce pci_device_to_OF_node() for !CONFIG_OF
Quoted 6 lines · Kevin Hao
So we can avoid the ugly #ifdef in some drivers.
Signed-off-by Kevin Hao <[email protected]>--- include/linux/pci.h | 2 ++ 1 file changed, 2 insertions(+)
Hi Bjorn,
Do you mind putting this into your next for 3.20? Or giving us an ACK for it if you prefer.
cheers
Quoted 13 lines
include/linux/pci.h +2
-0@@ -1863,6 +1863,8 @@ static inline void pci_set_of_node(struct pci_dev *dev) { }static inline void pci_release_of_node (struct pci_dev *dev) { }static inline void pci_set_bus_of_node (struct pci_bus *bus) { }static inline void pci_release_bus_of_node (struct pci_bus *bus) { } +static inline struct device_node * +pci_device_to_OF_node (const struct pci_dev *pdev) {return NULL ; }#endif /* CONFIG_OF */ #ifdef CONFIG_EEH
Re: [PATCH 01/15] PCI: introduce pci_device_to_OF_node() for !CONFIG_OF
Quoted 9 lines · Michael Ellerman
Quoted 6 lines · Kevin Hao
So we can avoid the ugly #ifdef in some drivers.
Signed-off-by Kevin Hao <[email protected]>--- include/linux/pci.h | 2 ++ 1 file changed, 2 insertions(+)
Quoted 4 lines
Hi Bjorn,
Do you mind putting this into your next for 3.20? Or giving us an ACK for it if you prefer.
I think it makes more sense to merge this along with the other 14 patches that remove the #ifdefs (at least, I assume that's what they do; I haven't seen them).
But please edit the subject line so it is capitalized consistently with the rest of the history. And it'd be nice if the changelog were a complete sentence all by itself, e.g.,
PCI: Add pci_device_to_OF_node() stub for !CONFIG_OF
Add a stub for pci_device_to_OF_node() so drivers don't need to use #ifdef CONFIG_OF around calls to it.
Bjorn
Quoted 19 lines
include/linux/pci.h static inline void pci_set_of_node(struct pci_dev *dev) { } · line 1870
Quoted 13 lines
include/linux/pci.h +2
-0@@ -1863,6 +1863,8 @@ static inline void pci_set_of_node(struct pci_dev *dev) { }static inline void pci_release_of_node (struct pci_dev *dev) { }static inline void pci_set_bus_of_node (struct pci_bus *bus) { }static inline void pci_release_bus_of_node (struct pci_bus *bus) { } +static inline struct device_node * +pci_device_to_OF_node (const struct pci_dev *pdev) {return NULL ; }#endif /* CONFIG_OF */ #ifdef CONFIG_EEH --
To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Michael Ellerman
reviewerRe: [PATCH 01/15] PCI: introduce pci_device_to_OF_node() for !CONFIG_OF
Quoted 10 lines · Bjorn Helgaas
Quoted 9 lines · Michael Ellerman
Quoted 6 lines · Kevin Hao
So we can avoid the ugly #ifdef in some drivers.
Signed-off-by Kevin Hao <[email protected]>--- include/linux/pci.h | 2 ++ 1 file changed, 2 insertions(+)
Quoted 8 lines
Quoted 4 lines
Hi Bjorn,
Do you mind putting this into your next for 3.20? Or giving us an ACK for it if you prefer.
I think it makes more sense to merge this along with the other 14 patches that remove the #ifdefs (at least, I assume that's what they do; I haven't seen them).
Yeah that is what they do.
The problem with doing it that way is the rest of the patches are splattered all across the tree, so getting them merged as a series will require a lot of searching for acks.
If you merged this one for 3.20 we could then merge the rest of the series one at a time as the respective maintainers get around to it during the 3.21 cycle.
I probably should have said all that in my original mail :)
Anyway it's not a big deal, but that's why it'd be nice if you could take it.
cheers
PATCH v2 1/15 PCI: Add pci_device_to_OF_node() stub for !CONFIG_OF
Add a stub for pci_device_to_OF_node() so drivers don't need to use #ifdef CONFIG_OF around calls to it.
---
Hi Bjorn,
Here is the revised version with the update of the subject and commit log in case that you want to take it for 3.20. Otherwise we will merge this version to powerpc tree during the 3.21 cycle.
include/linux/pci.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/pci.h +2 -0
@@ -1863,6 +1863,8 @@ static inline void pci_set_of_node(struct pci_dev *dev) { }static inline void pci_release_of_node (struct pci_dev *dev) { }static inline void pci_set_bus_of_node (struct pci_bus *bus) { }static inline void pci_release_bus_of_node (struct pci_bus *bus) { } +static inline struct device_node * +pci_device_to_OF_node (const struct pci_dev *pdev) {return NULL ; }#endif /* CONFIG_OF */ #ifdef CONFIG_EEH
Signature · 1 line
1.9.3
Re: [PATCH v2 01/15] PCI: Add pci_device_to_OF_node() stub for !CONFIG_OF
Quoted 5 lines · Kevin Hao
Add a stub for
pci_device_to_OF_node()so drivers don't need to use #ifdefCONFIG_OFaround calls to it.Signed-off-by Kevin Hao <[email protected]>Acked-by Bjorn Helgaas <[email protected]>
Applied to pci/misc for v3.20, thanks!
Quoted 26 lines
---
Hi Bjorn,Here is the revised version with the update of the subject and commit log in case that you want to take it for 3.20. Otherwise we will merge this version to powerpc tree during the 3.21 cycle.
include/linux/pci.h | 2 ++ 1 file changed, 2 insertions(+)include/linux/pci.h +2
-0@@ -1863,6 +1863,8 @@ static inline void pci_set_of_node(struct pci_dev *dev) { }static inline void pci_release_of_node (struct pci_dev *dev) { }static inline void pci_set_bus_of_node (struct pci_bus *bus) { }static inline void pci_release_bus_of_node (struct pci_bus *bus) { } +static inline struct device_node * +pci_device_to_OF_node (const struct pci_dev *pdev) {return NULL ; }#endif /* CONFIG_OF */ #ifdef CONFIG_EEH Signature · 1 line
1.9.3
Bjorn Helgaas
maintainerRe: [PATCH 01/15] PCI: introduce pci_device_to_OF_node() for !CONFIG_OF
In reply to Michael EllermanQuoted 26 lines · Michael Ellerman
Quoted 10 lines · Bjorn Helgaas
Quoted 9 lines · Michael Ellerman
Quoted 6 lines · Kevin Hao
So we can avoid the ugly #ifdef in some drivers.
Signed-off-by Kevin Hao <[email protected]>--- include/linux/pci.h | 2 ++ 1 file changed, 2 insertions(+)Quoted 8 lines
Quoted 4 lines
Hi Bjorn,
Do you mind putting this into your next for 3.20? Or giving us an ACK for it if you prefer.
I think it makes more sense to merge this along with the other 14 patches that remove the #ifdefs (at least, I assume that's what they do; I haven't seen them).
Yeah that is what they do.
The problem with doing it that way is the rest of the patches are splattered all across the tree, so getting them merged as a series will require a lot of searching for acks.
Quoted 6 lines
If you merged this one for 3.20 we could then merge the rest of the series one at a time as the respective maintainers get around to it during the 3.21 cycle.
I probably should have said all that in my original mail :)
Anyway it's not a big deal, but that's why it'd be nice if you could take it.
OK, sure, I didn't get the hint that it would be preferable for me to take it. I'll merge it for v3.20.
Bjorn
Re: [PATCH 01/15] PCI: introduce pci_device_to_OF_node() for !CONFIG_OF
In reply to Bjorn HelgaasQuoted 6 lines · Bjorn Helgaas
I think it makes more sense to merge this along with the other 14 patches that remove the #ifdefs (at least, I assume that's what they do; I haven't seen them).
Acked-by Bjorn Helgaas <[email protected]>
Quoted 8 lines
But please edit the subject line so it is capitalized consistently with the rest of the history. And it'd be nice if the changelog were a complete sentence all by itself, e.g.,
PCI: Add
pci_device_to_OF_node()stub for !CONFIG_OFAdd a stub for
pci_device_to_OF_node()so drivers don't need to use #ifdefCONFIG_OFaround calls to it.
Will update. Thanks Bjorn.
Kevin
PATCH 2/15 sata_svw: remove the dependency on PPC_OF
In reply to Kevin HaoThe OF functionality has moved to a common place and be used by many archs. So we don't need to include the ppc arch specific header files and depend on PPC_OF option any more. This is a preparation for killing PPC_OF.
--- drivers/ata/sata_svw.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/ata/sata_svw.c +1 -10
@@ -47,11 +47,7 @@#include <scsi/scsi_cmnd.h> #include <scsi/scsi.h> #include <linux/libata.h> - -#ifdef CONFIG_PPC_OF -#include <asm/prom.h> -#include <asm/pci-bridge.h> -#endif /* CONFIG_PPC_OF */ +#include <linux/of.h> #define DRV_NAME "sata_svw"#define DRV_VERSION "2.3"
@@ -320,7 +316,6 @@ static u8 k2_stat_check_status(struct ata_port *ap)return readl (ap->ioaddr.status_addr); } -#ifdef CONFIG_PPC_OF static int k2_sata_show_info (struct seq_file *m,struct Scsi_Host *shost) {struct ata_port *ap;
@@ -350,14 +345,10 @@ static int k2_sata_show_info(struct seq_file *m, struct Scsi_Host *shost) }return 0 ; } -#endif /* CONFIG_PPC_OF */ -static struct scsi_host_template k2_sata_sht = {ATA_BMDMA_SHT (DRV_NAME ), -#ifdef CONFIG_PPC_OF .show_info = k2_sata_show_info, -#endif };
Signature · 1 line
1.9.3
Re: [PATCH 02/15] sata_svw: remove the dependency on PPC_OF
Quoted 6 lines · Kevin Hao
The OF functionality has moved to a common place and be used by many archs. So we don't need to include the ppc arch specific header files and depend on
PPC_OFoption any more. This is a preparation for killingPPC_OF.Signed-off-by Kevin Hao <[email protected]>
Please route as you see fit.
Thanks.
Signature · 1 line
tejun
PATCH 3/15 fbdev: aty128fb: replace PPC_OF with PPC
In reply to Kevin HaoThe PPC_OF is a ppc specific option which is used to mean that the firmware device tree access functions are available. Since all the ppc platforms have a device tree, it is aways set to 'y' for ppc. So it makes no sense to keep a such option in the current kernel. Replace it with PPC.
--- drivers/video/fbdev/aty/aty128fb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/aty/aty128fb.c +2 -2
@@ -965,7 +965,7 @@ static void __iomem *aty128_find_mem_vbios(struct aty128fb_par *par)/* fill in known card constants if pll_block is not available */ static void aty128_timings (struct aty128fb_par *par) { -#ifdef CONFIG_PPC_OF +#ifdef CONFIG_PPC /* instead of a table lookup, assume OF has properly * setup the PLL registers and use their values * to set the XCLK values and reference divider values */
@@ -979,7 +979,7 @@ static void aty128_timings(struct aty128fb_par *par)if (!par->constants.ref_clk) par->constants.ref_clk =2950 ; -#ifdef CONFIG_PPC_OF +#ifdef CONFIG_PPC x_mpll_ref_fb_div =aty_ld_pll (X_MPLL_REF_FB_DIV ); xclk_cntl =aty_ld_pll (XCLK_CNTL ) &0x7 ; Nx = (x_mpll_ref_fb_div &0x00ff00 ) >>8 ;
Signature · 1 line
1.9.3
Re: [PATCH 03/15] fbdev: aty128fb: replace PPC_OF with PPC
Quoted 7 lines · Kevin Hao
The
PPC_OFis a ppc specific option which is used to mean that the firmware device tree access functions are available. Since all the ppc platforms have a device tree, it is aways set to 'y' for ppc. So it makes no sense to keep a such option in the current kernel. Replace it with PPC.Signed-off-by Kevin Hao <[email protected]>
For this and generally the whole series,
Which tree do we expect this to go through ?
Cheers,
Ben.
Quoted 26 lines
--- drivers/video/fbdev/aty/aty128fb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/video/fbdev/aty/aty128fb.c +2
-2@@ -965,7 +965,7 @@ static void __iomem *aty128_find_mem_vbios(struct aty128fb_par *par)/* fill in known card constants if pll_block is not available */ static void aty128_timings (struct aty128fb_par *par) { -#ifdef CONFIG_PPC_OF +#ifdef CONFIG_PPC /* instead of a table lookup, assume OF has properly * setup the PLL registers and use their values * to set the XCLK values and reference divider values */ @@ -979,7 +979,7 @@ static void aty128_timings(struct aty128fb_par *par)if (!par->constants.ref_clk) par->constants.ref_clk =2950 ; -#ifdef CONFIG_PPC_OF +#ifdef CONFIG_PPC x_mpll_ref_fb_div =aty_ld_pll (X_MPLL_REF_FB_DIV ); xclk_cntl =aty_ld_pll (XCLK_CNTL ) &0x7 ; Nx = (x_mpll_ref_fb_div &0x00ff00 ) >>8 ;
Re: [PATCH 03/15] fbdev: aty128fb: replace PPC_OF with PPC
Quoted 7 lines · Benjamin Herrenschmidt
Quoted 6 lines · Kevin Hao
The
PPC_OFis a ppc specific option which is used to mean that the firmware device tree access functions are available. Since all the ppc platforms have a device tree, it is aways set to 'y' for ppc. So it makes no sense to keep a such option in the current kernel. Replace it with PPC.
Quoted 5 lines
Quoted 1 line
Signed-off-by Kevin Hao <[email protected]>For this and generally the whole series,
Thanks Ben.
Quoted 2 lines
Which tree do we expect this to go through ?
I just sent out a v2 [1] a few hours earlier with some minor updates. We plan to merge this patch series via the powerpc tree in 4.1 cycle if I can collect all the acks from the corresponding driver maintainers.
[1] https://lists.ozlabs.org/pipermail/linuxppc-dev/2015-February/125331.html
Thanks,
Kevin
Benjamin Herrenschmidt
maintainerRe: [PATCH 03/15] fbdev: aty128fb: replace PPC_OF with PPC
Quoted 17 lines · Kevin Hao
Quoted 7 lines · Benjamin Herrenschmidt
Quoted 6 lines · Kevin Hao
The
PPC_OFis a ppc specific option which is used to mean that the firmware device tree access functions are available. Since all the ppc platforms have a device tree, it is aways set to 'y' for ppc. So it makes no sense to keep a such option in the current kernel. Replace it with PPC.Quoted 5 lines
Quoted 1 line
Signed-off-by Kevin Hao <[email protected]>For this and generally the whole series,
Thanks Ben.
Quoted 1 line
Quoted 7 lines
Quoted 1 line
Which tree do we expect this to go through ?
I just sent out a v2 [1] a few hours earlier with some minor updates. We plan to merge this patch series via the powerpc tree in 4.1 cycle if I can collect all the acks from the corresponding driver maintainers.
[1] https://lists.ozlabs.org/pipermail/linuxppc-dev/2015-February/125331.html
Anything I'm the maintainer by default for has my ack (radeonfb, aty128fb, ...)
Cheers,
Ben.
Re: [PATCH 03/15] fbdev: aty128fb: replace PPC_OF with PPC
In reply to Kevin HaoQuoted 14 lines · Kevin Hao
Quoted 7 lines · Benjamin Herrenschmidt
Quoted 6 lines · Kevin Hao
The
PPC_OFis a ppc specific option which is used to mean that the firmware device tree access functions are available. Since all the ppc platforms have a device tree, it is aways set to 'y' for ppc. So it makes no sense to keep a such option in the current kernel. Replace it with PPC.Quoted 5 lines
Quoted 1 line
Signed-off-by Kevin Hao <[email protected]>For this and generally the whole series,
Quoted 8 lines
Thanks Ben.
Quoted 2 lines
Which tree do we expect this to go through ?
I just sent out a v2 [1] a few hours earlier with some minor updates. We plan to merge this patch series via the powerpc tree in 4.1 cycle if I can collect all the acks from the corresponding driver maintainers.
Fbdev changes look ok to me.
Tomi
Re: [PATCH 03/15] fbdev: aty128fb: replace PPC_OF with PPC
Quoted 5 lines · Tomi Valkeinen
Quoted 3 lines
I just sent out a v2 [1] a few hours earlier with some minor updates. We plan to merge this patch series via the powerpc tree in 4.1 cycle if I can collect all the acks from the corresponding driver maintainers.
Fbdev changes look ok to me.
Hi Tomi,
I assume that I can add a "Acked-by: Tomi Valkeinen <[email protected]>" for all the following patches, right?
http://patchwork.ozlabs.org/patch/443890/
http://patchwork.ozlabs.org/patch/443891/
http://patchwork.ozlabs.org/patch/443892/
http://patchwork.ozlabs.org/patch/443893/
http://patchwork.ozlabs.org/patch/443894/
http://patchwork.ozlabs.org/patch/443895/
http://patchwork.ozlabs.org/patch/443897/
Thanks,
Kevin
Re: [PATCH 03/15] fbdev: aty128fb: replace PPC_OF with PPC
Quoted 9 lines · Kevin Hao
Quoted 5 lines · Tomi Valkeinen
Quoted 3 lines
I just sent out a v2 [1] a few hours earlier with some minor updates. We plan to merge this patch series via the powerpc tree in 4.1 cycle if I can collect all the acks from the corresponding driver maintainers.
Fbdev changes look ok to me.
Hi Tomi,
Quoted 9 lines
I assume that I can add a "Acked-by: Tomi Valkeinen <[email protected]>" for all the following patches, right?
http://patchwork.ozlabs.org/patch/443890/
http://patchwork.ozlabs.org/patch/443891/
http://patchwork.ozlabs.org/patch/443892/
http://patchwork.ozlabs.org/patch/443893/
http://patchwork.ozlabs.org/patch/443894/
http://patchwork.ozlabs.org/patch/443895/
http://patchwork.ozlabs.org/patch/443897/
Yes, that's right. Sorry for not being clear on the ack.
Tomi
PATCH 4/15 fbdev: radeon: replace PPC_OF with PPC
In reply to Kevin HaoThe PPC_OF is a ppc specific option which is used to mean that the firmware device tree access functions are available. Since all the ppc platforms have a device tree, it is aways set to 'y' for ppc. So it makes no sense to keep a such option in the current kernel. Replace it with PPC.
--- drivers/video/fbdev/Kconfig | 2 +- drivers/video/fbdev/aty/radeon_base.c | 24 ++++++++++++------------ drivers/video/fbdev/aty/radeon_monitor.c | 20 ++++++++++---------- drivers/video/fbdev/aty/radeon_pm.c | 16 ++++++++-------- drivers/video/fbdev/aty/radeonfb.h | 4 ++-- 5 files changed, 33 insertions(+), 33 deletions(-)
drivers/video/fbdev/Kconfig +1 -1
@@ -1333,7 +1333,7 @@ config FB_RADEON select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_MACMODES if PPC_OF + select FB_MACMODES if PPC help Choose this option if you want to use an ATI Radeon graphics card as a framebuffer device. There are both PCI and AGP versions. You
drivers/video/fbdev/aty/radeon_base.c +12 -12
@@ -74,7 +74,7 @@#include <asm/io.h> #include <linux/uaccess.h> -#ifdef CONFIG_PPC_OF +#ifdef CONFIG_PPC #include <asm/pci-bridge.h> #include "../macmodes.h"
@@ -83,7 +83,7 @@#include <asm/btext.h> #endif -#endif /* CONFIG_PPC_OF */ +#endif /* CONFIG_PPC */ #ifdef CONFIG_MTRR #include <asm/mtrr.h>
@@ -418,7 +418,7 @@ static int radeon_find_mem_vbios(struct radeonfb_info *rinfo) }#endif -#if defined(CONFIG_PPC_OF ) || defined(CONFIG_SPARC ) +#if defined(CONFIG_PPC ) || defined(CONFIG_SPARC )/* * Read XTAL (ref clock), SCLK and MCLK from Open Firmware device * tree. Hopefully, ATI OF driver is kind enough to fill these
@@ -448,7 +448,7 @@ static int radeon_read_xtal_OF(struct radeonfb_info *rinfo) return 0; } -#endif /* CONFIG_PPC_OF || CONFIG_SPARC */ +#endif /* CONFIG_PPC || CONFIG_SPARC */ /* * Read PLL infos from chip registers
@@ -653,7 +653,7 @@ static void radeon_get_pllinfo(struct radeonfb_info *rinfo) rinfo->pll.ref_div =INPLL (PPLL_REF_DIV ) &PPLL_REF_DIV_MASK ; -#if defined(CONFIG_PPC_OF ) || defined(CONFIG_SPARC ) +#if defined(CONFIG_PPC ) || defined(CONFIG_SPARC )/* * Retrieve PLL infos from Open Firmware first */
@@ -661,7 +661,7 @@ static void radeon_get_pllinfo(struct radeonfb_info *rinfo)printk (KERN_INFO "radeonfb: Retrieved PLL infos from Open Firmware\n" ); goto found; } -#endif /* CONFIG_PPC_OF || CONFIG_SPARC */ +#endif /* CONFIG_PPC || CONFIG_SPARC */ /* * Check out if we have an X86 which gave us some PLL informations
@@ -1910,7 +1910,7 @@ static int radeon_set_fbinfo(struct radeonfb_info *rinfo)* I put the card's memory at 0 in card space and AGP at some random high * local (0xe0000000 for now) that will be changed by XFree/DRI anyway */ -#ifdef CONFIG_PPC_OF +#ifdef CONFIG_PPC #undef SET_MC_FB_FROM_APERTUREstatic void fixup_memory_mappings (struct radeonfb_info *rinfo) {
@@ -1984,7 +1984,7 @@ static void fixup_memory_mappings(struct radeonfb_info *rinfo) ((aper_base + aper_size -1 ) &0xffff0000 ) | (aper_base >>16 ), 0xffff0000 | (agp_base >> 16)); } -#endif /* CONFIG_PPC_OF */ +#endif /* CONFIG_PPC */ static void radeon_identify_vram (struct radeonfb_info *rinfo)
@@ -2236,7 +2236,7 @@ static int radeonfb_pci_register(struct pci_dev *pdev, rinfo->family = CHIP_FAMILY_RS200) rinfo->errata |=CHIP_ERRATA_PLL_DELAY ; -#if defined(CONFIG_PPC_OF ) || defined(CONFIG_SPARC ) +#if defined(CONFIG_PPC ) || defined(CONFIG_SPARC )/* On PPC, we obtain the OF device-node pointer to the firmware * data for this chip */
@@ -2245,14 +2245,14 @@ static int radeonfb_pci_register(struct pci_dev *pdev,printk (KERN_WARNING "radeonfb (%s): Cannot match card to OF node !\n" ,pci_name (rinfo->pdev)); -#endif /* CONFIG_PPC_OF || CONFIG_SPARC */ -#ifdef CONFIG_PPC_OF +#endif /* CONFIG_PPC || CONFIG_SPARC */ +#ifdef CONFIG_PPC /* On PPC, the firmware sets up a memory mapping that tends * to cause lockups when enabling the engine. We reconfigure * the card internal memory mappings properly */ fixup_memory_mappings (rinfo); -#endif /* CONFIG_PPC_OF */ +#endif /* CONFIG_PPC */ /* Get VRAM size and type */ radeon_identify_vram (rinfo);
drivers/video/fbdev/aty/radeon_monitor.c +4 -4
@@ -55,7 +55,7 @@ static char *radeon_get_mon_name(int type) } -#if defined(CONFIG_PPC_OF ) || defined(CONFIG_SPARC ) +#if defined(CONFIG_PPC ) || defined(CONFIG_SPARC )/* * Try to find monitor informations & EDID data out of the Open Firmware * device-tree. This also contains some "hacks" to work around a few machine
@@ -160,7 +160,7 @@ static int radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_no, }return MT_NONE ; } -#endif /* CONFIG_PPC_OF || CONFIG_SPARC */ +#endif /* CONFIG_PPC || CONFIG_SPARC */ static int radeon_get_panel_info_BIOS (struct radeonfb_info *rinfo)
@@ -499,11 +499,11 @@ void radeon_probe_screens(struct radeonfb_info *rinfo,* Old single head cards */ if (!rinfo->has_CRTC2) { -#if defined(CONFIG_PPC_OF ) || defined(CONFIG_SPARC ) +#if defined(CONFIG_PPC ) || defined(CONFIG_SPARC )if (rinfo->mon1_type =MT_NONE ) rinfo->mon1_type =radeon_probe_OF_head (rinfo,0 , &rinfo->mon1_EDID); -#endif /* CONFIG_PPC_OF || CONFIG_SPARC */ +#endif /* CONFIG_PPC || CONFIG_SPARC */ #ifdef CONFIG_FB_RADEON_I2C if (rinfo->mon1_type = MT_NONE) rinfo->mon1_type @@ -548,11 +548,11 @@ void radeon_probe_screens(struct radeonfb_info *rinfo,
/*
* Probe primary head (DVI or laptop internal panel)
*/
-#if defined(CONFIG_PPC_OF) || defined(CONFIG_SPARC)
+#if defined(CONFIG_PPC) || defined(CONFIG_SPARC)
if (rinfo->mon1_type = MT_NONE)
rinfo->mon1_type = radeon_probe_OF_head(rinfo, 0,
&rinfo->mon1_EDID);
-#endif /* CONFIG_PPC_OF || CONFIG_SPARC */
+#endif /* CONFIG_PPC || CONFIG_SPARC */
#ifdef CONFIG_FB_RADEON_I2C
if (rinfo->mon1_type = MT_NONE)
rinfo->mon1_type = radeon_probe_i2c_connector(rinfo, ddc_dvi,
@@ -576,11 +576,11 @@ void radeon_probe_screens(struct radeonfb_info *rinfo,
/*
* Probe secondary head (mostly VGA, can be DVI)
*/
-#if defined(CONFIG_PPC_OF) || defined(CONFIG_SPARC)
+#if defined(CONFIG_PPC) || defined(CONFIG_SPARC)
if (rinfo->mon2_type = MT_NONE)
rinfo->mon2_type = radeon_probe_OF_head(rinfo, 1,
&rinfo->mon2_EDID);
-#endif /* CONFIG_PPC_OF || defined(CONFIG_SPARC) */
+#endif /* CONFIG_PPC || defined(CONFIG_SPARC) */
#ifdef CONFIG_FB_RADEON_I2C
if (rinfo->mon2_type = MT_NONE)
rinfo->mon2_type = radeon_probe_i2c_connector(rinfo, ddc_vga,
@@ -653,7 +653,7 @@ void radeon_probe_screens(struct radeonfb_info *rinfo,
*/
static void radeon_fixup_panel_info(struct radeonfb_info *rinfo)
{
-#ifdef CONFIG_PPC_OF
+#ifdef CONFIG_PPC
/*
* LCD Flat panels should use fixed dividers, we enfore that on
* PPC only for now...
@@ -676,7 +676,7 @@ static void radeon_fixup_panel_info(struct radeonfb_info *rinfo)
(rinfo->panel_info.post_divider << 16), ppll_div_sel);
}
-#endif /* CONFIG_PPC_OF */
+#endif /* CONFIG_PPC */
}
drivers/video/fbdev/aty/radeon_pm.c +8 -8
@@ -523,7 +523,7 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo)OUTPLL (pllVCLK_ECP_CNTL, tmp);/* X doesn't do that ... hrm, we do on mobility && Macs */ -#ifdef CONFIG_PPC_OF +#ifdef CONFIG_PPC if (rinfo->is_mobility) { tmp =INPLL (pllMCLK_CNTL); tmp &= ~(MCLK_CNTL__FORCE_MCLKA |
@@ -541,7 +541,7 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo)OUTPLL (pllMCLK_MISC, tmp); radeon_msleep(15); } -#endif /* CONFIG_PPC_OF */ +#endif /* CONFIG_PPC */ }#ifdef CONFIG_PM
@@ -1288,7 +1288,7 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo)radeon_pm_enable_dll_m10 (rinfo);radeon_pm_yclk_mclk_sync_m10 (rinfo); -#ifdef CONFIG_PPC_OF +#ifdef CONFIG_PPC if (rinfo->of_node !=NULL ) {int size;
@@ -1298,7 +1298,7 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo) else mrtable = default_mrtable; } -#endif /* CONFIG_PPC_OF */ +#endif /* CONFIG_PPC */ /* Program the SDRAM */ sdram_mode_reg = mrtable[0 ];
@@ -1943,7 +1943,7 @@ static void radeon_reinitialize_M10(struct radeonfb_info *rinfo) }#endif -#ifdef CONFIG_PPC_OF +#ifdef CONFIG_PPC #ifdef CONFIG_PPC_PMAC static void radeon_pm_m9p_reconfigure_mc(struct radeonfb_info *rinfo) {
@@ -2512,7 +2512,7 @@ static void radeon_reinitialize_QW(struct radeonfb_info *rinfo) }#endif /* 0 */ -#endif /* CONFIG_PPC_OF */ +#endif /* CONFIG_PPC */ static void radeonfb_whack_power_state (struct radeonfb_info *rinfo,pci_power_t state) {
@@ -2793,7 +2793,7 @@ int radeonfb_pci_resume(struct pci_dev *pdev)return rc; } -#ifdef CONFIG_PPC_OF__disabled +#ifdef CONFIG_PPC__disabledstatic void radeonfb_early_resume (void *data) {struct radeonfb_info *rinfo = data;
@@ -2803,7 +2803,7 @@ static void radeonfb_early_resume(void *data)radeonfb_pci_resume (rinfo->pdev); rinfo->no_schedule =0 ; } -#endif /* CONFIG_PPC_OF */ +#endif /* CONFIG_PPC */ #endif /* CONFIG_PM */
drivers/video/fbdev/aty/radeonfb.h +2 -2
@@ -20,7 +20,7 @@#include <asm/io.h> -#if defined(CONFIG_PPC_OF ) || defined(CONFIG_SPARC ) +#if defined(CONFIG_PPC ) || defined(CONFIG_SPARC )#include <asm/prom.h> #endif
@@ -301,7 +301,7 @@ struct radeonfb_info {unsigned long fb_local_base;struct pci_dev *pdev; -#if defined(CONFIG_PPC_OF ) || defined(CONFIG_SPARC ) +#if defined(CONFIG_PPC ) || defined(CONFIG_SPARC )struct device_node *of_node;#endif
Signature · 1 line
1.9.3
PATCH 5/15 fbdev: imsttfb: remove the dependency on PPC_OF
In reply to Kevin HaoThe OF functionality has moved to a common place and be used by many archs. So we don't need to depend on PPC_OF option any more. This is a preparation for killing PPC_OF.
--- drivers/video/fbdev/imsttfb.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/video/fbdev/imsttfb.c +0 -4
@@ -1470,7 +1470,6 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)unsigned long addr, size;struct imstt_par *par;struct fb_info *info; -#ifdef CONFIG_PPC_OF struct device_node *dp; dp =pci_device_to_OF_node (pdev);
@@ -1478,7 +1477,6 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)printk (KERN_INFO "%s: OF name %s\n" ,__func__, dp->name); else printk(KERN_ERR "imsttfb: no OF node for pci device\n"); -#endif /* CONFIG_PPC_OF */ info =framebuffer_alloc (sizeof (struct imstt_par ), &pdev->dev);
@@ -1501,11 +1499,9 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)switch (pdev->device) {case PCI_DEVICE_ID_IMS_TT128 :/* IMS,tt128mbA */ par->ramdac =IBM ; -#ifdef CONFIG_PPC_OF if (dp && ((strcmp (dp->name,"IMS,tt128mb8" ) =0 ) || (strcmp (dp->name,"IMS,tt128mb8A" ) =0 ))) par->ramdac =TVP ; -#endif /* CONFIG_PPC_OF */ break ;case PCI_DEVICE_ID_IMS_TT3D :/* IMS,tt3d */ par->ramdac =TVP ;
Signature · 1 line
1.9.3
Re: [PATCH 05/15] fbdev: imsttfb: remove the dependency on PPC_OF
Hi Kevin,
Quoted 4 lines · On Sat, 31 Jan 2015 21:47:35 +0800 Kevin Hao <[email protected]> wrote:
The OF functionality has moved to a common place and be used by many archs. So we don't need to depend on
PPC_OFoption any more. This is a preparation for killingPPC_OF.
I suspect that you want to do the PPC_OF -> PPC conversion on this file rather than just removing PPC_OF uses.
drivers/video/fbdev/imsttfb.c static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · line 1473
Quoted 10 lines
drivers/video/fbdev/imsttfb.c +0
-1@@ -1470,7 +1470,6 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)unsigned long addr, size;struct imstt_par *par;struct fb_info *info; -#ifdef CONFIG_PPC_OF struct device_node *dp;
I see no way in this file for struct device_node to be defined (especially if CONFIG_PPC is not set). of.h may be included implicitly, but that is very dependent on the architecture and CONFIG_ options.
drivers/video/fbdev/imsttfb.c static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · line 1481
Quoted 6 lines
drivers/video/fbdev/imsttfb.c +0
-1dp =pci_device_to_OF_node (pdev);@@ -1478,7 +1477,6 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)printk (KERN_INFO "%s: OF name %s\n" ,__func__, dp->name); else printk(KERN_ERR "imsttfb: no OF node for pci device\n"); -#endif /* CONFIG_PPC_OF */
This will emit the above error if CONFIG_OF is not set whereas in the past it would not.
Signature · 2 lines
Cheers, Stephen Rothwell [email protected]
Re: [PATCH 05/15] fbdev: imsttfb: remove the dependency on PPC_OF
Quoted 10 lines · Stephen Rothwell
Hi Kevin,
Quoted 4 lines · On Sat, 31 Jan 2015 21:47:35 +0800 Kevin Hao <[email protected]> wrote:
The OF functionality has moved to a common place and be used by many archs. So we don't need to depend on
PPC_OFoption any more. This is a preparation for killingPPC_OF.I suspect that you want to do the
PPC_OF-> PPC conversion on this file rather than just removingPPC_OFuses.
That was my first thought, but the codes protected by the PPC_OF seem not ppc specific and should be safe for other archs which also support OF. So I drop the PPC_OF completely. Did I miss something?
Quoted 16 lines
drivers/video/fbdev/imsttfb.c static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · line 1473
Quoted 11 lines
drivers/video/fbdev/imsttfb.c +0
-1@@ -1470,7 +1470,6 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)unsigned long addr, size;struct imstt_par *par;struct fb_info *info; -#ifdef CONFIG_PPC_OF struct device_node *dp;I see no way in this file for struct
device_nodeto be defined (especially ifCONFIG_PPCis not set).of.hmay be included implicitly, but that is very dependent on the architecture andCONFIG_options.
This do pass the build test for the non-OF archs, such as x86. But your concerns sound pretty reasonable, so I will explicitly include of.h.
Quoted 10 lines
drivers/video/fbdev/imsttfb.c static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · line 1481
Quoted 7 lines
drivers/video/fbdev/imsttfb.c +0
-1dp =pci_device_to_OF_node (pdev);@@ -1478,7 +1477,6 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)printk (KERN_INFO "%s: OF name %s\n" ,__func__, dp->name); else printk(KERN_ERR "imsttfb: no OF node for pci device\n"); -#endif /* CONFIG_PPC_OF */ This will emit the above error if
CONFIG_OFis not set whereas in the past it would not.
How about change it to:
if (IS_ENABLED(CONFIG_OF))
printk(KERN_ERR "imsttfb: no OF node for pci device\n");
Thanks,
Kevin
Re: [PATCH 05/15] fbdev: imsttfb: remove the dependency on PPC_OF
Quoted 16 lines · Kevin Hao
Quoted 7 lines
Quoted 7 lines
drivers/video/fbdev/imsttfb.c +0
-0@@ -1470,7 +1470,6 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)unsigned long addr, size;struct imstt_par *par;Quoted 8 lines
drivers/video/fbdev/imsttfb.c static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · line 1473
Quoted 3 lines
drivers/video/fbdev/imsttfb.c +0
-1struct fb_info *info; -#ifdef CONFIG_PPC_OF struct device_node *dp;I see no way in this file for struct
device_nodeto be defined (especially ifCONFIG_PPCis not set).of.hmay be included implicitly, but that is very dependent on the architecture andCONFIG_options.
Quoted 2 lines
This do pass the build test for the non-OF archs, such as x86. But your concerns sound pretty reasonable, so I will explicitly include
of.h.
I took a second look at this. It seems that there is a declaration of struct device_node in linux/device.h and there is also no access to the member of device_node in this driver. So we are safe to not include of.h here. That is also why I didn't get the build failure for the non-OF archs. :-)
Thanks,
Kevin
Re: [PATCH 05/15] fbdev: imsttfb: remove the dependency on PPC_OF
Hi Kevin,
Quoted 5 lines · On Tue, 3 Feb 2015 10:20:02 +0800 Kevin Hao <[email protected]> wrote:
I took a second look at this. It seems that there is a declaration of struct
device_nodeinlinux/device.hand there is also no access to the member ofdevice_nodein this driver. So we are safe to not includeof.hhere. That is also why I didn't get the build failure for the non-OF archs. :-)
Right.
Seems ok, then.
Signature · 2 lines
Cheers, Stephen Rothwell [email protected]
Re: [PATCH 05/15] fbdev: imsttfb: remove the dependency on PPC_OF
In reply to Kevin HaoHi Kevin,
Quoted 4 lines · On Sun, 1 Feb 2015 13:51:50 +0800 Kevin Hao <[email protected]> wrote:
That was my first thought, but the codes protected by the
PPC_OFseem not ppc specific and should be safe for other archs which also support OF. So I drop thePPC_OFcompletely. Did I miss something?
Ah, ok.
Quoted 10 lines
Quoted 9 lines
drivers/video/fbdev/imsttfb.c static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · line 1481
Quoted 6 lines
drivers/video/fbdev/imsttfb.c +0
-1dp =pci_device_to_OF_node (pdev);@@ -1478,7 +1477,6 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)printk (KERN_INFO "%s: OF name %s\n" ,__func__, dp->name); else printk(KERN_ERR "imsttfb: no OF node for pci device\n"); -#endif /* CONFIG_PPC_OF */ This will emit the above error if
CONFIG_OFis not set whereas in the past it would not.
Quoted 3 lines
How about change it to:
if (IS_ENABLED(CONFIG_OF))
printk(KERN_ERR "imsttfb: no OF node for pci device\n");
Looks good.
Signature · 2 lines
Cheers, Stephen Rothwell [email protected]
PATCH 6/15 fbdev: nvidia: remove the dependency on PPC_OF
In reply to Kevin HaoThe OF functionality has moved to a common place and be used by many archs. So we don't need to include the ppc arch specific header files and depend on PPC_OF option any more. This is a preparation for killing PPC_OF.
--- drivers/video/fbdev/nvidia/Makefile | 3 +-- drivers/video/fbdev/nvidia/nv_of.c | 3 --- drivers/video/fbdev/nvidia/nv_proto.h | 8 -------- drivers/video/fbdev/nvidia/nvidia.c | 4 ---- 4 files changed, 1 insertion(+), 17 deletions(-)
drivers/video/fbdev/nvidia/Makefile +1 -2
@@ -5,9 +5,8 @@ obj-$(CONFIG_FB_NVIDIA) += nvidiafb.o nvidiafb-y := nvidia.o nv_hw.o nv_setup.o \ - nv_accel.o + nv_accel.o nv_of.o nvidiafb-$(CONFIG_FB_NVIDIA_I2C) += nv_i2c.o nvidiafb-$(CONFIG_FB_NVIDIA_BACKLIGHT) += nv_backlight.o -nvidiafb-$(CONFIG_PPC_OF) += nv_of.o nvidiafb-objs := $(nvidiafb-y)
drivers/video/fbdev/nvidia/nv_of.c +0 -3
@@ -19,9 +19,6 @@#include <asm/io.h> -#include <asm/prom.h> -#include <asm/pci-bridge.h> -#include "nv_type.h" #include "nv_local.h" #include "nv_proto.h"
drivers/video/fbdev/nvidia/nv_proto.h +0 -8
@@ -42,16 +42,8 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn,#define nvidia_probe_i2c_connector (p, c, edid) (-1)#endif -#ifdef CONFIG_PPC_OF int nvidia_probe_of_connector (struct fb_info *info,int conn,u8 ** out_edid); -#else -static inline int nvidia_probe_of_connector (struct fb_info *info,int conn, -u8 ** out_edid) -{ -return -1 ; -} -#endif /* in nv_accel.c */ extern void NVResetGraphics (struct fb_info *info);
drivers/video/fbdev/nvidia/nvidia.c +0 -4
@@ -24,10 +24,6 @@#ifdef CONFIG_MTRR #include <asm/mtrr.h> #endif -#ifdef CONFIG_PPC_OF -#include <asm/prom.h> -#include <asm/pci-bridge.h> -#endif #ifdef CONFIG_BOOTX_TEXT #include <asm/btext.h> #endif
Signature · 1 line
1.9.3
PATCH 7/15 fbdev: riva: remove the dependency on PPC_OF
In reply to Kevin HaoThe OF functionality has moved to a common place and be used by many archs. So we don't need to include the ppc arch specific header files and depend on PPC_OF option any more. This is a preparation for killing PPC_OF.
--- drivers/video/fbdev/riva/fbdev.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
drivers/video/fbdev/riva/fbdev.c +7 -10
@@ -44,10 +44,6 @@#ifdef CONFIG_MTRR #include <asm/mtrr.h> #endif -#ifdef CONFIG_PPC_OF -#include <asm/prom.h> -#include <asm/pci-bridge.h> -#endif #ifdef CONFIG_PMAC_BACKLIGHT #include <asm/machdep.h> #include <asm/backlight.h>
@@ -1735,7 +1731,6 @@ static int riva_set_fbinfo(struct fb_info *info)return (rivafb_check_var (&info->var, info)); } -#ifdef CONFIG_PPC_OF static int riva_get_EDID_OF (struct fb_info *info,struct pci_dev *pd) {struct riva_par *par = info->par;
@@ -1766,9 +1761,8 @@ static int riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)NVTRACE_LEAVE ();return 0 ; } -#endif /* CONFIG_PPC_OF */ -#if defined(CONFIG_FB_RIVA_I2C ) && !defined(CONFIG_PPC_OF ) +#if defined(CONFIG_FB_RIVA_I2C )static int riva_get_EDID_i2c (struct fb_info *info) {struct riva_par *par = info->par;
@@ -1828,10 +1822,13 @@ static void riva_update_default_var(struct fb_var_screeninfo *var,static void riva_get_EDID (struct fb_info *info,struct pci_dev *pdev) {NVTRACE_ENTER (); -#ifdef CONFIG_PPC_OF -if (!riva_get_EDID_OF (info, pdev)) +if (riva_get_EDID_OF (info, pdev)) { +NVTRACE_LEAVE (); +return ; + } +if (IS_ENABLED (CONFIG_OF ))printk (PFX "could not retrieve EDID from OF\n" ); -#elif defined(CONFIG_FB_RIVA_I2C ) +#if defined(CONFIG_FB_RIVA_I2C )if (!riva_get_EDID_i2c (info))printk (PFX "could not retrieve EDID from DDC/I2C\n" );#endif
Signature · 1 line
1.9.3
PATCH 8/15 fbdev: remove the unnecessary includes of ppc specific header files
In reply to Kevin HaoIn the current kernel, we don't need to include these arch specific header files for ppc.
--- drivers/video/fbdev/core/fbmon.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/video/fbdev/core/fbmon.c +0 -4
@@ -33,10 +33,6 @@#include <video/edid.h> #include <video/of_videomode.h> #include <video/videomode.h> -#ifdef CONFIG_PPC_OF -#include <asm/prom.h> -#include <asm/pci-bridge.h> -#endif #include "../edid.h" /*
Signature · 1 line
1.9.3
PATCH 9/15 fbdev: kconfig: replace PPC_OF with PPC
In reply to Kevin HaoThe PPC_OF is a ppc specific option which is used to mean that the firmware device tree access functions are available. Since all the ppc platforms have a device tree, it is aways set to 'y' for ppc. So it makes no sense to keep a such option in the current kernel. Replace it with PPC.
--- drivers/video/fbdev/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/Kconfig +1 -1
@@ -479,7 +479,7 @@ config FB_ATARI config FB_OF bool "Open Firmware frame buffer device support" - depends on (FB = y) && (PPC64 || PPC_OF) && (!PPC_PSERIES || PCI) + depends on (FB = y) && PPC && (!PPC_PSERIES || PCI) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
Signature · 1 line
1.9.3
PATCH 10/15 gpio: kconfig: replace PPC_OF with PPC
In reply to Kevin HaoThe PPC_OF is a ppc specific option which is used to mean that the firmware device tree access functions are available. Since all the ppc platforms have a device tree, it is aways set to 'y' for ppc. So it makes no sense to keep a such option in the current kernel. Replace it with PPC.
--- drivers/gpio/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/Kconfig +1 -1
@@ -383,7 +383,7 @@ config GPIO_XGENE_SB config GPIO_XILINX tristate "Xilinx GPIO support" - depends on OF_GPIO && (PPC_OF || MICROBLAZE || ARCH_ZYNQ || X86) + depends on OF_GPIO && (PPC || MICROBLAZE || ARCH_ZYNQ || X86) help Say yes here to support the Xilinx FPGA GPIO device
Signature · 1 line
1.9.3
Re: [PATCH 10/15] gpio: kconfig: replace PPC_OF with PPC
Quoted 7 lines · Kevin Hao
The
PPC_OFis a ppc specific option which is used to mean that the firmware device tree access functions are available. Since all the ppc platforms have a device tree, it is aways set to 'y' for ppc. So it makes no sense to keep a such option in the current kernel. Replace it with PPC.Signed-off-by Kevin Hao <[email protected]>
Patch applied.
Yours,
Linus Walleij
PATCH 11/15 mmc: kconfig: replace PPC_OF with PPC
In reply to Kevin HaoThe PPC_OF is a ppc specific option which is used to mean that the firmware device tree access functions are available. Since all the ppc platforms have a device tree, it is aways set to 'y' for ppc. So it makes no sense to keep a such option in the current kernel. Replace it with PPC.
--- drivers/mmc/host/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/host/Kconfig +2 -2
@@ -132,7 +132,7 @@ config MMC_SDHCI_OF_ARASAN config MMC_SDHCI_OF_ESDHC tristate "SDHCI OF support for the Freescale eSDHC controller" depends on MMC_SDHCI_PLTFM - depends on PPC_OF + depends on PPC select MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER help This selects the Freescale eSDHC controller support.
@@ -144,7 +144,7 @@ config MMC_SDHCI_OF_ESDHC config MMC_SDHCI_OF_HLWD tristate "SDHCI OF support for the Nintendo Wii SDHCI controllers" depends on MMC_SDHCI_PLTFM - depends on PPC_OF + depends on PPC select MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER help This selects the Secure Digital Host Controller Interface (SDHCI)
Signature · 1 line
1.9.3
PATCH 12/15 mtd: kconfig: replace PPC_OF with PPC
In reply to Kevin HaoThe PPC_OF is a ppc specific option which is used to mean that the firmware device tree access functions are available. Since all the ppc platforms have a device tree, it is aways set to 'y' for ppc. So it makes no sense to keep a such option in the current kernel. Replace it with PPC.
--- drivers/mtd/nand/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/Kconfig +1 -1
@@ -421,7 +421,7 @@ config MTD_NAND_ORION config MTD_NAND_FSL_ELBC tristate "NAND support for Freescale eLBC controllers" - depends on PPC_OF + depends on PPC select FSL_LBC help Various Freescale chips, including the 8313, include a NAND Flash
Signature · 1 line
1.9.3
Brian Norris
AppliedRe: [PATCH 12/15] mtd: kconfig: replace PPC_OF with PPC
Quoted 7 lines · Kevin Hao
The
PPC_OFis a ppc specific option which is used to mean that the firmware device tree access functions are available. Since all the ppc platforms have a device tree, it is aways set to 'y' for ppc. So it makes no sense to keep a such option in the current kernel. Replace it with PPC.Signed-off-by Kevin Hao <[email protected]>
Pushed to l2-mtd.git. Thanks.
Brian
PATCH 13/15 tty: kconfig: remove the superfluous dependency on PPC_OF
In reply to Kevin HaoIn the current kernel, the CONFIG_PPC_OF is always 'y' for the ppc arch. So we don't need to check it with other ppc specific options.
--- drivers/tty/serial/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/Kconfig +2 -2
@@ -844,7 +844,7 @@ config SERIAL_MCF_CONSOLE config SERIAL_PMACZILOG tristate "Mac or PowerMac z85c30 ESCC support" - depends on (M68K && MAC) || (PPC_OF && PPC_PMAC) + depends on (M68K && MAC) || PPC_PMAC select SERIAL_CORE help This driver supports the Zilog z85C30 serial ports found on
@@ -1152,7 +1152,7 @@ config SERIAL_OMAP_CONSOLE config SERIAL_OF_PLATFORM_NWPSERIAL tristate "NWP serial port driver" - depends on PPC_OF && PPC_DCR + depends on PPC_DCR select SERIAL_OF_PLATFORM select SERIAL_CORE_CONSOLE select SERIAL_CORE
Signature · 6 lines
1.9.3 _______________________________________________ Linuxppc-dev mailing list [email protected] https://lists.ozlabs.org/listinfo/linuxppc-dev
PATCH 14/15 usb: kconfig: replace PPC_OF with PPC
In reply to Kevin HaoThe PPC_OF is a ppc specific option which is used to mean that the firmware device tree access functions are available. Since all the ppc platforms have a device tree, it is aways set to 'y' for ppc. So it makes no sense to keep a such option in the current kernel. Replace it with PPC
--- drivers/usb/host/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/usb/host/Kconfig +4 -4
@@ -219,7 +219,7 @@ config USB_EHCI_TEGRA config USB_EHCI_HCD_PPC_OF bool "EHCI support for PPC USB controller on OF platform bus" - depends on PPC_OF + depends on PPC default y ---help--- Enables support for the USB controller present on the PowerPC
@@ -480,7 +480,7 @@ config USB_OHCI_ATH79 config USB_OHCI_HCD_PPC_OF_BE bool "OHCI support for OF platform bus (big endian)" - depends on PPC_OF + depends on PPC select USB_OHCI_BIG_ENDIAN_DESC select USB_OHCI_BIG_ENDIAN_MMIO ---help---
@@ -489,7 +489,7 @@ config USB_OHCI_HCD_PPC_OF_BE config USB_OHCI_HCD_PPC_OF_LE bool "OHCI support for OF platform bus (little endian)" - depends on PPC_OF + depends on PPC select USB_OHCI_LITTLE_ENDIAN ---help--- Enables support for little-endian USB controllers present on the
@@ -497,7 +497,7 @@ config USB_OHCI_HCD_PPC_OF_LE config USB_OHCI_HCD_PPC_OF bool - depends on PPC_OF + depends on PPC default USB_OHCI_HCD_PPC_OF_BE || USB_OHCI_HCD_PPC_OF_LE config USB_OHCI_HCD_PCI
Signature · 1 line
1.9.3
PATCH 15/15 powerpc: kill PPC_OF
In reply to Kevin HaoWe have set CONFIG_PPC_OF to always 'y' in commit 0a498d96a332 ("powerpc: set CONFIG_PPC_OF=y always for ARCH=powerpc") nine years ago. And the arch/ppc also has gone away for many years. The OF functionality was also moved to a common place and be used by many archs. So it does make no sense to keep such a option in the current kernel. Just kill it.
--- arch/powerpc/Kconfig | 3 --- arch/powerpc/Kconfig.debug | 2 +- arch/powerpc/kernel/Makefile | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-)
arch/powerpc/Kconfig +0 -3
@@ -189,9 +189,6 @@ config ARCH_MAY_HAVE_PC_FDC bool default PCI -config PPC_OF - def_bool y - config PPC_UDBG_16550 bool default n
arch/powerpc/Kconfig.debug +1 -1
@@ -117,7 +117,7 @@ config BDI_SWITCH config BOOTX_TEXT bool "Support for early boot text console (BootX or OpenFirmware only)" - depends on PPC_OF && PPC_BOOK3S + depends on PPC_BOOK3S help Say Y here to see progress messages from the boot firmware in text mode. Requires either BootX or Open Firmware.
arch/powerpc/kernel/Makefile +2 -2
@@ -33,7 +33,8 @@ obj-y := cputable.o ptrace.o syscalls.o \ signal.o sysfs.o cacheinfo.o time.o \ prom.o traps.o setup-common.o \ udbg.o misc.o io.o dma.o \ - misc_$(CONFIG_WORD_SIZE).o vdso32/ + misc_$(CONFIG_WORD_SIZE).o vdso32/ \ + of_platform.o prom_parse.o obj-$(CONFIG_PPC64) += setup_64.o sys_ppc32.o \ signal_64.o ptrace32.o \ paca.o nvram_64.o firmware.o
@@ -47,7 +48,6 @@ obj-$(CONFIG_PPC64) += vdso64/ obj-$(CONFIG_ALTIVEC) += vecemu.o obj-$(CONFIG_PPC_970_NAP) += idle_power4.o obj-$(CONFIG_PPC_P7_NAP) += idle_power7.o -obj-$(CONFIG_PPC_OF) += of_platform.o prom_parse.o procfs-y := proc_powerpc.o obj-$(CONFIG_PROC_FS) += $(procfs-y) rtaspci-$(CONFIG_PPC64)-$(CONFIG_PCI) := rtas_pci.o
Signature · 1 line
1.9.3
Michael Ellerman
reviewerQuoted 3 lines · Kevin Hao
Hi,
This patch series tries to kill the
PPC_OF.
So on the whole this series looks good.
Getting it merged is going to be a bit of a pain though. I assume most of them depend on patch 1, in which case they really need to go in as one series.
So you'll just have to collect acks from all the driver/subsystem maintainers, and then we can take it all through the powerpc tree.
cheers
Quoted 9 lines · Michael Ellerman
Quoted 3 lines · Kevin Hao
Hi,
This patch series tries to kill the
PPC_OF.So on the whole this series looks good.
Getting it merged is going to be a bit of a pain though. I assume most of them depend on patch 1, in which case they really need to go in as one series.
Agreed.
Quoted 2 lines
So you'll just have to collect acks from all the driver/subsystem maintainers,
Will do.
Quoted 1 line
and then we can take it all through the powerpc tree.
Thanks Michael.
Kevin