diff options
author | Hans de Goede <hdegoede@redhat.com> | 2014-05-02 11:57:22 -0400 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-05-04 23:52:54 -0400 |
commit | 31064bbd6dc3d49fe18f97d81e6ef2cb0358c9c8 (patch) | |
tree | 912ee77a1108c93d65e25bda7d68f5096f2924a4 /arch/arm | |
parent | d3aed1dfbd2e66ff2eca14897fa141a989a36fb0 (diff) |
ARM: dts: sun5i: Enable mmc controller on various A10s and A13 boards
The cd pin settings have been taken from the original firmware fex files,
and have been confirmed to work on the actual boards.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 32 | ||||
-rw-r--r-- | arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 16 | ||||
-rw-r--r-- | arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 16 |
3 files changed, 64 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts index 23611b71d3aa..de9130848704 100644 --- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | |||
@@ -35,6 +35,24 @@ | |||
35 | }; | 35 | }; |
36 | }; | 36 | }; |
37 | 37 | ||
38 | mmc0: mmc@01c0f000 { | ||
39 | pinctrl-names = "default"; | ||
40 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino_micro>; | ||
41 | bus-width = <4>; | ||
42 | cd-gpios = <&pio 6 1 0>; /* PG1 */ | ||
43 | cd-inverted; | ||
44 | status = "okay"; | ||
45 | }; | ||
46 | |||
47 | mmc1: mmc@01c10000 { | ||
48 | pinctrl-names = "default"; | ||
49 | pinctrl-0 = <&mmc1_pins_a>, <&mmc1_cd_pin_olinuxino_micro>; | ||
50 | bus-width = <4>; | ||
51 | cd-gpios = <&pio 6 13 0>; /* PG13 */ | ||
52 | cd-inverted; | ||
53 | status = "okay"; | ||
54 | }; | ||
55 | |||
38 | usbphy: phy@01c13400 { | 56 | usbphy: phy@01c13400 { |
39 | usb1_vbus-supply = <®_usb1_vbus>; | 57 | usb1_vbus-supply = <®_usb1_vbus>; |
40 | status = "okay"; | 58 | status = "okay"; |
@@ -49,6 +67,20 @@ | |||
49 | }; | 67 | }; |
50 | 68 | ||
51 | pinctrl@01c20800 { | 69 | pinctrl@01c20800 { |
70 | mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin@0 { | ||
71 | allwinner,pins = "PG1"; | ||
72 | allwinner,function = "gpio_in"; | ||
73 | allwinner,drive = <0>; | ||
74 | allwinner,pull = <1>; | ||
75 | }; | ||
76 | |||
77 | mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin@0 { | ||
78 | allwinner,pins = "PG13"; | ||
79 | allwinner,function = "gpio_in"; | ||
80 | allwinner,drive = <0>; | ||
81 | allwinner,pull = <1>; | ||
82 | }; | ||
83 | |||
52 | led_pins_olinuxino: led_pins@0 { | 84 | led_pins_olinuxino: led_pins@0 { |
53 | allwinner,pins = "PE3"; | 85 | allwinner,pins = "PE3"; |
54 | allwinner,function = "gpio_out"; | 86 | allwinner,function = "gpio_out"; |
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts index 11169d5b5b86..8515f19477d2 100644 --- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | |||
@@ -21,6 +21,15 @@ | |||
21 | compatible = "olimex,a13-olinuxino-micro", "allwinner,sun5i-a13"; | 21 | compatible = "olimex,a13-olinuxino-micro", "allwinner,sun5i-a13"; |
22 | 22 | ||
23 | soc@01c00000 { | 23 | soc@01c00000 { |
24 | mmc0: mmc@01c0f000 { | ||
25 | pinctrl-names = "default"; | ||
26 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxinom>; | ||
27 | bus-width = <4>; | ||
28 | cd-gpios = <&pio 6 0 0>; /* PG0 */ | ||
29 | cd-inverted; | ||
30 | status = "okay"; | ||
31 | }; | ||
32 | |||
24 | usbphy: phy@01c13400 { | 33 | usbphy: phy@01c13400 { |
25 | usb1_vbus-supply = <®_usb1_vbus>; | 34 | usb1_vbus-supply = <®_usb1_vbus>; |
26 | status = "okay"; | 35 | status = "okay"; |
@@ -35,6 +44,13 @@ | |||
35 | }; | 44 | }; |
36 | 45 | ||
37 | pinctrl@01c20800 { | 46 | pinctrl@01c20800 { |
47 | mmc0_cd_pin_olinuxinom: mmc0_cd_pin@0 { | ||
48 | allwinner,pins = "PG0"; | ||
49 | allwinner,function = "gpio_in"; | ||
50 | allwinner,drive = <0>; | ||
51 | allwinner,pull = <1>; | ||
52 | }; | ||
53 | |||
38 | led_pins_olinuxinom: led_pins@0 { | 54 | led_pins_olinuxinom: led_pins@0 { |
39 | allwinner,pins = "PG9"; | 55 | allwinner,pins = "PG9"; |
40 | allwinner,function = "gpio_out"; | 56 | allwinner,function = "gpio_out"; |
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts index 7a9187bbeb28..51a943837cb2 100644 --- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts +++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts | |||
@@ -20,6 +20,15 @@ | |||
20 | compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13"; | 20 | compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13"; |
21 | 21 | ||
22 | soc@01c00000 { | 22 | soc@01c00000 { |
23 | mmc0: mmc@01c0f000 { | ||
24 | pinctrl-names = "default"; | ||
25 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>; | ||
26 | bus-width = <4>; | ||
27 | cd-gpios = <&pio 6 0 0>; /* PG0 */ | ||
28 | cd-inverted; | ||
29 | status = "okay"; | ||
30 | }; | ||
31 | |||
23 | usbphy: phy@01c13400 { | 32 | usbphy: phy@01c13400 { |
24 | usb1_vbus-supply = <®_usb1_vbus>; | 33 | usb1_vbus-supply = <®_usb1_vbus>; |
25 | status = "okay"; | 34 | status = "okay"; |
@@ -34,6 +43,13 @@ | |||
34 | }; | 43 | }; |
35 | 44 | ||
36 | pinctrl@01c20800 { | 45 | pinctrl@01c20800 { |
46 | mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 { | ||
47 | allwinner,pins = "PG0"; | ||
48 | allwinner,function = "gpio_in"; | ||
49 | allwinner,drive = <0>; | ||
50 | allwinner,pull = <1>; | ||
51 | }; | ||
52 | |||
37 | led_pins_olinuxino: led_pins@0 { | 53 | led_pins_olinuxino: led_pins@0 { |
38 | allwinner,pins = "PG9"; | 54 | allwinner,pins = "PG9"; |
39 | allwinner,function = "gpio_out"; | 55 | allwinner,function = "gpio_out"; |