mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-18 22:14:16 +00:00
Devicetree changes for omaps for v5.11 merge window
- Two non-urgent pandaboard updates to get gpio button and bluetooth working on pandaboard-es - Updates to follow devicetree binding docs for dwc3 and pwm-leds - Add initial support for droid bionic based on what we have for droid4 - Add second sha instance for dra7 - Add eQEP nodes for am335x for boneblue - Fix wrong comments for am335x gpio_31 -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAl/Aq4ARHHRvbnlAYXRv bWlkZS5jb20ACgkQG9Q+yVyrpXPxVg/9Gcw/MabrgYLZfDiDqtDJooNz0nBMTGVF eRGqUUnf5DBaOvJpq+nliqSvpl0BGnReYr48d9iqs4avZAUoBH14m8vGMgrS8ppc 84j/g4kYEMdmriWoPuAmQKLKoxyAv886I5Zv665vy2MGFAJYhXOhtLcZTf8IAbU+ Ln9nBntAk9/1bRQEpbSMyVOZ0NQLSeA3xxXIiyV+Y6hEUUbh+7jqXzwRR6O7UEVz WDSHofUmr3FoJyVkjUzxeqfTE18DEV/EIP+0FzxWFy6nDNGSDC9vXmJGPa4Ll8f7 Hw7JO9j0fZjom+OHh28jG0syARws/cE4v3EvvNuEKrMJoyBi0+Y4Paov8AOb/LpL j7JYgounOt0BSnnoZQILvLH34p+kZqj8Rw3nvf23bVASgTouOCYLpLjS8DDg1tzI v6O+hYbi7f2XR4b7u8ZpEXrjiO335MiZl530XU5GihXza5Keg/qDSF9uSmxkAGvD FIB2agmGfVj6Uk1LcR7JTfY+BHDWeRw7Om5EEEhiH9SBGVfZkLFnH7GkwtcG63nY EoPPocqw0Tdldgn0dxRAiTP3nbN28KRIrNNmePh6jfBcWLUtAxUREJZVoDq8tH2P YwwLm1RbCFm8B7RcRSHmBB6PAyWbmtczoaZ6jF0ehXz72w1jACu6KvE+VYkLr9Bc gCXfxbUycio= =7jNq -----END PGP SIGNATURE----- Merge tag 'omap-for-v5.11/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt Devicetree changes for omaps for v5.11 merge window - Two non-urgent pandaboard updates to get gpio button and bluetooth working on pandaboard-es - Updates to follow devicetree binding docs for dwc3 and pwm-leds - Add initial support for droid bionic based on what we have for droid4 - Add second sha instance for dra7 - Add eQEP nodes for am335x for boneblue - Fix wrong comments for am335x gpio_31 * tag 'omap-for-v5.11/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: am335x: Fix comments for AM335X_PIN_GPMC_WPN pin in GPIO mode ARM: dts: am335x-boneblue: Enable eQEP ARM: dts: am33xx: Add nodes for eQEP ARM: dts: dra7: add second SHA instance ARM: dts: xt875: add section for kionix kxtf9 ARM: dts: mapphone: separate out xt894 specific things ARM: dts: omap: Fix schema warnings for pwm-leds ARM: dts: omap5: Harmonize DWC USB3 DT nodes name ARM: dts: am437x: Correct DWC USB3 compatible string ARM: dts: pandaboard es: add bluetooth uart for HCI ARM: dts: pandaboard: fix pinmux for gpio user button of Pandaboard ES Link: https://lore.kernel.org/r/pull-1606462656-588116@atomide.com-2 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
3a53840627
17 changed files with 367 additions and 172 deletions
|
|
@ -168,7 +168,7 @@
|
|||
AM33XX_PADCONF(AM335X_PIN_GPMC_AD6, PIN_INPUT_PULLUP, MUX_MODE0) /* gpmc_ad6.gpmc_ad6 */
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_AD7, PIN_INPUT_PULLUP, MUX_MODE0) /* gpmc_ad7.gpmc_ad7 */
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_WAIT0, PIN_INPUT_PULLUP, MUX_MODE0) /* gpmc_wait0.gpmc_wait0 */
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_WPN, PIN_INPUT_PULLUP, MUX_MODE7) /* gpmc_wpn.gpio0_30 */
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_WPN, PIN_INPUT_PULLUP, MUX_MODE7) /* gpmc_wpn.gpio0_31 */
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_CSN0, PIN_OUTPUT, MUX_MODE0) /* gpmc_csn0.gpmc_csn0 */
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_ADVN_ALE, PIN_OUTPUT, MUX_MODE0) /* gpmc_advn_ale.gpmc_advn_ale */
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_OEN_REN, PIN_OUTPUT, MUX_MODE0) /* gpmc_oen_ren.gpmc_oen_ren */
|
||||
|
|
|
|||
|
|
@ -241,6 +241,30 @@
|
|||
AM33XX_PADCONF(AM335X_PIN_MII1_RXD0, PIN_OUTPUT, MUX_MODE7) /* (M16) gmii1_rxd0.gpio2[21] */
|
||||
>;
|
||||
};
|
||||
|
||||
/* E1 */
|
||||
eqep0_pins: pinmux_eqep0_pins {
|
||||
pinctrl-single,pins = <
|
||||
AM33XX_PADCONF(AM335X_PIN_MCASP0_AXR0, PIN_INPUT, MUX_MODE1) /* (B12) mcasp0_aclkr.eQEP0A_in */
|
||||
AM33XX_PADCONF(AM335X_PIN_MCASP0_FSR, PIN_INPUT, MUX_MODE1) /* (C13) mcasp0_fsr.eQEP0B_in */
|
||||
>;
|
||||
};
|
||||
|
||||
/* E2 */
|
||||
eqep1_pins: pinmux_eqep1_pins {
|
||||
pinctrl-single,pins = <
|
||||
AM33XX_PADCONF(AM335X_PIN_LCD_DATA12, PIN_INPUT, MUX_MODE2) /* (V2) lcd_data12.eQEP1A_in */
|
||||
AM33XX_PADCONF(AM335X_PIN_LCD_DATA13, PIN_INPUT, MUX_MODE2) /* (V3) lcd_data13.eQEP1B_in */
|
||||
>;
|
||||
};
|
||||
|
||||
/* E3 */
|
||||
eqep2_pins: pinmux_eqep2_pins {
|
||||
pinctrl-single,pins = <
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_AD12, PIN_INPUT, MUX_MODE4) /* (T12) gpmc_ad12.eQEP2A_in */
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_AD13, PIN_INPUT, MUX_MODE4) /* (R12) gpmc_ad13.eQEP2B_in */
|
||||
>;
|
||||
};
|
||||
};
|
||||
|
||||
&uart0 {
|
||||
|
|
@ -419,3 +443,33 @@
|
|||
line-name = "LS_BUF_EN";
|
||||
};
|
||||
};
|
||||
|
||||
&epwmss0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&eqep0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&eqep0_pins>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&epwmss1 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&eqep1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&eqep1_pins>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&epwmss2 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&eqep2 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&eqep2_pins>;
|
||||
status = "okay";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@
|
|||
AM33XX_PADCONF(AM335X_PIN_GPMC_AD6, PIN_INPUT_PULLUP, MUX_MODE0)
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_AD7, PIN_INPUT_PULLUP, MUX_MODE0)
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_WAIT0, PIN_INPUT_PULLUP, MUX_MODE0)
|
||||
/* gpmc_wpn.gpio0_30 */
|
||||
/* gpmc_wpn.gpio0_31 */
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_WPN, PIN_INPUT_PULLUP, MUX_MODE7)
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_CSN0, PIN_OUTPUT, MUX_MODE0)
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_ADVN_ALE, PIN_OUTPUT, MUX_MODE0)
|
||||
|
|
|
|||
|
|
@ -229,7 +229,7 @@
|
|||
AM33XX_PADCONF(AM335X_PIN_GPMC_AD6, PIN_INPUT_PULLUP, MUX_MODE0)
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_AD7, PIN_INPUT_PULLUP, MUX_MODE0)
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_WAIT0, PIN_INPUT_PULLUP, MUX_MODE0)
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_WPN, PIN_INPUT_PULLUP, MUX_MODE7) /* gpmc_wpn.gpio0_30 */
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_WPN, PIN_INPUT_PULLUP, MUX_MODE7) /* gpmc_wpn.gpio0_31 */
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_CSN0, PIN_OUTPUT, MUX_MODE0)
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_ADVN_ALE, PIN_OUTPUT, MUX_MODE0)
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_OEN_REN, PIN_OUTPUT, MUX_MODE0)
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@
|
|||
AM33XX_PADCONF(AM335X_PIN_GPMC_AD6, PIN_INPUT_PULLUP, MUX_MODE0)
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_AD7, PIN_INPUT_PULLUP, MUX_MODE0)
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_WAIT0, PIN_INPUT_PULLUP, MUX_MODE0)
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_WPN, PIN_INPUT_PULLUP, MUX_MODE7) /* gpmc_wpn.gpio0_30 */
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_WPN, PIN_INPUT_PULLUP, MUX_MODE7) /* gpmc_wpn.gpio0_31 */
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_CSN0, PIN_OUTPUT, MUX_MODE0)
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_ADVN_ALE, PIN_OUTPUT, MUX_MODE0)
|
||||
AM33XX_PADCONF(AM335X_PIN_GPMC_OEN_REN, PIN_OUTPUT, MUX_MODE0)
|
||||
|
|
|
|||
|
|
@ -1923,6 +1923,15 @@
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
eqep0: counter@180 {
|
||||
compatible = "ti,am3352-eqep";
|
||||
reg = <0x180 0x80>;
|
||||
clocks = <&l4ls_gclk>;
|
||||
clock-names = "sysclkout";
|
||||
interrupts = <79>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
ehrpwm0: pwm@200 {
|
||||
compatible = "ti,am3352-ehrpwm",
|
||||
"ti,am33xx-ehrpwm";
|
||||
|
|
@ -1975,6 +1984,15 @@
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
eqep1: counter@180 {
|
||||
compatible = "ti,am3352-eqep";
|
||||
reg = <0x180 0x80>;
|
||||
clocks = <&l4ls_gclk>;
|
||||
clock-names = "sysclkout";
|
||||
interrupts = <88>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
ehrpwm1: pwm@200 {
|
||||
compatible = "ti,am3352-ehrpwm",
|
||||
"ti,am33xx-ehrpwm";
|
||||
|
|
@ -2027,6 +2045,15 @@
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
eqep2: counter@180 {
|
||||
compatible = "ti,am3352-eqep";
|
||||
reg = <0x180 0x80>;
|
||||
clocks = <&l4ls_gclk>;
|
||||
clock-names = "sysclkout";
|
||||
interrupts = <89>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
ehrpwm2: pwm@200 {
|
||||
compatible = "ti,am3352-ehrpwm",
|
||||
"ti,am33xx-ehrpwm";
|
||||
|
|
|
|||
|
|
@ -2388,7 +2388,7 @@
|
|||
ranges = <0 0 0x20000>;
|
||||
|
||||
usb1: usb@10000 {
|
||||
compatible = "synopsys,dwc3";
|
||||
compatible = "snps,dwc3";
|
||||
reg = <0x10000 0x10000>;
|
||||
interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,
|
||||
|
|
@ -2468,7 +2468,7 @@
|
|||
ranges = <0 0 0x20000>;
|
||||
|
||||
usb2: usb@10000 {
|
||||
compatible = "synopsys,dwc3";
|
||||
compatible = "snps,dwc3";
|
||||
reg = <0x10000 0x10000>;
|
||||
interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>,
|
||||
|
|
|
|||
|
|
@ -932,7 +932,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
sham_target: target-module@4b101000 {
|
||||
sham1_target: target-module@4b101000 {
|
||||
compatible = "ti,sysc-omap3-sham", "ti,sysc";
|
||||
reg = <0x4b101100 0x4>,
|
||||
<0x4b101110 0x4>,
|
||||
|
|
@ -951,7 +951,7 @@
|
|||
#size-cells = <1>;
|
||||
ranges = <0x0 0x4b101000 0x1000>;
|
||||
|
||||
sham: sham@0 {
|
||||
sham1: sham@0 {
|
||||
compatible = "ti,omap5-sham";
|
||||
reg = <0 0x300>;
|
||||
interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
|
@ -962,6 +962,36 @@
|
|||
};
|
||||
};
|
||||
|
||||
sham2_target: target-module@42701000 {
|
||||
compatible = "ti,sysc-omap3-sham", "ti,sysc";
|
||||
reg = <0x42701100 0x4>,
|
||||
<0x42701110 0x4>,
|
||||
<0x42701114 0x4>;
|
||||
reg-names = "rev", "sysc", "syss";
|
||||
ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET |
|
||||
SYSC_OMAP2_AUTOIDLE)>;
|
||||
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
|
||||
<SYSC_IDLE_NO>,
|
||||
<SYSC_IDLE_SMART>;
|
||||
ti,syss-mask = <1>;
|
||||
/* Domains (P, C): l4per_pwrdm, l4sec_clkdm */
|
||||
clocks = <&l4sec_clkctrl DRA7_L4SEC_SHAM2_CLKCTRL 0>;
|
||||
clock-names = "fck";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges = <0x0 0x42701000 0x1000>;
|
||||
|
||||
sham2: sham@0 {
|
||||
compatible = "ti,omap5-sham";
|
||||
reg = <0 0x300>;
|
||||
interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
|
||||
dmas = <&edma_xbar 165 0>;
|
||||
dma-names = "rx";
|
||||
clocks = <&l3_iclk_div>;
|
||||
clock-names = "fck";
|
||||
};
|
||||
};
|
||||
|
||||
opp_supply_mpu: opp-supply@4a003b20 {
|
||||
compatible = "ti,omap5-opp-supply";
|
||||
reg = <0x4a003b20 0xc>;
|
||||
|
|
|
|||
|
|
@ -113,32 +113,9 @@
|
|||
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;
|
||||
/* Value above 7.95ms for no GPIO hardware debounce */
|
||||
debounce-interval = <10>;
|
||||
};
|
||||
|
||||
slider {
|
||||
label = "Keypad Slide";
|
||||
gpios = <&gpio4 26 GPIO_ACTIVE_HIGH>; /* gpio122 */
|
||||
linux,input-type = <EV_SW>;
|
||||
linux,code = <SW_KEYPAD_SLIDE>;
|
||||
linux,can-disable;
|
||||
/* Value above 7.95ms for no GPIO hardware debounce */
|
||||
debounce-interval = <10>;
|
||||
};
|
||||
};
|
||||
|
||||
soundcard {
|
||||
compatible = "audio-graph-card";
|
||||
label = "Droid 4 Audio";
|
||||
label = "Mapphone Audio";
|
||||
|
||||
widgets =
|
||||
"Speaker", "Earpiece",
|
||||
|
|
@ -282,80 +259,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
&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>;
|
||||
|
|
@ -395,34 +298,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";
|
||||
};
|
||||
|
||||
led@1 {
|
||||
reg = <1>;
|
||||
led-sources = <1>;
|
||||
ti,led-mode = <0>;
|
||||
label = ":kbd_backlight";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&i2c2 {
|
||||
touchscreen@4a {
|
||||
compatible = "atmel,maxtouch";
|
||||
|
|
@ -796,20 +671,6 @@
|
|||
"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";
|
||||
};
|
||||
};
|
||||
|
||||
&mcbsp2 {
|
||||
|
|
|
|||
|
|
@ -34,26 +34,26 @@
|
|||
clock-frequency = <26000000>;
|
||||
};
|
||||
|
||||
leds {
|
||||
led-controller-1 {
|
||||
compatible = "gpio-leds";
|
||||
|
||||
heartbeat {
|
||||
led-1 {
|
||||
label = "beagleboard::usr0";
|
||||
gpios = <&gpio5 22 GPIO_ACTIVE_HIGH>; /* 150 -> D6 LED */
|
||||
linux,default-trigger = "heartbeat";
|
||||
};
|
||||
|
||||
mmc {
|
||||
led-2 {
|
||||
label = "beagleboard::usr1";
|
||||
gpios = <&gpio5 21 GPIO_ACTIVE_HIGH>; /* 149 -> D7 LED */
|
||||
linux,default-trigger = "mmc0";
|
||||
};
|
||||
};
|
||||
|
||||
pwmleds {
|
||||
led-controller-2 {
|
||||
compatible = "pwm-leds";
|
||||
|
||||
pmu_stat {
|
||||
led-3 {
|
||||
label = "beagleboard::pmu_stat";
|
||||
pwms = <&twl_pwmled 1 7812500>;
|
||||
max-brightness = <127>;
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@
|
|||
reg = <0 0>;
|
||||
};
|
||||
|
||||
pwmleds {
|
||||
led-controller {
|
||||
compatible = "pwm-leds";
|
||||
|
||||
overo {
|
||||
led-1 {
|
||||
label = "overo:blue:COM";
|
||||
pwms = <&twl_pwmled 1 7812500>;
|
||||
max-brightness = <127>;
|
||||
|
|
|
|||
|
|
@ -7,3 +7,49 @@
|
|||
model = "Motorola Droid Bionic XT875";
|
||||
compatible = "motorola,droid-bionic", "ti,omap4430", "ti,omap4";
|
||||
};
|
||||
|
||||
&keypad {
|
||||
keypad,num-rows = <8>;
|
||||
keypad,num-columns = <8>;
|
||||
linux,keymap = <
|
||||
MATRIX_KEY(5, 0, KEY_VOLUMEUP)
|
||||
MATRIX_KEY(3, 0, KEY_VOLUMEDOWN)
|
||||
>;
|
||||
};
|
||||
|
||||
&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";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&i2c4 {
|
||||
kxtf9: accelerometer@f {
|
||||
compatible = "kionix,kxtf9";
|
||||
reg = <0x0f>;
|
||||
|
||||
vdd-supply = <&vhvio>;
|
||||
|
||||
interrupt-parent = <&gpio2>;
|
||||
interrupts = <2 IRQ_TYPE_EDGE_RISING>;
|
||||
|
||||
rotation-matrix = "0", "-1", "0",
|
||||
"1", "0", "0",
|
||||
"0", "0", "1";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,7 +3,150 @@
|
|||
|
||||
#include "motorola-mapphone-common.dtsi"
|
||||
|
||||
/ {
|
||||
gpio_keys {
|
||||
compatible = "gpio-keys";
|
||||
|
||||
volume_down {
|
||||
label = "Volume Down";
|
||||
gpios = <&gpio5 26 GPIO_ACTIVE_LOW>; /* gpio154 */
|
||||
linux,code = <KEY_VOLUMEDOWN>;
|
||||
linux,can-disable;
|
||||
/* Value above 7.95ms for no GPIO hardware debounce */
|
||||
debounce-interval = <10>;
|
||||
};
|
||||
|
||||
slider {
|
||||
label = "Keypad Slide";
|
||||
gpios = <&gpio4 26 GPIO_ACTIVE_HIGH>; /* gpio122 */
|
||||
linux,input-type = <EV_SW>;
|
||||
linux,code = <SW_KEYPAD_SLIDE>;
|
||||
linux,can-disable;
|
||||
/* Value above 7.95ms for no GPIO hardware debounce */
|
||||
debounce-interval = <10>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
/ {
|
||||
model = "Motorola Droid 4 XT894";
|
||||
compatible = "motorola,droid4", "ti,omap4430", "ti,omap4";
|
||||
};
|
||||
|
||||
&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)
|
||||
>;
|
||||
};
|
||||
|
||||
&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";
|
||||
};
|
||||
|
||||
led@1 {
|
||||
reg = <1>;
|
||||
led-sources = <1>;
|
||||
ti,led-mode = <0>;
|
||||
label = ":kbd_backlight";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&i2c4 {
|
||||
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";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@
|
|||
reg = <0x80000000 0x20000000>; /* 512 MB */
|
||||
};
|
||||
|
||||
pwmleds {
|
||||
led-controller {
|
||||
compatible = "pwm-leds";
|
||||
|
||||
green {
|
||||
led-1 {
|
||||
label = "green";
|
||||
pwms = <&twl_pwm 0 7812500>;
|
||||
max-brightness = <127>;
|
||||
};
|
||||
|
||||
orange {
|
||||
led-2 {
|
||||
label = "orange";
|
||||
pwms = <&twl_pwm 1 7812500>;
|
||||
max-brightness = <127>;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,23 @@
|
|||
|
||||
button_pins: pinmux_button_pins {
|
||||
pinctrl-single,pins = <
|
||||
OMAP4_IOPAD(0x11b, PIN_INPUT_PULLUP | MUX_MODE3) /* gpio_113 */
|
||||
OMAP4_IOPAD(0x0fc, PIN_INPUT_PULLUP | MUX_MODE3) /* gpio_113 */
|
||||
>;
|
||||
};
|
||||
|
||||
bt_pins: pinmux_bt_pins {
|
||||
pinctrl-single,pins = <
|
||||
OMAP4_IOPAD(0x06c, PIN_OUTPUT | MUX_MODE3) /* gpmc_a22.gpio_46 - BTEN */
|
||||
OMAP4_IOPAD(0x072, PIN_OUTPUT_PULLUP | MUX_MODE3) /* gpmc_a25.gpio_49 - BTWAKEUP */
|
||||
>;
|
||||
};
|
||||
|
||||
uart2_pins: pinmux_uart2_pins {
|
||||
pinctrl-single,pins = <
|
||||
OMAP4_IOPAD(0x118, PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_cts.uart2_cts - HCI */
|
||||
OMAP4_IOPAD(0x11a, PIN_OUTPUT | MUX_MODE0) /* uart2_rts.uart2_rts */
|
||||
OMAP4_IOPAD(0x11c, PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_rx.uart2_rx */
|
||||
OMAP4_IOPAD(0x11e, PIN_OUTPUT | MUX_MODE0) /* uart2_tx.uart2_tx */
|
||||
>;
|
||||
};
|
||||
};
|
||||
|
|
@ -80,3 +96,19 @@
|
|||
&gpio1_target {
|
||||
ti,no-reset-on-init;
|
||||
};
|
||||
|
||||
&wl12xx_gpio {
|
||||
pinctrl-single,pins = <
|
||||
OMAP4_IOPAD(0x066, PIN_OUTPUT | MUX_MODE3) /* gpmc_a19.gpio_43 */
|
||||
OMAP4_IOPAD(0x070, PIN_OUTPUT_PULLUP | MUX_MODE3) /* gpmc_a24.gpio_48 */
|
||||
>;
|
||||
};
|
||||
|
||||
&uart2 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&uart2_pins &bt_pins>;
|
||||
bluetooth: tiwi {
|
||||
compatible = "ti,wl1271-st";
|
||||
enable-gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>; /* GPIO_46 */
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -45,58 +45,60 @@
|
|||
regulator-boot-on;
|
||||
};
|
||||
|
||||
leds {
|
||||
led-controller-1 {
|
||||
compatible = "gpio-leds";
|
||||
debug0 {
|
||||
|
||||
led-1 {
|
||||
label = "omap4:green:debug0";
|
||||
gpios = <&gpio2 29 GPIO_ACTIVE_HIGH>; /* 61 */
|
||||
};
|
||||
|
||||
debug1 {
|
||||
led-2 {
|
||||
label = "omap4:green:debug1";
|
||||
gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>; /* 30 */
|
||||
};
|
||||
|
||||
debug2 {
|
||||
led-3 {
|
||||
label = "omap4:green:debug2";
|
||||
gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; /* 7 */
|
||||
};
|
||||
|
||||
debug3 {
|
||||
led-4 {
|
||||
label = "omap4:green:debug3";
|
||||
gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; /* 8 */
|
||||
};
|
||||
|
||||
debug4 {
|
||||
led-5 {
|
||||
label = "omap4:green:debug4";
|
||||
gpios = <&gpio2 18 GPIO_ACTIVE_HIGH>; /* 50 */
|
||||
};
|
||||
|
||||
user1 {
|
||||
led-6 {
|
||||
label = "omap4:blue:user";
|
||||
gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* 169 */
|
||||
};
|
||||
|
||||
user2 {
|
||||
led-7 {
|
||||
label = "omap4:red:user";
|
||||
gpios = <&gpio6 10 GPIO_ACTIVE_HIGH>; /* 170 */
|
||||
};
|
||||
|
||||
user3 {
|
||||
led-8 {
|
||||
label = "omap4:green:user";
|
||||
gpios = <&gpio5 11 GPIO_ACTIVE_HIGH>; /* 139 */
|
||||
};
|
||||
};
|
||||
|
||||
pwmleds {
|
||||
led-controller-2 {
|
||||
compatible = "pwm-leds";
|
||||
kpad {
|
||||
|
||||
led-9 {
|
||||
label = "omap4::keypad";
|
||||
pwms = <&twl_pwm 0 7812500>;
|
||||
max-brightness = <127>;
|
||||
};
|
||||
|
||||
charging {
|
||||
led-10 {
|
||||
label = "omap4:green:chrg";
|
||||
pwms = <&twl_pwmled 0 7812500>;
|
||||
max-brightness = <255>;
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@
|
|||
#size-cells = <1>;
|
||||
utmi-mode = <2>;
|
||||
ranges = <0 0 0x20000>;
|
||||
dwc3: dwc3@10000 {
|
||||
dwc3: usb@10000 {
|
||||
compatible = "snps,dwc3";
|
||||
reg = <0x10000 0x10000>;
|
||||
interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue