From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Walleij Subject: Re: [PATCH 1/1] i2c: Add default configuration into the Nomadik I2C driver. Date: Mon, 6 Aug 2012 16:00:04 +0200 Message-ID: References: <1344255947-10062-1-git-send-email-lee.jones@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Return-path: In-Reply-To: <1344255947-10062-1-git-send-email-lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> Sender: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Lee Jones Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, STEricsson_nomadik_linux-nkJGhpqTU55BDgjK7y7TUQ@public.gmane.org, linus.walleij-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org, arnd-r2nGTMty4D4@public.gmane.org, w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org, srinidhi.kasagar-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org, linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-i2c@vger.kernel.org On Mon, Aug 6, 2012 at 2:25 PM, Lee Jones wrote: > At this moment in time there is only one known configuration for the > Nomadik I2C driver. By not holding that configuration in the driver > adds some unnecessary overhead in platform code. The configuration > as already been removed from platform code, this patch checks for any > over-riding configurations. If there aren't any, the default is used. > > Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > Acked-by: srinidhi kasagar > Acked-by: Linus Walleij > Signed-off-by: Lee Jones This still does not apply for me on v3.6-rc1 what did you base this patch on? Applying: i2c: Add default configuration into the Nomadik I2C driver. error: patch failed: drivers/i2c/busses/i2c-nomadik.c:899 error: drivers/i2c/busses/i2c-nomadik.c: patch does not apply Patch failed at 0001 i2c: Add default configuration into the Nomadik I2C driver. When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Yours, Linus Walleij