-
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 'imx-soc-3.17' into imx/dt
The i.MX SoC changes for 3.17: - Add devicetree support for i.MX1 and i.MX21 clock driver - Use CLOCKSOURCE_OF_DECLARE() to initialize timer for DT targets - Use of_clk_init() to initialize i.MX25 and i.MX27 clock driver in device tree boot - Remove i.MX1 camera support - Remove i.MX27 IP Camera and Lite-Kit board support - Add suspend and cpuidle support for i.mx6sx - Clean up unused clk_register_clkdev() lookups - Update imx-weim bus driver to support populating devices on a simple bus - Switch i.MX27 and i.MX6QDL clock driver to use macro for clock IDs - Make i.MX51 a DT only platform and clean up the non-DT support code - Support disabling supervisor protect via DT - Random defconfig updates
- Loading branch information
Showing
109 changed files
with
1,806 additions
and
4,664 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
* Clock bindings for Freescale i.MX1 CPUs | ||
|
||
Required properties: | ||
- compatible: Should be "fsl,imx1-ccm". | ||
- reg: Address and length of the register set. | ||
- #clock-cells: Should be <1>. | ||
|
||
The clock consumer should specify the desired clock by having the clock | ||
ID in its "clocks" phandle cell. See include/dt-bindings/clock/imx1-clock.h | ||
for the full list of i.MX1 clock IDs. | ||
|
||
Examples: | ||
clks: ccm@0021b000 { | ||
#clock-cells = <1>; | ||
compatible = "fsl,imx1-ccm"; | ||
reg = <0x0021b000 0x1000>; | ||
}; | ||
|
||
pwm: pwm@00208000 { | ||
#pwm-cells = <2>; | ||
compatible = "fsl,imx1-pwm"; | ||
reg = <0x00208000 0x1000>; | ||
interrupts = <34>; | ||
clocks = <&clks IMX1_CLK_DUMMY>, <&clks IMX1_CLK_PER1>; | ||
clock-names = "ipg", "per"; | ||
}; |
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,28 @@ | ||
* Clock bindings for Freescale i.MX21 | ||
|
||
Required properties: | ||
- compatible : Should be "fsl,imx21-ccm". | ||
- reg : Address and length of the register set. | ||
- interrupts : Should contain CCM interrupt. | ||
- #clock-cells: Should be <1>. | ||
|
||
The clock consumer should specify the desired clock by having the clock | ||
ID in its "clocks" phandle cell. See include/dt-bindings/clock/imx21-clock.h | ||
for the full list of i.MX21 clock IDs. | ||
|
||
Examples: | ||
clks: ccm@10027000{ | ||
compatible = "fsl,imx21-ccm"; | ||
reg = <0x10027000 0x800>; | ||
#clock-cells = <1>; | ||
}; | ||
|
||
uart1: serial@1000a000 { | ||
compatible = "fsl,imx21-uart"; | ||
reg = <0x1000a000 0x1000>; | ||
interrupts = <20>; | ||
clocks = <&clks IMX21_CLK_UART1_IPG_GATE>, | ||
<&clks IMX21_CLK_PER1>; | ||
clock-names = "ipg", "per"; | ||
status = "disabled"; | ||
}; |
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
Oops, something went wrong.