From owner-svn-src-head@freebsd.org Fri Feb 24 00:15:18 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 046C7CEBA7B for ; Fri, 24 Feb 2017 00:15:18 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x236.google.com (mail-it0-x236.google.com [IPv6:2607:f8b0:4001:c0b::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C14491170 for ; Fri, 24 Feb 2017 00:15:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x236.google.com with SMTP id y135so5092378itc.1 for ; Thu, 23 Feb 2017 16:15:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=eWww+WELQo8Z/1rGWUX50vb3D4k1qZwREj7YBdNpqRk=; b=ay7E8VZWeyZKVjQEeVMc4NICpySd2NJAXp38RsXVVOnFkNLbTraHU1SwsNtR8PZq+U wrZACwYIdDY9O7HyCtxrNZQy3maHEuIiBzSy0pdiBDxylwF/mlciayRbFe3M6dtkB1hk j9aE+3u865z32yiMCjnVrlwCYkoBY7Nl1UdPl+y0whgpoN0hFxK22Ny4CwNcon5dy9iD Qb6G6/AeXok0huhkfZ3sbQjECF9NKI4wb8r53bOpcga92YnXecTSJqa/2mKG0iUZgHkp nNq6q+kVKzOb7PM/6j+VTWJFBIYzcWmORBQg/4jR1F0JC7igmkqccvWjXetsds8X0TcY wJWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=eWww+WELQo8Z/1rGWUX50vb3D4k1qZwREj7YBdNpqRk=; b=QgxhXkV9oLSNBqKfmSIdHzmQz7i41NejRddxufs60YjLS/8V3K7Y1mJJoBX1Eozsuk GOdJoO+OHDfsQNwlZy6qzadnI8TJfaK5e8iDKV1VaVOwzcb6SapjI2Dftmwc5IYPgZnn b6CZ3zJ9HV/gGJ4plOngaJntVTZQ9Kj+B2WXJHjzI3ifyVIKh/TURdW9P8SOYSHi1XPl Q/0IQvN+78bErgJdKBguWfiZO7uHsvuhwUCTAENm2eHXVWFE/qvbU2x9bWYI5L7Av0bt RSV3wbiLAHPcKN0Z1JTo1Sj2/4PNh1nLHeMSeTZcVb4v/ojOxwU91gUDUNJnUUuU1pV6 jhgw== X-Gm-Message-State: AMke39k38YCSlQ2wHM8NMz1HsIjCyK8v5e0vca7fBq8zMWObvX0VwC1fUNc7t5sSQBGQn8+kl5AaIq1vnC8rzA== X-Received: by 10.107.139.131 with SMTP id n125mr425295iod.166.1487895317059; Thu, 23 Feb 2017 16:15:17 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.145.132 with HTTP; Thu, 23 Feb 2017 16:15:16 -0800 (PST) X-Originating-IP: [50.253.99.174] In-Reply-To: <1487894717.25520.18.camel@freebsd.org> References: <201702232348.v1NNmiED031217@repo.freebsd.org> <1487894717.25520.18.camel@freebsd.org> From: Warner Losh Date: Thu, 23 Feb 2017 17:15:16 -0700 X-Google-Sender-Auth: 8uUUoNS7Dai3zDVtpy-E6TKySw8 Message-ID: Subject: Re: svn commit: r314186 - head/sys/arm/at91 To: Ian Lepore Cc: "Pedro F. Giffuni" , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Feb 2017 00:15:18 -0000 On Thu, Feb 23, 2017 at 5:05 PM, Ian Lepore wrote: > On Thu, 2017-02-23 at 23:48 +0000, Pedro F. Giffuni wrote: >> Author: pfg >> Date: Thu Feb 23 23:48:44 2017 >> New Revision: 314186 >> URL: https://svnweb.freebsd.org/changeset/base/314186 >> >> Log: >> at91: double assignment. >> >> Found with: coccinelle (da.cocci) >> Suggested by: cognet >> >> Modified: >> head/sys/arm/at91/at91sam9260.c >> >> Modified: head/sys/arm/at91/at91sam9260.c >> ===================================================================== >> ========= >> --- head/sys/arm/at91/at91sam9260.c Thu Feb 23 22:46:01 2017 >> (r314185) >> +++ head/sys/arm/at91/at91sam9260.c Thu Feb 23 23:48:44 2017 >> (r314186) >> @@ -193,7 +193,6 @@ at91_clock_init(void) >> */ >> clk = at91_pmc_clock_ref("pllb"); >> clk->pll_min_in = SAM9260_PLL_B_MIN_IN_FREQ; >> /* 1 MHz */ >> - clk->pll_max_in = SAM9260_PLL_B_MAX_IN_FREQ; >> /* 5 MHz */ >> clk->pll_max_in = 2999999; >> /* ~3 MHz */ >> clk->pll_min_out = SAM9260_PLL_B_MIN_OUT_FREQ; /* >> 70 MHz */ >> clk->pll_max_out = SAM9260_PLL_B_MAX_OUT_FREQ; /* >> 130 MHz */ >> > > Just looking at this by eye (but without digging out the at91 manuals) > I'd say this looks like fallout from a mismerge and the correct line to > keep would be the named constant. Keeping the one that has actually > been in effect all this time isn't the same as keeping the right one, > and this deletion may remove the only clue someone might find when they > eventually get around to debugging this (if ever, the sam9260 is a > pretty old chip). I was going to test boot on my SAM9260EK board since I had the same thought, but wasn't completely sure. Warner