diff options
author | Kevin Hao <haokexin@gmail.com> | 2015-03-12 08:32:43 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-03-17 05:04:31 -0400 |
commit | e7b410ef74b3d917db2545086578b663bed19d81 (patch) | |
tree | 89804b4d40fcc336dcbcb775a6f1871f466cf8cc /drivers/video | |
parent | d610f503612ddb5bf55e477fd48c678b3deab7ca (diff) |
fbdev: aty128fb: replace PPC_OF with PPC
The 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.
Signed-off-by: Kevin Hao <haokexin@gmail.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/fbdev/aty/aty128fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c index aedf2fbf9bf6..0156954bf340 100644 --- a/drivers/video/fbdev/aty/aty128fb.c +++ b/drivers/video/fbdev/aty/aty128fb.c | |||
@@ -965,7 +965,7 @@ static void __iomem *aty128_find_mem_vbios(struct aty128fb_par *par) | |||
965 | /* fill in known card constants if pll_block is not available */ | 965 | /* fill in known card constants if pll_block is not available */ |
966 | static void aty128_timings(struct aty128fb_par *par) | 966 | static void aty128_timings(struct aty128fb_par *par) |
967 | { | 967 | { |
968 | #ifdef CONFIG_PPC_OF | 968 | #ifdef CONFIG_PPC |
969 | /* instead of a table lookup, assume OF has properly | 969 | /* instead of a table lookup, assume OF has properly |
970 | * setup the PLL registers and use their values | 970 | * setup the PLL registers and use their values |
971 | * to set the XCLK values and reference divider values */ | 971 | * to set the XCLK values and reference divider values */ |
@@ -979,7 +979,7 @@ static void aty128_timings(struct aty128fb_par *par) | |||
979 | if (!par->constants.ref_clk) | 979 | if (!par->constants.ref_clk) |
980 | par->constants.ref_clk = 2950; | 980 | par->constants.ref_clk = 2950; |
981 | 981 | ||
982 | #ifdef CONFIG_PPC_OF | 982 | #ifdef CONFIG_PPC |
983 | x_mpll_ref_fb_div = aty_ld_pll(X_MPLL_REF_FB_DIV); | 983 | x_mpll_ref_fb_div = aty_ld_pll(X_MPLL_REF_FB_DIV); |
984 | xclk_cntl = aty_ld_pll(XCLK_CNTL) & 0x7; | 984 | xclk_cntl = aty_ld_pll(XCLK_CNTL) & 0x7; |
985 | Nx = (x_mpll_ref_fb_div & 0x00ff00) >> 8; | 985 | Nx = (x_mpll_ref_fb_div & 0x00ff00) >> 8; |