diff for duplicates of <5607915.FAWxOoA1QB@phil> diff --git a/a/1.txt b/N1/1.txt index 96b207d..78cf934 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,7 +34,7 @@ guess it can stay together with the emmc controller. > status = "disabled"; > }; > -> + sdhci: sdhci@fe330000 { +> + sdhci: sdhci at fe330000 { > + compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1"; > + reg = <0x0 0xfe330000 0x0 0x10000>; > + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; @@ -47,13 +47,13 @@ guess it can stay together with the emmc controller. > + status = "disabled"; > + }; > + -> usb_host0_ehci: usb@fe380000 { +> usb_host0_ehci: usb at fe380000 { > compatible = "generic-ehci"; > reg = <0x0 0xfe380000 0x0 0x20000>; > @@ -481,8 +494,18 @@ > }; > -> grf: syscon@ff770000 { +> grf: syscon at ff770000 { > - compatible = "rockchip,rk3399-grf", "syscon"; > + compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd"; > reg = <0x0 0xff770000 0x0 0x10000>; @@ -61,7 +61,7 @@ guess it can stay together with the emmc controller. > + #address-cells = <1>; > + #size-cells = <1>; > + -> + emmc_phy: phy@f780 { +> + emmc_phy: phy at f780 { > + compatible = "rockchip,rk3399-emmc-phy"; > + reg = <0xf780 0x20>; > + #phy-cells = <0>; @@ -69,4 +69,4 @@ guess it can stay together with the emmc controller. > + }; > }; > -> watchdog@ff840000 { +> watchdog at ff840000 { diff --git a/a/content_digest b/N1/content_digest index a349232..1442bf7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,8 @@ "ref\01463092552-60696-1-git-send-email-briannorris@chromium.org\0" - "From\0Heiko Stuebner <heiko@sntech.de>\0" - "Subject\0Re: [PATCH v2 1/2] ARM64: dts: rockchip: add sdhci/emmc for rk3399\0" + "From\0heiko@sntech.de (Heiko Stuebner)\0" + "Subject\0[PATCH v2 1/2] ARM64: dts: rockchip: add sdhci/emmc for rk3399\0" "Date\0Fri, 13 May 2016 23:47:57 +0200\0" - "To\0Brian Norris <briannorris@chromium.org>\0" - "Cc\0linux-kernel@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - linux-rockchip@lists.infradead.org - Doug Anderson <dianders@chromium.org> - Shawn Lin <shawn.lin@rock-chips.com> - " Brian Norris <computersforpeace@gmail.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Am Donnerstag, 12. Mai 2016, 15:35:51 schrieb Brian Norris:\n" @@ -47,7 +41,7 @@ "> \t\tstatus = \"disabled\";\n" "> \t};\n" "> \n" - "> +\tsdhci: sdhci@fe330000 {\n" + "> +\tsdhci: sdhci at fe330000 {\n" "> +\t\tcompatible = \"rockchip,rk3399-sdhci-5.1\", \"arasan,sdhci-5.1\";\n" "> +\t\treg = <0x0 0xfe330000 0x0 0x10000>;\n" "> +\t\tinterrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -60,13 +54,13 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t};\n" "> +\n" - "> \tusb_host0_ehci: usb@fe380000 {\n" + "> \tusb_host0_ehci: usb at fe380000 {\n" "> \t\tcompatible = \"generic-ehci\";\n" "> \t\treg = <0x0 0xfe380000 0x0 0x20000>;\n" "> @@ -481,8 +494,18 @@\n" "> \t};\n" "> \n" - "> \tgrf: syscon@ff770000 {\n" + "> \tgrf: syscon at ff770000 {\n" "> -\t\tcompatible = \"rockchip,rk3399-grf\", \"syscon\";\n" "> +\t\tcompatible = \"rockchip,rk3399-grf\", \"syscon\", \"simple-mfd\";\n" "> \t\treg = <0x0 0xff770000 0x0 0x10000>;\n" @@ -74,7 +68,7 @@ "> +\t\t#address-cells = <1>;\n" "> +\t\t#size-cells = <1>;\n" "> +\n" - "> +\t\temmc_phy: phy@f780 {\n" + "> +\t\temmc_phy: phy at f780 {\n" "> +\t\t\tcompatible = \"rockchip,rk3399-emmc-phy\";\n" "> +\t\t\treg = <0xf780 0x20>;\n" "> +\t\t\t#phy-cells = <0>;\n" @@ -82,6 +76,6 @@ "> +\t\t};\n" "> \t};\n" "> \n" - "> \twatchdog@ff840000 {" + "> \twatchdog at ff840000 {" -d03c661faff2aff56efcad9c6c1e52532884bea87cf81cbec92e9f51b24175af +8c7e1c49ba494bcfca6bb940635a5164ecc2470d8ef2a5b450045e87802a20f7
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.