mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-26 20:44:32 +08:00
8bd2bcf320
of these fixes are needed to support omap5 es2 version that includes PM features while the earlier version es1 did not. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJRWwn7AAoJEBvUPslcq6Vztp4QAKWN2Tv218cf21Qfa3gjjAk4 I45+cBvsNqyMo3HoXrHLXM5QyI7p3g3ixdYdak5QxZ+eiyJaigNVRCD/bsmEzC0W aYU2uwgLJOCkWdilPFvNsHpIm/9Ecfv6Ss3TVHIp5XpJQhoZ466tfmiWlpR9xEPZ BBIYr1NSvnb19AKL/CjOwM2xNuIJOjFF4cMiltRpXy96vdtnrPLzLlz4NrD9LhdW iT0ZGLKb0T6N1awwcmdKgJNudk3i4uc5XbvQoloL62EVPc6PHH6tOG3skjI283nw W4kiyZzVy6FLzyNz/7pZ22IZdxZ4h8cBnBz8nBrdav65tPzukWghdWvlwJdpxfkh BT512Fg+a4i2LMZDdUCCeY7lUVYr7Z3ckl0RObqlWBf210aEUiq5FfrvDYxX2xZm P9TR7uajfDr4HqoI/kBYjZe/sHhesugWxdKxzDPf9wF6vuQC1cpwucT92ybtRbJn aiTNi6s1k2QuDgAor26mMoIctZt+uZOYfkAtpp/nvWj8vUAcRWb9eHVmcm2uHI8/ ijMwlPxsQ846K/ztTlTlAw0wvOdvmXXf8PNT2wKsNTmcwbLK+2uCGTR4q2O7WOFo lKFB93/zJA3mL52bhSkEkEFrbRv6XsRfSc4tcVdueEQAfjZD3hsngpzS5PsDczbo MLm0q7WCBHhS0CRqOFEE =mjWl -----END PGP SIGNATURE----- Merge tag 'omap-for-v3.10/fixes-non-critical-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical From Tony Lindgren <tony@atomide.com>: Non critical omap fixes for v3.10 merge window. A big chunk of these fixes are needed to support omap5 es2 version that includes PM features while the earlier version es1 did not. * tag 'omap-for-v3.10/fixes-non-critical-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: fix typo "CONFIG_BRIDGE_DVFS" ARM: OMAP1: remove "config MACH_OMAP_HTCWIZARD" ARM: OMAP: dpll: enable bypass clock only when attempting dpll bypass ARM: OMAP2+: powerdomain: avoid testing whether an unsigned char is less than 0 ARM: OMAP2+: hwmod: Remove unused _HWMOD_WAKEUP_ENABLED flag ARM: OMAP2+: am335x: Change the wdt1 func clk src to per_32k clk ARM: OMAP2+: AM33xx: hwmod: Add missing sysc definition to wdt1 entry Contains an update to 3.9-rc5 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
275 lines
5.3 KiB
Plaintext
275 lines
5.3 KiB
Plaintext
/*
|
|
* Copyright 2012 ST-Ericsson AB
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
/include/ "dbx5x0.dtsi"
|
|
|
|
/ {
|
|
memory {
|
|
reg = <0x00000000 0x20000000>;
|
|
};
|
|
|
|
gpio_keys {
|
|
compatible = "gpio-keys";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
button@1 {
|
|
linux,code = <11>;
|
|
label = "SFH7741 Proximity Sensor";
|
|
};
|
|
};
|
|
|
|
soc-u9500 {
|
|
uart@80120000 {
|
|
status = "okay";
|
|
};
|
|
|
|
uart@80121000 {
|
|
status = "okay";
|
|
};
|
|
|
|
uart@80007000 {
|
|
status = "okay";
|
|
};
|
|
|
|
i2c@80004000 {
|
|
tc3589x@42 {
|
|
compatible = "tc3589x";
|
|
reg = <0x42>;
|
|
interrupt-parent = <&gpio6>;
|
|
interrupts = <25 0x1>;
|
|
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
|
|
tc3589x_gpio: tc3589x_gpio {
|
|
compatible = "tc3589x-gpio";
|
|
interrupts = <0 0x1>;
|
|
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
};
|
|
};
|
|
};
|
|
|
|
i2c@80128000 {
|
|
lp5521@0x33 {
|
|
compatible = "lp5521";
|
|
reg = <0x33>;
|
|
};
|
|
|
|
lp5521@0x34 {
|
|
compatible = "lp5521";
|
|
reg = <0x34>;
|
|
};
|
|
|
|
bh1780@0x29 {
|
|
compatible = "rohm,bh1780gli";
|
|
reg = <0x33>;
|
|
};
|
|
};
|
|
|
|
// External Micro SD slot
|
|
sdi0_per1@80126000 {
|
|
arm,primecell-periphid = <0x10480180>;
|
|
max-frequency = <50000000>;
|
|
bus-width = <4>;
|
|
mmc-cap-sd-highspeed;
|
|
mmc-cap-mmc-highspeed;
|
|
vmmc-supply = <&ab8500_ldo_aux3_reg>;
|
|
vqmmc-supply = <&vmmci>;
|
|
|
|
cd-gpios = <&tc3589x_gpio 3 0x4>;
|
|
|
|
status = "okay";
|
|
};
|
|
|
|
// WLAN SDIO channel
|
|
sdi1_per2@80118000 {
|
|
arm,primecell-periphid = <0x10480180>;
|
|
max-frequency = <50000000>;
|
|
bus-width = <4>;
|
|
|
|
status = "okay";
|
|
};
|
|
|
|
// PoP:ed eMMC
|
|
sdi2_per3@80005000 {
|
|
arm,primecell-periphid = <0x10480180>;
|
|
max-frequency = <50000000>;
|
|
bus-width = <8>;
|
|
mmc-cap-mmc-highspeed;
|
|
|
|
status = "okay";
|
|
};
|
|
|
|
// On-board eMMC
|
|
sdi4_per2@80114000 {
|
|
arm,primecell-periphid = <0x10480180>;
|
|
max-frequency = <50000000>;
|
|
bus-width = <8>;
|
|
mmc-cap-mmc-highspeed;
|
|
vmmc-supply = <&ab8500_ldo_aux2_reg>;
|
|
|
|
status = "okay";
|
|
};
|
|
|
|
sound {
|
|
compatible = "stericsson,snd-soc-mop500";
|
|
|
|
stericsson,cpu-dai = <&msp1 &msp3>;
|
|
stericsson,audio-codec = <&codec>;
|
|
};
|
|
|
|
msp1: msp@80124000 {
|
|
status = "okay";
|
|
};
|
|
|
|
msp3: msp@80125000 {
|
|
status = "okay";
|
|
};
|
|
|
|
prcmu@80157000 {
|
|
db8500-prcmu-regulators {
|
|
db8500_vape_reg: db8500_vape {
|
|
regulator-name = "db8500-vape";
|
|
};
|
|
|
|
db8500_varm_reg: db8500_varm {
|
|
regulator-name = "db8500-varm";
|
|
};
|
|
|
|
db8500_vmodem_reg: db8500_vmodem {
|
|
regulator-name = "db8500-vmodem";
|
|
};
|
|
|
|
db8500_vpll_reg: db8500_vpll {
|
|
regulator-name = "db8500-vpll";
|
|
};
|
|
|
|
db8500_vsmps1_reg: db8500_vsmps1 {
|
|
regulator-name = "db8500-vsmps1";
|
|
};
|
|
|
|
db8500_vsmps2_reg: db8500_vsmps2 {
|
|
regulator-name = "db8500-vsmps2";
|
|
};
|
|
|
|
db8500_vsmps3_reg: db8500_vsmps3 {
|
|
regulator-name = "db8500-vsmps3";
|
|
};
|
|
|
|
db8500_vrf1_reg: db8500_vrf1 {
|
|
regulator-name = "db8500-vrf1";
|
|
};
|
|
|
|
db8500_sva_mmdsp_reg: db8500_sva_mmdsp {
|
|
regulator-name = "db8500-sva-mmdsp";
|
|
};
|
|
|
|
db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {
|
|
regulator-name = "db8500-sva-mmdsp-ret";
|
|
};
|
|
|
|
db8500_sva_pipe_reg: db8500_sva_pipe {
|
|
regulator-name = "db8500_sva_pipe";
|
|
};
|
|
|
|
db8500_sia_mmdsp_reg: db8500_sia_mmdsp {
|
|
regulator-name = "db8500_sia_mmdsp";
|
|
};
|
|
|
|
db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret {
|
|
regulator-name = "db8500-sia-mmdsp-ret";
|
|
};
|
|
|
|
db8500_sia_pipe_reg: db8500_sia_pipe {
|
|
regulator-name = "db8500-sia-pipe";
|
|
};
|
|
|
|
db8500_sga_reg: db8500_sga {
|
|
regulator-name = "db8500-sga";
|
|
};
|
|
|
|
db8500_b2r2_mcde_reg: db8500_b2r2_mcde {
|
|
regulator-name = "db8500-b2r2-mcde";
|
|
};
|
|
|
|
db8500_esram12_reg: db8500_esram12 {
|
|
regulator-name = "db8500-esram12";
|
|
};
|
|
|
|
db8500_esram12_ret_reg: db8500_esram12_ret {
|
|
regulator-name = "db8500-esram12-ret";
|
|
};
|
|
|
|
db8500_esram34_reg: db8500_esram34 {
|
|
regulator-name = "db8500-esram34";
|
|
};
|
|
|
|
db8500_esram34_ret_reg: db8500_esram34_ret {
|
|
regulator-name = "db8500-esram34-ret";
|
|
};
|
|
};
|
|
|
|
ab8500 {
|
|
ab8500-regulators {
|
|
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
|
|
regulator-name = "V-DISPLAY";
|
|
};
|
|
|
|
ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {
|
|
regulator-name = "V-eMMC1";
|
|
};
|
|
|
|
ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {
|
|
regulator-name = "V-MMC-SD";
|
|
};
|
|
|
|
ab8500_ldo_initcore_reg: ab8500_ldo_initcore {
|
|
regulator-name = "V-INTCORE";
|
|
};
|
|
|
|
ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
|
|
regulator-name = "V-TVOUT";
|
|
};
|
|
|
|
ab8500_ldo_usb_reg: ab8500_ldo_usb {
|
|
regulator-name = "dummy";
|
|
};
|
|
|
|
ab8500_ldo_audio_reg: ab8500_ldo_audio {
|
|
regulator-name = "V-AUD";
|
|
};
|
|
|
|
ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
|
|
regulator-name = "V-AMIC1";
|
|
};
|
|
|
|
ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 {
|
|
regulator-name = "V-AMIC2";
|
|
};
|
|
|
|
ab8500_ldo_dmic_reg: ab8500_ldo_dmic {
|
|
regulator-name = "V-DMIC";
|
|
};
|
|
|
|
ab8500_ldo_ana_reg: ab8500_ldo_ana {
|
|
regulator-name = "V-CSI/DSI";
|
|
};
|
|
};
|
|
};
|
|
};
|
|
};
|
|
};
|