Commit 9f47df26 authored by David S. Miller's avatar David S. Miller
Browse files

[RADEON]: Probe clocks and monitor using OF properties on sparc. 



Just like powerpc does.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a8b8814b

drivers/video/aty/radeon_base.c

+7 −5
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ static int __devinit radeon_find_mem_vbios(struct radeonfb_info *rinfo) 
}

#endif



#ifdef CONFIG_PPC_OF

#if defined(CONFIG_PPC_OF) || 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
@@ -440,7 +440,7 @@ static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo) 


       	return 0;

}

#endif /* CONFIG_PPC_OF */

#endif /* CONFIG_PPC_OF || CONFIG_SPARC */



/*

 * Read PLL infos from chip registers
@@ -645,7 +645,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo) 
	rinfo->pll.ref_div = INPLL(PPLL_REF_DIV) & PPLL_REF_DIV_MASK;





#ifdef CONFIG_PPC_OF

#if defined(CONFIG_PPC_OF) || defined(CONFIG_SPARC)

	/*

	 * Retrieve PLL infos from Open Firmware first

	 */
@@ -653,7 +653,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo) 
       		printk(KERN_INFO "radeonfb: Retrieved PLL infos from Open Firmware\n");

		goto found;

	}

#endif /* CONFIG_PPC_OF */

#endif /* CONFIG_PPC_OF || CONFIG_SPARC */



	/*

	 * Check out if we have an X86 which gave us some PLL informations
@@ -2231,7 +2231,7 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev, 
	    rinfo->family == CHIP_FAMILY_RS200)

		rinfo->errata |= CHIP_ERRATA_PLL_DELAY;



#ifdef CONFIG_PPC_OF

#if defined(CONFIG_PPC_OF) || defined(CONFIG_SPARC)

	/* On PPC, we obtain the OF device-node pointer to the firmware

	 * data for this chip

	 */
@@ -2240,6 +2240,8 @@ static int __devinit 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

	/* 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

drivers/video/aty/radeon_monitor.c

+8 −8
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static char *radeon_get_mon_name(int type) 
}





#ifdef CONFIG_PPC_OF

#if defined(CONFIG_PPC_OF) || 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
@@ -156,7 +156,7 @@ static int __devinit radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_ 
	}

        return MT_NONE;

}

#endif /* CONFIG_PPC_OF */

#endif /* CONFIG_PPC_OF || CONFIG_SPARC */





static int __devinit radeon_get_panel_info_BIOS(struct radeonfb_info *rinfo)
@@ -495,11 +495,11 @@ void __devinit radeon_probe_screens(struct radeonfb_info *rinfo, 
		 * Old single head cards

		 */

		if (!rinfo->has_CRTC2) {

#ifdef CONFIG_PPC_OF

#if defined(CONFIG_PPC_OF) || 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 */

#endif /* CONFIG_PPC_OF || CONFIG_SPARC */

#ifdef CONFIG_FB_RADEON_I2C

			if (rinfo->mon1_type == MT_NONE)

				rinfo->mon1_type =
@@ -544,11 +544,11 @@ void __devinit radeon_probe_screens(struct radeonfb_info *rinfo, 
		/*

		 * Probe primary head (DVI or laptop internal panel)

		 */

#ifdef CONFIG_PPC_OF

#if defined(CONFIG_PPC_OF) || 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 */

#endif /* CONFIG_PPC_OF || CONFIG_SPARC */

#ifdef CONFIG_FB_RADEON_I2C

		if (rinfo->mon1_type == MT_NONE)

			rinfo->mon1_type = radeon_probe_i2c_connector(rinfo, ddc_dvi,
@@ -572,11 +572,11 @@ void __devinit radeon_probe_screens(struct radeonfb_info *rinfo, 
		/*

		 * Probe secondary head (mostly VGA, can be DVI)

		 */

#ifdef CONFIG_PPC_OF

#if defined(CONFIG_PPC_OF) || 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 */

#endif /* CONFIG_PPC_OF || defined(CONFIG_SPARC) */

#ifdef CONFIG_FB_RADEON_I2C

		if (rinfo->mon2_type == MT_NONE)

			rinfo->mon2_type = radeon_probe_i2c_connector(rinfo, ddc_vga,

drivers/video/aty/radeonfb.h

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#include <asm/io.h>



#ifdef CONFIG_PPC_OF

#if defined(CONFIG_PPC_OF) || defined(CONFIG_SPARC)

#include <asm/prom.h>

#endif
@@ -292,7 +292,7 @@ struct radeonfb_info { 
	unsigned long		fb_local_base;



	struct pci_dev		*pdev;

#ifdef CONFIG_PPC_OF

#if defined(CONFIG_PPC_OF) || defined(CONFIG_SPARC)

	struct device_node	*of_node;

#endif