diff --git a/dts/2621-UM3XL.dts b/dts/2621-S5.dts similarity index 100% rename from dts/2621-UM3XL.dts rename to dts/2621-S5.dts diff --git a/dts/UM3m.dts b/dts/UM3m.dts deleted file mode 100644 index f57dec54..00000000 --- a/dts/UM3m.dts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2017 - Ultimaker B.V. - * Author Olliver Schinagl - * - * 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 "part2005-olimexinterface.dtsi" -#include "part1994-ulticontroller.dtsi" -#include "part201258-ulticontroller3.dtsi" - -/ { - model = "Ultimaker UM3m-Hybrid (9066-9051)"; - compatible = "ultimaker,9066-9051", "olimex,a20-olinuxino-lime2", - "allwinner,sun7i-a20"; -}; - -&pio { - oled_pins_opinicus: oled_pins@0 { - pins = "PI13"; - function = "gpio_out"; - drive-strength = <10>; - bias-pull-up; - }; -}; - -&ssd1309 { - reset-gpios = <&pio 8 13 GPIO_ACTIVE_HIGH>; -}; diff --git a/dts/article.links b/dts/article.links index 556dd0c9..21f1a6a9 100644 --- a/dts/article.links +++ b/dts/article.links @@ -3,9 +3,6 @@ 1866:1866-nfc-station:NFC Programming station 1797:part2005-withpart1994:programming station 9066:part2005-withpart1994:UM3 -9066-9051:UM3m:UM3 Hybrid 9511:part2005-withpart1994:UM3 extended -9051:2621-UM3XL:UM3 XL -9051-999:part2005-withpart1994:UM3 XL proto 1 -9051-1000:part2005-withpart1994:UM3 XL proto 2 +9051:2621-S5:S5 202970:202970-touchscreen_workstation:Touchscreen test and programming station diff --git a/dts/part1000897-ultimainboard3.1.dtsi b/dts/part1000897-ultimainboard3.1.dtsi deleted file mode 100644 index 9e3f3d01..00000000 --- a/dts/part1000897-ultimainboard3.1.dtsi +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright 2015 - Ultimaker B.V. - * Author Olliver Schinagl - * - * 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 "jedi-common.dts" - -/ { - aliases { - serial1 = &uart7; - }; - - leds { - green { - linux,default-trigger = "mmc0"; - }; - - ol1 { - label = "opinicus:orange:ol1"; - gpios = <&pio 1 11 GPIO_ACTIVE_HIGH>; - default-state = "on"; - }; - - ol2 { - label = "opinicus:orange:ol2"; - gpios = <&pio 1 10 GPIO_ACTIVE_HIGH>; - default-state = "on"; - }; - - ol3 { - label = "opinicus:orange:ol3"; - gpios = <&pio 1 9 GPIO_ACTIVE_HIGH>; - default-state = "on"; - }; - }; -}; - -&i2c1 { - cabin_light: pca9632@61 { - compatible = "nxp,pca9632"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x61>; - nxp,totem-pole; - nxp,inverted-out; - nxp,hw-blink; - - red@0 { - label = "red:cabin_light"; - reg = <0>; - linux,default-trigger = "none"; - }; - - green@1 { - label = "green:cabin_light"; - reg = <1>; - linux,default-trigger = "none"; - }; - - blue@2 { - label = "blue:cabin_light"; - reg = <2>; - linux,default-trigger = "none"; - }; - - white@3 { - label = "white:cabin_light"; - reg = <3>; - linux,default-trigger = "default-on"; - }; - }; -}; - -&i2c2 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins_a>; - clock-frequency = <50000>; - status = "okay"; -}; - -&pio { - nfc_irq: nfc_irq { - pins = "PI11"; - function = "gpio_in"; - bias-disabled; - }; - - nfc_hreq: nfc_hreq { - pins = "PI10"; - function = "gpio_out"; - drive-strength = <10>; - bias-pullup; - }; - - led_pins_opinicus: led_pins@0 { - pins = "PB9", "PB10", "PB11"; - function = "gpio_out"; - drive-strength = <20>; - bias-disabled; - }; -}; - -&spi1 { - pinctrl-names = "default"; - pinctrl-0 = <&spi1_pins_a>; - status = "okay"; -}; - -&uart7 { - pinctrl-names = "default"; - pinctrl-0 = <&uart7_pins_a>; - status = "okay"; -}; diff --git a/dts/part1000897-withpart1994.dts b/dts/part1000897-withpart1994.dts deleted file mode 100644 index 6691b5dd..00000000 --- a/dts/part1000897-withpart1994.dts +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2015 - Ultimaker B.V. - * Author Olliver Schinagl - * - * 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 "part1000897-ultimainboard3.1.dtsi" -#include "part1994-ulticontroller.dtsi" - -&pio { - oled_pins_opinicus: oled_pins@0 { - pins = "PI4"; - function = "gpio_out"; - drive-strength = <10>; - bias-pulldown; - }; -}; - -&ssd1309 { - reset-gpios = <&pio 8 4 GPIO_ACTIVE_HIGH>; -};