Commit 4b2bb6ca authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt 

* 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux

:
  ARM: dts: at91-vinco: use SPDX-License-Identifier
  ARM: dts: atmel boards: use SPDX-License-Identifier
  ARM: dts: at91sam9xe: use SPDX-License-Identifier
  ARM: dts: sama5d{2,4}: use SPDX-License-Identifier
  ARM: dts: at91: sama5d2_xplained: Add proper regulator states for suspend-to-mem
  ARM: dts: at91: sama5d2: add labels to soc dtsi for derivative boards

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fbadd4d1 a4a11b79

arch/arm/boot/dts/at91-sama5d27_som1.dtsi

+1 −38
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * at91-sama5d27_som1.dtsi - Device Tree file for SAMA5D27 SoM1 board

 *

 *  Copyright (c) 2017, Microchip Technology Inc.

 *                2017 Cristian Birsan <cristian.birsan@microchip.com>

 *                2017 Claudiu Beznea <claudiu.beznea@microchip.com>

 *

 * 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 file 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 file 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 "sama5d2.dtsi"

#include "sama5d2-pinfunc.h"

arch/arm/boot/dts/at91-sama5d27_som1_ek.dts

+1 −38
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * at91-sama5d27_som1_ek.dts - Device Tree file for SAMA5D27-SOM1-EK board

 *
@@ -5,44 +6,6 @@ 
 *                2016 Nicolas Ferre <nicolas.ferre@atmel.com>

 *                2017 Cristian Birsan <cristian.birsan@microchip.com>

 *                2017 Claudiu Beznea <claudiu.beznea@microchip.com>

 *

 * 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 file 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 file 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/;

#include "at91-sama5d27_som1.dtsi"

arch/arm/boot/dts/at91-sama5d2_xplained.dts

+55 −38
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * at91-sama5d2_xplained.dts - Device Tree file for SAMA5D2 Xplained board

 *

 *  Copyright (C) 2015 Atmel,

 *                2015 Nicolas Ferre <nicolas.ferre@atmel.com>

 *

 * 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 file 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 file 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/;

#include "sama5d2.dtsi"

#include "sama5d2-pinfunc.h"

#include <dt-bindings/mfd/atmel-flexcom.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/regulator/active-semi,8945a-regulator.h>



/ {

	model = "Atmel SAMA5D2 Xplained";
@@ -181,49 +145,102 @@ 
							regulator-name = "VDD_1V35";

							regulator-min-microvolt = <1350000>;

							regulator-max-microvolt = <1350000>;

							regulator-allowed-modes = <ACT8945A_REGULATOR_MODE_FIXED>,

										  <ACT8945A_REGULATOR_MODE_LOWPOWER>;

							regulator-initial-mode = <ACT8945A_REGULATOR_MODE_FIXED>;

							regulator-always-on;



							regulator-state-mem {

								regulator-on-in-suspend;

								regulator-suspend-min-microvolt=<1400000>;

								regulator-suspend-max-microvolt=<1400000>;

								regulator-changeable-in-suspend;

								regulator-mode=<ACT8945A_REGULATOR_MODE_LOWPOWER>;

							};

						};



						vdd_1v2_reg: REG_DCDC2 {

							regulator-name = "VDD_1V2";

							regulator-min-microvolt = <1100000>;

							regulator-max-microvolt = <1300000>;

							regulator-allowed-modes = <ACT8945A_REGULATOR_MODE_FIXED>,

										  <ACT8945A_REGULATOR_MODE_LOWPOWER>;

							regulator-initial-mode = <ACT8945A_REGULATOR_MODE_FIXED>;

							regulator-always-on;



							regulator-state-mem {

								regulator-off-in-suspend;

							};

						};



						vdd_3v3_reg: REG_DCDC3 {

							regulator-name = "VDD_3V3";

							regulator-min-microvolt = <3300000>;

							regulator-max-microvolt = <3300000>;

							regulator-allowed-modes = <ACT8945A_REGULATOR_MODE_FIXED>,

										  <ACT8945A_REGULATOR_MODE_LOWPOWER>;

							regulator-initial-mode = <ACT8945A_REGULATOR_MODE_FIXED>;

							regulator-always-on;



							regulator-state-mem {

								regulator-off-in-suspend;

							};

						};



						vdd_fuse_reg: REG_LDO1 {

							regulator-name = "VDD_FUSE";

							regulator-min-microvolt = <2500000>;

							regulator-max-microvolt = <2500000>;

							regulator-allowed-modes = <ACT8945A_REGULATOR_MODE_NORMAL>,

										  <ACT8945A_REGULATOR_MODE_LOWPOWER>;

							regulator-initial-mode = <ACT8945A_REGULATOR_MODE_NORMAL>;

							regulator-always-on;



							regulator-state-mem {

								regulator-off-in-suspend;

							};

						};



						vdd_3v3_lp_reg: REG_LDO2 {

							regulator-name = "VDD_3V3_LP";

							regulator-min-microvolt = <3300000>;

							regulator-max-microvolt = <3300000>;

							regulator-allowed-modes = <ACT8945A_REGULATOR_MODE_NORMAL>,

										  <ACT8945A_REGULATOR_MODE_LOWPOWER>;

							regulator-initial-mode = <ACT8945A_REGULATOR_MODE_NORMAL>;

							regulator-always-on;



							regulator-state-mem {

								regulator-off-in-suspend;

							};

						};



						vdd_led_reg: REG_LDO3 {

							regulator-name = "VDD_LED";

							regulator-min-microvolt = <3300000>;

							regulator-max-microvolt = <3300000>;

							regulator-allowed-modes = <ACT8945A_REGULATOR_MODE_NORMAL>,

										  <ACT8945A_REGULATOR_MODE_LOWPOWER>;

							regulator-initial-mode = <ACT8945A_REGULATOR_MODE_NORMAL>;

							regulator-always-on;



							regulator-state-mem {

								regulator-off-in-suspend;

							};

						};



						vdd_sdhc_1v8_reg: REG_LDO4 {

							regulator-name = "VDD_SDHC_1V8";

							regulator-min-microvolt = <1800000>;

							regulator-max-microvolt = <1800000>;

							regulator-allowed-modes = <ACT8945A_REGULATOR_MODE_NORMAL>,

										  <ACT8945A_REGULATOR_MODE_LOWPOWER>;

							regulator-initial-mode = <ACT8945A_REGULATOR_MODE_NORMAL>;

							regulator-always-on;



							regulator-state-mem {

								regulator-off-in-suspend;

							};

						};

					};

arch/arm/boot/dts/at91-sama5d4_xplained.dts

+1 −38
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * at91-sama5d4_xplained.dts - Device Tree file for SAMA5D4 Xplained board

 *

 *  Copyright (C) 2015 Atmel,

 *                2015 Josh Wu <josh.wu@atmel.com>

 *

 * 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 file 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 file 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/;

#include "sama5d4.dtsi"

arch/arm/boot/dts/at91-sama5d4ek.dts

+1 −38
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * at91-sama5d4ek.dts - Device Tree file for SAMA5D4 Evaluation Kit

 *

 *  Copyright (C) 2014 Atmel,

 *                2014 Nicolas Ferre <nicolas.ferre@atmel.com>

 *

 * 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 file 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 file 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/;

#include "sama5d4.dtsi"

CRA Git | Maintained and supported by SUSTech CRA and CCSE