Hi Niklas,
On Wed, Sep 13, 2017 at 12:55 PM, Niklas Söderlund
<niklas.soderlund+renesas@xxxxxxxxxxxx> wrote:
> The initialization sequence for H3 (r8a7795) ES1.x and ES2.0 is
> different. H3 ES2.0 and later uses the same sequence as M3 (r8a7796)
> ES1.0. Fix this by swapping place of the two initialization functions
> and calling the r8a7796 init function from the r8a7795 init function if
> the ES version is not "ES1.*".
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx>
Thanks for your patch!
> --- a/drivers/thermal/rcar_gen3_thermal.c
> +++ b/drivers/thermal/rcar_gen3_thermal.c
> -static void r8a7796_thermal_init(struct rcar_gen3_thermal_tsc *tsc)
> +static void r8a7795_thermal_init(struct rcar_gen3_thermal_tsc *tsc)
> {
> - u32 reg_val;
> + /* H3 ES2.0 and later uses same initialization sequence as M3 ES1.0 */
... use the same ...
> + if (!soc_device_match(r8a7795es1)) {
> + r8a7796_thermal_init(tsc);
> + return;
> + }
In general, I prefer soc_device_match() tests for pre-production SoCs to
use positive tests, not negative tests. That makes it easier to drop the
tests and the related code when support for these pre-production SoCs is
dropped later.
I.e.
static void rcar_gen3_thermal_init(struct rcar_gen3_thermal_tsc *tsc)
{
if (soc_device_match(r8a7795es1))
return r8a7795es1_thermal_init(tsc);
[... common init code ...]
}
Notes:
- The above naming ("rcar_gen3_thermal_init") assumes other R-Car Gen3
SoCs need the same initialization sequence.
- Yes, you can call and return from a void function like that ;-)
However, that still leaves the test in the .thermal_init() callback, so it
will be evaluated multiple times, during probe and during each and every
resume.
You can avoid that by using a separate rcar_gen3_thermal_data structure for
H3 ES1.x, and changing the probe function like:
priv->data = of_device_get_match_data(dev);
+ if (soc_device_match(r8a7795es1))
+ priv->data = &r8a7795es_data;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
