mirror of
https://github.com/torvalds/linux.git
synced 2024-11-07 12:41:55 +00:00
4f2d658b2f
This branch contains two kinds of updates: Some platforms in the process of getting converted to device tree based booting, and the platform specific patches necessary for that are included here. Other platforms are already converted, so we just need to update the actual device tree source files and the binding documents to add support for new board and new drivers. In the future we will probably separate those into two branches, and in the long run, the plan is to move the device tree source files out of the kernel repository, but that has to wait until we have completed a much larger portion of the binding documents. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIVAwUAUA2dbmCrR//JCVInAQJl0hAA3U3AnfBBXbKEJhUi47z6QU2kRPVfyjAj ct+FsZMWFihEHC5/YkB/bQ/i7Hf/AKBZRG6eAUfsyevuhQ0Li+wsRM4eU3FaF6kw HNqqB6GQWM+2rR8//Y6AAZymTLfe5nbuWFhRXiIggIlQne5jJ1kSidmSzG+OJEuN sAKXX7Ud5goVsby9Uwp4Gc0fpDsjFmIarhHfMDizFozNZIFzZIhKKdl1VOf+Kv+o PFRfCGB2KQrrDy0oB62y3iNUiK84LA0xWX4KkI9rD4OHWeiDQpbUITchf//Wa20X vgZdI8T16sxbmAHi1zerIl8y/CLgLyerp1L3KSMGTwirC+92vZg+jOGYGgNqu973 NOl0IBQFpbAlNzmf52naNgcQ2OxxFQ3ogrlpvE2bItLL7J3vpmn1JwWMTtSrcs3Z xgbovAq2ivNOiKpzXexvMsWDCU3PxzXaP+2hEUhglJcdXkx5Iwiwi6un2FuF2qWT l5rSAWkg2kT/OkgYHLBI5JW7e7ugWhUAuCsrIH9eW7xstm4hIlN950vefs2FrZkP FeE7pn6s6mr98+j9isJKusETXIoEXDLX61vxA8PQP7GYN+/O/g2qB0qztBwarMBL wAdHCjavOYNwPkxYaGLjv9qKt3X575O/6aFa/NoKGhIECanjLl02Tqg02BdHecST 8HENXCvwQns= =K3WL -----END PGP SIGNATURE----- Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull arm-soc device tree description updates from Arnd Bergmann: "This branch contains two kinds of updates: Some platforms in the process of getting converted to device tree based booting, and the platform specific patches necessary for that are included here. Other platforms are already converted, so we just need to update the actual device tree source files and the binding documents to add support for new board and new drivers. In the future we will probably separate those into two branches, and in the long run, the plan is to move the device tree source files out of the kernel repository, but that has to wait until we have completed a much larger portion of the binding documents." Fix up trivial conflicts in arch/arm/mach-imx/clk-imx6q.c due to newly added clkdev registers next to a few removed unnecessary ones. * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (119 commits) ARM: LPC32xx: Add PWM to base dts file ARM: EXYNOS: mark the DMA channel binding for SPI as preliminary ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS5 platforms ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOS5 ARM: EXYNOS: Add spi clock support for EXYNOS5 ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS4 platforms ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOX4 ARM: EXYNOS: Fix the incorrect hierarchy of spi controller bus clock ARM: ux500: Remove PMU platform registration when booting with DT ARM: ux500: Remove temporary snowball_of_platform_devs enablement structure ARM: ux500: Ensure vendor specific properties have the vendor's identifier pinctrl: pinctrl-nomadik: Append sleepmode property with vendor specific prefixes ARM: ux500: Move rtc-pl031 registration to Device Tree when enabled ARM: ux500: Enable the AB8500 RTC for all DT:ed DB8500 based devices ARM: ux500: Correctly reference IRQs supplied by the AB8500 from Device Tree ARM: ux500: Apply ab8500-debug node do the db8500 DT structure ARM: ux500: Add a ab8500-usb Device Tree node for db8500 based devices ARM: ux500: Add db8500 Device Tree node for misc/ab8500-pwm ARM: ux500: Add db8500 Device Tree node for ab8500-sysctrl ARM: ux500: Enable LED heartbeat functionality on Snowbal via DT ...
229 lines
4.2 KiB
Plaintext
229 lines
4.2 KiB
Plaintext
/*
|
|
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
|
|
*
|
|
* 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/ "omap4.dtsi"
|
|
|
|
/ {
|
|
model = "TI OMAP4 SDP board";
|
|
compatible = "ti,omap4-sdp", "ti,omap4430", "ti,omap4";
|
|
|
|
memory {
|
|
device_type = "memory";
|
|
reg = <0x80000000 0x40000000>; /* 1 GB */
|
|
};
|
|
|
|
vdd_eth: fixedregulator@0 {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "VDD_ETH";
|
|
regulator-min-microvolt = <3300000>;
|
|
regulator-max-microvolt = <3300000>;
|
|
gpio = <&gpio2 16 0>; /* gpio line 48 */
|
|
enable-active-high;
|
|
regulator-boot-on;
|
|
};
|
|
|
|
vbat: fixedregulator@2 {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "VBAT";
|
|
regulator-min-microvolt = <3750000>;
|
|
regulator-max-microvolt = <3750000>;
|
|
regulator-boot-on;
|
|
};
|
|
|
|
leds {
|
|
compatible = "gpio-leds";
|
|
debug0 {
|
|
label = "omap4:green:debug0";
|
|
gpios = <&gpio2 29 0>; /* 61 */
|
|
};
|
|
|
|
debug1 {
|
|
label = "omap4:green:debug1";
|
|
gpios = <&gpio1 30 0>; /* 30 */
|
|
};
|
|
|
|
debug2 {
|
|
label = "omap4:green:debug2";
|
|
gpios = <&gpio1 7 0>; /* 7 */
|
|
};
|
|
|
|
debug3 {
|
|
label = "omap4:green:debug3";
|
|
gpios = <&gpio1 8 0>; /* 8 */
|
|
};
|
|
|
|
debug4 {
|
|
label = "omap4:green:debug4";
|
|
gpios = <&gpio2 18 0>; /* 50 */
|
|
};
|
|
|
|
user1 {
|
|
label = "omap4:blue:user";
|
|
gpios = <&gpio6 9 0>; /* 169 */
|
|
};
|
|
|
|
user2 {
|
|
label = "omap4:red:user";
|
|
gpios = <&gpio6 10 0>; /* 170 */
|
|
};
|
|
|
|
user3 {
|
|
label = "omap4:green:user";
|
|
gpios = <&gpio5 11 0>; /* 139 */
|
|
};
|
|
};
|
|
|
|
sound {
|
|
compatible = "ti,abe-twl6040";
|
|
ti,model = "SDP4430";
|
|
|
|
ti,jack-detection = <1>;
|
|
ti,mclk-freq = <38400000>;
|
|
|
|
ti,mcpdm = <&mcpdm>;
|
|
ti,dmic = <&dmic>;
|
|
|
|
ti,twl6040 = <&twl6040>;
|
|
|
|
/* Audio routing */
|
|
ti,audio-routing =
|
|
"Headset Stereophone", "HSOL",
|
|
"Headset Stereophone", "HSOR",
|
|
"Earphone Spk", "EP",
|
|
"Ext Spk", "HFL",
|
|
"Ext Spk", "HFR",
|
|
"Line Out", "AUXL",
|
|
"Line Out", "AUXR",
|
|
"Vibrator", "VIBRAL",
|
|
"Vibrator", "VIBRAR",
|
|
"HSMIC", "Headset Mic",
|
|
"Headset Mic", "Headset Mic Bias",
|
|
"MAINMIC", "Main Handset Mic",
|
|
"Main Handset Mic", "Main Mic Bias",
|
|
"SUBMIC", "Sub Handset Mic",
|
|
"Sub Handset Mic", "Main Mic Bias",
|
|
"AFML", "Line In",
|
|
"AFMR", "Line In",
|
|
"DMic", "Digital Mic",
|
|
"Digital Mic", "Digital Mic1 Bias";
|
|
};
|
|
};
|
|
|
|
&i2c1 {
|
|
clock-frequency = <400000>;
|
|
|
|
twl: twl@48 {
|
|
reg = <0x48>;
|
|
/* SPI = 0, IRQ# = 7, 4 = active high level-sensitive */
|
|
interrupts = <0 7 4>; /* IRQ_SYS_1N cascaded to gic */
|
|
interrupt-parent = <&gic>;
|
|
};
|
|
|
|
twl6040: twl@4b {
|
|
compatible = "ti,twl6040";
|
|
reg = <0x4b>;
|
|
/* SPI = 0, IRQ# = 119, 4 = active high level-sensitive */
|
|
interrupts = <0 119 4>; /* IRQ_SYS_2N cascaded to gic */
|
|
interrupt-parent = <&gic>;
|
|
ti,audpwron-gpio = <&gpio4 31 0>; /* gpio line 127 */
|
|
|
|
vio-supply = <&v1v8>;
|
|
v2v1-supply = <&v2v1>;
|
|
enable-active-high;
|
|
|
|
/* regulators for vibra motor */
|
|
vddvibl-supply = <&vbat>;
|
|
vddvibr-supply = <&vbat>;
|
|
|
|
vibra {
|
|
/* Vibra driver, motor resistance parameters */
|
|
ti,vibldrv-res = <8>;
|
|
ti,vibrdrv-res = <3>;
|
|
ti,viblmotor-res = <10>;
|
|
ti,vibrmotor-res = <10>;
|
|
};
|
|
};
|
|
};
|
|
|
|
/include/ "twl6030.dtsi"
|
|
|
|
&i2c2 {
|
|
clock-frequency = <400000>;
|
|
};
|
|
|
|
&i2c3 {
|
|
clock-frequency = <400000>;
|
|
|
|
/*
|
|
* Temperature Sensor
|
|
* http://www.ti.com/lit/ds/symlink/tmp105.pdf
|
|
*/
|
|
tmp105@48 {
|
|
compatible = "ti,tmp105";
|
|
reg = <0x48>;
|
|
};
|
|
|
|
/*
|
|
* Ambient Light Sensor
|
|
* http://www.rohm.com/products/databook/sensor/pdf/bh1780gli-e.pdf
|
|
*/
|
|
bh1780@29 {
|
|
compatible = "rohm,bh1780";
|
|
reg = <0x29>;
|
|
};
|
|
};
|
|
|
|
&i2c4 {
|
|
clock-frequency = <400000>;
|
|
|
|
/*
|
|
* 3-Axis Digital Compass
|
|
* http://www.sparkfun.com/datasheets/Sensors/Magneto/HMC5843.pdf
|
|
*/
|
|
hmc5843@1e {
|
|
compatible = "honeywell,hmc5843";
|
|
reg = <0x1e>;
|
|
};
|
|
};
|
|
|
|
&mcspi1 {
|
|
eth@0 {
|
|
compatible = "ks8851";
|
|
spi-max-frequency = <24000000>;
|
|
reg = <0>;
|
|
interrupt-parent = <&gpio2>;
|
|
interrupts = <2>; /* gpio line 34 */
|
|
vdd-supply = <&vdd_eth>;
|
|
};
|
|
};
|
|
|
|
&mmc1 {
|
|
vmmc-supply = <&vmmc>;
|
|
bus-width = <8>;
|
|
};
|
|
|
|
&mmc2 {
|
|
vmmc-supply = <&vaux1>;
|
|
bus-width = <8>;
|
|
ti,non-removable;
|
|
};
|
|
|
|
&mmc3 {
|
|
status = "disabled";
|
|
};
|
|
|
|
&mmc4 {
|
|
status = "disabled";
|
|
};
|
|
|
|
&mmc5 {
|
|
bus-width = <4>;
|
|
ti,non-removable;
|
|
};
|