diff for duplicates of <2576845.mbFzWJ2q3T@phil> diff --git a/a/1.txt b/N1/1.txt index bbdca0d..4a7b856 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -23,7 +23,7 @@ I've added this to my tree. > status = "disabled"; > }; > -> + i2s: i2s at ff890000 { +> + i2s: i2s@ff890000 { > + compatible = "rockchip,rk3288-i2s", "rockchip,rk3066-i2s"; > + reg = <0xff890000 0x10000>; > + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; @@ -38,7 +38,7 @@ I've added this to my tree. > + status = "disabled"; > + }; > + -> gic: interrupt-controller at ffc01000 { +> gic: interrupt-controller@ffc01000 { > compatible = "arm,gic-400"; > interrupt-controller; > @@ -463,6 +478,17 @@ diff --git a/a/content_digest b/N1/content_digest index 1ff3baf..fd34dda 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,21 @@ "ref\01410509511-16667-1-git-send-email-jay.xu@rock-chips.com\0" "ref\01410519295-18980-1-git-send-email-jay.xu@rock-chips.com\0" - "From\0heiko@sntech.de (Heiko St\303\274bner)\0" - "Subject\0[PATCH v2] ARM: dts: add rk3288 i2s controller\0" + "From\0Heiko St\303\274bner <heiko@sntech.de>\0" + "Subject\0Re: [PATCH v2] ARM: dts: add rk3288 i2s controller\0" "Date\0Mon, 22 Sep 2014 16:35:27 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jianqun <jay.xu@rock-chips.com>\0" + "Cc\0robh+dt@kernel.org" + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + linux@arm.linux.org.uk + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-rockchip@lists.infradead.org + devicetree@vger.kernel.org + huangtao@rock-chips.com + " cf@rock-chips.com\0" "\00:1\0" "b\0" "Am Freitag, 12. September 2014, 18:54:55 schrieb Jianqun:\n" @@ -31,7 +43,7 @@ "> \t\tstatus = \"disabled\";\n" "> \t};\n" "> \n" - "> +\ti2s: i2s at ff890000 {\n" + "> +\ti2s: i2s@ff890000 {\n" "> +\t\tcompatible = \"rockchip,rk3288-i2s\", \"rockchip,rk3066-i2s\";\n" "> +\t\treg = <0xff890000 0x10000>;\n" "> +\t\tinterrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -46,7 +58,7 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t};\n" "> +\n" - "> \tgic: interrupt-controller at ffc01000 {\n" + "> \tgic: interrupt-controller@ffc01000 {\n" "> \t\tcompatible = \"arm,gic-400\";\n" "> \t\tinterrupt-controller;\n" "> @@ -463,6 +478,17 @@\n" @@ -68,4 +80,4 @@ "> \t\t\tsdmmc_clk: sdmmc-clk {\n" "> \t\t\t\trockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none>;" -33905b340db0c2541882b1ab45678923938ea63eb692e32b4ea0c90e44fc9633 +3e1c6df7ae05cc7567c91821975e7518313c6d68547c2c541c35036662785293
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.