From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Mon, 05 Jul 2010 13:14:16 +0200 Subject: [U-Boot] [PATCH 2/2] Blackfin: bf533/bf561 boards: convert to new soft gpio i2c code In-Reply-To: <1278319809-28569-2-git-send-email-vapier@gentoo.org> References: <1278319809-28569-1-git-send-email-vapier@gentoo.org> <1278319809-28569-2-git-send-email-vapier@gentoo.org> Message-ID: <4C31BE88.4030002@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Mike, Mike Frysinger wrote: > Use the new common gpio framework to simplify and unify the soft i2c > configuration settings. > > Signed-off-by: Mike Frysinger > --- > note: i can run this through the Blackfin tree if you want I actually tried your 2 patches, but this patch doesn;t apply :-( [hs at pollux u-boot-i2c]$ git am -i --whitespace=strip \[U-Boot\]\ \[PATCH\ 2_2\]\ Blackfin\:\ bf533_bf561\ boards\:\ convert\ to\ new\ soft\ gpio\ i2c\ code.eml Commit Body is: -------------------------- Blackfin: bf533/bf561 boards: convert to new soft gpio i2c code Use the new common gpio framework to simplify and unify the soft i2c configuration settings. Signed-off-by: Mike Frysinger -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Blackfin: bf533/bf561 boards: convert to new soft gpio i2c code error: patch failed: include/configs/bf533-ezkit.h:94 error: include/configs/bf533-ezkit.h: patch does not apply error: patch failed: include/configs/bf533-stamp.h:138 error: include/configs/bf533-stamp.h: patch does not apply error: patch failed: include/configs/bf561-ezkit.h:112 error: include/configs/bf561-ezkit.h: patch does not apply error: patch failed: include/configs/ibf-dsp561.h:112 error: include/configs/ibf-dsp561.h: patch does not apply Patch failed at 0001 Blackfin: bf533/bf561 boards: convert to new soft gpio i2c code When you have resolved this problem run "git am -i --resolved". If you would prefer to skip this patch, instead run "git am -i --skip". To restore the original branch and stop patching run "git am -i --abort". [hs at pollux u-boot-i2c]$ Beside of this issue, your 2 patches are looking good! So, if you want to pick up this patches in your blackfin tree, you can add my Acked-by: Heiko Schocher bye Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany