Files
linux/arch/arm/boot/dts/omap4-droid4-xt894.dts
Tony Lindgren 75b3054d68 ARM: dts: omap4-droid4: Fix emmc errors seen on some devices
[ Upstream commit 2d59bb6023 ]

Otherwise we can get the following errors occasionally on some devices:

mmc1: tried to HW reset card, got error -110
mmcblk1: error -110 requesting status
mmcblk1: recovery failed!
print_req_error: I/O error, dev mmcblk1, sector 14329
...

I have one device that hits this error almost on every boot, and another
one that hits it only rarely with the other ones I've used behave without
problems. I'm not sure if the issue is related to a particular eMMC card
model, but in case it is, both of the machines with issues have:

# cat /sys/class/mmc_host/mmc1/mmc1:0001/manfid \
/sys/class/mmc_host/mmc1/mmc1:0001/oemid \
/sys/class/mmc_host/mmc1/mmc1:0001/name
0x000045
0x0100
SEM16G

and the working ones have:

0x000011
0x0100
016G92

Note that "ti,non-removable" is different as omap_hsmmc_reg_get() does not
call omap_hsmmc_disable_boot_regulators() if no_regulator_off_init is set.
And currently we set no_regulator_off_init only for "ti,non-removable" and
not for "non-removable". It seems that we should have "non-removable" with
some other mmc generic property behave in the same way instead of having to
use a non-generic property. But let's fix the issue first.

