mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
powerpc updates for 4.1
- Numerous minor fixes, cleanups etc. - More EEH work from Gavin to remove its dependency on device_nodes. - Memory hotplug implemented entirely in the kernel from Nathan Fontenot. - Removal of redundant CONFIG_PPC_OF by Kevin Hao. - Rewrite of VPHN parsing logic & tests from Greg Kurz. - A fix from Nish Aravamudan to reduce memory usage by clamping nodes_possible_map. - Support for pstore on powernv from Hari Bathini. - Removal of old powerpc specific byte swap routines by David Gibson. - Fix from Vasant Hegde to prevent the flash driver telling you it was flashing your firmware when it wasn't. - Patch from Ben Herrenschmidt to add an OPAL heartbeat driver. - Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan Stancek. - Some fixes for migration from Tyrel Datwyler. - A new syscall to switch the cpu endian by Michael Ellerman. - Large series from Wei Yang to implement SRIOV, reviewed and acked by Bjorn. - A fix for the OPAL sensor driver from Cédric Le Goater. - Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman. - Large series from Daniel Axtens to make our PCI hooks per PHB rather than per machine. - Small patch from Sam Bobroff to explicitly abort non-suspended transactions on syscalls, plus a test to exercise it. - Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu. - Small patch to enable the hard lockup detector from Anton Blanchard. - Fix from Dave Olson for missing L2 cache information on some CPUs. - Some fixes from Michael Ellerman to get Cell machines booting again. - Freescale updates from Scott: Highlights include BMan device tree nodes, an MSI erratum workaround, a couple minor performance improvements, config updates, and misc fixes/cleanup. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJVL2cxAAoJEFHr6jzI4aWAR8cP/19VTo/CzCE4ffPSx7qR464n F+WFZcbNjIMXu6+B0YLuJZEsuWtKKrCit/MCg3+mSgE4iqvxmtI+HDD0445Buszj UD4E4HMdPrXQ+KUSUDORvRjv/FFUXIa94LSv/0g2UeMsPz/HeZlhMxEu7AkXw9Nf rTxsmRTsOWME85Y/c9ss7XHuWKXT3DJV7fOoK9roSaN3dJAuWTtG3WaKS0nUu0ok 0M81D6ZczoD6ybwh2DUMPD9K6SGxLdQ4OzQwtW6vWzcQIBDfy5Pdeo0iAFhGPvXf T4LLPkv4cF4AwHsAC4rKDPHQNa+oZBoLlScrHClaebAlDiv+XYKNdMogawUObvSh h7avKmQr0Ygp1OvvZAaXLhuDJI9FJJ8lf6AOIeULgHsDR9SyKMjZWxRzPe11uarO Fyi0qj3oJaQu6LjazZraApu8mo+JBtQuD3z3o5GhLxeFtBBF60JXj6zAXJikufnl kk1/BUF10nKUhtKcDX767AMUCtMH3fp5hx8K/z9T5v+pobJB26Wup1bbdT68pNBT NjdKUppV6QTjZvCsA6U2/ECu6E9KeIaFtFSL2IRRoiI0dWBN5/5eYn3RGkO2ZFoL 1NdwKA2XJcchwTPkpSRrUG70sYH0uM2AldNYyaLfjzrQqza7Y6lF699ilxWmCN/H OplzJAE5cQ8Am078veTW =03Yh -----END PGP SIGNATURE----- Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux Pull powerpc updates from Michael Ellerman: - Numerous minor fixes, cleanups etc. - More EEH work from Gavin to remove its dependency on device_nodes. - Memory hotplug implemented entirely in the kernel from Nathan Fontenot. - Removal of redundant CONFIG_PPC_OF by Kevin Hao. - Rewrite of VPHN parsing logic & tests from Greg Kurz. - A fix from Nish Aravamudan to reduce memory usage by clamping nodes_possible_map. - Support for pstore on powernv from Hari Bathini. - Removal of old powerpc specific byte swap routines by David Gibson. - Fix from Vasant Hegde to prevent the flash driver telling you it was flashing your firmware when it wasn't. - Patch from Ben Herrenschmidt to add an OPAL heartbeat driver. - Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan Stancek. - Some fixes for migration from Tyrel Datwyler. - A new syscall to switch the cpu endian by Michael Ellerman. - Large series from Wei Yang to implement SRIOV, reviewed and acked by Bjorn. - A fix for the OPAL sensor driver from Cédric Le Goater. - Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman. - Large series from Daniel Axtens to make our PCI hooks per PHB rather than per machine. - Small patch from Sam Bobroff to explicitly abort non-suspended transactions on syscalls, plus a test to exercise it. - Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu. - Small patch to enable the hard lockup detector from Anton Blanchard. - Fix from Dave Olson for missing L2 cache information on some CPUs. - Some fixes from Michael Ellerman to get Cell machines booting again. - Freescale updates from Scott: Highlights include BMan device tree nodes, an MSI erratum workaround, a couple minor performance improvements, config updates, and misc fixes/cleanup. * tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits) powerpc/powermac: Fix build error seen with powermac smp builds powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE powerpc: Remove PPC32 code from pseries specific find_and_init_phbs() powerpc/cell: Fix iommu breakage caused by controller_ops change powerpc/eeh: Fix crash in eeh_add_device_early() on Cell powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails powerpc/pseries: Correct memory hotplug locking powerpc: Fix missing L2 cache size in /sys/devices/system/cpu powerpc: Add ppc64 hard lockup detector support oprofile: Disable oprofile NMI timer on ppc64 powerpc/perf/hv-24x7: Add missing put_cpu_var() powerpc/perf/hv-24x7: Break up single_24x7_request powerpc/perf/hv-24x7: Define update_event_count() powerpc/perf/hv-24x7: Whitespace cleanup powerpc/perf/hv-24x7: Define add_event_to_24x7_request() powerpc/perf/hv-24x7: Rename hv_24x7_event_update powerpc/perf/hv-24x7: Move debug prints to separate function powerpc/perf/hv-24x7: Drop event_24x7_request() powerpc/perf/hv-24x7: Use pr_devel() to log message ... Conflicts: tools/testing/selftests/powerpc/Makefile tools/testing/selftests/powerpc/tm/Makefile
This commit is contained in:
Linus Torvalds
commit
d19d5efd8c
299 changed files with 8755 additions and 9760 deletions
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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_APERTURE
|
||||
static 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);
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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__disabled
|
||||
static 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 */
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -315,7 +315,7 @@ static int controlfb_blank(int blank_mode, struct fb_info *info)
|
|||
container_of(info, struct fb_info_control, info);
|
||||
unsigned ctrl;
|
||||
|
||||
ctrl = ld_le32(CNTRL_REG(p,ctrl));
|
||||
ctrl = le32_to_cpup(CNTRL_REG(p,ctrl));
|
||||
if (blank_mode > 0)
|
||||
switch (blank_mode) {
|
||||
case FB_BLANK_VSYNC_SUSPEND:
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1470,15 +1470,13 @@ 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);
|
||||
if(dp)
|
||||
printk(KERN_INFO "%s: OF name %s\n",__func__, dp->name);
|
||||
else
|
||||
else if (IS_ENABLED(CONFIG_OF))
|
||||
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;
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ static int platinumfb_blank(int blank, struct fb_info *fb)
|
|||
struct fb_info_platinum *info = (struct fb_info_platinum *) fb;
|
||||
int ctrl;
|
||||
|
||||
ctrl = ld_le32(&info->platinum_regs->ctrl.r) | 0x33;
|
||||
ctrl = le32_to_cpup(&info->platinum_regs->ctrl.r) | 0x33;
|
||||
if (blank)
|
||||
--blank_mode;
|
||||
if (blank & VESA_VSYNC_SUSPEND)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue