Skip to content

L
linux
Commit 734e575f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'omap-for-v6.8/dt-signed' of... 

Merge tag 'omap-for-v6.8/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into soc/dt

Devicetree changes for omaps

- A series of patches to reorganize Motorola Mapphone related files to add
  support for tablets as the peripherals are different compared to the
  phones

- Apply am57xx-idk overlays to base dtbs

- Extcon update to use id-gpios and vbus-gpios

- Update omap4-epson-embt2ws to enable wlan clock and bluetooth-gnss

- Update for logicpd-torpedo to use bluetooth-gnss node name

* tag 'omap-for-v6.8/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: omap4-embt2ws: Add Bluetooth
  ARM: dts: omap: logicpd-torpedo: do not disguise GNSS device
  ARM: dts: omap4-embt2ws: enable 32K clock on WLAN
  ARM: dts: ti/omap: Replace deprecated extcon-usb-gpio id-gpio/vbus-gpio properties
  arm: dts: omap: Apply am57xx-idk overlays to base dtbs
  ARM: dts: motorola-mapphone: Add basic support for mz609 and mz617
  ARM: dts: motorola-mapphone: Move handset devices to a common file
  ARM: dts: motorola-mapphone: Move LCD to common file for xt875 and xt894
  dt-bindings: omap: Add Motorola mapphone mz609 and mz617 tablets

