| Message ID | 1369210939-25087-1-git-send-email-Yuantian.Tang@freescale.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Quoting Yuantian.Tang@freescale.com (2013-05-22 01:22:19) > From: Tang Yuantian <yuantian.tang@freescale.com> > > The compatible string of clock is changed from *-2 to *-2.0 > on chassis 2. So updated it accordingly. > > Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com> Taken into clk-next. Regards, Mike > --- > drivers/clk/clk-ppc-corenet.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/clk/clk-ppc-corenet.c b/drivers/clk/clk-ppc-corenet.c > index a2d483f..e958707 100644 > --- a/drivers/clk/clk-ppc-corenet.c > +++ b/drivers/clk/clk-ppc-corenet.c > @@ -260,7 +260,7 @@ static int __init ppc_corenet_clk_probe(struct platform_device *pdev) > > static const struct of_device_id ppc_clk_ids[] __initconst = { > { .compatible = "fsl,qoriq-clockgen-1.0", }, > - { .compatible = "fsl,qoriq-clockgen-2", }, > + { .compatible = "fsl,qoriq-clockgen-2.0", }, > {} > }; > > -- > 1.8.0
Quoting Mike Turquette (2013-05-30 11:57:32) > Quoting Yuantian.Tang@freescale.com (2013-05-22 01:22:19) > > From: Tang Yuantian <yuantian.tang@freescale.com> > > > > The compatible string of clock is changed from *-2 to *-2.0 > > on chassis 2. So updated it accordingly. > > > > Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com> > > Taken into clk-next. > One small nitpick. I updated the $SUBJECT to: clk: mpc85xx: Update the compatible string The difference being "clk: mpc85xx:" versus "clk/mpc85xx:". Please use the former format in the future. Thanks, Mike > Regards, > Mike > > > --- > > drivers/clk/clk-ppc-corenet.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/clk/clk-ppc-corenet.c b/drivers/clk/clk-ppc-corenet.c > > index a2d483f..e958707 100644 > > --- a/drivers/clk/clk-ppc-corenet.c > > +++ b/drivers/clk/clk-ppc-corenet.c > > @@ -260,7 +260,7 @@ static int __init ppc_corenet_clk_probe(struct platform_device *pdev) > > > > static const struct of_device_id ppc_clk_ids[] __initconst = { > > { .compatible = "fsl,qoriq-clockgen-1.0", }, > > - { .compatible = "fsl,qoriq-clockgen-2", }, > > + { .compatible = "fsl,qoriq-clockgen-2.0", }, > > {} > > }; > > > > -- > > 1.8.0
On May 30, 2013, at 2:21 PM, Mike Turquette wrote: > Quoting Mike Turquette (2013-05-30 11:57:32) >> Quoting Yuantian.Tang@freescale.com (2013-05-22 01:22:19) >>> From: Tang Yuantian <yuantian.tang@freescale.com> >>> >>> The compatible string of clock is changed from *-2 to *-2.0 >>> on chassis 2. So updated it accordingly. >>> >>> Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com> >> >> Taken into clk-next. >> > > One small nitpick. I updated the $SUBJECT to: > > clk: mpc85xx: Update the compatible string > > The difference being "clk: mpc85xx:" versus "clk/mpc85xx:". Please use > the former format in the future. > > Thanks, > Mike Mike, If clk-ppc-corenet.c went into v3.10, than I think this fix is needed there and shouldn't wait til v3.11 - k
Quoting Kumar Gala (2013-05-30 12:26:38) > On May 30, 2013, at 2:21 PM, Mike Turquette wrote: > > > Quoting Mike Turquette (2013-05-30 11:57:32) > >> Quoting Yuantian.Tang@freescale.com (2013-05-22 01:22:19) > >>> From: Tang Yuantian <yuantian.tang@freescale.com> > >>> > >>> The compatible string of clock is changed from *-2 to *-2.0 > >>> on chassis 2. So updated it accordingly. > >>> > >>> Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com> > >> > >> Taken into clk-next. > >> > > > > One small nitpick. I updated the $SUBJECT to: > > > > clk: mpc85xx: Update the compatible string > > > > The difference being "clk: mpc85xx:" versus "clk/mpc85xx:". Please use > > the former format in the future. > > > > Thanks, > > Mike > > Mike, > > If clk-ppc-corenet.c went into v3.10, than I think this fix is needed there and shouldn't wait til v3.11 > clk-ppc-corenet.c is first introduced in the current clk-next branch. It is not merged into Linus' tree yet. Regards, Mike > - k
diff --git a/drivers/clk/clk-ppc-corenet.c b/drivers/clk/clk-ppc-corenet.c index a2d483f..e958707 100644 --- a/drivers/clk/clk-ppc-corenet.c +++ b/drivers/clk/clk-ppc-corenet.c @@ -260,7 +260,7 @@ static int __init ppc_corenet_clk_probe(struct platform_device *pdev) static const struct of_device_id ppc_clk_ids[] __initconst = { { .compatible = "fsl,qoriq-clockgen-1.0", }, - { .compatible = "fsl,qoriq-clockgen-2", }, + { .compatible = "fsl,qoriq-clockgen-2.0", }, {} };