From 78c4f19293494b1011ba5fb3dd88e3d934650da3 Mon Sep 17 00:00:00 2001 From: Soby Mathew Date: Wed, 5 Oct 2016 15:38:01 +0100 Subject: [PATCH] Fix GICv3 DT to include psci system off/reset The `fvp-base-gicv3-psci` and `fvp-foundation-gicv3-psci` device tree source files did not have psci node entries for `system off` and `system reset`. Also the DTS files included `rtsm_ve-motherboard-no_psci.dtsi` instead of `rtsm_ve-motherboard.dtsi`. As a result, the Linux kernel failed to invoke the PSCI_SYSTEM_OFF/RESET API when being shutdown/reset. This patch corrects this problem and also updates the corresponding DTB files. This patch also removes `rtsm_ve-motherboard-no_psci.dtsi` and `fvp-foundation-motherboard-no_psci.dtsi` files as they are no longer used. Change-Id: I8ba61a1323035f7508cae663bb490ac0e8a64618 --- fdts/fvp-base-gicv3-psci.dtb | Bin 10996 -> 10835 bytes fdts/fvp-base-gicv3-psci.dts | 4 +- fdts/fvp-foundation-gicv3-psci.dtb | Bin 8301 -> 8140 bytes fdts/fvp-foundation-gicv3-psci.dts | 4 +- fdts/fvp-foundation-motherboard-no_psci.dtsi | 197 -------------- fdts/rtsm_ve-motherboard-no_psci.dtsi | 264 ------------------- 6 files changed, 6 insertions(+), 463 deletions(-) delete mode 100644 fdts/fvp-foundation-motherboard-no_psci.dtsi delete mode 100644 fdts/rtsm_ve-motherboard-no_psci.dtsi diff --git a/fdts/fvp-base-gicv3-psci.dtb b/fdts/fvp-base-gicv3-psci.dtb index 0acbe17e7b3187526a1c39851b297c17233988d0..e175bf02e46c4daadcc8889d59f34d0136c7d986 100644 GIT binary patch literal 10835 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 literal 10996 zcmb_i&2J<}6|c65Nq~@q?=Qo$hGesH$1~$~;sAlkdUumm_Dj)b6-7c;Pfw5CZ1;4h zduD7$5Edn8#07-J1^xiI!hs7?4se1ihy$EJkw7^RDdGV9ey^&!Yi8OeUZwicdK25_CA(e zx^?5!`Jjvpiu%vsS_+DEbu!5P9?L|C_VXetOARFMeYnVhHm!Ub`2|OA8`%qYvoab& z(&b)|#IP*ZSa%KAQ)^|~TT8RiZdCNLpy;o~*&yEuy6dYglh(#TG3vISq)1cJF6&-= z*L8!rx>w(I-QHZ?7v6Q;Mw`zk*AAPQBlLtR+4dq4ij&5(uw+{mn8B zUAh0p^jPGtPmjeu%Gs8*ALe5-l$E`vv7>ztSU(MNolnN)C@Qq~S(X)%5ont+@m*YO zL$`x+1_6>=Uh_bCXTF?vs`~5m<@cC!jnSM;Glz0oa&0zndcRxV!0BGMynz$vlkKtaXLBUFa9l)D9U~DBz^M$E{TWQ1~l4-y#K)D>8GE`46Ob8E9kgB zSbzTx`Mx9n5&0iE@|(ziz>(iFvg=#_B>X(R>R3MD=W#8wGWae2-I2lXzBe41{66T& z#%T?h_vO$<@jF3Bi4W^j+C9TmWaGtj;zP)q+`v!#d4q@DGSG>+aKxgC$WS zgJkP*4RhBt+M!H4Vk?c(tT^ay@-%}4wbbR9y`#&h65T1gzTTk*i3bCud+*4tI;)D^ zc!*O)G0sPRm<>lomLyTp?F{Nxv`wzRvX<|}p+C_Jf#L2wfimW8Urr-W+g4_x23N@obRE+v{*VLw==E_Yl4Ikpar8U& zmMbe$_To`VH*~DC4W>FDXg~OXp+wim&C5(4to0tZ#-20jJAZk3qd1KU>UCZAvfeBG zs+7E1fLs3eEA?OD2mObgJjSQeW51NV>67>BJ#YUNaHrjFC)mV7>73<1hVrWYCv^Kh z;)?ZXr|Qqy?@@(B7M0(sHmn~{qm2Eua#IX=gCa;Ha#^3^g7NXbkGgDu_3ii}E6+%F z{Ay0Gu?R_Xs(hTM)mdc5zbMf`O#9ZqwD2`tw9oVuE}Q?llmCXv%Q)iE38L_nIa0=H zj?-t)obqk|PXj}|mFW-LzkOsmC#u9n&NQrh1epV5bhIPsQ}{JH+LiP<{2HCP>4n4y z+$$x~Ax>RnWgc5j^!ZN=lsEPnZ7fm$3rEjv#nI7MZJY903}qL?KFwmNb204WEXMj1 zMUsf0#Zc$kp$}#;)VUb0)3X@rTnyLVSqyb9hC?}vafTPAdQFvqPQR z7UOT$4s|XD<2Q$)&c$GjnZr=$VzBniVW@L4Tq|e!Q0HP8hO-zaG*Mc=>kz^GJcPSz z=Od73?NH}pKH7kx&c$$=&DwFM9!iz^cmswy*AAasX6;btVm{e`q0Yr{iqG0{raelP z`g8+^I@b>0EzR1Y&c%GT0YjaO;qo$T$60bvs?>4=hC0{I=NmB8xtK3BV5oC3ry4NS zxtK3DV5oC3ryDTTxtNs(40SH%OAQ$6T+EjnFx0u2hZ``|xtK>9Fx0u2GYuH(T+E{l z80uWi*#-=C#CXoDLx^^d^L|~F+~!2)xXJlqVqRyiPCBWdx7A(jmuPcpuYzgWKfOT` zl)K$l_12P&BXN&l{7tp*3s{AN*yM=RSj?~b{e*FX+)Uo=Io|Jqr%Lv&3C=Rz&Q#OH zaSfVomp~|ySkC>_+ED5a)!JUfx3R-$M4NI5tD)c3P=j1*YHqp8CiG~(E!!jmdUYss0Yq>jcv4{c{JFxJh(@>JSaOn);qVgOODS& z-GM2wjs45zF=f;8;C|}zpe#J*UcJ+*#&X@)XY{le$O&_L@>qMPf#Vu&W%sN}ZqK5O ziRDV2l3%YpD2r&P+o~T6q`Z1Au=Cc}KvrUXoMjNdY)yX>(KeO$Z&Qx`F7TYfzF9tu z2k!A!W;{@q{=ipk5*gcgy>$>X$r%RPtrydG=#D+Nk`iy7##4p4h133O?RAvVT1N*Zs3TMxPGlg0tnq@^e=&KY#Jk)|Ka` z<4eX|_&jl!eE6g>&&RGSO}_cRd}coK(Z{ZTu+7L9l;(NIk)G$ns5oq_Fpdk$Y;$h* zp#b$f&8PZscsxFgx_Lev#S`+WK1Lpo4`<^%ACBS)`BWb`kH?3RJI@DkbN77q`uIjH zuMTNj>{RiCb-T53RQzxT&-1Z%Y&_ZnR8)TZ!XbLb_m%k@KxE}X-upeuCwnOr~G#$S79MbE4kVA ziTPQsEwr1rFpLkld#`ySHVVX<*Pj5 zk@$$Uiccf+9PHW9#v0!ZSpP_@vCW29W7}Bg7G8Mq)-zAjG7@#{%S$3@nRa_5DNG?C z=S|{b6ldE#9=LJ(s^5g_I-I3T8nc?FamL!T4O=*Ok>Pwl&O%AsVqeblIN6PpV3Za1 zbFJ85uq;(Yz96BhxDVHFt-JDfROh9iI^{ofWT+Q@UYE(4pR>pKLC*Y?g;N@a$V%A? z?o-c4tN08th<6%}x7OCeZ%{|h3R#Ibq$O>O_NQ$507$7Wr~m&9nRApExl#AF_pK;j z{Ov#gVsxB4?(+`DK%eJf4#O`kvMytmXF868mESV5^b>#E!2?_iDk&#!nx6nzTyY^k zIZ5HJeKp>f|Kf-hjpMtfX*;O~LC<9SMO$)8z+G&WyW>$m+Z&oFAdY9_X?P72V8o&F?Fvwma)leqc*84wL2xwd3ig^sq|%gcjd zl$3>V*9q91AdF?&C6Fi+vm3~D9K#Du_eV~1Mip?i>+%nuWVo0x^VN-O(psB&pfX) zP~O_Qe)Yzg_M>&3GpMt-g`(}Pr*CX;Y;3euEj_+b3!9sptYx`>8~F!ux#M;pgCS92 zmgd1I?j@0`KTzgD5e-LbCFuA0hd7_lex+I|<5wb+FQXz3l9tkUyj&8wWA5uJ#aorE zukat0?Q&e^(NO2J!9aA`kT-=!iUWN75-ir`ATi&=%2Af6H1sq)?E3_iYA-jLG}w2jPw+I0G0OAgKryJ)xQw>@X`uVm8xIEP zQoZ}ps3UT;(l{)#NtTRUJ=$o}2gzP=Q2K}<9y{#Il4>(6;{ML`-#N{Dl-0p_7=lvt zvM(csrXZBNY9GJqfIoS>FWpy3G#G8CL9r7LRT1y(RsuR16}BYF_G)3bJQ#-C3H|^& asdCJyiMRxZ&W;L)BTTp;FI6wk)&BsSUL)K9 diff --git a/fdts/fvp-base-gicv3-psci.dts b/fdts/fvp-base-gicv3-psci.dts index 5d54dbf32..57f351615 100644 --- a/fdts/fvp-base-gicv3-psci.dts +++ b/fdts/fvp-base-gicv3-psci.dts @@ -57,6 +57,8 @@ cpu_suspend = <0xc4000001>; cpu_off = <0x84000002>; cpu_on = <0xc4000003>; + sys_poweroff = <0x84000008>; + sys_reset = <0x84000009>; }; cpus { @@ -310,7 +312,7 @@ <0 0 41 &gic 0 0 0 41 4>, <0 0 42 &gic 0 0 0 42 4>; - /include/ "rtsm_ve-motherboard-no_psci.dtsi" + /include/ "rtsm_ve-motherboard.dtsi" }; panels { diff --git a/fdts/fvp-foundation-gicv3-psci.dtb b/fdts/fvp-foundation-gicv3-psci.dtb index 44024369911bcec285fa92f881109857ce133aa8..34bf8db662ccd190da6de31ab70f491b6d38c54d 100644 GIT binary patch delta 2152 zcmb_d&r4KM6u$TA%yVWO)R}Q~<~eFcsEL%CQd&6uoWjak6{Mmu%}}U~j8d3_LJ}@q z1Q%OGP+*bUYSW@+K?|Xv{(xCTv`7$i;i~%1ow>fJPgnNfa?h{teCM2d-+QakmG0)R z-ao61)vPeaE;1G=#omBbhD9D{KM-pRj-T3_F`5Q-iY3%>3U-D8c8eEaK&4-*A;YUDJ!RtU%33jwOZuzDvA%cd>7s8{yFh&aBetEjO6ojug{IPfL5-HTg%S zc*37!tv6mkR(iihhgq8tn?}qr578^;tGXRakaRH=iSZ?|9C;obpBx_?OW#js(y0_9 PC6gRaPQ1HNU9bHECAGjs delta 2290 zcmb_dO>0w46rQ=gO`4dZP1CeZQ(G0k4cb~iUb|@YMG`4e7ouP-RNIK6F)>l!4@3)Y zi-_~$M!^ayF62dVTT=y&qDO)g%DXGdSBwX4!aF|88()4ALlcaW>jA!`D9<%QDtZH*cIBUTTT^9xdHkJ z(S+?{(@vQ_+CB&Y%eK?6X5XsKb-NmB+9vME1ky(!zghqgG<~pi5QJV>IthZ7UQu)IN=JNCj{|EbSg~2mxEal9 zDVC>BRS$XAg0ncD%+d-Z*Lb#Cr6gkaOyw1oZC*Z~h_(CaXzWb&&-z*|H^!R=AOj-vb4@ulE~xcHXOEVmw{Ao_<^NB+ zB5MQkxk^XJ8$9ToRga=0-HhsR;*BpOV!Q3bE8ft6RUM-Lhm z8;YN8AKvc+i=}(gRj;K4UmVQuD&>tG+wxu& zW7TvxpZevy9V?*TNXOW2*Q*oWo*fVQrS2<#KsGM`d&9Y+Qae`1Xv)<--iMVe=(xiM zkd@xx_kE><+3`iJhxm5ry3!k-2c|h-xO$C!=aE zF}2MV82AGIyh!xNvo<&Cr~@i=9rWaFe^4bgcUxOA*i?s%cV6jiDt+39ICvOo@;; cpu_off = <0x84000002>; cpu_on = <0xc4000003>; + sys_poweroff = <0x84000008>; + sys_reset = <0x84000009>; }; cpus { @@ -259,6 +261,6 @@ <0 0 41 &gic 0 0 0 41 4>, <0 0 42 &gic 0 0 0 42 4>; - /include/ "fvp-foundation-motherboard-no_psci.dtsi" + /include/ "fvp-foundation-motherboard.dtsi" }; }; diff --git a/fdts/fvp-foundation-motherboard-no_psci.dtsi b/fdts/fvp-foundation-motherboard-no_psci.dtsi deleted file mode 100644 index fd41c8ae2..000000000 --- a/fdts/fvp-foundation-motherboard-no_psci.dtsi +++ /dev/null @@ -1,197 +0,0 @@ -/* - * Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * Neither the name of the ARM nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - - motherboard { - arm,v2m-memory-map = "rs1"; - compatible = "arm,vexpress,v2m-p1", "simple-bus"; - #address-cells = <2>; /* SMB chipselect number and offset */ - #size-cells = <1>; - #interrupt-cells = <1>; - ranges; - - ethernet@2,02000000 { - compatible = "smsc,lan91c111"; - reg = <2 0x02000000 0x10000>; - interrupts = <15>; - }; - - v2m_clk24mhz: clk24mhz { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <24000000>; - clock-output-names = "v2m:clk24mhz"; - }; - - v2m_refclk1mhz: refclk1mhz { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <1000000>; - clock-output-names = "v2m:refclk1mhz"; - }; - - v2m_refclk32khz: refclk32khz { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <32768>; - clock-output-names = "v2m:refclk32khz"; - }; - - iofpga@3,00000000 { - compatible = "arm,amba-bus", "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 3 0 0x200000>; - - v2m_sysreg: sysreg@010000 { - compatible = "arm,vexpress-sysreg"; - reg = <0x010000 0x1000>; - gpio-controller; - #gpio-cells = <2>; - }; - - v2m_sysctl: sysctl@020000 { - compatible = "arm,sp810", "arm,primecell"; - reg = <0x020000 0x1000>; - clocks = <&v2m_refclk32khz>, <&v2m_refclk1mhz>, <&v2m_clk24mhz>; - clock-names = "refclk", "timclk", "apb_pclk"; - #clock-cells = <1>; - clock-output-names = "timerclken0", "timerclken1", "timerclken2", "timerclken3"; - }; - - v2m_serial0: uart@090000 { - compatible = "arm,pl011", "arm,primecell"; - reg = <0x090000 0x1000>; - interrupts = <5>; - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>; - clock-names = "uartclk", "apb_pclk"; - }; - - v2m_serial1: uart@0a0000 { - compatible = "arm,pl011", "arm,primecell"; - reg = <0x0a0000 0x1000>; - interrupts = <6>; - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>; - clock-names = "uartclk", "apb_pclk"; - }; - - v2m_serial2: uart@0b0000 { - compatible = "arm,pl011", "arm,primecell"; - reg = <0x0b0000 0x1000>; - interrupts = <7>; - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>; - clock-names = "uartclk", "apb_pclk"; - }; - - v2m_serial3: uart@0c0000 { - compatible = "arm,pl011", "arm,primecell"; - reg = <0x0c0000 0x1000>; - interrupts = <8>; - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>; - clock-names = "uartclk", "apb_pclk"; - }; - - wdt@0f0000 { - compatible = "arm,sp805", "arm,primecell"; - reg = <0x0f0000 0x1000>; - interrupts = <0>; - clocks = <&v2m_refclk32khz>, <&v2m_clk24mhz>; - clock-names = "wdogclk", "apb_pclk"; - }; - - v2m_timer01: timer@110000 { - compatible = "arm,sp804", "arm,primecell"; - reg = <0x110000 0x1000>; - interrupts = <2>; - clocks = <&v2m_sysctl 0>, <&v2m_sysctl 1>, <&v2m_clk24mhz>; - clock-names = "timclken1", "timclken2", "apb_pclk"; - }; - - v2m_timer23: timer@120000 { - compatible = "arm,sp804", "arm,primecell"; - reg = <0x120000 0x1000>; - interrupts = <3>; - clocks = <&v2m_sysctl 2>, <&v2m_sysctl 3>, <&v2m_clk24mhz>; - clock-names = "timclken1", "timclken2", "apb_pclk"; - }; - - rtc@170000 { - compatible = "arm,pl031", "arm,primecell"; - reg = <0x170000 0x1000>; - interrupts = <4>; - clocks = <&v2m_clk24mhz>; - clock-names = "apb_pclk"; - }; - - virtio_block@0130000 { - compatible = "virtio,mmio"; - reg = <0x130000 0x1000>; - interrupts = <0x2a>; - }; - }; - - v2m_fixed_3v3: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "3V3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - - - mcc { - compatible = "arm,vexpress,config-bus", "simple-bus"; - arm,vexpress,config-bridge = <&v2m_sysreg>; - - reset@0 { - compatible = "arm,vexpress-reset"; - arm,vexpress-sysreg,func = <5 0>; - }; - - muxfpga@0 { - compatible = "arm,vexpress-muxfpga"; - arm,vexpress-sysreg,func = <7 0>; - }; - - shutdown@0 { - compatible = "arm,vexpress-shutdown"; - arm,vexpress-sysreg,func = <8 0>; - }; - - reboot@0 { - compatible = "arm,vexpress-reboot"; - arm,vexpress-sysreg,func = <9 0>; - }; - - dvimode@0 { - compatible = "arm,vexpress-dvimode"; - arm,vexpress-sysreg,func = <11 0>; - }; - }; - }; diff --git a/fdts/rtsm_ve-motherboard-no_psci.dtsi b/fdts/rtsm_ve-motherboard-no_psci.dtsi deleted file mode 100644 index 7ba575ea7..000000000 --- a/fdts/rtsm_ve-motherboard-no_psci.dtsi +++ /dev/null @@ -1,264 +0,0 @@ -/* - * Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * Neither the name of ARM nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - - motherboard { - arm,v2m-memory-map = "rs1"; - compatible = "arm,vexpress,v2m-p1", "simple-bus"; - #address-cells = <2>; /* SMB chipselect number and offset */ - #size-cells = <1>; - #interrupt-cells = <1>; - ranges; - - flash@0,00000000 { - compatible = "arm,vexpress-flash", "cfi-flash"; - reg = <0 0x00000000 0x04000000>, - <4 0x00000000 0x04000000>; - bank-width = <4>; - }; - - vram@2,00000000 { - compatible = "arm,vexpress-vram"; - reg = <2 0x00000000 0x00800000>; - }; - - ethernet@2,02000000 { - compatible = "smsc,lan91c111"; - reg = <2 0x02000000 0x10000>; - interrupts = <15>; - }; - - v2m_clk24mhz: clk24mhz { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <24000000>; - clock-output-names = "v2m:clk24mhz"; - }; - - v2m_refclk1mhz: refclk1mhz { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <1000000>; - clock-output-names = "v2m:refclk1mhz"; - }; - - v2m_refclk32khz: refclk32khz { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <32768>; - clock-output-names = "v2m:refclk32khz"; - }; - - iofpga@3,00000000 { - compatible = "arm,amba-bus", "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 3 0 0x200000>; - - v2m_sysreg: sysreg@010000 { - compatible = "arm,vexpress-sysreg"; - reg = <0x010000 0x1000>; - gpio-controller; - #gpio-cells = <2>; - }; - - v2m_sysctl: sysctl@020000 { - compatible = "arm,sp810", "arm,primecell"; - reg = <0x020000 0x1000>; - clocks = <&v2m_refclk32khz>, <&v2m_refclk1mhz>, <&v2m_clk24mhz>; - clock-names = "refclk", "timclk", "apb_pclk"; - #clock-cells = <1>; - clock-output-names = "timerclken0", "timerclken1", "timerclken2", "timerclken3"; - }; - - aaci@040000 { - compatible = "arm,pl041", "arm,primecell"; - reg = <0x040000 0x1000>; - interrupts = <11>; - clocks = <&v2m_clk24mhz>; - clock-names = "apb_pclk"; - }; - - mmci@050000 { - compatible = "arm,pl180", "arm,primecell"; - reg = <0x050000 0x1000>; - interrupts = <9 10>; - cd-gpios = <&v2m_sysreg 0 0>; - wp-gpios = <&v2m_sysreg 1 0>; - max-frequency = <12000000>; - vmmc-supply = <&v2m_fixed_3v3>; - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>; - clock-names = "mclk", "apb_pclk"; - }; - - kmi@060000 { - compatible = "arm,pl050", "arm,primecell"; - reg = <0x060000 0x1000>; - interrupts = <12>; - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>; - clock-names = "KMIREFCLK", "apb_pclk"; - }; - - kmi@070000 { - compatible = "arm,pl050", "arm,primecell"; - reg = <0x070000 0x1000>; - interrupts = <13>; - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>; - clock-names = "KMIREFCLK", "apb_pclk"; - }; - - v2m_serial0: uart@090000 { - compatible = "arm,pl011", "arm,primecell"; - reg = <0x090000 0x1000>; - interrupts = <5>; - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>; - clock-names = "uartclk", "apb_pclk"; - }; - - v2m_serial1: uart@0a0000 { - compatible = "arm,pl011", "arm,primecell"; - reg = <0x0a0000 0x1000>; - interrupts = <6>; - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>; - clock-names = "uartclk", "apb_pclk"; - }; - - v2m_serial2: uart@0b0000 { - compatible = "arm,pl011", "arm,primecell"; - reg = <0x0b0000 0x1000>; - interrupts = <7>; - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>; - clock-names = "uartclk", "apb_pclk"; - }; - - v2m_serial3: uart@0c0000 { - compatible = "arm,pl011", "arm,primecell"; - reg = <0x0c0000 0x1000>; - interrupts = <8>; - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>; - clock-names = "uartclk", "apb_pclk"; - }; - - wdt@0f0000 { - compatible = "arm,sp805", "arm,primecell"; - reg = <0x0f0000 0x1000>; - interrupts = <0>; - clocks = <&v2m_refclk32khz>, <&v2m_clk24mhz>; - clock-names = "wdogclk", "apb_pclk"; - }; - - v2m_timer01: timer@110000 { - compatible = "arm,sp804", "arm,primecell"; - reg = <0x110000 0x1000>; - interrupts = <2>; - clocks = <&v2m_sysctl 0>, <&v2m_sysctl 1>, <&v2m_clk24mhz>; - clock-names = "timclken1", "timclken2", "apb_pclk"; - }; - - v2m_timer23: timer@120000 { - compatible = "arm,sp804", "arm,primecell"; - reg = <0x120000 0x1000>; - interrupts = <3>; - clocks = <&v2m_sysctl 2>, <&v2m_sysctl 3>, <&v2m_clk24mhz>; - clock-names = "timclken1", "timclken2", "apb_pclk"; - }; - - rtc@170000 { - compatible = "arm,pl031", "arm,primecell"; - reg = <0x170000 0x1000>; - interrupts = <4>; - clocks = <&v2m_clk24mhz>; - clock-names = "apb_pclk"; - }; - - clcd@1f0000 { - compatible = "arm,pl111", "arm,primecell"; - reg = <0x1f0000 0x1000>; - interrupts = <14>; - clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>; - clock-names = "clcdclk", "apb_pclk"; - mode = "XVGA"; - use_dma = <0>; - framebuffer = <0x18000000 0x00180000>; - }; - - virtio_block@0130000 { - compatible = "virtio,mmio"; - reg = <0x130000 0x1000>; - interrupts = <0x2a>; - }; - }; - - v2m_fixed_3v3: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "3V3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - - mcc { - compatible = "arm,vexpress,config-bus", "simple-bus"; - arm,vexpress,config-bridge = <&v2m_sysreg>; - - v2m_oscclk1: osc@1 { - /* CLCD clock */ - compatible = "arm,vexpress-osc"; - arm,vexpress-sysreg,func = <1 1>; - freq-range = <23750000 63500000>; - #clock-cells = <0>; - clock-output-names = "v2m:oscclk1"; - }; - - reset@0 { - compatible = "arm,vexpress-reset"; - arm,vexpress-sysreg,func = <5 0>; - }; - - muxfpga@0 { - compatible = "arm,vexpress-muxfpga"; - arm,vexpress-sysreg,func = <7 0>; - }; - - shutdown@0 { - compatible = "arm,vexpress-shutdown"; - arm,vexpress-sysreg,func = <8 0>; - }; - - reboot@0 { - compatible = "arm,vexpress-reboot"; - arm,vexpress-sysreg,func = <9 0>; - }; - - dvimode@0 { - compatible = "arm,vexpress-dvimode"; - arm,vexpress-sysreg,func = <11 0>; - }; - }; - };