Link: https://lore.kernel.org/r/pull-1702037869-295608@atomide.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6fab7e69 10dfde4b
Hide whitespace changes
Inline Side-by-side
Showing with 459 additions and 324 deletions
Documentation/devicetree/bindings/arm/ti/omap.yaml
View file @ 734e575f
......@@ -134,6 +134,8 @@ properties:
- amazon,omap4-kc1 # Amazon Kindle Fire (first generation)
- motorola,droid4 # Motorola Droid 4 XT894
- motorola,droid-bionic # Motorola Droid Bionic XT875
- motorola,xyboard-mz609
- motorola,xyboard-mz617
- ti,omap4-panda
- ti,omap4-sdp
- const: ti,omap4430
......
arch/arm/boot/dts/ti/omap/Makefile
View file @ 734e575f
......@@ -79,7 +79,9 @@ dtb-$(CONFIG_ARCH_OMAP4) += \
omap4-sdp.dtb \
omap4-sdp-es23plus.dtb \
omap4-var-dvk-om44.dtb \
omap4-var-stk-om44.dtb
omap4-var-stk-om44.dtb \
omap4-xyboard-mz609.dtb \
omap4-xyboard-mz617.dtb
dtb-$(CONFIG_SOC_AM33XX) += \
am335x-baltos-ir2110.dtb \
am335x-baltos-ir3220.dtb \
......@@ -129,6 +131,16 @@ dtb-$(CONFIG_SOC_AM43XX) += \
am57xx-evm-dtbs := am57xx-beagle-x15.dtb am57xx-evm.dtbo
am57xx-evm-reva3-dtbs := am57xx-beagle-x15-revc.dtb am57xx-evm.dtbo
am571x-idk-overlays-dtbs := am571x-idk.dtb \
am571x-idk-touchscreen.dtbo am57xx-idk-lcd-osd101t2587.dtbo
am572x-idk-overlays-dtbs := am572x-idk.dtb \
am572x-idk-touchscreen.dtbo am57xx-idk-lcd-osd101t2045.dtbo
# Build time test only, enabled by CONFIG_OF_ALL_DTBS
dtb- += \
am571x-idk-overlays.dtb \
am572x-idk-overlays.dtb
dtb-$(CONFIG_SOC_DRA7XX) += \
am57xx-beagle-x15.dtb \
am57xx-beagle-x15-revb1.dtb \
......
arch/arm/boot/dts/ti/omap/am571x-idk.dts
View file @ 734e575f
......@@ -168,8 +168,8 @@ blue3-led {
};
&extcon_usb2 {
id-gpio = <&gpio5 7 GPIO_ACTIVE_HIGH>;
vbus-gpio = <&gpio7 22 GPIO_ACTIVE_HIGH>;
id-gpios = <&gpio5 7 GPIO_ACTIVE_HIGH>;
vbus-gpios = <&gpio7 22 GPIO_ACTIVE_HIGH>;
};
&sn65hvs882 {
......
arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts
View file @ 734e575f
......@@ -197,7 +197,7 @@ brcmf_pwrseq: brcmf_pwrseq {
extcon_usb1: extcon_usb1 {
compatible = "linux,extcon-usb-gpio";
ti,enable-id-detection;
id-gpio = <&gpio3 13 GPIO_ACTIVE_HIGH>;
id-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;
};
};
......
arch/arm/boot/dts/ti/omap/am572x-idk-common.dtsi
View file @ 734e575f
......@@ -169,8 +169,8 @@ blue3-led {
};
&extcon_usb2 {
id-gpio = <&gpio3 16 GPIO_ACTIVE_HIGH>;
vbus-gpio = <&gpio3 26 GPIO_ACTIVE_HIGH>;
id-gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>;
vbus-gpios = <&gpio3 26 GPIO_ACTIVE_HIGH>;
};
&sn65hvs882 {
......
arch/arm/boot/dts/ti/omap/dra7-evm-common.dtsi
View file @ 734e575f
......@@ -15,12 +15,12 @@ chosen {
extcon_usb1: extcon_usb1 {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
id-gpios = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
};
extcon_usb2: extcon_usb2 {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
id-gpios = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
};
sound0: sound0 {
......
arch/arm/boot/dts/ti/omap/dra71-evm.dts
View file @ 734e575f
......@@ -293,11 +293,11 @@ &hdmi {
};
&extcon_usb1 {
vbus-gpio = <&pcf_lcd 14 GPIO_ACTIVE_HIGH>;
vbus-gpios = <&pcf_lcd 14 GPIO_ACTIVE_HIGH>;
};
&extcon_usb2 {
vbus-gpio = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>;
vbus-gpios = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>;
};
&ipu2 {
......
arch/arm/boot/dts/ti/omap/dra72-evm-common.dtsi
View file @ 734e575f
......@@ -96,12 +96,12 @@ evm_3v3_sd: fixedregulator-sd {
extcon_usb1: extcon_usb1 {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
id-gpios = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
};
extcon_usb2: extcon_usb2 {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
id-gpios = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
};
hdmi0: connector {
......
arch/arm/boot/dts/ti/omap/dra76-evm.dts
View file @ 734e575f
......@@ -533,11 +533,11 @@ &pcie1_ep {
};
&extcon_usb1 {
vbus-gpio = <&pcf_lcd 14 GPIO_ACTIVE_HIGH>;
vbus-gpios = <&pcf_lcd 14 GPIO_ACTIVE_HIGH>;
};
&extcon_usb2 {
vbus-gpio = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>;
vbus-gpios = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>;
};
&m_can0 {
......
arch/arm/boot/dts/ti/omap/logicpd-torpedo-37xx-devkit.dts
View file @ 734e575f
......@@ -52,7 +52,7 @@ wlcore: wlcore@2 {
&uart2 {
/delete-property/dma-names;
bluetooth {
bluetooth-gnss {
compatible = "ti,wl1283-st";
enable-gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>; /* gpio 162 */
max-speed = <3000000>;
......
arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi
View file @ 734e575f
......@@ -6,15 +6,6 @@
#include "motorola-cpcap-mapphone.dtsi"
/ {
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.
......@@ -63,46 +54,6 @@ hdmi_regulator: regulator-hdmi {
regulator-always-on;
};
/* FS USB Host PHY on port 1 for mdm6600 */
fsusb1_phy: usb-phy@1 {
compatible = "motorola,mapphone-mdm6600";
pinctrl-0 = <&usb_mdm6600_pins>;
pinctrl-1 = <&usb_mdm6600_sleep_pins>;
pinctrl-names = "default", "sleep";
enable-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>; /* gpio_95 */
power-gpios = <&gpio2 22 GPIO_ACTIVE_HIGH>; /* gpio_54 */
reset-gpios = <&gpio2 17 GPIO_ACTIVE_HIGH>; /* gpio_49 */
/* mode: gpio_148 gpio_149 */
motorola,mode-gpios = <&gpio5 20 GPIO_ACTIVE_HIGH>,
<&gpio5 21 GPIO_ACTIVE_HIGH>;
/* cmd: gpio_103 gpio_104 gpio_142 */
motorola,cmd-gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>,
<&gpio4 8 GPIO_ACTIVE_HIGH>,
<&gpio5 14 GPIO_ACTIVE_HIGH>;
/* status: gpio_52 gpio_53 gpio_55 */
motorola,status-gpios = <&gpio2 20 GPIO_ACTIVE_HIGH>,
<&gpio2 21 GPIO_ACTIVE_HIGH>,
<&gpio2 23 GPIO_ACTIVE_HIGH>;
#phy-cells = <0>;
};
/* HS USB host TLL nop-phy on port 2 for w3glte */
hsusb2_phy: usb-phy@2 {
compatible = "usb-nop-xceiv";
#phy-cells = <0>;
};
/* 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";
......@@ -133,41 +84,6 @@ soundcard {
dais = <&mcbsp2_port>, <&mcbsp3_port>;
};
pwm8: 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: 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>;
};
backlight: backlight {
compatible = "led-backlight";
leds = <&backlight_led>;
brightness-levels = <31 63 95 127 159 191 223 255>;
default-brightness-level = <6>;
};
};
&cpu_thermal {
......@@ -197,57 +113,6 @@ &dss {
status = "okay";
};
&dsi1 {
status = "okay";
vdd-supply = <&vcsi>;
port {
dsi1_out_ep: endpoint {
remote-endpoint = <&lcd0_in>;
lanes = <0 1 2 3 4 5>;
};
};
lcd0: panel@0 {
compatible = "motorola,droid4-panel", "panel-dsi-cm";
reg = <0>;
label = "lcd0";
vddi-supply = <&lcd_regulator>;
reset-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>; /* gpio101 */
backlight = <&backlight>;
width-mm = <50>;
height-mm = <89>;
rotation = <90>;
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>;
......@@ -262,13 +127,6 @@ hdmi_out: endpoint {
};
};
/* Battery NVRAM on 1-wire handled by w1_ds250x driver */
&hdqw1w {
pinctrl-0 = <&hdq_pins>;
pinctrl-names = "default";
ti,mode = "1w";
};
&i2c1 {
tmp105@48 {
compatible = "ti,tmp105";
......@@ -322,34 +180,6 @@ wlcore: wlcore@2 {
};
};
&i2c2 {
touchscreen@4a {
compatible = "atmel,maxtouch";
reg = <0x4a>;
pinctrl-names = "default";
pinctrl-0 = <&touchscreen_pins>;
reset-gpios = <&gpio6 13 GPIO_ACTIVE_LOW>; /* gpio173 */
/* gpio_183 with sys_nirq2 pad as wakeup */
interrupts-extended = <&gpio6 23 IRQ_TYPE_LEVEL_LOW>,
<&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 */
......@@ -359,13 +189,6 @@ OMAP4_IOPAD(0x098, PIN_INPUT | MUX_MODE3)
>;
};
hdq_pins: hdq-pins {
pinctrl-single,pins = <
/* 0x4a100120 hdq_sio.hdq_sio aa27 */
OMAP4_IOPAD(0x120, PIN_INPUT | MUX_MODE0)
>;
};
/* hdmi_cec.hdmi_cec, hdmi_scl.hdmi_scl, hdmi_sda.hdmi_sda */
dss_hdmi_pins: dss-hdmi-pins {
pinctrl-single,pins = <
......@@ -427,73 +250,6 @@ OMAP4_IOPAD(0x088, PIN_OUTPUT | MUX_MODE3)
>;
};
touchscreen_pins: touchscreen-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x180, PIN_OUTPUT | MUX_MODE3)
OMAP4_IOPAD(0x1a0, PIN_INPUT_PULLUP | MUX_MODE3)
>;
};
als_proximity_pins: als-proximity-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x18c, PIN_INPUT_PULLUP | MUX_MODE3)
>;
};
usb_mdm6600_pins: usb-mdm6600-pins {
pinctrl-single,pins = <
/* enable 0x4a1000d8 usbb1_ulpitll_dat7.gpio_95 ag16 */
OMAP4_IOPAD(0x0d8, PIN_INPUT | MUX_MODE3)
/* power 0x4a10007c gpmc_nwp.gpio_54 c25 */
OMAP4_IOPAD(0x07c, PIN_OUTPUT | MUX_MODE3)
/* reset 0x4a100072 gpmc_a25.gpio_49 d20 */
OMAP4_IOPAD(0x072, PIN_OUTPUT | MUX_MODE3)
/* mode0/bpwake 0x4a10014e sdmmc5_dat1.gpio_148 af4 */
OMAP4_IOPAD(0x14e, PIN_OUTPUT | MUX_MODE3)
/* mode1/apwake 0x4a100150 sdmmc5_dat2.gpio_149 ag3 */
OMAP4_IOPAD(0x150, PIN_OFF_OUTPUT_LOW | PIN_INPUT | MUX_MODE3)
/* status0 0x4a10007e gpmc_clk.gpio_55 b22 */
OMAP4_IOPAD(0x07e, PIN_INPUT | MUX_MODE3)
/* status1 0x4a10007a gpmc_ncs3.gpio_53 c22 */
OMAP4_IOPAD(0x07a, PIN_INPUT | MUX_MODE3)
/* status2 0x4a100078 gpmc_ncs2.gpio_52 d21 */
OMAP4_IOPAD(0x078, PIN_INPUT | MUX_MODE3)
/* cmd0 0x4a100094 gpmc_ncs6.gpio_103 c24 */
OMAP4_IOPAD(0x094, PIN_OUTPUT | MUX_MODE3)
/* cmd1 0x4a100096 gpmc_ncs7.gpio_104 d24 */
OMAP4_IOPAD(0x096, PIN_OUTPUT | MUX_MODE3)
/* cmd2 0x4a100142 uart3_rts_sd.gpio_142 f28 */
OMAP4_IOPAD(0x142, PIN_OUTPUT | MUX_MODE3)
>;
};
/* Modem sleep pins to keep gpio_49 high with internal pull */
usb_mdm6600_sleep_pins: usb-mdm6600-sleep-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x0d8, PIN_INPUT | MUX_MODE3)
OMAP4_IOPAD(0x07c, PIN_OUTPUT | MUX_MODE3)
OMAP4_IOPAD(0x072, PIN_INPUT_PULLUP | MUX_MODE7) /* Keep gpio_49 reset high */
OMAP4_IOPAD(0x14e, PIN_OUTPUT | MUX_MODE3)
OMAP4_IOPAD(0x150, PIN_OFF_OUTPUT_LOW | PIN_INPUT | MUX_MODE3)
OMAP4_IOPAD(0x07e, PIN_INPUT | MUX_MODE3)
OMAP4_IOPAD(0x07a, PIN_INPUT | MUX_MODE3)
OMAP4_IOPAD(0x078, PIN_INPUT | MUX_MODE3)
OMAP4_IOPAD(0x094, PIN_OUTPUT | MUX_MODE3)
OMAP4_IOPAD(0x096, PIN_OUTPUT | MUX_MODE3)
OMAP4_IOPAD(0x142, PIN_OUTPUT | MUX_MODE3)
>;
};
usb_ulpi_pins: usb-ulpi-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x196, MUX_MODE7)
......@@ -601,18 +357,6 @@ OMAP4_IOPAD(0x10a, PIN_INPUT | MUX_MODE1) /* abe_mcbsp3_clkx */
OMAP4_IOPAD(0x10c, PIN_INPUT | MUX_MODE1) /* abe_mcbsp3_fsx */
>;
};
vibrator_direction_pin: vibrator-direction-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x1ce, PIN_OUTPUT | MUX_MODE1) /* dmtimer8_pwm_evt (gpio_27) */
>;
};
vibrator_enable_pin: vibrator-enable-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0X1d0, PIN_OUTPUT | MUX_MODE1) /* dmtimer9_pwm_evt (gpio_28) */
>;
};
};
&omap4_pmx_wkup {
......@@ -629,17 +373,6 @@ &rng_target {
status = "disabled";
};
/* Configure pwm clock source for timers 8 & 9 */
&timer8 {
assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>;
assigned-clock-parents = <&sys_32k_ck>;
};
&timer9 {
assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>;
assigned-clock-parents = <&sys_32k_ck>;
};
/*
* The uart1 port is wired to mdm6600 with rts and cts. The modem uses gpio_149
* for wake-up events for both the USB PHY and the UART. We can use gpio_149
......@@ -672,20 +405,6 @@ bluetooth {
};
};
&usbhsohci {
phys = <&fsusb1_phy>;
phy-names = "usb";
};
&usbhsehci {
phys = <&hsusb2_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>;
......@@ -698,23 +417,6 @@ &usb_otg_hs {
power = <150>;
};
&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";
};
};
&mcbsp2 {
#sound-dai-cells = <0>;
pinctrl-names = "default";
......
arch/arm/boot/dts/ti/omap/motorola-mapphone-handset.dtsi 0 → 100644
View file @ 734e575f
// SPDX-License-Identifier: GPL-2.0-only
/dts-v1/;
#include "motorola-mapphone-common.dtsi"
/ {
/* FS USB Host PHY on port 1 for mdm6600 */
fsusb1_phy: usb-phy@1 {
compatible = "motorola,mapphone-mdm6600";
pinctrl-0 = <&usb_mdm6600_pins>;
pinctrl-1 = <&usb_mdm6600_sleep_pins>;
pinctrl-names = "default", "sleep";
enable-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>; /* gpio_95 */
power-gpios = <&gpio2 22 GPIO_ACTIVE_HIGH>; /* gpio_54 */
reset-gpios = <&gpio2 17 GPIO_ACTIVE_HIGH>; /* gpio_49 */
/* mode: gpio_148 gpio_149 */
motorola,mode-gpios = <&gpio5 20 GPIO_ACTIVE_HIGH>,
<&gpio5 21 GPIO_ACTIVE_HIGH>;
/* cmd: gpio_103 gpio_104 gpio_142 */
motorola,cmd-gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>,
<&gpio4 8 GPIO_ACTIVE_HIGH>,
<&gpio5 14 GPIO_ACTIVE_HIGH>;
/* status: gpio_52 gpio_53 gpio_55 */
motorola,status-gpios = <&gpio2 20 GPIO_ACTIVE_HIGH>,
<&gpio2 21 GPIO_ACTIVE_HIGH>,
<&gpio2 23 GPIO_ACTIVE_HIGH>;
#phy-cells = <0>;
};
/* HS USB host TLL nop-phy on port 2 for w3glte */
hsusb2_phy: usb-phy@2 {
compatible = "usb-nop-xceiv";
#phy-cells = <0>;
};
pwm8: 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: 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>;
};
};
/* Battery NVRAM on 1-wire handled by w1_ds250x driver */
&hdqw1w {
pinctrl-0 = <&hdq_pins>;
pinctrl-names = "default";
ti,mode = "1w";
};
&i2c2 {
touchscreen@4a {
compatible = "atmel,maxtouch";
reg = <0x4a>;
pinctrl-names = "default";
pinctrl-0 = <&touchscreen_pins>;
reset-gpios = <&gpio6 13 GPIO_ACTIVE_LOW>; /* gpio173 */
/* gpio_183 with sys_nirq2 pad as wakeup */
interrupts-extended = <&gpio6 23 IRQ_TYPE_LEVEL_LOW>,
<&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 {
hdq_pins: hdq-pins {
pinctrl-single,pins = <
/* 0x4a100120 hdq_sio.hdq_sio aa27 */
OMAP4_IOPAD(0x120, PIN_INPUT | MUX_MODE0)
>;
};
/* kpd_row0.gpio_178 */
tmp105_irq: tmp105-irq-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x18e, PIN_INPUT_PULLUP | MUX_MODE3)
>;
};
touchscreen_pins: touchscreen-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x180, PIN_OUTPUT | MUX_MODE3)
OMAP4_IOPAD(0x1a0, PIN_INPUT_PULLUP | MUX_MODE3)
>;
};
usb_mdm6600_pins: usb-mdm6600-pins {
pinctrl-single,pins = <
/* enable 0x4a1000d8 usbb1_ulpitll_dat7.gpio_95 ag16 */
OMAP4_IOPAD(0x0d8, PIN_INPUT | MUX_MODE3)
/* power 0x4a10007c gpmc_nwp.gpio_54 c25 */
OMAP4_IOPAD(0x07c, PIN_OUTPUT | MUX_MODE3)
/* reset 0x4a100072 gpmc_a25.gpio_49 d20 */
OMAP4_IOPAD(0x072, PIN_OUTPUT | MUX_MODE3)
/* mode0/bpwake 0x4a10014e sdmmc5_dat1.gpio_148 af4 */
OMAP4_IOPAD(0x14e, PIN_OUTPUT | MUX_MODE3)
/* mode1/apwake 0x4a100150 sdmmc5_dat2.gpio_149 ag3 */
OMAP4_IOPAD(0x150, PIN_OFF_OUTPUT_LOW | PIN_INPUT | MUX_MODE3)
/* status0 0x4a10007e gpmc_clk.gpio_55 b22 */
OMAP4_IOPAD(0x07e, PIN_INPUT | MUX_MODE3)
/* status1 0x4a10007a gpmc_ncs3.gpio_53 c22 */
OMAP4_IOPAD(0x07a, PIN_INPUT | MUX_MODE3)
/* status2 0x4a100078 gpmc_ncs2.gpio_52 d21 */
OMAP4_IOPAD(0x078, PIN_INPUT | MUX_MODE3)
/* cmd0 0x4a100094 gpmc_ncs6.gpio_103 c24 */
OMAP4_IOPAD(0x094, PIN_OUTPUT | MUX_MODE3)
/* cmd1 0x4a100096 gpmc_ncs7.gpio_104 d24 */
OMAP4_IOPAD(0x096, PIN_OUTPUT | MUX_MODE3)
/* cmd2 0x4a100142 uart3_rts_sd.gpio_142 f28 */
OMAP4_IOPAD(0x142, PIN_OUTPUT | MUX_MODE3)
>;
};
/* Modem sleep pins to keep gpio_49 high with internal pull */
usb_mdm6600_sleep_pins: usb-mdm6600-sleep-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x0d8, PIN_INPUT | MUX_MODE3)
OMAP4_IOPAD(0x07c, PIN_OUTPUT | MUX_MODE3)
OMAP4_IOPAD(0x072, PIN_INPUT_PULLUP | MUX_MODE7) /* Keep gpio_49 reset high */
OMAP4_IOPAD(0x14e, PIN_OUTPUT | MUX_MODE3)
OMAP4_IOPAD(0x150, PIN_OFF_OUTPUT_LOW | PIN_INPUT | MUX_MODE3)
OMAP4_IOPAD(0x07e, PIN_INPUT | MUX_MODE3)
OMAP4_IOPAD(0x07a, PIN_INPUT | MUX_MODE3)
OMAP4_IOPAD(0x078, PIN_INPUT | MUX_MODE3)
OMAP4_IOPAD(0x094, PIN_OUTPUT | MUX_MODE3)
OMAP4_IOPAD(0x096, PIN_OUTPUT | MUX_MODE3)
OMAP4_IOPAD(0x142, PIN_OUTPUT | MUX_MODE3)
>;
};
als_proximity_pins: als-proximity-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x18c, PIN_INPUT_PULLUP | MUX_MODE3)
>;
};
vibrator_direction_pin: vibrator-direction-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0x1ce, PIN_OUTPUT | MUX_MODE1) /* dmtimer8_pwm_evt (gpio_27) */
>;
};
vibrator_enable_pin: vibrator-enable-pins {
pinctrl-single,pins = <
OMAP4_IOPAD(0X1d0, PIN_OUTPUT | MUX_MODE1) /* dmtimer9_pwm_evt (gpio_28) */
>;
};
};
/* Configure pwm clock source for timers 8 & 9 */
&timer8 {
assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>;
assigned-clock-parents = <&sys_32k_ck>;
};
&timer9 {
assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>;
assigned-clock-parents = <&sys_32k_ck>;
};
&usbhsohci {
phys = <&fsusb1_phy>;
phy-names = "usb";
};
&usbhsehci {
phys = <&hsusb2_phy>;
};
&usbhshost {
port1-mode = "ohci-phy-4pin-dpdm";
port2-mode = "ehci-tll";
};
&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";
};
};
arch/arm/boot/dts/ti/omap/motorola-mapphone-mz607-mz617.dtsi 0 → 100644
View file @ 734e575f
// SPDX-License-Identifier: GPL-2.0-only
/dts-v1/;
#include "motorola-mapphone-common.dtsi"
&keypad {
keypad,num-rows = <8>;
keypad,num-columns = <8>;
linux,keymap = <MATRIX_KEY(5, 0, KEY_VOLUMEUP)>,
<MATRIX_KEY(3, 0, KEY_VOLUMEDOWN)>;
};
/*
* On tablets, mmc1 regulator is vsimcard instead of vwlan2 in the stock kernel
* dtb. The regulator may not be wired even if a MMC cage is added though.
*/
&mmc1 {
vmmc-supply = <&vsimcard>;
bus-width = <4>;
cd-gpios = <&gpio6 16 GPIO_ACTIVE_LOW>; /* gpio_176 */
};
arch/arm/boot/dts/ti/omap/motorola-mapphone-xt8xx.dtsi 0 → 100644
View file @ 734e575f
// SPDX-License-Identifier: GPL-2.0-only
/dts-v1/;
#include "motorola-mapphone-handset.dtsi"
/ {
backlight: backlight {
compatible = "led-backlight";
leds = <&backlight_led>;
brightness-levels = <31 63 95 127 159 191 223 255>;
default-brightness-level = <6>;
};
/* 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>;
};
};
&dsi1 {
status = "okay";
vdd-supply = <&vcsi>;
port {
dsi1_out_ep: endpoint {
remote-endpoint = <&lcd0_in>;
lanes = <0 1 2 3 4 5>;
};
};
lcd0: panel@0 {
compatible = "motorola,droid4-panel", "panel-dsi-cm";
reg = <0>;
label = "lcd0";
vddi-supply = <&lcd_regulator>;
reset-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>; /* gpio101 */
backlight = <&backlight>;
width-mm = <50>;
height-mm = <89>;
rotation = <90>;
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>;
};
};
};
};
arch/arm/boot/dts/ti/omap/omap4-droid-bionic-xt875.dts
View file @ 734e575f
// SPDX-License-Identifier: GPL-2.0-only
/dts-v1/;
#include "motorola-mapphone-common.dtsi"
#include "motorola-mapphone-xt8xx.dtsi"
/ {
model = "Motorola Droid Bionic XT875";
compatible = "motorola,droid-bionic", "ti,omap4430", "ti,omap4";
chosen {
stdout-path = &uart3;
};
aliases {
display0 = &lcd0;
display1 = &hdmi0;
};
};
&keypad {
......
arch/arm/boot/dts/ti/omap/omap4-droid4-xt894.dts
View file @ 734e575f
// SPDX-License-Identifier: GPL-2.0-only
/dts-v1/;
#include "motorola-mapphone-common.dtsi"
#include "motorola-mapphone-xt8xx.dtsi"
/ {
model = "Motorola Droid 4 XT894";
compatible = "motorola,droid4", "ti,omap4430", "ti,omap4";
chosen {
stdout-path = &uart3;
};
aliases {
display0 = &lcd0;
display1 = &hdmi0;
};
gpio_keys {
compatible = "gpio-keys";
......@@ -33,11 +45,6 @@ slider {
};
};
/ {
model = "Motorola Droid 4 XT894";
compatible = "motorola,droid4", "ti,omap4430", "ti,omap4";
};
&keypad {
keypad,num-rows = <8>;
keypad,num-columns = <8>;
......
arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts
View file @ 734e575f
......@@ -51,6 +51,12 @@ unknown_supply: unknown-supply {
regulator-name = "unknown";
};
wl12xx_pwrseq: wl12xx-pwrseq {
compatible = "mmc-pwrseq-simple";
clocks = <&twl 1>;
clock-names = "ext_clock";
};
/* regulator for wl12xx on sdio2 */
wl12xx_vmmc: wl12xx-vmmc {
pinctrl-names = "default";
......@@ -74,6 +80,7 @@ &i2c1 {
twl: pmic@48 {
compatible = "ti,twl6032";
reg = <0x48>;
#clock-cells = <1>;
/* IRQ# = 7 */
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_1N cascaded to gic */
interrupt-controller;
......@@ -294,6 +301,7 @@ &mmc3 {
pinctrl-names = "default";
pinctrl-0 = <&wl12xx_pins>;
vmmc-supply = <&wl12xx_vmmc>;
mmc-pwrseq = <&wl12xx_pwrseq>;
interrupts-extended = <&wakeupgen GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH
&omap4_pmx_core 0x12e>;
non-removable;
......@@ -454,10 +462,12 @@ &uart2 {
interrupts-extended = <&wakeupgen GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH
&omap4_pmx_core OMAP4_UART2_RX>;
/*
* BT + GPS in WL1283 in WG7500 requiring CLK32KAUDIO of pmic
* which does not have a driver
*/
bluetooth-gnss {
compatible = "ti,wl1283-st";
enable-gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>; /* GPIO_25 */
clocks = <&twl 1>;
clock-names = "ext_clock";
};
};
&uart3 {
......
arch/arm/boot/dts/ti/omap/omap4-xyboard-mz609.dts 0 → 100644
View file @ 734e575f
// SPDX-License-Identifier: GPL-2.0-only
/dts-v1/;
#include "motorola-mapphone-mz607-mz617.dtsi"
/ {
model = "Motorola Xyboard MZ609";
compatible = "motorola,xyboard-mz609", "ti,omap4430", "ti,omap4";
chosen {
stdout-path = &uart3;
};
aliases {
display1 = &hdmi0;
};
backlight: backlight {
compatible = "led-backlight";
leds = <&backlight_led>;
brightness-levels = <31 63 95 127 159 191 223 255>;
default-brightness-level = <6>;
};
};
&i2c1 {
led-controller@38 {
compatible = "ti,lm3532";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x38>;
enable-gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>;
ramp-up-us = <1024>;
ramp-down-us = <8193>;
backlight_led: led@0 {
reg = <0>;
led-sources = <2>;
ti,led-mode = <0>;
label = ":backlight";
};
};
};
arch/arm/boot/dts/ti/omap/omap4-xyboard-mz617.dts 0 → 100644
View file @ 734e575f
// SPDX-License-Identifier: GPL-2.0-only
/dts-v1/;
#include "motorola-mapphone-mz607-mz617.dtsi"
/ {
model = "Motorola Xyboard MZ617";
compatible = "motorola,xyboard-mz617", "ti,omap4430", "ti,omap4";
chosen {
stdout-path = &uart3;
};
aliases {
display1 = &hdmi0;
};
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7