Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53f72331 authored by Shawn Guo's avatar Shawn Guo
Browse files

Merge tag 'imx-soc-3.11' into imx/dt

imx soc changes for 3.11:

* New SoCs i.MX6 Sololite and Vybrid VF610 support
* imx5 and imx6 clock fixes and additions
* Update clock driver to use of_clk_init() function
* Refactor restart routine mxc_restart() to get it work for DT boot
  as well
* Clean up mxc specific ulpi access ops
* imx defconfig updates
parents 7d132055 3bfbc6cd
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -184,6 +184,19 @@ clocks and IDs.
	cko2			170
	srtc_gate		171
	pata_gate		172
	sata_gate		173
	spdif_xtal_sel		174
	spdif0_sel		175
	spdif1_sel		176
	spdif0_pred		177
	spdif0_podf		178
	spdif1_pred		179
	spdif1_podf		180
	spdif0_com_sel		181
	spdif1_com_sel		182
	spdif0_gate		183
	spdif1_gate		184
	spdif_ipg_gate		185

Examples (for mx53):

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ clocks and IDs.
	pll4_post_div		193
	pll5_post_div		194
	pll5_video_div		195
	eim_slow      		196

Examples:

+10 −0
Original line number Diff line number Diff line
* Clock bindings for Freescale i.MX6 SoloLite

Required properties:
- compatible: Should be "fsl,imx6sl-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/imx6sl-clock.h
for the full list of i.MX6 SoloLite clock IDs.
+26 −0
Original line number Diff line number Diff line
* Clock bindings for Freescale Vybrid VF610 SOC

Required properties:
- compatible: Should be "fsl,vf610-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/vf610-clock.h
for the full list of VF610 clock IDs.

Examples:

clks: ccm@4006b000 {
	compatible = "fsl,vf610-ccm";
	reg = <0x4006b000 0x1000>;
	#clock-cells = <1>;
};

uart1: serial@40028000 {
	compatible = "fsl,vf610-uart";
	reg = <0x40028000 0x1000>;
	interrupts = <0 62 0x04>;
	clocks = <&clks VF610_CLK_UART1>;
	clock-names = "ipg";
};
+11 −2
Original line number Diff line number Diff line
@@ -251,6 +251,13 @@ choice
		  Say Y here if you want kernel low-level debugging support
		  on i.MX6Q/DL.

	config DEBUG_IMX6SL_UART
		bool "i.MX6SL Debug UART"
		depends on SOC_IMX6SL
		help
		  Say Y here if you want kernel low-level debugging support
		  on i.MX6SL.

	config DEBUG_MMP_UART2
		bool "Kernel low-level debugging message via MMP UART2"
		depends on ARCH_MMP
@@ -532,7 +539,8 @@ config DEBUG_IMX_UART_PORT
						DEBUG_IMX35_UART || \
						DEBUG_IMX51_UART || \
						DEBUG_IMX53_UART || \
						DEBUG_IMX6Q_UART
						DEBUG_IMX6Q_UART || \
						DEBUG_IMX6SL_UART
	default 1
	depends on ARCH_MXC
	help
@@ -631,7 +639,8 @@ config DEBUG_LL_INCLUDE
				 DEBUG_IMX35_UART || \
				 DEBUG_IMX51_UART || \
				 DEBUG_IMX53_UART ||\
				 DEBUG_IMX6Q_UART
				 DEBUG_IMX6Q_UART || \
				 DEBUG_IMX6SL_UART
	default "debug/mvebu.S" if DEBUG_MVEBU_UART
	default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
	default "debug/nomadik.S" if DEBUG_NOMADIK_UART
Loading