Fixes: 7e2f8c0ae6 ("ARM: dts: Add minimal support for motorola droid 4
xt894")
Cc: Marcel Partap <mpartap@gmx.net>
Cc: Merlijn Wajer <merlijn@wizzup.org>
Cc: Michael Scott <hashcode0f@gmail.com>
Cc: NeKit <nekit1000@gmail.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-10-03 17:00:59 -07:00

595 lines
13 KiB
Plaintext

/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
/dts-v1/;
#include <dt-bindings/input/input.h>
#include "omap443x.dtsi"
#include "motorola-cpcap-mapphone.dtsi"
/ {
model = "Motorola Droid 4 XT894";
compatible = "motorola,droid4", "ti,omap4430", "ti,omap4";
chosen {
stdout-path = &uart3;
};
aliases {
display0 = &lcd0;
display1 = &hdmi0;
};
/*
* We seem to have only 1021 MB accessible, 1021 - 1022 is locked,
* then 1023 - 1024 seems to contain mbm.
*/
memory {
device_type = "memory";
reg = <0x80000000 0x3fd00000>; /* 1021 MB */
};
/* Poweroff GPIO probably connected to CPCAP */
gpio-poweroff {
compatible = "gpio-poweroff";
pinctrl-0 = <&poweroff_gpio>;
pinctrl-names = "default";
gpios = <&gpio2 18 GPIO_ACTIVE_LOW>; /* gpio50 */
};
hdmi0: connector {
compatible = "hdmi-connector";
pinctrl-0 = <&hdmi_hpd_gpio>;
pinctrl-names = "default";
label = "hdmi";
type = "d";
hpd-gpios = <&gpio2 31 GPIO_ACTIVE_HIGH>; /* gpio63 */
port {
hdmi_connector_in: endpoint {
remote-endpoint = <&hdmi_out>;
};
};
};
/*
* HDMI 5V regulator probably sourced from battery. Let's keep
* keep this as always enabled for HDMI to work until we've
* figured what the encoder chip is.
*/
hdmi_regulator: regulator-hdmi {
compatible = "regulator-fixed";
regulator-name = "hdmi";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio2 27 GPIO_ACTIVE_HIGH>; /* gpio59 */
enable-active-high;
regulator-always-on;
};
/* HS USB Host PHY on PORT 1 */
hsusb1_phy: hsusb1_phy {
compatible = "usb-nop-xceiv";
};
/* LCD regulator from sw5 source */
lcd_regulator: regulator-lcd {
compatible = "regulator-fixed";
regulator-name = "lcd";
regulator-min-microvolt = <5050000>;
regulator-max-microvolt = <5050000>;
gpio = <&gpio4 0 GPIO_ACTIVE_HIGH>; /* gpio96 */
enable-active-high;
vin-supply = <&sw5>;
};
/* This is probably coming straight from the battery.. */
wl12xx_vmmc: regulator-wl12xx {
compatible = "regulator-fixed";
regulator-name = "vwl1271";
regulator-min-microvolt = <1650000>;
regulator-max-microvolt = <1650000>;
gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>; /* gpio94 */
startup-delay-us = <70000>;
enable-active-high;
};
gpio_keys {
compatible = "gpio-keys";
volume_down {
label = "Volume Down";
gpios = <&gpio5 26 GPIO_ACTIVE_LOW>; /* gpio154 */
linux,code = <KEY_VOLUMEDOWN>;
linux,can-disable;
};
slider {
label = "Keypad Slide";
gpios = <&gpio4 26 GPIO_ACTIVE_HIGH>; /* gpio122 */
linux,input-type = <EV_SW>;
linux,code = <SW_KEYPAD_SLIDE>;
linux,can-disable;
};
};
};
&dss {
status = "okay";
};
&gpio6 {
touchscreen_reset {
gpio-hog;
gpios = <13 0>;
output-high;
line-name = "touchscreen-reset";
};
pwm8: dmtimer-pwm-8 {
pinctrl-names = "default";
pinctrl-0 = <&vibrator_direction_pin>;
compatible = "ti,omap-dmtimer-pwm";
#pwm-cells = <3>;
ti,timers = <&timer8>;
ti,clock-source = <0x01>;
};
pwm9: dmtimer-pwm-9 {
pinctrl-names = "default";
pinctrl-0 = <&vibrator_enable_pin>;
compatible = "ti,omap-dmtimer-pwm";
#pwm-cells = <3>;
ti,timers = <&timer9>;
ti,clock-source = <0x01>;
};
vibrator {
compatible = "pwm-vibrator";
pwms = <&pwm9 0 10000000 0>, <&pwm8 0 10000000 0>;
pwm-names = "enable", "direction";
direction-duty-cycle-ns = <10000000>;
};
};
&dsi1 {
status = "okay";
vdd-supply = <&vcsi>;
port {
dsi1_out_ep: endpoint {
remote-endpoint = <&lcd0_in>;
lanes = <0 1 2 3 4 5>;
};
};
lcd0: display {
compatible = "panel-dsi-cm";
label = "lcd0";
vddi-supply = <&lcd_regulator>;
reset-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>; /* gpio101 */
panel-timing {
clock-frequency = <0>; /* Calculated by dsi */
hback-porch = <2>;
hactive = <540>;
hfront-porch = <0>;
hsync-len = <2>;
vback-porch = <1>;
vactive = <960>;
vfront-porch = <0>;
vsync-len = <1>;
hsync-active = <0>;
vsync-active = <0>;
de-active = <1>;
pixelclk-active = <1>;
};
port {
lcd0_in: endpoint {
remote-endpoint = <&dsi1_out_ep>;
};
};
};
};
&hdmi {
status = "okay";
pinctrl-0 = <&dss_hdmi_pins>;
pinctrl-names = "default";
vdda-supply = <&vdac>;
port {
hdmi_out: endpoint {
remote-endpoint = <&hdmi_connector_in>;
lanes = <1 0 3 2 5 4 7 6>;
};
};
};
&i2c1 {
tmp105@48 {
compatible = "ti,tmp105";
reg = <0x48>;
pinctrl-0 = <&tmp105_irq>;
pinctrl-names = "default";
/* kpd_row0.gpio_178 */
interrupts-extended = <&gpio6 18 IRQ_TYPE_EDGE_FALLING
&omap4_pmx_core 0x14e>;
interrupt-names = "irq", "wakeup";
wakeup-source;
};
};
&keypad {
keypad,num-rows = <8>;
keypad,num-columns = <8>;
linux,keymap = <
/* Row 1 */
MATRIX_KEY(0, 2, KEY_1)
MATRIX_KEY(0, 6, KEY_2)
MATRIX_KEY(2, 3, KEY_3)
MATRIX_KEY(0, 7, KEY_4)
MATRIX_KEY(0, 4, KEY_5)
MATRIX_KEY(5, 5, KEY_6)
MATRIX_KEY(0, 1, KEY_7)
MATRIX_KEY(0, 5, KEY_8)
MATRIX_KEY(0, 0, KEY_9)
MATRIX_KEY(1, 6, KEY_0)
/* Row 2 */
MATRIX_KEY(3, 4, KEY_APOSTROPHE)
MATRIX_KEY(7, 6, KEY_Q)
MATRIX_KEY(7, 7, KEY_W)
MATRIX_KEY(7, 2, KEY_E)
MATRIX_KEY(1, 0, KEY_R)
MATRIX_KEY(4, 4, KEY_T)
MATRIX_KEY(1, 2, KEY_Y)
MATRIX_KEY(6, 7, KEY_U)
MATRIX_KEY(2, 2, KEY_I)
MATRIX_KEY(5, 6, KEY_O)
MATRIX_KEY(3, 7, KEY_P)
MATRIX_KEY(6, 5, KEY_BACKSPACE)
/* Row 3 */
MATRIX_KEY(5, 4, KEY_TAB)
MATRIX_KEY(5, 7, KEY_A)
MATRIX_KEY(2, 7, KEY_S)
MATRIX_KEY(7, 0, KEY_D)
MATRIX_KEY(2, 6, KEY_F)
MATRIX_KEY(6, 2, KEY_G)
MATRIX_KEY(6, 6, KEY_H)
MATRIX_KEY(1, 4, KEY_J)
MATRIX_KEY(3, 1, KEY_K)
MATRIX_KEY(2, 1, KEY_L)
MATRIX_KEY(4, 6, KEY_ENTER)
/* Row 4 */
MATRIX_KEY(3, 6, KEY_LEFTSHIFT) /* KEY_CAPSLOCK */
MATRIX_KEY(6, 1, KEY_Z)
MATRIX_KEY(7, 4, KEY_X)
MATRIX_KEY(5, 1, KEY_C)
MATRIX_KEY(1, 7, KEY_V)
MATRIX_KEY(2, 4, KEY_B)
MATRIX_KEY(4, 1, KEY_N)
MATRIX_KEY(1, 1, KEY_M)
MATRIX_KEY(3, 5, KEY_COMMA)
MATRIX_KEY(5, 2, KEY_DOT)
MATRIX_KEY(6, 3, KEY_UP)
MATRIX_KEY(7, 3, KEY_OK)
/* Row 5 */
MATRIX_KEY(2, 5, KEY_LEFTCTRL) /* KEY_LEFTSHIFT */
MATRIX_KEY(4, 5, KEY_LEFTALT) /* SYM */
MATRIX_KEY(6, 0, KEY_MINUS)
MATRIX_KEY(4, 7, KEY_EQUAL)
MATRIX_KEY(1, 5, KEY_SPACE)
MATRIX_KEY(3, 2, KEY_SLASH)
MATRIX_KEY(4, 3, KEY_LEFT)
MATRIX_KEY(5, 3, KEY_DOWN)
MATRIX_KEY(3, 3, KEY_RIGHT)
/* Side buttons, KEY_VOLUMEDOWN and KEY_PWER are on CPCAP? */
MATRIX_KEY(5, 0, KEY_VOLUMEUP)
>;
};
&mmc1 {
vmmc-supply = <&vwlan2>;
bus-width = <4>;
cd-gpios = <&gpio6 16 GPIO_ACTIVE_LOW>; /* gpio176 */
};
&mmc2 {
vmmc-supply = <&vsdio>;
bus-width = <8>;
ti,non-removable;
};
&mmc3 {
vmmc-supply = <&wl12xx_vmmc>;
interrupts-extended = <&wakeupgen GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH
&omap4_pmx_core 0xde>;
non-removable;
bus-width = <4>;
cap-power-off-card;
#address-cells = <1>;
#size-cells = <0>;
wlcore: wlcore@2 {
compatible = "ti,wl1285", "ti,wl1283";
reg = <2>;
interrupt-parent = <&gpio4>;
interrupts = <4 IRQ_TYPE_LEVEL_HIGH>; /* gpio100 */
ref-clock-frequency = <26000000>;
tcxo-clock-frequency = <26000000>;
};
};
&i2c1 {
lm3532@38 {
compatible = "ti,lm3532";
reg = <0x38>;
enable-gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>;
backlight {
compatible = "ti,lm3532-backlight";
lcd {
led-sources = <0 1 2>;
ramp-up-msec = <1>;
ramp-down-msec = <0>;
};
};
};
};
/*
* REVISIT: Add gpio173 reset pin handling to the driver, see gpio-hog above.
* If the GPIO reset is used, we probably need to have /lib/firmware/maxtouch.fw
* available. See "mxt-app" and "droid4-touchscreen-firmware" tools for more
* information.
*/
&i2c2 {
tsp@4a {
compatible = "atmel,maxtouch";
reg = <0x4a>;
pinctrl-names = "default";
pinctrl-0 = <&touchscreen_pins>;
/* gpio_183 with sys_nirq2 pad as wakeup */
interrupts-extended = <&gpio6 23 IRQ_TYPE_EDGE_FALLING
&omap4_pmx_core 0x160>;
interrupt-names = "irq", "wakeup";
wakeup-source;
};
isl29030@44 {
compatible = "isil,isl29030";
reg = <0x44>;
pinctrl-names = "default";
pinctrl-0 = <&als_proximity_pins>;
interrupt-parent = <&gpio6>;
interrupts = <17 IRQ_TYPE_LEVEL_LOW>; /* gpio177 */
};
};
&omap4_pmx_core {
/* hdmi_hpd.gpio_63 */
hdmi_hpd_gpio: pinmux_hdmi_hpd_pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x098, PIN_INPUT | MUX_MODE3)
>;
};
/* hdmi_cec.hdmi_cec, hdmi_scl.hdmi_scl, hdmi_sda.hdmi_sda */
dss_hdmi_pins: pinmux_dss_hdmi_pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x09a, PIN_INPUT | MUX_MODE0)
OMAP4_IOPAD(0x09c, PIN_INPUT | MUX_MODE0)
OMAP4_IOPAD(0x09e, PIN_INPUT | MUX_MODE0)
>;
};
/* gpmc_ncs0.gpio_50 */
poweroff_gpio: pinmux_poweroff_pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x074, PIN_OUTPUT_PULLUP | MUX_MODE3)
>;
};
/* kpd_row0.gpio_178 */
tmp105_irq: pinmux_tmp105_irq {
pinctrl-single,pins = <
OMAP4_IOPAD(0x18e, PIN_INPUT_PULLUP | MUX_MODE3)
>;
};
usb_gpio_mux_sel1: pinmux_usb_gpio_mux_sel1_pins {
/* gpio_60 */
pinctrl-single,pins = <
OMAP4_IOPAD(0x088, PIN_OUTPUT | MUX_MODE3)
>;
};
touchscreen_pins: pinmux_touchscreen_pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x1a0, PIN_INPUT_PULLUP | MUX_MODE3)
>;
};
als_proximity_pins: pinmux_als_proximity_pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x18c, PIN_INPUT_PULLUP | MUX_MODE3)
>;
};
usb_ulpi_pins: pinmux_usb_ulpi_pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x196, MUX_MODE7)
OMAP4_IOPAD(0x198, MUX_MODE7)
OMAP4_IOPAD(0x1b2, PIN_INPUT_PULLUP | MUX_MODE0)
OMAP4_IOPAD(0x1b4, PIN_INPUT_PULLUP | MUX_MODE0)
OMAP4_IOPAD(0x1b6, PIN_INPUT_PULLUP | MUX_MODE0)
OMAP4_IOPAD(0x1b8, PIN_INPUT_PULLUP | MUX_MODE0)
OMAP4_IOPAD(0x1ba, PIN_INPUT_PULLUP | MUX_MODE0)
OMAP4_IOPAD(0x1bc, PIN_INPUT_PULLUP | MUX_MODE0)
OMAP4_IOPAD(0x1be, PIN_INPUT_PULLUP | MUX_MODE0)
OMAP4_IOPAD(0x1c0, PIN_INPUT_PULLUP | MUX_MODE0)
OMAP4_IOPAD(0x1c2, PIN_INPUT_PULLUP | MUX_MODE0)
OMAP4_IOPAD(0x1c4, PIN_INPUT_PULLUP | MUX_MODE0)
OMAP4_IOPAD(0x1c6, PIN_INPUT_PULLUP | MUX_MODE0)
OMAP4_IOPAD(0x1c8, PIN_INPUT_PULLUP | MUX_MODE0)
>;
};
/* usb0_otg_dp and usb0_otg_dm */
usb_utmi_pins: pinmux_usb_utmi_pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x196, PIN_INPUT | MUX_MODE0)
OMAP4_IOPAD(0x198, PIN_INPUT | MUX_MODE0)
OMAP4_IOPAD(0x1b2, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1b4, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1b6, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1b8, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1ba, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1bc, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1be, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1c0, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1c2, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1c4, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1c6, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1c8, PIN_INPUT_PULLUP | MUX_MODE7)
>;
};
/* uart3_tx_irtx and uart3_rx_irrx */
uart3_pins: pinmux_uart3_pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x196, MUX_MODE7)
OMAP4_IOPAD(0x198, MUX_MODE7)
OMAP4_IOPAD(0x1b2, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1b4, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1b6, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1b8, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1ba, MUX_MODE2)
OMAP4_IOPAD(0x1bc, PIN_INPUT | MUX_MODE2)
OMAP4_IOPAD(0x1be, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1c0, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1c2, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1c4, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1c6, PIN_INPUT_PULLUP | MUX_MODE7)
OMAP4_IOPAD(0x1c8, PIN_INPUT_PULLUP | MUX_MODE7)
>;
};
uart4_pins: pinmux_uart4_pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x15c, PIN_INPUT | MUX_MODE0) /* uart4_rx */
OMAP4_IOPAD(0x15e, PIN_OUTPUT | MUX_MODE0) /* uart4_tx */
OMAP4_IOPAD(0x110, PIN_INPUT_PULLUP | MUX_MODE5) /* uart4_cts */
OMAP4_IOPAD(0x112, PIN_OUTPUT_PULLUP | MUX_MODE5) /* uart4_rts */
>;
};
};
&omap4_pmx_wkup {
usb_gpio_mux_sel2: pinmux_usb_gpio_mux_sel2_pins {
/* gpio_wk0 */
pinctrl-single,pins = <
OMAP4_IOPAD(0x040, PIN_OUTPUT_PULLDOWN | MUX_MODE3)
>;
};
vibrator_direction_pin: pinmux_vibrator_direction_pin {
pinctrl-single,pins = <
OMAP4_IOPAD(0x1ce, PIN_OUTPUT | MUX_MODE1) /* dmtimer8_pwm_evt (gpio_27) */
>;
};
vibrator_enable_pin: pinmux_vibrator_enable_pin {
pinctrl-single,pins = <
OMAP4_IOPAD(0X1d0, PIN_OUTPUT | MUX_MODE1) /* dmtimer9_pwm_evt (gpio_28) */
>;
};
};
&uart3 {
interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH
&omap4_pmx_core 0x17c>;
};
&uart4 {
pinctrl-names = "default";
pinctrl-0 = <&uart4_pins>;
bluetooth {
compatible = "ti,wl1285-st";
enable-gpios = <&gpio6 14 GPIO_ACTIVE_HIGH>; /* gpio 174 */
max-speed = <3686400>;
};
};
&usbhsehci {
phys = <&hsusb1_phy>;
};
&usbhshost {
port1-mode = "ohci-phy-4pin-dpdm";
port2-mode = "ehci-tll";
};
/* Internal UTMI+ PHY used for OTG, CPCAP ULPI PHY for detection and charger */
&usb_otg_hs {
interface-type = <1>;
mode = <3>;
power = <50>;
};
&i2c4 {
ak8975: magnetometer@c {
compatible = "asahi-kasei,ak8975";
reg = <0x0c>;
vdd-supply = <&vhvio>;
interrupt-parent = <&gpio6>;
interrupts = <15 IRQ_TYPE_EDGE_RISING>; /* gpio175 */
rotation-matrix = "-1", "0", "0",
"0", "1", "0",
"0", "0", "-1";
};
lis3dh: accelerometer@18 {
compatible = "st,lis3dh-accel";
reg = <0x18>;
vdd-supply = <&vhvio>;
interrupt-parent = <&gpio2>;
interrupts = <2 IRQ_TYPE_EDGE_BOTH>; /* gpio34 */
rotation-matrix = "0", "-1", "0",
"1", "0", "0",
"0", "0", "1";
};
};