forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'omap-for-v4.10/dt-signed' of git://git.kernel.org/pub/scm/…
…linux/kernel/git/tmlind/linux-omap into next/dt Device tree changes for omaps for v4.10 merge window: - A series of patches to configure tps65217 PMIC interrupts for power button, charger and usb and use them on am335x - Configure EEPROM, LEDs and USR1 button for omap5 boards - Add tscadc DMA properites for am33xx and am4372 - Configure baltos-ir5221 both musb channels to host mode - Configure internal and external RTC clocks for am335x boards - Don't reset gpio3 block on baltos - Remove pinmux for dra72-evm for erratum i869, fix the regulators and seprate out tps65917 support - Add dra718-evm support - Add minimal droid 4 xt894 support * tag 'omap-for-v4.10/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (22 commits) ARM: dts: Add minimal support for motorola droid 4 xt894 ARM: dts: Add support for dra718-evm ARM: dts: dra72: Add separate dtsi for tps65917 ARM: dts: dra72-evm: Fix modelling of regulators ARM: dts: dra72-evm: Remove pinmux configurations for erratum i869 ARM: dts: am335x-baltos: don't reset gpio3 block ARM: dts: AM335X-evmsk: Add the internal and external clock nodes for rtc ARM: dts: AM335X-evm: Add the internal and external clock nodes for rtc ARM: dts: AM335X-bone-common: Add the internal and external clock nodes for rtc ARM: dts: am335x-baltos-ir5221: use both musb channels in host mode ARM: dts: am4372: add DMA properties for tscadc ARM: dts: am33xx: add DMA properties for tscadc ARM: dts: omap5 uevm: add USR1 button ARM: dts: omap5 uevm: add LEDs ARM: dts: omap5 uevm: add EEPROM ARM: dts: am335x: Add the power button interrupt ARM: dts: am335x: Add the charger interrupt dt-bindings: mfd: Provide human readable defines for TPS65217 interrupts ARM: dts: am335x: Support the PMIC interrupt ARM: dts: tps65217: Add the power button device ... Signed-off-by: Olof Johansson <[email protected]>
- Loading branch information
Showing
17 changed files
with
787 additions
and
326 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -114,7 +114,7 @@ | |
|
|
||
| &usb1 { | ||
| status = "okay"; | ||
| dr_mode = "otg"; | ||
| dr_mode = "host"; | ||
| }; | ||
|
|
||
| &cpsw_emac0 { | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -406,3 +406,7 @@ | |
| &gpio0 { | ||
| ti,no-reset-on-init; | ||
| }; | ||
|
|
||
| &gpio3 { | ||
| ti,no-reset-on-init; | ||
| }; | ||
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
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,230 @@ | ||
| /* | ||
| * Copyright (C) 2016 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. | ||
| */ | ||
|
|
||
| #include "dra72-evm-common.dtsi" | ||
| #include <dt-bindings/net/ti-dp83867.h> | ||
|
|
||
| / { | ||
| compatible = "ti,dra718-evm", "ti,dra718", "ti,dra722", "ti,dra72", "ti,dra7"; | ||
| model = "TI DRA718 EVM"; | ||
|
|
||
| memory { | ||
| device_type = "memory"; | ||
| reg = <0x0 0x80000000 0x0 0x80000000>; /* 2GB */ | ||
| }; | ||
|
|
||
| vpo_sd_1v8_3v3: gpio-regulator-TPS74801 { | ||
| compatible = "regulator-gpio"; | ||
|
|
||
| regulator-name = "vddshv8"; | ||
| regulator-min-microvolt = <1800000>; | ||
| regulator-max-microvolt = <3000000>; | ||
| regulator-boot-on; | ||
| vin-supply = <&evm_5v0>; | ||
|
|
||
| gpios = <&gpio7 11 GPIO_ACTIVE_HIGH>; | ||
| states = <1800000 0x0 | ||
| 3000000 0x1>; | ||
| }; | ||
|
|
||
| poweroff: gpio-poweroff { | ||
| compatible = "gpio-poweroff"; | ||
| gpios = <&gpio7 30 GPIO_ACTIVE_HIGH>; | ||
| input; | ||
| }; | ||
| }; | ||
|
|
||
| &i2c1 { | ||
| status = "okay"; | ||
| clock-frequency = <400000>; | ||
|
|
||
| lp8733: lp8733@60 { | ||
| compatible = "ti,lp8733"; | ||
| reg = <0x60>; | ||
|
|
||
| buck0-in-supply =<&vsys_3v3>; | ||
| buck1-in-supply =<&vsys_3v3>; | ||
| ldo0-in-supply =<&evm_5v0>; | ||
| ldo1-in-supply =<&evm_5v0>; | ||
|
|
||
| lp8733_regulators: regulators { | ||
| lp8733_buck0_reg: buck0 { | ||
| /* FB_B0 -> LP8733-BUCK1 - VPO_S1_AVS - VDD_CORE_AVS (core, mpu, gpu) */ | ||
| regulator-name = "lp8733-buck0"; | ||
| regulator-min-microvolt = <850000>; | ||
| regulator-max-microvolt = <1250000>; | ||
| regulator-always-on; | ||
| regulator-boot-on; | ||
| }; | ||
|
|
||
| lp8733_buck1_reg: buck1 { | ||
| /* FB_B1 -> LP8733-BUCK2 - VPO_S2_AVS - VDD_DSP_AVS (DSP/eve/iva) */ | ||
| regulator-name = "lp8733-buck1"; | ||
| regulator-min-microvolt = <850000>; | ||
| regulator-max-microvolt = <1250000>; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| lp8733_ldo0_reg: ldo0 { | ||
| /* LDO0 -> LP8733-LDO1 - VPO_L1_3V3 - VDDSHV8 (optional) */ | ||
| regulator-name = "lp8733-ldo0"; | ||
| regulator-min-microvolt = <3300000>; | ||
| regulator-max-microvolt = <3300000>; | ||
| }; | ||
|
|
||
| lp8733_ldo1_reg: ldo1 { | ||
| /* LDO1 -> LP8733-LDO2 - VPO_L2_3V3 - VDDA_USB3V3 */ | ||
| regulator-name = "lp8733-ldo1"; | ||
| regulator-min-microvolt = <3300000>; | ||
| regulator-max-microvolt = <3300000>; | ||
| regulator-always-on; | ||
| regulator-boot-on; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| lp8732: lp8732@61 { | ||
| compatible = "ti,lp8732"; | ||
| reg = <0x61>; | ||
|
|
||
| buck0-in-supply =<&vsys_3v3>; | ||
| buck1-in-supply =<&vsys_3v3>; | ||
| ldo0-in-supply =<&vsys_3v3>; | ||
| ldo1-in-supply =<&vsys_3v3>; | ||
|
|
||
| lp8732_regulators: regulators { | ||
| lp8732_buck0_reg: buck0 { | ||
| /* FB_B0 -> LP8732-BUCK1 - VPO_S3_1V8 - VDDS_1V8 */ | ||
| regulator-name = "lp8732-buck0"; | ||
| regulator-min-microvolt = <1800000>; | ||
| regulator-max-microvolt = <1800000>; | ||
| regulator-always-on; | ||
| regulator-boot-on; | ||
| }; | ||
|
|
||
| lp8732_buck1_reg: buck1 { | ||
| /* FB_B1 -> LP8732-BUCK2 - VPO_S4_DDR - VDD_DDR_1V35 */ | ||
| regulator-name = "lp8732-buck1"; | ||
| regulator-min-microvolt = <1350000>; | ||
| regulator-max-microvolt = <1350000>; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| lp8732_ldo0_reg: ldo0 { | ||
| /* LDO0 -> LP8732-LDO1 - VPO_L3_1V8 - VDA_1V8_PLL */ | ||
| regulator-name = "lp8732-ldo0"; | ||
| regulator-min-microvolt = <1800000>; | ||
| regulator-max-microvolt = <1800000>; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| lp8732_ldo1_reg: ldo1 { | ||
| /* LDO1 -> LP8732-LDO2 - VPO_L4_1V8 - VDA_1V8_PHY */ | ||
| regulator-name = "lp8732-ldo1"; | ||
| regulator-min-microvolt = <1800000>; | ||
| regulator-max-microvolt = <1800000>; | ||
| regulator-always-on; | ||
| regulator-boot-on; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &pcf_gpio_21 { | ||
| interrupt-parent = <&gpio7>; | ||
| interrupts = <31 IRQ_TYPE_EDGE_FALLING>; | ||
| }; | ||
|
|
||
| &pcf_hdmi { | ||
| p0 { | ||
| /* | ||
| * PM_OEn to High: Disable routing I2C3 to PM_I2C | ||
| * With this PM_SEL(p3) should not matter | ||
| */ | ||
| gpio-hog; | ||
| gpios = <0 GPIO_ACTIVE_LOW>; | ||
| output-high; | ||
| line-name = "pm_oe_n"; | ||
| }; | ||
| }; | ||
|
|
||
| &mmc1 { | ||
| vmmc_aux-supply = <&vpo_sd_1v8_3v3>; | ||
| }; | ||
|
|
||
| &mac { | ||
| mode-gpios = <&pcf_gpio_21 4 GPIO_ACTIVE_LOW>, | ||
| <&pcf_hdmi 9 GPIO_ACTIVE_LOW>, /* P11 */ | ||
| <&pcf_hdmi 10 GPIO_ACTIVE_LOW>; /* P12 */ | ||
| dual_emac; | ||
| }; | ||
|
|
||
| &cpsw_emac0 { | ||
| phy_id = <&davinci_mdio>, <2>; | ||
| phy-mode = "rgmii-id"; | ||
| dual_emac_res_vlan = <1>; | ||
| }; | ||
|
|
||
| &cpsw_emac1 { | ||
| phy_id = <&davinci_mdio>, <3>; | ||
| phy-mode = "rgmii-id"; | ||
| dual_emac_res_vlan = <2>; | ||
| }; | ||
|
|
||
| &davinci_mdio { | ||
| dp83867_0: ethernet-phy@2 { | ||
| reg = <2>; | ||
| ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>; | ||
| ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>; | ||
| ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>; | ||
| ti,impedance-control = <0x1f>; | ||
| }; | ||
|
|
||
| dp83867_1: ethernet-phy@3 { | ||
| reg = <3>; | ||
| ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>; | ||
| ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>; | ||
| ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>; | ||
| ti,impedance-control = <0x1f>; | ||
| }; | ||
| }; | ||
|
|
||
| /* No Sata on this device */ | ||
| &sata_phy { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &sata { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| /* No RTC on this device */ | ||
| &rtc { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &usb2_phy1 { | ||
| phy-supply = <&lp8733_ldo1_reg>; | ||
| }; | ||
|
|
||
| &usb2_phy2 { | ||
| phy-supply = <&lp8733_ldo1_reg>; | ||
| }; | ||
|
|
||
| &dss { | ||
| /* Supplied by VDA_1V8_PLL */ | ||
| vdda_video-supply = <&lp8732_ldo0_reg>; | ||
| }; | ||
|
|
||
| &hdmi { | ||
| /* Supplied by VDA_1V8_PHY */ | ||
| vdda_video-supply = <&lp8732_ldo1_reg>; | ||
| }; |
Oops, something went wrong.