From: Simon Horman Date: Wed, 15 May 2013 02:10:06 +0000 (+0900) Subject: Merge branch 'heads/soc-sh73a0' into next X-Git-Tag: next-20130521~8^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c482a654c61eab87ea66d3e3613f05c7b1447173;p=karo-tx-linux.git Merge branch 'heads/soc-sh73a0' into next Conflicts: arch/arm/boot/dts/sh73a0.dtsi --- c482a654c61eab87ea66d3e3613f05c7b1447173 diff --cc arch/arm/boot/dts/sh73a0.dtsi index ec40bf78289e,82f16bf84780..17fd9c6e04ce --- a/arch/arm/boot/dts/sh73a0.dtsi +++ b/arch/arm/boot/dts/sh73a0.dtsi @@@ -179,47 -179,14 +179,58 @@@ 0 190 0x4>; }; + timer@e6138010 { + compatible = "renesas,cmt-timer"; + interrupt-parent = <&gic>; + reg = <0xe6138010 0xc>; + interrupts = <0 65 0x4>; + renesas,device-id = <1>; + renesas,channel-id = <0>; + renesas,source-quality = <3>; + renesas,event-quality = <3>; + }; ++ + mmcif: mmcif@0x10010000 { + compatible = "renesas,sh-mmcif"; + reg = <0xe6bd0000 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 140 0x4 + 0 141 0x4>; + reg-io-width = <4>; + status = "disabled"; + }; + + sdhi0: sdhi@0xee100000 { + compatible = "renesas,r8a7740-sdhi"; + reg = <0xee100000 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 83 4 + 0 84 4 + 0 85 4>; + cap-sd-highspeed; + status = "disabled"; + }; + + /* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */ + sdhi1: sdhi@0xee120000 { + compatible = "renesas,r8a7740-sdhi"; + reg = <0xee120000 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 88 4 + 0 89 4>; + toshiba,mmc-wrprotect-disable; + cap-sd-highspeed; + status = "disabled"; + }; + + sdhi2: sdhi@0xee140000 { + compatible = "renesas,r8a7740-sdhi"; + reg = <0xee140000 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 104 4 + 0 105 4>; + toshiba,mmc-wrprotect-disable; + cap-sd-highspeed; + status = "disabled"; + }; };