forked from Freescale/linux-fslc
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request Freescale#20 from falstaff84/4.9-1.0.x-imx-fixes
4.9-1.0.x-imx fixes from Toradex branch
- Loading branch information
Showing
157 changed files
with
21,602 additions
and
1,638 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
Documentation/devicetree/bindings/staging/iio/adc/stmpe-adc.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| STMPE ADC driver | ||
| ---------------- | ||
|
|
||
| Required properties: | ||
| - compatible: "st,stmpe-adc" | ||
|
|
||
| Optional properties: | ||
| Note that the ADC is shared with the STMPE touchscreen, so if using both the | ||
| settings should be the same. | ||
| If they are not, the last one to be initialized will win. | ||
| - st,sample-time: ADC converstion time in number of clock. (0 -> 36 clocks, 1 -> | ||
| 44 clocks, 2 -> 56 clocks, 3 -> 64 clocks, 4 -> 80 clocks, 5 -> 96 clocks, 6 | ||
| -> 144 clocks), recommended is 4. | ||
| - st,mod-12b: ADC Bit mode (0 -> 10bit ADC, 1 -> 12bit ADC) | ||
| - st,ref-sel: ADC reference source (0 -> internal reference, 1 -> external | ||
| reference) | ||
| - st,adc-freq: ADC Clock speed (0 -> 1.625 MHz, 1 -> 3.25 MHz, 2 || 3 -> 6.5 MHz) | ||
|
|
||
| Node name must be stmpe_adc and should be child node of stmpe node to | ||
| which it belongs. | ||
|
|
||
| Example: | ||
|
|
||
| stmpe_adc { | ||
| compatible = "st,stmpe-adc"; | ||
| st,sample-time = <4>; | ||
| st,mod-12b = <1>; | ||
| st,ref-sel = <0>; | ||
| st,adc-freq = <1>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,222 @@ | ||
| /* | ||
| * Copyright 2014-2017 Toradex AG | ||
| * Copyright 2012 Freescale Semiconductor, Inc. | ||
| * Copyright 2011 Linaro Ltd. | ||
| * | ||
| * The code contained herein is licensed under the GNU General Public | ||
| * License. You may obtain a copy of the GNU General Public License | ||
| * Version 2 or later at the following locations: | ||
| * | ||
| * http://www.opensource.org/licenses/gpl-license.html | ||
| * http://www.gnu.org/copyleft/gpl.html | ||
| */ | ||
|
|
||
| /dts-v1/; | ||
|
|
||
| #include <dt-bindings/input/input.h> | ||
| #include <dt-bindings/interrupt-controller/irq.h> | ||
| #include "imx6dl.dtsi" | ||
| #include "imx6qdl-colibri.dtsi" | ||
|
|
||
| / { | ||
| model = "Toradex Colibri iMX6DL/S on Colibri Aster Board"; | ||
| compatible = "toradex,colibri_imx6dl-aster", "toradex,colibri_imx6dl", "fsl,imx6dl"; | ||
|
|
||
| aliases { | ||
| i2c1 = &i2c2; | ||
| i2c2 = &i2c3; | ||
| }; | ||
|
|
||
| aliases { | ||
| rtc0 = &rtc_i2c; | ||
| rtc1 = "/soc/aips-bus@02000000/snvs@020cc000/snvs-rtc-lp@34"; | ||
| }; | ||
|
|
||
| aliases { | ||
| /* the following, together with kernel patches, forces a fixed assignment | ||
| between device id and usdhc controller */ | ||
| /* i.e. the eMMC on usdhc3 will be /dev/mmcblk0 */ | ||
| mmc0 = &usdhc3; /* eMMC */ | ||
| mmc1 = &usdhc1; /* MMC 4bit slot */ | ||
| }; | ||
|
|
||
| extcon_usbc_det: usbc_det { | ||
| compatible = "linux,extcon-usb-gpio"; | ||
| debounce = <25>; | ||
| id-gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&pinctrl_usbc_det_1>; | ||
| }; | ||
|
|
||
| gpio-keys { | ||
| compatible = "gpio-keys"; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&pinctrl_gpio_keys>; | ||
|
|
||
| wakeup { | ||
| label = "Wake-Up"; | ||
| gpios = <&gpio2 22 GPIO_ACTIVE_HIGH>; | ||
| linux,code = <KEY_WAKEUP>; | ||
| debounce-interval = <10>; | ||
| gpio-key,wakeup; | ||
| }; | ||
| }; | ||
|
|
||
| regulators { | ||
| reg_usb_host_vbus: usb_host_vbus { | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &backlight { | ||
| #if 0 /* PWM polarity: if 1 is brightest */ | ||
| pwms = <&pwm3 0 5000000 0>; | ||
| #else /* PWM polarity: if 0 is brightest */ | ||
| pwms = <&pwm3 0 5000000 1>; | ||
| #endif | ||
| brightness-levels = <0 4 8 16 32 64 128 255>; | ||
| default-brightness-level = <6>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &ecspi4 { | ||
| fsl,spi-num-chipselects = <2>; | ||
| cs-gpios = < | ||
| &gpio5 2 GPIO_ACTIVE_HIGH | ||
| &gpio5 4 GPIO_ACTIVE_HIGH | ||
| >; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&pinctrl_ecspi4 &pinctrl_spi_cs1 &pinctrl_csi_gpio_2>; | ||
| status = "okay"; | ||
|
|
||
| spidev0: spidev@0 { | ||
| compatible = "toradex,evalspi"; | ||
| reg = <0>; | ||
| spi-max-frequency = <23000000>; | ||
| }; | ||
|
|
||
| spidev1: spidev@1 { | ||
| compatible = "toradex,evalspi"; | ||
| reg = <1>; | ||
| spi-max-frequency = <23000000>; | ||
| }; | ||
| }; | ||
|
|
||
| /* | ||
| * I2C: I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier | ||
| * board) | ||
| */ | ||
| &i2c3 { | ||
| status = "okay"; | ||
|
|
||
| /* Atmel maxtouch controller */ | ||
| atmel_mxt_ts: atmel_mxt_ts@4a { | ||
| compatible = "atmel,maxtouch"; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&pinctrl_mxt_ts>; | ||
| reg = <0x4a>; | ||
| interrupt-parent = <&gpio2>; | ||
| interrupts = <24 IRQ_TYPE_EDGE_FALLING>; | ||
| /* | ||
| * Note: When the status is set to okay, to avoid pinmux | ||
| * conflict, one should remove the pinctrl_weim_cs1 and | ||
| * pinctrl_weim_cs2 pingroup from the weim pinctrl-0 | ||
| * property or disable weim node. | ||
| */ | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| /* M41T0M6 real time clock on carrier board */ | ||
| rtc_i2c: rtc@68 { | ||
| compatible = "st,m41t0"; | ||
| reg = <0x68>; | ||
| }; | ||
| }; | ||
|
|
||
| &iomuxc { | ||
| /* | ||
| * Mux all pins which are unused to be GPIOs | ||
| * so they are ready for export to user space | ||
| */ | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = < | ||
| &pinctrl_weim_gpio_1 &pinctrl_weim_gpio_2 | ||
| &pinctrl_weim_gpio_3 &pinctrl_weim_gpio_4 | ||
| &pinctrl_weim_gpio_5 &pinctrl_weim_gpio_6 | ||
| &pinctrl_csi_gpio_1 | ||
| &pinctrl_gpio_1 | ||
| &pinctrl_gpio_2 | ||
| &pinctrl_usbh_oc_1 &pinctrl_usbc_id_1 | ||
| >; | ||
|
|
||
| gpio { | ||
| pinctrl_gpios: gpios { | ||
| fsl,pins = < | ||
| MX6QDL_PAD_GPIO_9__GPIO1_IO09 PAD_CTRL_HYS_PU /* SODIMM 28 */ | ||
| MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 PAD_CTRL_HYS_PU /* SODIMM 30 */ | ||
| >; | ||
| }; | ||
|
|
||
| pinctrl_mxt_ts: mxt-ts { | ||
| fsl,pins = < | ||
| MX6QDL_PAD_EIM_CS1__GPIO2_IO24 PAD_CTRL_HYS_PD /* SODIMM 107 */ | ||
| MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 PAD_CTRL_HYS_PD /* SODIMM 106 */ | ||
| >; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &lcd { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &mxcfb1 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &mxcfb2 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &pwm1 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &pwm2 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &pwm3 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &pwm4 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &uart1 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &uart2 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &uart3 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &usbh1 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &usbotg { | ||
| status = "okay"; | ||
| extcon = <&extcon_usbc_det>; | ||
| }; | ||
|
|
||
| /* MMC */ | ||
| &usdhc1 { | ||
| status = "okay"; | ||
| }; |
Oops, something went wrong.