| Message ID | 1422712065-9403-4-git-send-email-haokexin@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e7b410ef74b3d917db2545086578b663bed19d81 |
| Delegated to: | Michael Ellerman |
| Headers | show |
On Sat, 2015-01-31 at 21:47 +0800, Kevin Hao wrote: > 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> For this and generally the whole series, Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Which tree do we expect this to go through ? Cheers, Ben. > --- > drivers/video/fbdev/aty/aty128fb.c | 4 ++-- > 1 file 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) > /* 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;
On Fri, Feb 27, 2015 at 11:11:15AM +1100, Benjamin Herrenschmidt wrote: > On Sat, 2015-01-31 at 21:47 +0800, Kevin Hao wrote: > > 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> > > For this and generally the whole series, > > Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Thanks Ben. > > 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
On Fri, 2015-02-27 at 09:05 +0800, Kevin Hao wrote: > On Fri, Feb 27, 2015 at 11:11:15AM +1100, Benjamin Herrenschmidt wrote: > > On Sat, 2015-01-31 at 21:47 +0800, Kevin Hao wrote: > > > 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> > > > > For this and generally the whole series, > > > > Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > Thanks Ben. > > > > > 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.
On 27/02/15 03:05, Kevin Hao wrote: > On Fri, Feb 27, 2015 at 11:11:15AM +1100, Benjamin Herrenschmidt wrote: >> On Sat, 2015-01-31 at 21:47 +0800, Kevin Hao wrote: >>> 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> >> >> For this and generally the whole series, >> >> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > Thanks Ben. > >> >> 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
On Tue, Mar 10, 2015 at 02:23:12PM +0200, Tomi Valkeinen wrote: > > 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 <tomi.valkeinen@ti.com>" 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
On 11/03/15 06:38, Kevin Hao wrote: > On Tue, Mar 10, 2015 at 02:23:12PM +0200, Tomi Valkeinen wrote: >>> 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 <tomi.valkeinen@ti.com>" > 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
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) /* 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;
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> --- drivers/video/fbdev/aty/aty128fb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)