From: nicolas.ferre@atmel.com (Nicolas Ferre) Date: Wed, 10 Dec 2014 10:24:35 +0100 Subject: [PATCH 1/2] ARM: at91/dt: sama5d3: move wm8904 codec to i2c1 In-Reply-To: <1418122486-23184-1-git-send-email-josh.wu@atmel.com> References: <1418122486-23184-1-git-send-email-josh.wu@atmel.com> Message-ID: <54881153.3050400@atmel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Le 09/12/2014 11:54, Josh Wu a ?crit : > Since from rev.D MB, the wm8904 is moved to i2c1. > This patch will adapt to this change. I'd like a more generic way of dealing with board revisions. So, let's keep it like it is for now. Bye, > Signed-off-by: Josh Wu > --- > arch/arm/boot/dts/sama5d3xmb.dtsi | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi > index 49c10d3..74bc633 100644 > --- a/arch/arm/boot/dts/sama5d3xmb.dtsi > +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi > @@ -38,12 +38,7 @@ > atmel,clk-from-rk-pin; > }; > > - /* > - * i2c0 conflicts with ISI: > - * disable it to allow the use of ISI > - * can not enable audio when i2c0 disabled > - */ > - i2c0: i2c at f0014000 { > + i2c1: i2c at f0018000 { > wm8904: wm8904 at 1a { > compatible = "wm8904"; > reg = <0x1a>; > -- Nicolas Ferre