diff options
author | Hans de Goede <hdegoede@redhat.com> | 2016-07-08 12:05:53 -0400 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2016-07-18 05:39:50 -0400 |
commit | 8bb55cf157fdb6c5e930b2dcc47bc72a24646f75 (patch) | |
tree | b59b7dc62d3c6795048488a5fed00153d6ebfa95 | |
parent | a0e4eb4b81b44663f21b289d8126ca6f6dc8a863 (diff) |
ARM: dts: sun8i: Use sun8i-reference-design-tablet for ga10h dts
This results in quite a nice cleanup for this dts file.
As an added bonus this also enables backlight, regulator and full otg
support. I've tested that all these works as advertised.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
-rw-r--r-- | arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts | 77 |
1 files changed, 1 insertions, 76 deletions
diff --git a/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts b/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts index 1aefc6793e25..65660324005c 100644 --- a/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts +++ b/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts | |||
@@ -42,59 +42,18 @@ | |||
42 | 42 | ||
43 | /dts-v1/; | 43 | /dts-v1/; |
44 | #include "sun8i-a33.dtsi" | 44 | #include "sun8i-a33.dtsi" |
45 | #include "sunxi-common-regulators.dtsi" | 45 | #include "sun8i-reference-design-tablet.dtsi" |
46 | |||
47 | #include <dt-bindings/gpio/gpio.h> | ||
48 | #include <dt-bindings/input/input.h> | ||
49 | #include <dt-bindings/pinctrl/sun4i-a10.h> | ||
50 | 46 | ||
51 | / { | 47 | / { |
52 | model = "Allwinner GA10H Quad Core Tablet (v1.1)"; | 48 | model = "Allwinner GA10H Quad Core Tablet (v1.1)"; |
53 | compatible = "allwinner,ga10h-v1.1", "allwinner,sun8i-a33"; | 49 | compatible = "allwinner,ga10h-v1.1", "allwinner,sun8i-a33"; |
54 | |||
55 | aliases { | ||
56 | serial0 = &r_uart; | ||
57 | }; | ||
58 | |||
59 | chosen { | ||
60 | stdout-path = "serial0:115200n8"; | ||
61 | }; | ||
62 | }; | 50 | }; |
63 | 51 | ||
64 | &ehci0 { | 52 | &ehci0 { |
65 | status = "okay"; | 53 | status = "okay"; |
66 | }; | 54 | }; |
67 | 55 | ||
68 | &i2c0 { | ||
69 | pinctrl-names = "default"; | ||
70 | pinctrl-0 = <&i2c0_pins_a>; | ||
71 | status = "okay"; | ||
72 | }; | ||
73 | |||
74 | &i2c1 { | ||
75 | pinctrl-names = "default"; | ||
76 | pinctrl-0 = <&i2c1_pins_a>; | ||
77 | status = "okay"; | ||
78 | }; | ||
79 | |||
80 | &lradc { | 56 | &lradc { |
81 | vref-supply = <®_vcc3v0>; | ||
82 | status = "okay"; | ||
83 | |||
84 | button@200 { | ||
85 | label = "Volume Up"; | ||
86 | linux,code = <KEY_VOLUMEUP>; | ||
87 | channel = <0>; | ||
88 | voltage = <200000>; | ||
89 | }; | ||
90 | |||
91 | button@400 { | ||
92 | label = "Volume Down"; | ||
93 | linux,code = <KEY_VOLUMEDOWN>; | ||
94 | channel = <0>; | ||
95 | voltage = <400000>; | ||
96 | }; | ||
97 | |||
98 | button@600 { | 57 | button@600 { |
99 | label = "Back"; | 58 | label = "Back"; |
100 | linux,code = <KEY_BACK>; | 59 | linux,code = <KEY_BACK>; |
@@ -103,40 +62,6 @@ | |||
103 | }; | 62 | }; |
104 | }; | 63 | }; |
105 | 64 | ||
106 | &mmc0 { | ||
107 | pinctrl-names = "default"; | ||
108 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_q8h>; | ||
109 | vmmc-supply = <®_vcc3v0>; | ||
110 | bus-width = <4>; | ||
111 | cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */ | ||
112 | cd-inverted; | ||
113 | status = "okay"; | ||
114 | }; | ||
115 | |||
116 | &ohci0 { | 65 | &ohci0 { |
117 | status = "okay"; | 66 | status = "okay"; |
118 | }; | 67 | }; |
119 | |||
120 | &pio { | ||
121 | mmc0_cd_pin_q8h: mmc0_cd_pin@0 { | ||
122 | allwinner,pins = "PB4"; | ||
123 | allwinner,function = "gpio_in"; | ||
124 | allwinner,drive = <SUN4I_PINCTRL_10_MA>; | ||
125 | allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; | ||
126 | }; | ||
127 | }; | ||
128 | |||
129 | &r_uart { | ||
130 | pinctrl-names = "default"; | ||
131 | pinctrl-0 = <&r_uart_pins_a>; | ||
132 | status = "okay"; | ||
133 | }; | ||
134 | |||
135 | &usb_otg { | ||
136 | dr_mode = "host"; | ||
137 | status = "okay"; | ||
138 | }; | ||
139 | |||
140 | &usbphy { | ||
141 | status = "okay"; | ||
142 | }; | ||