On Thu, Jun 11, 2015 at 08:51:07AM -0700, Nicolin Chen wrote: > On Thu, Jun 11, 2015 at 07:10:00PM +0800, Zidan Wang wrote: > > > > > This imx-wm8960 device-tree-only machine driver works with sai driver > > > > and have below feature. > > > > * support codec master and slave mode > > > > * support headphone jack detect > > > > * support headphone and micphone jack event > > > > * support asrc<->sai<->wm8960 mode > > > > > > > > Signed-off-by: Zidan Wang <zidan.wang@xxxxxxxxxxxxx> > > > > > > Above all, could you merge this into fsl-asoc-card? > > > > > > It'd be nicer to have jack detection over there. And we can > > > put PLL settings to the codec driver as Mark suggested. > > > I want to modify imx-wm8960 and upstream it because our release is using it now. After > > upstreaming imx-wm8960, i will try to merge it to fsl-asoc-card. > > I knew your intention. That's why I suggested you to merge it directly > to fsl-asoc-card instead of making a duplicated copy of that. Remember > that getting code upstream should be a chance for us to improve thing. > > If you find painstaking to handle it in parallel, you can focus on the > improvements of the WM8960 driver while I would help you on the dai- > link part. How about this? > > Nicolin The new imx7 release have two new codec wm8958 and wm8960. So we have two machine driver imx-wm8960 and imx-wm8958 which should be upstreamed. I am appreciate that you can help me merge the imx-wm8960 to fsl-asoc-card. And i will focus on wm8960 and wm8958 driver. And i will try to merge imx-wm8958 to fsl-asoc-card. Best Regards, Zidan Wang -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html