author | Dan Murphy <dmurphy@ti.com> | |
Fri, 31 May 2013 20:19:19 +0000 (15:19 -0500) | ||
committer | Dan Murphy <dmurphy@ti.com> | |
Fri, 31 May 2013 20:19:19 +0000 (15:19 -0500) |
TI-Feature: J6-sd-mmc
TI-Tree: git://git.ti.com/~balajitk/ti-linux-kernel/omap-hsmmc into ti-linux-3.8.y
TI-Branch: sdmmc-dra-linux-3.8.y
* 'sdmmc-dra-linux-3.8.y' of git://git.ti.com/~balajitk/ti-linux-kernel/omap-hsmmc:
ARM: dra7: dts: Add a fixed regulator node needed for eMMC
arm/dts: dra7: Add ldo regulator for mmc1
arm/dts: dra7: Add mmc controller nodes and board data
ARM: DRA: hwmod: Correct the dma line names for mmc
Signed-off-by: Dan Murphy <dmurphy@ti.com>
TI-Tree: git://git.ti.com/~balajitk/ti-linux-kernel/omap-hsmmc into ti-linux-3.8.y
TI-Branch: sdmmc-dra-linux-3.8.y
* 'sdmmc-dra-linux-3.8.y' of git://git.ti.com/~balajitk/ti-linux-kernel/omap-hsmmc:
ARM: dra7: dts: Add a fixed regulator node needed for eMMC
arm/dts: dra7: Add ldo regulator for mmc1
arm/dts: dra7: Add mmc controller nodes and board data
ARM: DRA: hwmod: Correct the dma line names for mmc
Signed-off-by: Dan Murphy <dmurphy@ti.com>
1 | 2 | |||
---|---|---|---|---|
arch/arm/boot/dts/dra7-evm.dts | patch | | diff1 | | diff2 | | blob | history |
arch/arm/boot/dts/dra7.dtsi | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/boot/dts/dra7-evm.dts
index 1084acd876585cfffeb2db8ea683e1fd7948fc0d,375db4d7ce2d003208a1eb43c8e0bc69e493ba78..896d885f94f1d12d99045bc3d2749d17c227b094
device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */
};
+
+ vmmc2_fixed: fixedregulator-mmc2 {
+ compatible = "regulator-fixed";
+ regulator-name = "vmmc2_fixed";
+ regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3000000>;
+ };
};
+&dra7_pmx_core {
+ pinctrl-names = "default";
+ pinctrl-0 = <
+ &vout1_pins
+ >;
+
+ i2c2_pins: pinmux_i2c2_pins {
+ pinctrl-single,pins = <
+ 0x408 0x60000 /* i2c2_sda INPUT | MODE0 */
+ 0x40C 0x60000 /* i2c2_scl INPUT | MODE0 */
+ >;
+ };
+
+ vout1_pins: pinmux_vout1_pins {
+ pinctrl-single,pins = <
+ 0x1C8 0x0 /* vout1_clk OUTPUT | MODE0 */
+ 0x1CC 0x0 /* vout1_de OUTPUT | MODE0 */
+ 0x1D0 0x0 /* vout1_fld OUTPUT | MODE0 */
+ 0x1D4 0x0 /* vout1_hsync OUTPUT | MODE0 */
+ 0x1D8 0x0 /* vout1_vsync OUTPUT | MODE0 */
+ 0x1DC 0x0 /* vout1_d0 OUTPUT | MODE0 */
+ 0x1E0 0x0 /* vout1_d1 OUTPUT | MODE0 */
+ 0x1E4 0x0 /* vout1_d2 OUTPUT | MODE0 */
+ 0x1E8 0x0 /* vout1_d3 OUTPUT | MODE0 */
+ 0x1EC 0x0 /* vout1_d4 OUTPUT | MODE0 */
+ 0x1F0 0x0 /* vout1_d5 OUTPUT | MODE0 */
+ 0x1F4 0x0 /* vout1_d6 OUTPUT | MODE0 */
+ 0x1F8 0x0 /* vout1_d7 OUTPUT | MODE0 */
+ 0x1FC 0x0 /* vout1_d8 OUTPUT | MODE0 */
+ 0x200 0x0 /* vout1_d9 OUTPUT | MODE0 */
+ 0x204 0x0 /* vout1_d10 OUTPUT | MODE0 */
+ 0x208 0x0 /* vout1_d11 OUTPUT | MODE0 */
+ 0x20C 0x0 /* vout1_d12 OUTPUT | MODE0 */
+ 0x210 0x0 /* vout1_d13 OUTPUT | MODE0 */
+ 0x214 0x0 /* vout1_d14 OUTPUT | MODE0 */
+ 0x218 0x0 /* vout1_d15 OUTPUT | MODE0 */
+ 0x21C 0x0 /* vout1_d16 OUTPUT | MODE0 */
+ 0x220 0x0 /* vout1_d17 OUTPUT | MODE0 */
+ 0x224 0x0 /* vout1_d18 OUTPUT | MODE0 */
+ 0x228 0x0 /* vout1_d19 OUTPUT | MODE0 */
+ 0x22C 0x0 /* vout1_d20 OUTPUT | MODE0 */
+ 0x230 0x0 /* vout1_d21 OUTPUT | MODE0 */
+ 0x234 0x0 /* vout1_d22 OUTPUT | MODE0 */
+ 0x238 0x0 /* vout1_d23 OUTPUT | MODE0 */
+ >;
+ };
+};
+
&i2c1 {
clock-frequency = <400000>;
+
tps659038: tps659038@58 {
reg = <0x58>;
};
diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge