* Updates for UDOO Neo
@ 2019-06-01 7:07 Peter Robinson
2019-06-01 7:07 ` [PATCH 1/3] arm: imx6sx: udoo: Use the correct style for SPDX License Identifier Peter Robinson
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Peter Robinson @ 2019-06-01 7:07 UTC (permalink / raw)
To: Rob Herring, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team,
Fabio Estevam, NXP Linux Team, devicetree, linux-arm-kernel
Cc: Peter Robinson
A small improvements series to update licenece to SPDX License Identifier,
enable two of the i2c interfaces that contain either on-board sensors or
a connector for "bricks" of sensors, and finally enable bluetooth using
the serdev driver for the TI module.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/3] arm: imx6sx: udoo: Use the correct style for SPDX License Identifier 2019-06-01 7:07 Updates for UDOO Neo Peter Robinson @ 2019-06-01 7:07 ` Peter Robinson 2019-06-05 15:19 ` Fabio Estevam 2019-06-11 22:49 ` Rob Herring 2019-06-01 7:07 ` [PATCH 2/3] ARM: dts: imx6sx-udoo-neo: enable i2c-2 and i2c-4 for onboard sensors Peter Robinson 2019-06-01 7:07 ` [PATCH 3/3] ARM: dts: imx6sx-udoo-neo: add bluetooth config to uart3 Peter Robinson 2 siblings, 2 replies; 10+ messages in thread From: Peter Robinson @ 2019-06-01 7:07 UTC (permalink / raw) To: Rob Herring, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team, devicetree, linux-arm-kernel Cc: Peter Robinson Use the SPDX License Identifier for GPL-2.0+ OR X11 Signed-off-by: Peter Robinson <pbrobinson@gmail.com> --- arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 39 +------------------ .../arm/boot/dts/imx6sx-udoo-neo-extended.dts | 39 +------------------ arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 39 +------------------ arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 39 +------------------ 4 files changed, 4 insertions(+), 152 deletions(-) diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts index db0feb9b9f5d..b6fbceaf6889 100644 --- a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts @@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright (c) 2016 Andreas Färber - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ /dts-v1/; diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts index 5c7a2bb9141c..c6005cd284be 100644 --- a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts @@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright (c) 2016 Andreas Färber - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ /dts-v1/; diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts index 13dfe2afaba5..ad8b8a663a70 100644 --- a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts @@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright (c) 2016 Andreas Färber - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ /dts-v1/; diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi index 53b3eac94f0d..386707c1bfe0 100644 --- a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi +++ b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi @@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright (c) 2016 Andreas Färber - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #include "imx6sx.dtsi" -- 2.21.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] arm: imx6sx: udoo: Use the correct style for SPDX License Identifier 2019-06-01 7:07 ` [PATCH 1/3] arm: imx6sx: udoo: Use the correct style for SPDX License Identifier Peter Robinson @ 2019-06-05 15:19 ` Fabio Estevam 2019-06-06 1:47 ` Shawn Guo 2019-06-11 22:49 ` Rob Herring 1 sibling, 1 reply; 10+ messages in thread From: Fabio Estevam @ 2019-06-05 15:19 UTC (permalink / raw) To: Peter Robinson Cc: open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Sascha Hauer, Rob Herring, NXP Linux Team, Pengutronix Kernel Team, Shawn Guo, moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE On Sat, Jun 1, 2019 at 4:07 AM Peter Robinson <pbrobinson@gmail.com> wrote: > > Use the SPDX License Identifier for GPL-2.0+ OR X11 > > Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Fabio Estevam <festevam@gmail.com> Nit: the Subject could be consistent with the other patches in the series: ARM: dts: imx6sx-udoo: Use the correct... ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] arm: imx6sx: udoo: Use the correct style for SPDX License Identifier 2019-06-05 15:19 ` Fabio Estevam @ 2019-06-06 1:47 ` Shawn Guo 0 siblings, 0 replies; 10+ messages in thread From: Shawn Guo @ 2019-06-06 1:47 UTC (permalink / raw) To: Fabio Estevam Cc: open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Sascha Hauer, Rob Herring, Peter Robinson, Pengutronix Kernel Team, moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE, NXP Linux Team On Wed, Jun 05, 2019 at 12:19:18PM -0300, Fabio Estevam wrote: > On Sat, Jun 1, 2019 at 4:07 AM Peter Robinson <pbrobinson@gmail.com> wrote: > > > > Use the SPDX License Identifier for GPL-2.0+ OR X11 > > > > Signed-off-by: Peter Robinson <pbrobinson@gmail.com> > > Reviewed-by: Fabio Estevam <festevam@gmail.com> > > Nit: the Subject could be consistent with the other patches in the series: > > ARM: dts: imx6sx-udoo: Use the correct... Fixed it up and applied all, thanks. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] arm: imx6sx: udoo: Use the correct style for SPDX License Identifier 2019-06-01 7:07 ` [PATCH 1/3] arm: imx6sx: udoo: Use the correct style for SPDX License Identifier Peter Robinson 2019-06-05 15:19 ` Fabio Estevam @ 2019-06-11 22:49 ` Rob Herring 2019-06-12 8:12 ` Shawn Guo 1 sibling, 1 reply; 10+ messages in thread From: Rob Herring @ 2019-06-11 22:49 UTC (permalink / raw) To: Peter Robinson Cc: devicetree, Shawn Guo, Sascha Hauer, NXP Linux Team, Pengutronix Kernel Team, Fabio Estevam, linux-arm-kernel On Sat, Jun 01, 2019 at 08:07:16AM +0100, Peter Robinson wrote: > Use the SPDX License Identifier for GPL-2.0+ OR X11 > > Signed-off-by: Peter Robinson <pbrobinson@gmail.com> > --- > arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 39 +------------------ > .../arm/boot/dts/imx6sx-udoo-neo-extended.dts | 39 +------------------ > arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 39 +------------------ > arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 39 +------------------ > 4 files changed, 4 insertions(+), 152 deletions(-) > > diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts > index db0feb9b9f5d..b6fbceaf6889 100644 > --- a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts > +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts > @@ -1,43 +1,6 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR X11) This should actually be MIT, not X11. If you look at X11 SPDX definition, it is for a specifc X Consortium copyright and adds a no advertising clause on top of MIT. > /* > * Copyright (c) 2016 Andreas Färber > - * > - * This file is dual-licensed: you can use it either under the terms > - * of the GPL or the X11 license, at your option. Note that this dual > - * licensing only applies to this file, and not this project as a > - * whole. > - * > - * a) This library is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of the > - * License, or (at your option) any later version. > - * > - * This library is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - * > - * Or, alternatively, > - * > - * b) Permission is hereby granted, free of charge, to any person > - * obtaining a copy of this software and associated documentation > - * files (the "Software"), to deal in the Software without > - * restriction, including without limitation the rights to use, > - * copy, modify, merge, publish, distribute, sublicense, and/or > - * sell copies of the Software, and to permit persons to whom the > - * Software is furnished to do so, subject to the following > - * conditions: > - * > - * The above copyright notice and this permission notice shall be > - * included in all copies or substantial portions of the Software. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > - * OTHER DEALINGS IN THE SOFTWARE. > */ > > /dts-v1/; > diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts > index 5c7a2bb9141c..c6005cd284be 100644 > --- a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts > +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts > @@ -1,43 +1,6 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR X11) > /* > * Copyright (c) 2016 Andreas Färber > - * > - * This file is dual-licensed: you can use it either under the terms > - * of the GPL or the X11 license, at your option. Note that this dual > - * licensing only applies to this file, and not this project as a > - * whole. > - * > - * a) This library is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of the > - * License, or (at your option) any later version. > - * > - * This library is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - * > - * Or, alternatively, > - * > - * b) Permission is hereby granted, free of charge, to any person > - * obtaining a copy of this software and associated documentation > - * files (the "Software"), to deal in the Software without > - * restriction, including without limitation the rights to use, > - * copy, modify, merge, publish, distribute, sublicense, and/or > - * sell copies of the Software, and to permit persons to whom the > - * Software is furnished to do so, subject to the following > - * conditions: > - * > - * The above copyright notice and this permission notice shall be > - * included in all copies or substantial portions of the Software. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > - * OTHER DEALINGS IN THE SOFTWARE. > */ > > /dts-v1/; > diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts > index 13dfe2afaba5..ad8b8a663a70 100644 > --- a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts > +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts > @@ -1,43 +1,6 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR X11) > /* > * Copyright (c) 2016 Andreas Färber > - * > - * This file is dual-licensed: you can use it either under the terms > - * of the GPL or the X11 license, at your option. Note that this dual > - * licensing only applies to this file, and not this project as a > - * whole. > - * > - * a) This library is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of the > - * License, or (at your option) any later version. > - * > - * This library is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - * > - * Or, alternatively, > - * > - * b) Permission is hereby granted, free of charge, to any person > - * obtaining a copy of this software and associated documentation > - * files (the "Software"), to deal in the Software without > - * restriction, including without limitation the rights to use, > - * copy, modify, merge, publish, distribute, sublicense, and/or > - * sell copies of the Software, and to permit persons to whom the > - * Software is furnished to do so, subject to the following > - * conditions: > - * > - * The above copyright notice and this permission notice shall be > - * included in all copies or substantial portions of the Software. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > - * OTHER DEALINGS IN THE SOFTWARE. > */ > > /dts-v1/; > diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi > index 53b3eac94f0d..386707c1bfe0 100644 > --- a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi > +++ b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi > @@ -1,43 +1,6 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR X11) > /* > * Copyright (c) 2016 Andreas Färber > - * > - * This file is dual-licensed: you can use it either under the terms > - * of the GPL or the X11 license, at your option. Note that this dual > - * licensing only applies to this file, and not this project as a > - * whole. > - * > - * a) This library is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License as > - * published by the Free Software Foundation; either version 2 of the > - * License, or (at your option) any later version. > - * > - * This library is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - * > - * Or, alternatively, > - * > - * b) Permission is hereby granted, free of charge, to any person > - * obtaining a copy of this software and associated documentation > - * files (the "Software"), to deal in the Software without > - * restriction, including without limitation the rights to use, > - * copy, modify, merge, publish, distribute, sublicense, and/or > - * sell copies of the Software, and to permit persons to whom the > - * Software is furnished to do so, subject to the following > - * conditions: > - * > - * The above copyright notice and this permission notice shall be > - * included in all copies or substantial portions of the Software. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > - * OTHER DEALINGS IN THE SOFTWARE. > */ > > #include "imx6sx.dtsi" > -- > 2.21.0 > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] arm: imx6sx: udoo: Use the correct style for SPDX License Identifier 2019-06-11 22:49 ` Rob Herring @ 2019-06-12 8:12 ` Shawn Guo 0 siblings, 0 replies; 10+ messages in thread From: Shawn Guo @ 2019-06-12 8:12 UTC (permalink / raw) To: Rob Herring Cc: devicetree, Sascha Hauer, Peter Robinson, Pengutronix Kernel Team, Fabio Estevam, linux-arm-kernel, NXP Linux Team On Tue, Jun 11, 2019 at 04:49:33PM -0600, Rob Herring wrote: > On Sat, Jun 01, 2019 at 08:07:16AM +0100, Peter Robinson wrote: > > Use the SPDX License Identifier for GPL-2.0+ OR X11 > > > > Signed-off-by: Peter Robinson <pbrobinson@gmail.com> > > --- > > arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 39 +------------------ > > .../arm/boot/dts/imx6sx-udoo-neo-extended.dts | 39 +------------------ > > arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 39 +------------------ > > arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 39 +------------------ > > 4 files changed, 4 insertions(+), 152 deletions(-) > > > > diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts > > index db0feb9b9f5d..b6fbceaf6889 100644 > > --- a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts > > +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts > > @@ -1,43 +1,6 @@ > > +// SPDX-License-Identifier: (GPL-2.0+ OR X11) > > This should actually be MIT, not X11. If you look at X11 SPDX > definition, it is for a specifc X Consortium copyright and adds a no > advertising clause on top of MIT. Okay. I just got it fixed on my branch. Shawn ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/3] ARM: dts: imx6sx-udoo-neo: enable i2c-2 and i2c-4 for onboard sensors 2019-06-01 7:07 Updates for UDOO Neo Peter Robinson 2019-06-01 7:07 ` [PATCH 1/3] arm: imx6sx: udoo: Use the correct style for SPDX License Identifier Peter Robinson @ 2019-06-01 7:07 ` Peter Robinson 2019-06-05 15:19 ` Fabio Estevam 2019-06-01 7:07 ` [PATCH 3/3] ARM: dts: imx6sx-udoo-neo: add bluetooth config to uart3 Peter Robinson 2 siblings, 1 reply; 10+ messages in thread From: Peter Robinson @ 2019-06-01 7:07 UTC (permalink / raw) To: Rob Herring, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team, devicetree, linux-arm-kernel Cc: Peter Robinson The i2c2 bus has a external plug which enables the easy connection of external "bricks" with sensors of various kinds, while i2c4 on the Extended/Full boards has a pair of on board motion sensors, accelerometer and magnetometer on one chip and gyroscope on another so it makes sense to enable these i2c buses for use. Tested on UDOO Neo Full. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> -- v2: move i2c-4 core to imx6sx-udoo-neo.dtsi and just enable it on specific boards --- .../arm/boot/dts/imx6sx-udoo-neo-extended.dts | 4 +++ arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 4 +++ arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 26 +++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts index c6005cd284be..04a9f8780b8c 100644 --- a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts @@ -16,3 +16,7 @@ reg = <0x80000000 0x40000000>; }; }; + +&i2c4 { /* Onboard Motion sensors */ + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts index ad8b8a663a70..3cc6b0231ff6 100644 --- a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts @@ -31,3 +31,7 @@ }; }; }; + +&i2c4 { /* Onboard Motion sensors */ + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi index 386707c1bfe0..26373e3f3afd 100644 --- a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi +++ b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi @@ -188,6 +188,20 @@ }; }; +&i2c2 { /* Brick snap in sensors connector */ + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; + clock-frequency = <100000>; + status = "okay"; +}; + +&i2c4 { /* Onboard Motion sensors */ + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c4>; + clock-frequency = <100000>; + status = "disabled"; +}; + &iomuxc { pinctrl_bt_reg: btreggrp { fsl,pins = @@ -219,6 +233,18 @@ <MX6SX_PAD_GPIO1_IO01__I2C1_SDA 0x4001b8b1>; }; + pinctrl_i2c2: i2c2grp { + fsl,pins = + <MX6SX_PAD_GPIO1_IO03__I2C2_SDA 0x4001b8b1>, + <MX6SX_PAD_GPIO1_IO02__I2C2_SCL 0x4001b8b1>; + }; + + pinctrl_i2c4: i2c4grp { + fsl,pins = + <MX6SX_PAD_USB_H_DATA__I2C4_SDA 0x4001b8b1>, + <MX6SX_PAD_USB_H_STROBE__I2C4_SCL 0x4001b8b1>; + }; + pinctrl_uart1: uart1grp { fsl,pins = <MX6SX_PAD_GPIO1_IO04__UART1_TX 0x1b0b1>, -- 2.21.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] ARM: dts: imx6sx-udoo-neo: enable i2c-2 and i2c-4 for onboard sensors 2019-06-01 7:07 ` [PATCH 2/3] ARM: dts: imx6sx-udoo-neo: enable i2c-2 and i2c-4 for onboard sensors Peter Robinson @ 2019-06-05 15:19 ` Fabio Estevam 0 siblings, 0 replies; 10+ messages in thread From: Fabio Estevam @ 2019-06-05 15:19 UTC (permalink / raw) To: Peter Robinson Cc: open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Sascha Hauer, Rob Herring, NXP Linux Team, Pengutronix Kernel Team, Shawn Guo, moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE On Sat, Jun 1, 2019 at 4:07 AM Peter Robinson <pbrobinson@gmail.com> wrote: > > The i2c2 bus has a external plug which enables the easy connection of external > "bricks" with sensors of various kinds, while i2c4 on the Extended/Full boards > has a pair of on board motion sensors, accelerometer and magnetometer on one chip > and gyroscope on another so it makes sense to enable these i2c buses for use. > Tested on UDOO Neo Full. > > Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Fabio Estevam <festevam@gmail.com> ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] ARM: dts: imx6sx-udoo-neo: add bluetooth config to uart3 2019-06-01 7:07 Updates for UDOO Neo Peter Robinson 2019-06-01 7:07 ` [PATCH 1/3] arm: imx6sx: udoo: Use the correct style for SPDX License Identifier Peter Robinson 2019-06-01 7:07 ` [PATCH 2/3] ARM: dts: imx6sx-udoo-neo: enable i2c-2 and i2c-4 for onboard sensors Peter Robinson @ 2019-06-01 7:07 ` Peter Robinson 2019-06-05 15:20 ` Fabio Estevam 2 siblings, 1 reply; 10+ messages in thread From: Peter Robinson @ 2019-06-01 7:07 UTC (permalink / raw) To: Rob Herring, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team, devicetree, linux-arm-kernel Cc: Peter Robinson This updates the WL1831 bluetooth to use the serial serdev driver interface. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> --- .../arm/boot/dts/imx6sx-udoo-neo-extended.dts | 4 ++++ arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 4 ++++ arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 24 ++++++++----------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts index 04a9f8780b8c..5c50d44eb8d8 100644 --- a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts @@ -20,3 +20,7 @@ &i2c4 { /* Onboard Motion sensors */ status = "okay"; }; + +&uart3 { /* Bluetooth */ + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts index 3cc6b0231ff6..ba051a755177 100644 --- a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts @@ -35,3 +35,7 @@ &i2c4 { /* Onboard Motion sensors */ status = "okay"; }; + +&uart3 { /* Bluetooth */ + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi index 26373e3f3afd..f35c3af43780 100644 --- a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi +++ b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi @@ -70,18 +70,6 @@ startup-delay-us = <70000>; enable-active-high; }; - - reg_bt: regulator-bt { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_bt_reg>; - enable-active-high; - gpio = <&gpio2 17 GPIO_ACTIVE_HIGH>; - regulator-name = "bt_reg"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - }; }; &fec1 { @@ -343,11 +331,19 @@ status = "disabled"; }; -&uart3 { /* Bluetooth */ +&uart3 { /* Bluetooth - only on Extended/Full versions */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart3>; uart-has-rtscts; - status = "okay"; + status = "disabled"; + + bluetooth { + compatible = "ti,wl1831-st"; + enable-gpios = <&gpio2 17 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_bt_reg>; + max-speed = <921600>; + }; }; /* Arduino serial */ -- 2.21.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] ARM: dts: imx6sx-udoo-neo: add bluetooth config to uart3 2019-06-01 7:07 ` [PATCH 3/3] ARM: dts: imx6sx-udoo-neo: add bluetooth config to uart3 Peter Robinson @ 2019-06-05 15:20 ` Fabio Estevam 0 siblings, 0 replies; 10+ messages in thread From: Fabio Estevam @ 2019-06-05 15:20 UTC (permalink / raw) To: Peter Robinson Cc: open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Sascha Hauer, Rob Herring, NXP Linux Team, Pengutronix Kernel Team, Shawn Guo, moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE On Sat, Jun 1, 2019 at 4:07 AM Peter Robinson <pbrobinson@gmail.com> wrote: > > This updates the WL1831 bluetooth to use the serial serdev driver > interface. > > Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Fabio Estevam <festevam@gmail.com> ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2019-06-12 8:12 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-06-01 7:07 Updates for UDOO Neo Peter Robinson 2019-06-01 7:07 ` [PATCH 1/3] arm: imx6sx: udoo: Use the correct style for SPDX License Identifier Peter Robinson 2019-06-05 15:19 ` Fabio Estevam 2019-06-06 1:47 ` Shawn Guo 2019-06-11 22:49 ` Rob Herring 2019-06-12 8:12 ` Shawn Guo 2019-06-01 7:07 ` [PATCH 2/3] ARM: dts: imx6sx-udoo-neo: enable i2c-2 and i2c-4 for onboard sensors Peter Robinson 2019-06-05 15:19 ` Fabio Estevam 2019-06-01 7:07 ` [PATCH 3/3] ARM: dts: imx6sx-udoo-neo: add bluetooth config to uart3 Peter Robinson 2019-06-05 15:20 ` Fabio Estevam
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).