Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: sun5i: Use sun5i-reference-design-tablet.dtsi for dit4350 dts

This results in quite a nice cleanup for this dts file.

Note as a side-effect this also enables the on board speaker / headphones
out. I've tested that this works as advertised.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

authored by

Hans de Goede and committed by
Maxime Ripard
f51203b2 86ee0974

+1 -177
+1 -177
arch/arm/boot/dts/sun5i-a13-difrnce-dit4350.dts
··· 42 42 43 43 /dts-v1/; 44 44 #include "sun5i-a13.dtsi" 45 - #include "sunxi-common-regulators.dtsi" 46 - #include <dt-bindings/gpio/gpio.h> 47 - #include <dt-bindings/input/input.h> 48 - #include <dt-bindings/interrupt-controller/irq.h> 49 - #include <dt-bindings/pinctrl/sun4i-a10.h> 50 - #include <dt-bindings/pwm/pwm.h> 45 + #include "sun5i-reference-design-tablet.dtsi" 51 46 52 47 / { 53 48 model = "Difrnce DIT4350"; 54 49 compatible = "difrnce,dit4350", "allwinner,sun5i-a13"; 55 - 56 - aliases { 57 - serial0 = &uart1; 58 - }; 59 - 60 - backlight: backlight { 61 - compatible = "pwm-backlight"; 62 - pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>; 63 - brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>; 64 - default-brightness-level = <8>; 65 - /* TODO: backlight uses axp gpio1 as enable pin */ 66 - }; 67 - 68 - chosen { 69 - stdout-path = "serial0:115200n8"; 70 - }; 71 - }; 72 - 73 - &cpu0 { 74 - cpu-supply = <&reg_dcdc2>; 75 - }; 76 - 77 - &ehci0 { 78 - status = "okay"; 79 - }; 80 - 81 - &i2c0 { 82 - pinctrl-names = "default"; 83 - pinctrl-0 = <&i2c0_pins_a>; 84 - status = "okay"; 85 - 86 - axp209: pmic@34 { 87 - reg = <0x34>; 88 - interrupts = <0>; 89 - }; 90 - }; 91 - 92 - #include "axp209.dtsi" 93 - 94 - &i2c1 { 95 - pinctrl-names = "default"; 96 - pinctrl-0 = <&i2c1_pins_a>; 97 - status = "okay"; 98 - 99 - pcf8563: rtc@51 { 100 - compatible = "nxp,pcf8563"; 101 - reg = <0x51>; 102 - }; 103 - }; 104 - 105 - &lradc { 106 - vref-supply = <&reg_ldo2>; 107 - status = "okay"; 108 - 109 - button@200 { 110 - label = "Volume Up"; 111 - linux,code = <KEY_VOLUMEUP>; 112 - channel = <0>; 113 - voltage = <200000>; 114 - }; 115 - 116 - button@400 { 117 - label = "Volume Down"; 118 - linux,code = <KEY_VOLUMEDOWN>; 119 - channel = <0>; 120 - voltage = <400000>; 121 - }; 122 - }; 123 - 124 - &mmc0 { 125 - pinctrl-names = "default"; 126 - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_d709>; 127 - vmmc-supply = <&reg_vcc3v3>; 128 - bus-width = <4>; 129 - cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */ 130 - cd-inverted; 131 - status = "okay"; 132 - }; 133 - 134 - &otg_sram { 135 - status = "okay"; 136 - }; 137 - 138 - &pio { 139 - mmc0_cd_pin_d709: mmc0_cd_pin@0 { 140 - allwinner,pins = "PG0"; 141 - allwinner,function = "gpio_in"; 142 - allwinner,drive = <SUN4I_PINCTRL_10_MA>; 143 - allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; 144 - }; 145 - 146 - usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { 147 - allwinner,pins = "PG1"; 148 - allwinner,function = "gpio_in"; 149 - allwinner,drive = <SUN4I_PINCTRL_10_MA>; 150 - allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>; 151 - }; 152 - 153 - usb0_id_detect_pin: usb0_id_detect_pin@0 { 154 - allwinner,pins = "PG2"; 155 - allwinner,function = "gpio_in"; 156 - allwinner,drive = <SUN4I_PINCTRL_10_MA>; 157 - allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; 158 - }; 159 - }; 160 - 161 - &pwm { 162 - pinctrl-names = "default"; 163 - pinctrl-0 = <&pwm0_pins>; 164 - status = "okay"; 165 - }; 166 - 167 - &reg_dcdc2 { 168 - regulator-always-on; 169 - regulator-min-microvolt = <1000000>; 170 - regulator-max-microvolt = <1400000>; 171 - regulator-name = "vdd-cpu"; 172 - }; 173 - 174 - &reg_dcdc3 { 175 - regulator-always-on; 176 - regulator-min-microvolt = <1250000>; 177 - regulator-max-microvolt = <1250000>; 178 - regulator-name = "vdd-int-pll"; 179 - }; 180 - 181 - &reg_ldo1 { 182 - regulator-name = "vdd-rtc"; 183 - }; 184 - 185 - &reg_ldo2 { 186 - regulator-always-on; 187 - regulator-min-microvolt = <3000000>; 188 - regulator-max-microvolt = <3000000>; 189 - regulator-name = "avcc"; 190 - }; 191 - 192 - &reg_ldo3 { 193 - regulator-min-microvolt = <3300000>; 194 - regulator-max-microvolt = <3300000>; 195 - regulator-name = "vcc-wifi"; 196 - }; 197 - 198 - &reg_usb0_vbus { 199 - gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ 200 - status = "okay"; 201 - }; 202 - 203 - &uart1 { 204 - pinctrl-names = "default"; 205 - pinctrl-0 = <&uart1_pins_b>; 206 - status = "okay"; 207 - }; 208 - 209 - &usb_otg { 210 - dr_mode = "otg"; 211 - status = "okay"; 212 - }; 213 - 214 - &usb0_vbus_pin_a { 215 - allwinner,pins = "PG12"; 216 - }; 217 - 218 - &usbphy { 219 - pinctrl-names = "default"; 220 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 221 - usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ 222 - usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ 223 - usb0_vbus-supply = <&reg_usb0_vbus>; 224 - usb1_vbus-supply = <&reg_ldo3>; 225 - status = "okay"; 226 50 };