Commit abda5334 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'omap-for-v4.8/dt-part1-signed-v2' of...

Merge tag 'omap-for-v4.8/dt-part1-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Device tree changes for omaps for v4.8 merge window:

- PWM binding updates and related dts changes
- OCM RAM updates for dra7
- Enable n900 lirc-rx51 driver
- omap3-gta04 updates for backlight, bma180, itg3200, hmc5843 and wifi
- am335x, am437x and am57xx operating point updates and additions
- am335x-icev2 pca9536 node
- dra72-evm regulator updates
- edma spelling fixes
- am335x and am437x ethernet phy update
- a series of mcbsp updates
- omap3-gta04 eeprom
- dra7 PCIe unit address fix
- stdout-path for beaglebone variants
- crypto accelerator nodes for am335x, am437x and dra7

* tag 'omap-for-v4.8/dt-part1-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (42 commits)
  ARM: dts: AM43xx: Add node for RNG
  ARM: dts: AM43xx: clk: Add RNG clk node
  ARM: dts: DRA7: Add DT node for RNG IP
  ARM: dts: DRA7: Add support for SHA IP
  ARM: dts: DRA7: Add DT nodes for AES IP
  ARM: dts: DRA7: Add DT node for DES IP
  ARM: dts: am335x-bone-common: use stdout-path in Beaglebone boards.
  ARM: dts: DRA7: fix unit address of second PCIe instance
  ARM: dts: omap3-gta04: Add RFID eeprom node
  ARM: dts: omap4-duovero: Add pdmclk binding for audio
  ARM: dts: omap4-var-som-om44: Add pdmclk binding for audio
  ARM: dts: omap4-sdp: Add pdmclk binding for audio
  ARM: dts: omap4-panda-common: Add pdmclk binding for audio
  ARM: dts: omap5-board-common: Add pdmclk binding for audio
  ARM: dts: omap3: Add clocks to McBSP nodes
  ARM: dts: am335x-bone-common: Mark MAC as having only one PHY
  ARM: dts: am437x-idk-evm: Mark MAC as having only one PHY
  ARM: dts: Correct misspelling, "emda3" -> "edma3"
  ARM: dts: dra72-evm: Rename 3.3V regulator tag
  ARM: dts: am335x-icev2: Add DT node for TI PCA9536
  ...
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 35902cf1 52c7c913
...@@ -15,7 +15,7 @@ Required properties: ...@@ -15,7 +15,7 @@ Required properties:
- reg: Memory map of eDMA CC - reg: Memory map of eDMA CC
- reg-names: "edma3_cc" - reg-names: "edma3_cc"
- interrupts: Interrupt lines for CCINT, MPERR and CCERRINT. - interrupts: Interrupt lines for CCINT, MPERR and CCERRINT.
- interrupt-names: "edma3_ccint", "emda3_mperr" and "edma3_ccerrint" - interrupt-names: "edma3_ccint", "edma3_mperr" and "edma3_ccerrint"
- ti,tptcs: List of TPTCs associated with the eDMA in the following form: - ti,tptcs: List of TPTCs associated with the eDMA in the following form:
<&tptc_phandle TC_priority_number>. The highest priority is 0. <&tptc_phandle TC_priority_number>. The highest priority is 0.
...@@ -48,7 +48,7 @@ edma: edma@49000000 { ...@@ -48,7 +48,7 @@ edma: edma@49000000 {
reg = <0x49000000 0x10000>; reg = <0x49000000 0x10000>;
reg-names = "edma3_cc"; reg-names = "edma3_cc";
interrupts = <12 13 14>; interrupts = <12 13 14>;
interrupt-names = "edma3_ccint", "emda3_mperr", "edma3_ccerrint"; interrupt-names = "edma3_ccint", "edma3_mperr", "edma3_ccerrint";
dma-requests = <64>; dma-requests = <64>;
#dma-cells = <2>; #dma-cells = <2>;
......
...@@ -2,28 +2,48 @@ TI SOC ECAP based APWM controller ...@@ -2,28 +2,48 @@ TI SOC ECAP based APWM controller
Required properties: Required properties:
- compatible: Must be "ti,<soc>-ecap". - compatible: Must be "ti,<soc>-ecap".
for am33xx - compatible = "ti,am33xx-ecap"; for am33xx - compatible = "ti,am3352-ecap", "ti,am33xx-ecap";
for da850 - compatible = "ti,da850-ecap", "ti,am33xx-ecap"; for am4372 - compatible = "ti,am4372-ecap", "ti,am3352-ecap", "ti,am33xx-ecap";
for da850 - compatible = "ti,da850-ecap", "ti,am3352-ecap", "ti,am33xx-ecap";
for dra746 - compatible = "ti,dra746-ecap", "ti,am3352-ecap";
- #pwm-cells: should be 3. See pwm.txt in this directory for a description of - #pwm-cells: should be 3. See pwm.txt in this directory for a description of
the cells format. The PWM channel index ranges from 0 to 4. The only third the cells format. The PWM channel index ranges from 0 to 4. The only third
cell flag supported by this binding is PWM_POLARITY_INVERTED. cell flag supported by this binding is PWM_POLARITY_INVERTED.
- reg: physical base address and size of the registers map. - reg: physical base address and size of the registers map.
Optional properties: Optional properties:
- ti,hwmods: Name of the hwmod associated to the ECAP: - clocks: Handle to the ECAP's functional clock.
"ecap<x>", <x> being the 0-based instance number from the HW spec - clock-names: Must be set to "fck".
Example: Example:
ecap0: ecap@0 { /* ECAP on am33xx */ ecap0: ecap@48300100 { /* ECAP on am33xx */
compatible = "ti,am33xx-ecap"; compatible = "ti,am3352-ecap", "ti,am33xx-ecap";
#pwm-cells = <3>;
reg = <0x48300100 0x80>;
clocks = <&l4ls_gclk>;
clock-names = "fck";
};
ecap0: ecap@48300100 { /* ECAP on am4372 */
compatible = "ti,am4372-ecap", "ti,am3352-ecap", "ti,am33xx-ecap";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x48300100 0x80>; reg = <0x48300100 0x80>;
ti,hwmods = "ecap0"; ti,hwmods = "ecap0";
clocks = <&l4ls_gclk>;
clock-names = "fck";
};
ecap0: ecap@1f06000 { /* ECAP on da850 */
compatible = "ti,da850-ecap", "ti,am3352-ecap", "ti,am33xx-ecap";
#pwm-cells = <3>;
reg = <0x1f06000 0x80>;
}; };
ecap0: ecap@0 { /* ECAP on da850 */ ecap0: ecap@4843e100 {
compatible = "ti,da850-ecap", "ti,am33xx-ecap"; compatible = "ti,dra746-ecap", "ti,am3352-ecap";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x306000 0x80>; reg = <0x4843e100 0x80>;
clocks = <&l4_root_clk_div>;
clock-names = "fck";
}; };
...@@ -2,28 +2,48 @@ TI SOC EHRPWM based PWM controller ...@@ -2,28 +2,48 @@ TI SOC EHRPWM based PWM controller
Required properties: Required properties:
- compatible: Must be "ti,<soc>-ehrpwm". - compatible: Must be "ti,<soc>-ehrpwm".
for am33xx - compatible = "ti,am33xx-ehrpwm"; for am33xx - compatible = "ti,am3352-ehrpwm", "ti,am33xx-ehrpwm";
for da850 - compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm"; for am4372 - compatible = "ti,am4372-ehrpwm", "ti-am3352-ehrpwm", "ti,am33xx-ehrpwm";
for da850 - compatible = "ti,da850-ehrpwm", "ti-am3352-ehrpwm", "ti,am33xx-ehrpwm";
for dra746 - compatible = "ti,dra746-ehrpwm", "ti-am3352-ehrpwm";
- #pwm-cells: should be 3. See pwm.txt in this directory for a description of - #pwm-cells: should be 3. See pwm.txt in this directory for a description of
the cells format. The only third cell flag supported by this binding is the cells format. The only third cell flag supported by this binding is
PWM_POLARITY_INVERTED. PWM_POLARITY_INVERTED.
- reg: physical base address and size of the registers map. - reg: physical base address and size of the registers map.
Optional properties: Optional properties:
- ti,hwmods: Name of the hwmod associated to the EHRPWM: - clocks: Handle to the PWM's time-base and functional clock.
"ehrpwm<x>", <x> being the 0-based instance number from the HW spec - clock-names: Must be set to "tbclk" and "fck".
Example: Example:
ehrpwm0: ehrpwm@0 { /* EHRPWM on am33xx */ ehrpwm0: pwm@48300200 { /* EHRPWM on am33xx */
compatible = "ti,am33xx-ehrpwm"; compatible = "ti,am3352-ehrpwm", "ti,am33xx-ehrpwm";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x48300200 0x100>; reg = <0x48300200 0x100>;
clocks = <&ehrpwm0_tbclk>, <&l4ls_gclk>;
clock-names = "tbclk", "fck";
};
ehrpwm0: pwm@48300200 { /* EHRPWM on am4372 */
compatible = "ti,am4372-ehrpwm", "ti,am3352-ehrpwm", "ti,am33xx-ehrpwm";
#pwm-cells = <3>;
reg = <0x48300200 0x80>;
clocks = <&ehrpwm0_tbclk>, <&l4ls_gclk>;
clock-names = "tbclk", "fck";
ti,hwmods = "ehrpwm0"; ti,hwmods = "ehrpwm0";
}; };
ehrpwm0: ehrpwm@0 { /* EHRPWM on da850 */ ehrpwm0: pwm@1f00000 { /* EHRPWM on da850 */
compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm"; compatible = "ti,da850-ehrpwm", "ti,am3352-ehrpwm", "ti,am33xx-ehrpwm";
#pwm-cells = <3>;
reg = <0x1f00000 0x2000>;
};
ehrpwm0: pwm@4843e200 { /* EHRPWM on dra746 */
compatible = "ti,dra746-ehrpwm", "ti,am3352-ehrpwm";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x300000 0x2000>; reg = <0x4843e200 0x80>;
clocks = <&ehrpwm0_tbclk>, <&l4_root_clk_div>;
clock-names = "tbclk", "fck";
}; };
TI SOC based PWM Subsystem TI SOC based PWM Subsystem
Required properties: Required properties:
- compatible: Must be "ti,am33xx-pwmss"; - compatible: Must be "ti,<soc>-pwmss".
for am33xx - compatible = "ti,am33xx-pwmss";
for am4372 - compatible = "ti,am4372-pwmss","ti,am33xx-pwmss";
for dra746 - compatible = "ti,dra746-pwmss", "ti,am33xx-pwmss"
- reg: physical base address and size of the registers map. - reg: physical base address and size of the registers map.
- address-cells: Specify the number of u32 entries needed in child nodes. - address-cells: Specify the number of u32 entries needed in child nodes.
Should set to 1. Should set to 1.
...@@ -16,7 +20,7 @@ Required properties: ...@@ -16,7 +20,7 @@ Required properties:
Also child nodes should also populated under PWMSS DT node. Also child nodes should also populated under PWMSS DT node.
Example: Example:
pwmss0: pwmss@48300000 { epwmss0: epwmss@48300000 { /* PWMSS for am33xx */
compatible = "ti,am33xx-pwmss"; compatible = "ti,am33xx-pwmss";
reg = <0x48300000 0x10>; reg = <0x48300000 0x10>;
ti,hwmods = "epwmss0"; ti,hwmods = "epwmss0";
...@@ -29,3 +33,28 @@ pwmss0: pwmss@48300000 { ...@@ -29,3 +33,28 @@ pwmss0: pwmss@48300000 {
/* child nodes go here */ /* child nodes go here */
}; };
epwmss0: epwmss@48300000 { /* PWMSS for am4372 */
compatible = "ti,am4372-pwmss","ti,am33xx-pwmss"
reg = <0x48300000 0x10>;
ti,hwmods = "epwmss0";
#address-cells = <1>;
#size-cells = <1>;
status = "disabled";
ranges = <0x48300100 0x48300100 0x80 /* ECAP */
0x48300180 0x48300180 0x80 /* EQEP */
0x48300200 0x48300200 0x80>; /* EHRPWM */
/* child nodes go here */
};
epwmss0: epwmss@4843e000 { /* PWMSS for DRA7xx */
compatible = "ti,dra746-pwmss", "ti,am33xx-pwmss";
reg = <0x4843e000 0x30>;
ti,hwmods = "epwmss0";
#address-cells = <1>;
#size-cells = <1>;
ranges;
/* child nodes go here */
};
...@@ -18,6 +18,10 @@ memory { ...@@ -18,6 +18,10 @@ memory {
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
chosen {
stdout-path = &uart0;
};
leds { leds {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&user_leds_s0>; pinctrl-0 = <&user_leds_s0>;
...@@ -318,7 +322,7 @@ dcdc2_reg: regulator@1 { ...@@ -318,7 +322,7 @@ dcdc2_reg: regulator@1 {
/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */ /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
regulator-name = "vdd_mpu"; regulator-name = "vdd_mpu";
regulator-min-microvolt = <925000>; regulator-min-microvolt = <925000>;
regulator-max-microvolt = <1325000>; regulator-max-microvolt = <1351500>;
regulator-boot-on; regulator-boot-on;
regulator-always-on; regulator-always-on;
}; };
...@@ -359,12 +363,8 @@ &cpsw_emac0 { ...@@ -359,12 +363,8 @@ &cpsw_emac0 {
phy-mode = "mii"; phy-mode = "mii";
}; };
&cpsw_emac1 {
phy_id = <&davinci_mdio>, <1>;
phy-mode = "mii";
};
&mac { &mac {
slaves = <1>;
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>; pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>; pinctrl-1 = <&cpsw_sleep>;
......
...@@ -33,6 +33,17 @@ &mmc2 { ...@@ -33,6 +33,17 @@ &mmc2 {
status = "okay"; status = "okay";
}; };
&cpu0_opp_table {
/*
* All PG 2.0 silicon may not support 1GHz but some of the early
* BeagleBone Blacks have PG 2.0 silicon which is guaranteed
* to support 1GHz OPP so enable it for PG 2.0 on this board.
*/
oppnitro@1000000000 {
opp-supported-hw = <0x06 0x0100>;
};
};
&am33xx_pinmux { &am33xx_pinmux {
nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins { nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
pinctrl-single,pins = < pinctrl-single,pins = <
......
...@@ -640,7 +640,7 @@ vdd1_reg: regulator@2 { ...@@ -640,7 +640,7 @@ vdd1_reg: regulator@2 {
/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */ /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
regulator-name = "vdd_mpu"; regulator-name = "vdd_mpu";
regulator-min-microvolt = <912500>; regulator-min-microvolt = <912500>;
regulator-max-microvolt = <1312500>; regulator-max-microvolt = <1351500>;
regulator-boot-on; regulator-boot-on;
regulator-always-on; regulator-always-on;
}; };
......
...@@ -560,7 +560,7 @@ vdd1_reg: regulator@2 { ...@@ -560,7 +560,7 @@ vdd1_reg: regulator@2 {
/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */ /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
regulator-name = "vdd_mpu"; regulator-name = "vdd_mpu";
regulator-min-microvolt = <912500>; regulator-min-microvolt = <912500>;
regulator-max-microvolt = <1312500>; regulator-max-microvolt = <1351500>;
regulator-boot-on; regulator-boot-on;
regulator-always-on; regulator-always-on;
}; };
......
...@@ -206,6 +206,13 @@ tpic2810: gpio@60 { ...@@ -206,6 +206,13 @@ tpic2810: gpio@60 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
}; };
pca9536: gpio@41 {
compatible = "ti,pca9536";
reg = <0x41>;
gpio-controller;
#gpio-cells = <2>;
};
}; };
#include "tps65910.dtsi" #include "tps65910.dtsi"
......
...@@ -45,19 +45,9 @@ cpu@0 { ...@@ -45,19 +45,9 @@ cpu@0 {
device_type = "cpu"; device_type = "cpu";
reg = <0>; reg = <0>;
/* operating-points-v2 = <&cpu0_opp_table>;
* To consider voltage drop between PMIC and SoC, ti,syscon-efuse = <&scm_conf 0x7fc 0x1fff 0>;
* tolerance value is reduced to 2% from 4% and ti,syscon-rev = <&scm_conf 0x600>;
* voltage value is increased as a precaution.
*/
operating-points = <
/* kHz uV */
720000 1285000
600000 1225000
500000 1125000
275000 1125000
>;
voltage-tolerance = <2>; /* 2 percentage */
clocks = <&dpll_mpu_ck>; clocks = <&dpll_mpu_ck>;
clock-names = "cpu"; clock-names = "cpu";
...@@ -66,6 +56,78 @@ cpu@0 { ...@@ -66,6 +56,78 @@ cpu@0 {
}; };
}; };
cpu0_opp_table: opp_table0 {
compatible = "operating-points-v2";
/*
* The three following nodes are marked with opp-suspend
* because the can not be enabled simultaneously on a
* single SoC.
*/
opp50@300000000 {
opp-hz = /bits/ 64 <300000000>;
opp-microvolt = <950000 931000 969000>;
opp-supported-hw = <0x06 0x0010>;
opp-suspend;
};
opp100@275000000 {
opp-hz = /bits/ 64 <275000000>;
opp-microvolt = <1100000 1078000 1122000>;
opp-supported-hw = <0x01 0x00FF>;
opp-suspend;
};
opp100@300000000 {
opp-hz = /bits/ 64 <300000000>;
opp-microvolt = <1100000 1078000 1122000>;
opp-supported-hw = <0x06 0x0020>;
opp-suspend;
};
opp100@500000000 {
opp-hz = /bits/ 64 <500000000>;
opp-microvolt = <1100000 1078000 1122000>;
opp-supported-hw = <0x01 0xFFFF>;
};
opp100@600000000 {
opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <1100000 1078000 1122000>;
opp-supported-hw = <0x06 0x0040>;
};
opp120@600000000 {
opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <1200000 1176000 1224000>;
opp-supported-hw = <0x01 0xFFFF>;
};
opp120@720000000 {
opp-hz = /bits/ 64 <720000000>;
opp-microvolt = <1200000 1176000 1224000>;
opp-supported-hw = <0x06 0x0080>;
};
oppturbo@720000000 {
opp-hz = /bits/ 64 <720000000>;
opp-microvolt = <1260000 1234800 1285200>;
opp-supported-hw = <0x01 0xFFFF>;
};
oppturbo@800000000 {
opp-hz = /bits/ 64 <800000000>;
opp-microvolt = <1260000 1234800 1285200>;
opp-supported-hw = <0x06 0x0100>;
};
oppnitro@1000000000 {
opp-hz = /bits/ 64 <1000000000>;
opp-microvolt = <1325000 1298500 1351500>;
opp-supported-hw = <0x04 0x0200>;
};
};
pmu { pmu {
compatible = "arm,cortex-a8-pmu"; compatible = "arm,cortex-a8-pmu";
interrupts = <3>; interrupts = <3>;
...@@ -187,7 +249,7 @@ edma: edma@49000000 { ...@@ -187,7 +249,7 @@ edma: edma@49000000 {
reg = <0x49000000 0x10000>; reg = <0x49000000 0x10000>;
reg-names = "edma3_cc"; reg-names = "edma3_cc";
interrupts = <12 13 14>; interrupts = <12 13 14>;
interrupt-names = "edma3_ccint", "emda3_mperr", interrupt-names = "edma3_ccint", "edma3_mperr",
"edma3_ccerrint"; "edma3_ccerrint";
dma-requests = <64>; dma-requests = <64>;
#dma-cells = <2>; #dma-cells = <2>;
...@@ -679,20 +741,24 @@ epwmss0: epwmss@48300000 { ...@@ -679,20 +741,24 @@ epwmss0: epwmss@48300000 {
0x48300200 0x48300200 0x80>; /* EHRPWM */ 0x48300200 0x48300200 0x80>; /* EHRPWM */
ecap0: ecap@48300100 { ecap0: ecap@48300100 {
compatible = "ti,am33xx-ecap"; compatible = "ti,am3352-ecap",
"ti,am33xx-ecap";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x48300100 0x80>; reg = <0x48300100 0x80>;
clocks = <&l4ls_gclk>;
clock-names = "fck";
interrupts = <31>; interrupts = <31>;
interrupt-names = "ecap0"; interrupt-names = "ecap0";
ti,hwmods = "ecap0";
status = "disabled"; status = "disabled";
}; };
ehrpwm0: pwm@48300200 { ehrpwm0: pwm@48300200 {
compatible = "ti,am33xx-ehrpwm"; compatible = "ti,am3352-ehrpwm",
"ti,am33xx-ehrpwm";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x48300200 0x80>; reg = <0x48300200 0x80>;
ti,hwmods = "ehrpwm0"; clocks = <&ehrpwm0_tbclk>, <&l4ls_gclk>;
clock-names = "tbclk", "fck";
status = "disabled"; status = "disabled";
}; };
}; };
...@@ -709,20 +775,24 @@ epwmss1: epwmss@48302000 { ...@@ -709,20 +775,24 @@ epwmss1: epwmss@48302000 {
0x48302200 0x48302200 0x80>; /* EHRPWM */ 0x48302200 0x48302200 0x80>; /* EHRPWM */
ecap1: ecap@48302100 { ecap1: ecap@48302100 {
compatible = "ti,am33xx-ecap"; compatible = "ti,am3352-ecap",
"ti,am33xx-ecap";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x48302100 0x80>; reg = <0x48302100 0x80>;
clocks = <&l4ls_gclk>;
clock-names = "fck";
interrupts = <47>; interrupts = <47>;
interrupt-names = "ecap1"; interrupt-names = "ecap1";
ti,hwmods = "ecap1";
status = "disabled"; status = "disabled";
}; };
ehrpwm1: pwm@48302200 { ehrpwm1: pwm@48302200 {
compatible = "ti,am33xx-ehrpwm"; compatible = "ti,am3352-ehrpwm",
"ti,am33xx-ehrpwm";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x48302200 0x80>; reg = <0x48302200 0x80>;
ti,hwmods = "ehrpwm1"; clocks = <&ehrpwm1_tbclk>, <&l4ls_gclk>;
clock-names = "tbclk", "fck";
status = "disabled"; status = "disabled";
}; };
}; };
...@@ -739,20 +809,24 @@ epwmss2: epwmss@48304000 { ...@@ -739,20 +809,24 @@ epwmss2: epwmss@48304000 {
0x48304200 0x48304200 0x80>; /* EHRPWM */ 0x48304200 0x48304200 0x80>; /* EHRPWM */
ecap2: ecap@48304100 { ecap2: ecap@48304100 {
compatible = "ti,am33xx-ecap"; compatible = "ti,am3352-ecap",
"ti,am33xx-ecap";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x48304100 0x80>; reg = <0x48304100 0x80>;
clocks = <&l4ls_gclk>;
clock-names = "fck";
interrupts = <61>; interrupts = <61>;
interrupt-names = "ecap2"; interrupt-names = "ecap2";
ti,hwmods = "ecap2";
status = "disabled"; status = "disabled";
}; };
ehrpwm2: pwm@48304200 { ehrpwm2: pwm@48304200 {
compatible = "ti,am33xx-ehrpwm"; compatible = "ti,am3352-ehrpwm",
"ti,am33xx-ehrpwm";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x48304200 0x80>; reg = <0x48304200 0x80>;
ti,hwmods = "ehrpwm2"; clocks = <&ehrpwm2_tbclk>, <&l4ls_gclk>;
clock-names = "tbclk", "fck";
status = "disabled"; status = "disabled";
}; };
}; };
......
...@@ -44,10 +44,49 @@ cpu: cpu@0 { ...@@ -44,10 +44,49 @@ cpu: cpu@0 {
clocks = <&dpll_mpu_ck>; clocks = <&dpll_mpu_ck>;
clock-names = "cpu"; clock-names = "cpu";
operating-points-v2 = <&cpu0_opp_table>;
ti,syscon-efuse = <&scm_conf 0x610 0x3f 0>;
ti,syscon-rev = <&scm_conf 0x600>;
clock-latency = <300000>; /* From omap-cpufreq driver */ clock-latency = <300000>; /* From omap-cpufreq driver */
}; };
}; };
cpu0_opp_table: opp_table0 {
compatible = "operating-points-v2";
opp50@300000000 {
opp-hz = /bits/ 64 <300000000>;
opp-microvolt = <950000 931000 969000>;
opp-supported-hw = <0xFF 0x01>;
opp-suspend;
};
opp100@600000000 {
opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <1100000 1078000 1122000>;
opp-supported-hw = <0xFF 0x04>;
};
opp120@720000000 {
opp-hz = /bits/ 64 <720000000>;
opp-microvolt = <1200000 1176000 1224000>;
opp-supported-hw = <0xFF 0x08>;
};
oppturbo@800000000 {
opp-hz = /bits/ 64 <800000000>;
opp-microvolt = <1260000 1234800 1285200>;
opp-supported-hw = <0xFF 0x10>;
};
oppnitro@1000000000 {
opp-hz = /bits/ 64 <1000000000>;
opp-microvolt = <1325000 1298500 1351500>;
opp-supported-hw = <0xFF 0x20>;
};
};
gic: interrupt-controller@48241000 { gic: interrupt-controller@48241000 {
compatible = "arm,cortex-a9-gic"; compatible = "arm,cortex-a9-gic";
interrupt-controller; interrupt-controller;
...@@ -199,7 +238,7 @@ edma: edma@49000000 { ...@@ -199,7 +238,7 @@ edma: edma@49000000 {
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "edma3_ccint", "emda3_mperr", interrupt-names = "edma3_ccint", "edma3_mperr",
"edma3_ccerrint"; "edma3_ccerrint";
dma-requests = <64>; dma-requests = <64>;
#dma-cells = <2>; #dma-cells = <2>;
...@@ -672,18 +711,24 @@ epwmss0: epwmss@48300000 { ...@@ -672,18 +711,24 @@ epwmss0: epwmss@48300000 {
status = "disabled"; status = "disabled";
ecap0: ecap@48300100 { ecap0: ecap@48300100 {
compatible = "ti,am4372-ecap","ti,am33xx-ecap"; compatible = "ti,am4372-ecap",
"ti,am3352-ecap",
"ti,am33xx-ecap";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x48300100 0x80>; reg = <0x48300100 0x80>;
ti,hwmods = "ecap0"; clocks = <&l4ls_gclk>;
clock-names = "fck";
status = "disabled"; status = "disabled";
}; };
ehrpwm0: pwm@48300200 { ehrpwm0: pwm@48300200 {
compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm"; compatible = "ti,am4372-ehrpwm",
"ti,am3352-ehrpwm",
"ti,am33xx-ehrpwm";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x48300200 0x80>; reg = <0x48300200 0x80>;
ti,hwmods = "ehrpwm0"; clocks = <&ehrpwm0_tbclk>, <&l4ls_gclk>;
clock-names = "tbclk", "fck";
status = "disabled"; status = "disabled";
}; };
}; };
...@@ -698,18 +743,24 @@ epwmss1: epwmss@48302000 { ...@@ -698,18 +743,24 @@ epwmss1: epwmss@48302000 {
status = "disabled"; status = "disabled";
ecap1: ecap@48302100 { ecap1: ecap@48302100 {
compatible = "ti,am4372-ecap","ti,am33xx-ecap"; compatible = "ti,am4372-ecap",
"ti,am3352-ecap",
"ti,am33xx-ecap";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x48302100 0x80>; reg = <0x48302100 0x80>;
ti,hwmods = "ecap1"; clocks = <&l4ls_gclk>;
clock-names = "fck";
status = "disabled"; status = "disabled";
}; };
ehrpwm1: pwm@48302200 { ehrpwm1: pwm@48302200 {
compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm"; compatible = "ti,am4372-ehrpwm",
"ti,am3352-ehrpwm",
"ti,am33xx-ehrpwm";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x48302200 0x80>; reg = <0x48302200 0x80>;
ti,hwmods = "ehrpwm1"; clocks = <&ehrpwm1_tbclk>, <&l4ls_gclk>;
clock-names = "tbclk", "fck";
status = "disabled"; status = "disabled";
}; };
}; };
...@@ -724,18 +775,24 @@ epwmss2: epwmss@48304000 { ...@@ -724,18 +775,24 @@ epwmss2: epwmss@48304000 {
status = "disabled"; status = "disabled";
ecap2: ecap@48304100 { ecap2: ecap@48304100 {
compatible = "ti,am4372-ecap","ti,am33xx-ecap"; compatible = "ti,am4372-ecap",
"ti,am3352-ecap",
"ti,am33xx-ecap";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x48304100 0x80>; reg = <0x48304100 0x80>;
ti,hwmods = "ecap2"; clocks = <&l4ls_gclk>;
clock-names = "fck";
status = "disabled"; status = "disabled";
}; };
ehrpwm2: pwm@48304200 { ehrpwm2: pwm@48304200 {
compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm"; compatible = "ti,am4372-ehrpwm",
"ti,am3352-ehrpwm",
"ti,am33xx-ehrpwm";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x48304200 0x80>; reg = <0x48304200 0x80>;
ti,hwmods = "ehrpwm2"; clocks = <&ehrpwm2_tbclk>, <&l4ls_gclk>;
clock-names = "tbclk", "fck";
status = "disabled"; status = "disabled";
}; };
}; };
...@@ -750,10 +807,13 @@ epwmss3: epwmss@48306000 { ...@@ -750,10 +807,13 @@ epwmss3: epwmss@48306000 {
status = "disabled"; status = "disabled";
ehrpwm3: pwm@48306200 { ehrpwm3: pwm@48306200 {
compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm"; compatible = "ti,am4372-ehrpwm",
"ti,am3352-ehrpwm",
"ti,am33xx-ehrpwm";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x48306200 0x80>; reg = <0x48306200 0x80>;
ti,hwmods = "ehrpwm3"; clocks = <&ehrpwm3_tbclk>, <&l4ls_gclk>;
clock-names = "tbclk", "fck";
status = "disabled"; status = "disabled";
}; };
}; };
...@@ -768,10 +828,13 @@ epwmss4: epwmss@48308000 { ...@@ -768,10 +828,13 @@ epwmss4: epwmss@48308000 {
status = "disabled"; status = "disabled";
ehrpwm4: pwm@48308200 { ehrpwm4: pwm@48308200 {
compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm"; compatible = "ti,am4372-ehrpwm",
"ti,am3352-ehrpwm",
"ti,am33xx-ehrpwm";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x48308200 0x80>; reg = <0x48308200 0x80>;
ti,hwmods = "ehrpwm4"; clocks = <&ehrpwm4_tbclk>, <&l4ls_gclk>;
clock-names = "tbclk", "fck";
status = "disabled"; status = "disabled";
}; };
}; };
...@@ -786,10 +849,13 @@ epwmss5: epwmss@4830a000 { ...@@ -786,10 +849,13 @@ epwmss5: epwmss@4830a000 {
status = "disabled"; status = "disabled";
ehrpwm5: pwm@4830a200 { ehrpwm5: pwm@4830a200 {
compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm"; compatible = "ti,am4372-ehrpwm",
"ti,am3352-ehrpwm",
"ti,am33xx-ehrpwm";
#pwm-cells = <3>; #pwm-cells = <3>;
reg = <0x4830a200 0x80>; reg = <0x4830a200 0x80>;
ti,hwmods = "ehrpwm5"; clocks = <&ehrpwm5_tbclk>, <&l4ls_gclk>;
clock-names = "tbclk", "fck";
status = "disabled"; status = "disabled";
}; };
}; };
...@@ -843,6 +909,13 @@ des: des@53701000 { ...@@ -843,6 +909,13 @@ des: des@53701000 {
dma-names = "tx", "rx"; dma-names = "tx", "rx";
}; };
rng: rng@48310000 {
compatible = "ti,omap4-rng";
ti,hwmods = "rng";
reg = <0x48310000 0x2000>;
interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
};
mcasp0: mcasp@48038000 { mcasp0: mcasp@48038000 {
compatible = "ti,am33xx-mcasp-audio"; compatible = "ti,am33xx-mcasp-audio";
ti,hwmods = "mcasp0"; ti,hwmods = "mcasp0";
......
...@@ -975,3 +975,7 @@ &rtc { ...@@ -975,3 +975,7 @@ &rtc {
clock-names = "ext-clk", "int-clk"; clock-names = "ext-clk", "int-clk";
status = "okay"; status = "okay";
}; };
&cpu {
cpu0-supply = <&dcdc2>;
};
...@@ -382,6 +382,7 @@ partition@6 { ...@@ -382,6 +382,7 @@ partition@6 {
}; };
&mac { &mac {
slaves = <1>;
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>; pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>; pinctrl-1 = <&cpsw_sleep>;
......
...@@ -104,6 +104,14 @@ aes0_fck: aes0_fck { ...@@ -104,6 +104,14 @@ aes0_fck: aes0_fck {
clock-div = <1>; clock-div = <1>;
}; };
rng_fck: rng_fck {
#clock-cells = <0>;
compatible = "fixed-factor-clock";
clocks = <&sys_clkin_ck>;
clock-mult = <1>;
clock-div = <1>;
};
ehrpwm0_tbclk: ehrpwm0_tbclk@664 { ehrpwm0_tbclk: ehrpwm0_tbclk@664 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "ti,gate-clock"; compatible = "ti,gate-clock";
......
...@@ -448,7 +448,7 @@ edma: edma@49000000 { ...@@ -448,7 +448,7 @@ edma: edma@49000000 {
reg = <0x49000000 0x10000>; reg = <0x49000000 0x10000>;
reg-names = "edma3_cc"; reg-names = "edma3_cc";
interrupts = <12 13 14>; interrupts = <12 13 14>;
interrupt-names = "edma3_ccint", "emda3_mperr", interrupt-names = "edma3_ccint", "edma3_mperr",
"edma3_ccerrint"; "edma3_ccerrint";
dma-requests = <64>; dma-requests = <64>;
#dma-cells = <2>; #dma-cells = <2>;
......
...@@ -73,6 +73,49 @@ wakeupgen: interrupt-controller@48281000 { ...@@ -73,6 +73,49 @@ wakeupgen: interrupt-controller@48281000 {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
}; };
cpus {
#address-cells = <1>;
#size-cells = <0>;
cpu0: cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-a15";
reg = <0>;
operating-points-v2 = <&cpu0_opp_table>;
ti,syscon-efuse = <&scm_wkup 0x20c 0xf80000 19>;
ti,syscon-rev = <&scm_wkup 0x204>;
clocks = <&dpll_mpu_ck>;
clock-names = "cpu";
clock-latency = <300000>; /* From omap-cpufreq driver */
/* cooling options */
cooling-min-level = <0>;
cooling-max-level = <2>;
#cooling-cells = <2>; /* min followed by max */
};
};
cpu0_opp_table: opp_table0 {
compatible = "operating-points-v2";
opp-shared;
opp_nom@1000000000 {
opp-hz = /bits/ 64 <1000000000>;
opp-microvolt = <1060000 850000 1150000>;
opp-supported-hw = <0xFF 0x01>;
opp-suspend;
};
opp_od@1176000000 {
opp-hz = /bits/ 64 <1176000000>;
opp-microvolt = <1160000 885000 1160000>;
opp-supported-hw = <0xFF 0x02>;
};
};
/* /*
* The soc node represents the soc top level view. It is used for IPs * The soc node represents the soc top level view. It is used for IPs
* that are not memory mapped in the MPU view or for the MPU itself. * that are not memory mapped in the MPU view or for the MPU itself.
...@@ -233,6 +276,11 @@ prm_clocks: clocks { ...@@ -233,6 +276,11 @@ prm_clocks: clocks {
prm_clockdomains: clockdomains { prm_clockdomains: clockdomains {
}; };
}; };
scm_wkup: scm_conf@c000 {
compatible = "syscon";
reg = <0xc000 0x1000>;
};
}; };
axi@0 { axi@0 {
...@@ -276,7 +324,7 @@ axi@1 { ...@@ -276,7 +324,7 @@ axi@1 {
ranges = <0x51800000 0x51800000 0x3000 ranges = <0x51800000 0x51800000 0x3000
0x0 0x30000000 0x10000000>; 0x0 0x30000000 0x10000000>;
status = "disabled"; status = "disabled";
pcie@51000000 { pcie@51800000 {
compatible = "ti,dra7-pcie"; compatible = "ti,dra7-pcie";
reg = <0x51800000 0x2000>, <0x51802000 0x14c>, <0x1000 0x2000>; reg = <0x51800000 0x2000>, <0x51802000 0x14c>, <0x1000 0x2000>;
reg-names = "rc_dbics", "ti_conf", "config"; reg-names = "rc_dbics", "ti_conf", "config";
...@@ -304,6 +352,53 @@ pcie2_intc: interrupt-controller { ...@@ -304,6 +352,53 @@ pcie2_intc: interrupt-controller {
}; };
}; };
ocmcram1: ocmcram@40300000 {
compatible = "mmio-sram";
reg = <0x40300000 0x80000>;
ranges = <0x0 0x40300000 0x80000>;
#address-cells = <1>;
#size-cells = <1>;
/*
* This is a placeholder for an optional reserved
* region for use by secure software. The size
* of this region is not known until runtime so it
* is set as zero to either be updated to reserve
* space or left unchanged to leave all SRAM for use.
* On HS parts that that require the reserved region
* either the bootloader can update the size to
* the required amount or the node can be overridden
* from the board dts file for the secure platform.
*/
sram-hs@0 {
compatible = "ti,secure-ram";
reg = <0x0 0x0>;
};
};
/*
* NOTE: ocmcram2 and ocmcram3 are not available on all
* DRA7xx and AM57xx variants. Confirm availability in
* the data manual for the exact part number in use
* before enabling these nodes in the board dts file.
*/
ocmcram2: ocmcram@40400000 {
status = "disabled";
compatible = "mmio-sram";
reg = <0x40400000 0x100000>;
ranges = <0x0 0x40400000 0x100000>;
#address-cells = <1>;
#size-cells = <1>;
};
ocmcram3: ocmcram@40500000 {
status = "disabled";
compatible = "mmio-sram";
reg = <0x40500000 0x100000>;
ranges = <0x0 0x40500000 0x100000>;
#address-cells = <1>;
#size-cells = <1>;
};
bandgap: bandgap@4a0021e0 { bandgap: bandgap@4a0021e0 {
reg = <0x4a0021e0 0xc reg = <0x4a0021e0 0xc
0x4a00232c 0xc 0x4a00232c 0xc
...@@ -341,7 +436,7 @@ edma: edma@43300000 { ...@@ -341,7 +436,7 @@ edma: edma@43300000 {
interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "edma3_ccint", "emda3_mperr", interrupt-names = "edma3_ccint", "edma3_mperr",
"edma3_ccerrint"; "edma3_ccerrint";
dma-requests = <64>; dma-requests = <64>;
#dma-cells = <2>; #dma-cells = <2>;
...@@ -1743,6 +1838,149 @@ hdmi: encoder@58060000 { ...@@ -1743,6 +1838,149 @@ hdmi: encoder@58060000 {
clock-names = "fck", "sys_clk"; clock-names = "fck", "sys_clk";
}; };
}; };
epwmss0: epwmss@4843e000 {
compatible = "ti,dra746-pwmss", "ti,am33xx-pwmss";
reg = <0x4843e000 0x30>;
ti,hwmods = "epwmss0";
#address-cells = <1>;
#size-cells = <1>;
status = "disabled";
ranges;
ehrpwm0: pwm@4843e200 {
compatible = "ti,dra746-ehrpwm",
"ti,am3352-ehrpwm";
#pwm-cells = <3>;
reg = <0x4843e200 0x80>;
clocks = <&ehrpwm0_tbclk>, <&l4_root_clk_div>;
clock-names = "tbclk", "fck";
status = "disabled";
};
ecap0: ecap@4843e100 {
compatible = "ti,dra746-ecap",
"ti,am3352-ecap";
#pwm-cells = <3>;
reg = <0x4843e100 0x80>;
clocks = <&l4_root_clk_div>;
clock-names = "fck";
status = "disabled";
};
};
epwmss1: epwmss@48440000 {
compatible = "ti,dra746-pwmss", "ti,am33xx-pwmss";
reg = <0x48440000 0x30>;
ti,hwmods = "epwmss1";
#address-cells = <1>;
#size-cells = <1>;
status = "disabled";
ranges;
ehrpwm1: pwm@48440200 {
compatible = "ti,dra746-ehrpwm",
"ti,am3352-ehrpwm";
#pwm-cells = <3>;
reg = <0x48440200 0x80>;
clocks = <&ehrpwm1_tbclk>, <&l4_root_clk_div>;
clock-names = "tbclk", "fck";
status = "disabled";
};
ecap1: ecap@48440100 {
compatible = "ti,dra746-ecap",
"ti,am3352-ecap";
#pwm-cells = <3>;
reg = <0x48440100 0x80>;
clocks = <&l4_root_clk_div>;
clock-names = "fck";
status = "disabled";
};
};
epwmss2: epwmss@48442000 {
compatible = "ti,dra746-pwmss", "ti,am33xx-pwmss";
reg = <0x48442000 0x30>;
ti,hwmods = "epwmss2";
#address-cells = <1>;
#size-cells = <1>;
status = "disabled";
ranges;
ehrpwm2: pwm@48442200 {
compatible = "ti,dra746-ehrpwm",
"ti,am3352-ehrpwm";
#pwm-cells = <3>;
reg = <0x48442200 0x80>;
clocks = <&ehrpwm2_tbclk>, <&l4_root_clk_div>;
clock-names = "tbclk", "fck";
status = "disabled";
};
ecap2: ecap@48442100 {
compatible = "ti,dra746-ecap",
"ti,am3352-ecap";
#pwm-cells = <3>;
reg = <0x48442100 0x80>;
clocks = <&l4_root_clk_div>;
clock-names = "fck";
status = "disabled";
};
};
aes1: aes@4b500000 {
compatible = "ti,omap4-aes";
ti,hwmods = "aes1";
reg = <0x4b500000 0xa0>;
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&edma_xbar 111 0>, <&edma_xbar 110 0>;
dma-names = "tx", "rx";
clocks = <&l3_iclk_div>;
clock-names = "fck";
};
aes2: aes@4b700000 {
compatible = "ti,omap4-aes";
ti,hwmods = "aes2";
reg = <0x4b700000 0xa0>;
interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&edma_xbar 114 0>, <&edma_xbar 113 0>;
dma-names = "tx", "rx";
clocks = <&l3_iclk_div>;
clock-names = "fck";
};
des: des@480a5000 {
compatible = "ti,omap4-des";
ti,hwmods = "des";
reg = <0x480a5000 0xa0>;
interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&sdma_xbar 117>, <&sdma_xbar 116>;
dma-names = "tx", "rx";
clocks = <&l3_iclk_div>;
clock-names = "fck";
};
sham: sham@53100000 {
compatible = "ti,omap5-sham";
ti,hwmods = "sham";
reg = <0x4b101000 0x300>;
interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&edma_xbar 119 0>;
dma-names = "rx";
clocks = <&l3_iclk_div>;
clock-names = "fck";
};
rng: rng@48090000 {
compatible = "ti,omap4-rng";
ti,hwmods = "rng";
reg = <0x48090000 0x2000>;
interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&l3_iclk_div>;
clock-names = "fck";
};
}; };
thermal_zones: thermal-zones { thermal_zones: thermal-zones {
......
...@@ -18,7 +18,7 @@ aliases { ...@@ -18,7 +18,7 @@ aliases {
display0 = &hdmi0; display0 = &hdmi0;
}; };
evm_3v3: fixedregulator-evm_3v3 { evm_3v3_sw: fixedregulator-evm_3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "evm_3v3"; regulator-name = "evm_3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -29,7 +29,7 @@ aic_dvdd: fixedregulator-aic_dvdd { ...@@ -29,7 +29,7 @@ aic_dvdd: fixedregulator-aic_dvdd {
/* TPS77018DBVT */ /* TPS77018DBVT */
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "aic_dvdd"; regulator-name = "aic_dvdd";
vin-supply = <&evm_3v3>; vin-supply = <&evm_3v3_sw>;
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
}; };
...@@ -414,9 +414,9 @@ tlv320aic3106: tlv320aic3106@19 { ...@@ -414,9 +414,9 @@ tlv320aic3106: tlv320aic3106@19 {
status = "okay"; status = "okay";
/* Regulators */ /* Regulators */
AVDD-supply = <&evm_3v3>; AVDD-supply = <&evm_3v3_sw>;
IOVDD-supply = <&evm_3v3>; IOVDD-supply = <&evm_3v3_sw>;
DRVDD-supply = <&evm_3v3>; DRVDD-supply = <&evm_3v3_sw>;
DVDD-supply = <&aic_dvdd>; DVDD-supply = <&aic_dvdd>;
}; };
}; };
...@@ -597,7 +597,7 @@ &mmc2 { ...@@ -597,7 +597,7 @@ &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_default>; pinctrl-0 = <&mmc2_pins_default>;
vmmc-supply = <&evm_3v3>; vmmc-supply = <&evm_3v3_sw>;
bus-width = <8>; bus-width = <8>;
ti,non-removable; ti,non-removable;
max-frequency = <192000000>; max-frequency = <192000000>;
......
...@@ -12,22 +12,6 @@ ...@@ -12,22 +12,6 @@
/ { / {
compatible = "ti,dra722", "ti,dra72", "ti,dra7"; compatible = "ti,dra722", "ti,dra72", "ti,dra7";
cpus {
#address-cells = <1>;
#size-cells = <0>;
cpu0: cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-a15";
reg = <0>;
/* cooling options */
cooling-min-level = <0>;
cooling-max-level = <2>;
#cooling-cells = <2>; /* min followed by max */
};
};
pmu { pmu {
compatible = "arm,cortex-a15-pmu"; compatible = "arm,cortex-a15-pmu";
interrupt-parent = <&wakeupgen>; interrupt-parent = <&wakeupgen>;
......
...@@ -13,34 +13,11 @@ / { ...@@ -13,34 +13,11 @@ / {
compatible = "ti,dra742", "ti,dra74", "ti,dra7"; compatible = "ti,dra742", "ti,dra74", "ti,dra7";
cpus { cpus {
#address-cells = <1>;
#size-cells = <0>;
cpu0: cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-a15";
reg = <0>;
operating-points = <
/* kHz uV */
1000000 1060000
1176000 1160000
>;
clocks = <&dpll_mpu_ck>;
clock-names = "cpu";
clock-latency = <300000>; /* From omap-cpufreq driver */
/* cooling options */
cooling-min-level = <0>;
cooling-max-level = <2>;
#cooling-cells = <2>; /* min followed by max */
};
cpu@1 { cpu@1 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a15"; compatible = "arm,cortex-a15";
reg = <1>; reg = <1>;
operating-points-v2 = <&cpu0_opp_table>;
}; };
}; };
......
...@@ -100,6 +100,22 @@ lcd_in: endpoint { ...@@ -100,6 +100,22 @@ lcd_in: endpoint {
}; };
}; };
backlight {
compatible = "pwm-backlight";
pwms = <&pwm11 0 2000000 0>;
pwm-names = "backlight";
brightness-levels = <0 11 20 30 40 50 60 70 80 90 100>;
default-brightness-level = <9>; /* => 90 */
pinctrl-names = "default";
pinctrl-0 = <&backlight_pins>;
};
pwm11: dmtimer-pwm@11 {
compatible = "ti,omap-dmtimer-pwm";
ti,timers = <&timer11>;
#pwm-cells = <3>;
};
hsusb2_phy: hsusb2_phy { hsusb2_phy: hsusb2_phy {
compatible = "usb-nop-xceiv"; compatible = "usb-nop-xceiv";
reset-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>; reset-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
...@@ -139,6 +155,11 @@ opa_out: endpoint@0 { ...@@ -139,6 +155,11 @@ opa_out: endpoint@0 {
}; };
}; };
}; };
wifi_pwrseq: wifi_pwrseq {
compatible = "mmc-pwrseq-simple";
reset-gpios = <&tca6507 0 GPIO_ACTIVE_LOW>; /* W2CBW003 reset through tca6507 */
};
}; };
&omap3_pmx_core { &omap3_pmx_core {
...@@ -190,6 +211,12 @@ OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat3.sdmmc1_d ...@@ -190,6 +211,12 @@ OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat3.sdmmc1_d
>; >;
}; };
backlight_pins: backlight_pins_pimnux {
pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x20ba, MUX_MODE3) /* gpt11/gpio57 */
>;
};
dss_dpi_pins: pinmux_dss_dpi_pins { dss_dpi_pins: pinmux_dss_dpi_pins {
pinctrl-single,pins = < pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x20d4, PIN_OUTPUT | MUX_MODE0) /* dss_pclk.dss_pclk */ OMAP3_CORE1_IOPAD(0x20d4, PIN_OUTPUT | MUX_MODE0) /* dss_pclk.dss_pclk */
...@@ -228,6 +255,24 @@ hdq_pins: hdq_pins { ...@@ -228,6 +255,24 @@ hdq_pins: hdq_pins {
OMAP3_CORE1_IOPAD(0x21c6, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda.hdq */ OMAP3_CORE1_IOPAD(0x21c6, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda.hdq */
>; >;
}; };
bma180_pins: pinmux_bma180_pins {
pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x213a, PIN_INPUT_PULLUP | MUX_MODE4) /* gpio115 */
>;
};
itg3200_pins: pinmux_itg3200_pins {
pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x20b8, PIN_INPUT_PULLUP | MUX_MODE4) /* gpio56 */
>;
};
hmc5843_pins: pinmux_hmc5843_pins {
pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x2134, PIN_INPUT_PULLUP | MUX_MODE4) /* gpio112 */
>;
};
}; };
&omap3_pmx_core2 { &omap3_pmx_core2 {
...@@ -298,6 +343,8 @@ bmp085@77 { ...@@ -298,6 +343,8 @@ bmp085@77 {
bma180@41 { bma180@41 {
compatible = "bosch,bma180"; compatible = "bosch,bma180";
reg = <0x41>; reg = <0x41>;
pinctrl-names = "default";
pintcrl-0 = <&bma180_pins>;
interrupt-parent = <&gpio4>; interrupt-parent = <&gpio4>;
interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; /* GPIO_115 */ interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; /* GPIO_115 */
}; };
...@@ -306,12 +353,14 @@ bma180@41 { ...@@ -306,12 +353,14 @@ bma180@41 {
itg3200@68 { itg3200@68 {
compatible = "invensense,itg3200"; compatible = "invensense,itg3200";
reg = <0x68>; reg = <0x68>;
pinctrl-names = "default";
pinctrl-0 = <&itg3200_pins>;
interrupt-parent = <&gpio2>; interrupt-parent = <&gpio2>;
interrupts = <24 0>; /* GPIO_56 */ interrupts = <24 IRQ_TYPE_EDGE_FALLING>; /* GPIO_56 */
}; };
/* leds */ /* leds + gpios */
tca6507@45 { tca6507: tca6507@45 {
compatible = "ti,tca6507"; compatible = "ti,tca6507";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -351,6 +400,10 @@ wifi_reset: wifi_reset@6 { ...@@ -351,6 +400,10 @@ wifi_reset: wifi_reset@6 {
hmc5843@1e { hmc5843@1e {
compatible = "honeywell,hmc5883l"; compatible = "honeywell,hmc5883l";
reg = <0x1e>; reg = <0x1e>;
pinctrl-names = "default";
pinctrl-0 = <&hmc5843_pins>;
interrupt-parent = <&gpio4>;
interrupts = <16 IRQ_TYPE_EDGE_FALLING>; /* gpio112 */
}; };
/* touchscreen */ /* touchscreen */
...@@ -362,6 +415,12 @@ tsc2007@48 { ...@@ -362,6 +415,12 @@ tsc2007@48 {
gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; gpios = <&gpio6 0 GPIO_ACTIVE_LOW>;
ti,x-plate-ohms = <600>; ti,x-plate-ohms = <600>;
}; };
/* RFID EEPROM */
m24lr64@50 {
compatible = "at,24c64";
reg = <0x50>;
};
}; };
&i2c3 { &i2c3 {
...@@ -398,6 +457,7 @@ &mmc2 { ...@@ -398,6 +457,7 @@ &mmc2 {
bus-width = <4>; bus-width = <4>;
ti,non-removable; ti,non-removable;
cap-power-off-card; cap-power-off-card;
mmc-pwrseq = <&wifi_pwrseq>;
}; };
&mmc3 { &mmc3 {
......
...@@ -143,6 +143,18 @@ battery: n900-battery { ...@@ -143,6 +143,18 @@ battery: n900-battery {
io-channels = <&twl_madc 0>, <&twl_madc 4>, <&twl_madc 12>; io-channels = <&twl_madc 0>, <&twl_madc 4>, <&twl_madc 12>;
io-channel-names = "temp", "bsi", "vbat"; io-channel-names = "temp", "bsi", "vbat";
}; };
pwm9: dmtimer-pwm@9 {
compatible = "ti,omap-dmtimer-pwm";
#pwm-cells = <3>;
ti,timers = <&timer9>;
ti,clock-source = <0x00>; /* timer_sys_ck */
};
ir: n900-ir {
compatible = "nokia,n900-ir";
pwms = <&pwm9 0 26316 0>; /* 38000 Hz */
};
}; };
&omap3_pmx_core { &omap3_pmx_core {
......
...@@ -493,6 +493,8 @@ mcbsp1: mcbsp@48074000 { ...@@ -493,6 +493,8 @@ mcbsp1: mcbsp@48074000 {
dmas = <&sdma 31>, dmas = <&sdma 31>,
<&sdma 32>; <&sdma 32>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
clocks = <&mcbsp1_fck>;
clock-names = "fck";
status = "disabled"; status = "disabled";
}; };
...@@ -511,6 +513,8 @@ mcbsp2: mcbsp@49022000 { ...@@ -511,6 +513,8 @@ mcbsp2: mcbsp@49022000 {
dmas = <&sdma 33>, dmas = <&sdma 33>,
<&sdma 34>; <&sdma 34>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
clocks = <&mcbsp2_fck>, <&mcbsp2_ick>;
clock-names = "fck", "ick";
status = "disabled"; status = "disabled";
}; };
...@@ -529,6 +533,8 @@ mcbsp3: mcbsp@49024000 { ...@@ -529,6 +533,8 @@ mcbsp3: mcbsp@49024000 {
dmas = <&sdma 17>, dmas = <&sdma 17>,
<&sdma 18>; <&sdma 18>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
clocks = <&mcbsp3_fck>, <&mcbsp3_ick>;
clock-names = "fck", "ick";
status = "disabled"; status = "disabled";
}; };
...@@ -545,6 +551,8 @@ mcbsp4: mcbsp@49026000 { ...@@ -545,6 +551,8 @@ mcbsp4: mcbsp@49026000 {
dmas = <&sdma 19>, dmas = <&sdma 19>,
<&sdma 20>; <&sdma 20>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
clocks = <&mcbsp4_fck>;
clock-names = "fck";
status = "disabled"; status = "disabled";
}; };
...@@ -561,6 +569,8 @@ mcbsp5: mcbsp@48096000 { ...@@ -561,6 +569,8 @@ mcbsp5: mcbsp@48096000 {
dmas = <&sdma 21>, dmas = <&sdma 21>,
<&sdma 22>; <&sdma 22>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
clocks = <&mcbsp5_fck>;
clock-names = "fck";
status = "disabled"; status = "disabled";
}; };
......
...@@ -177,6 +177,7 @@ twl: twl@48 { ...@@ -177,6 +177,7 @@ twl: twl@48 {
twl6040: twl@4b { twl6040: twl@4b {
compatible = "ti,twl6040"; compatible = "ti,twl6040";
#clock-cells = <0>;
reg = <0x4b>; reg = <0x4b>;
interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_2N cascaded to gic */ interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_2N cascaded to gic */
ti,audpwron-gpio = <&gpio6 0 GPIO_ACTIVE_HIGH>; /* gpio_160 */ ti,audpwron-gpio = <&gpio6 0 GPIO_ACTIVE_HIGH>; /* gpio_160 */
...@@ -207,6 +208,10 @@ &mcbsp1 { ...@@ -207,6 +208,10 @@ &mcbsp1 {
&mcpdm { &mcpdm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mcpdm_pins>; pinctrl-0 = <&mcpdm_pins>;
clocks = <&twl6040>;
clock-names = "pdmclk";
status = "okay"; status = "okay";
}; };
......
...@@ -376,6 +376,7 @@ twl: twl@48 { ...@@ -376,6 +376,7 @@ twl: twl@48 {
twl6040: twl@4b { twl6040: twl@4b {
compatible = "ti,twl6040"; compatible = "ti,twl6040";
#clock-cells = <0>;
reg = <0x4b>; reg = <0x4b>;
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -479,6 +480,10 @@ &mcbsp1 { ...@@ -479,6 +480,10 @@ &mcbsp1 {
&mcpdm { &mcpdm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mcpdm_pins>; pinctrl-0 = <&mcpdm_pins>;
clocks = <&twl6040>;
clock-names = "pdmclk";
status = "okay"; status = "okay";
}; };
......
...@@ -367,6 +367,7 @@ twl: twl@48 { ...@@ -367,6 +367,7 @@ twl: twl@48 {
twl6040: twl@4b { twl6040: twl@4b {
compatible = "ti,twl6040"; compatible = "ti,twl6040";
#clock-cells = <0>;
reg = <0x4b>; reg = <0x4b>;
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -620,6 +621,10 @@ &dmic { ...@@ -620,6 +621,10 @@ &dmic {
&mcpdm { &mcpdm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mcpdm_pins>; pinctrl-0 = <&mcpdm_pins>;
clocks = <&twl6040>;
clock-names = "pdmclk";
status = "okay"; status = "okay";
}; };
......
...@@ -189,6 +189,7 @@ twl: twl@48 { ...@@ -189,6 +189,7 @@ twl: twl@48 {
twl6040: twl@4b { twl6040: twl@4b {
compatible = "ti,twl6040"; compatible = "ti,twl6040";
#clock-cells = <0>;
reg = <0x4b>; reg = <0x4b>;
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -252,6 +253,10 @@ &i2c4 { ...@@ -252,6 +253,10 @@ &i2c4 {
&mcpdm { &mcpdm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mcpdm_pins>; pinctrl-0 = <&mcpdm_pins>;
clocks = <&twl6040>;
clock-names = "pdmclk";
status = "okay"; status = "okay";
}; };
......
...@@ -594,6 +594,7 @@ palmas_power_button: palmas_power_button { ...@@ -594,6 +594,7 @@ palmas_power_button: palmas_power_button {
twl6040: twl@4b { twl6040: twl@4b {
compatible = "ti,twl6040"; compatible = "ti,twl6040";
#clock-cells = <0>;
reg = <0x4b>; reg = <0x4b>;
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -614,6 +615,10 @@ twl6040: twl@4b { ...@@ -614,6 +615,10 @@ twl6040: twl@4b {
&mcpdm { &mcpdm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mcpdm_pins>; pinctrl-0 = <&mcpdm_pins>;
clocks = <&twl6040>;
clock-names = "pdmclk";
status = "okay"; status = "okay";
}; };
......
...@@ -58,6 +58,7 @@ static struct ti_dt_clk am43xx_clks[] = { ...@@ -58,6 +58,7 @@ static struct ti_dt_clk am43xx_clks[] = {
DT_CLK(NULL, "smartreflex1_fck", "smartreflex1_fck"), DT_CLK(NULL, "smartreflex1_fck", "smartreflex1_fck"),
DT_CLK(NULL, "sha0_fck", "sha0_fck"), DT_CLK(NULL, "sha0_fck", "sha0_fck"),
DT_CLK(NULL, "aes0_fck", "aes0_fck"), DT_CLK(NULL, "aes0_fck", "aes0_fck"),
DT_CLK(NULL, "rng_fck", "rng_fck"),
DT_CLK(NULL, "timer1_fck", "timer1_fck"), DT_CLK(NULL, "timer1_fck", "timer1_fck"),
DT_CLK(NULL, "timer2_fck", "timer2_fck"), DT_CLK(NULL, "timer2_fck", "timer2_fck"),
DT_CLK(NULL, "timer3_fck", "timer3_fck"), DT_CLK(NULL, "timer3_fck", "timer3_fck"),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment