Re: [PATCH 02/12] ARM: dts: sunxi: Remove unused devicetree headers

Andre Przywara
2022-05-06T00:40:21Z

On Wed, 27 Apr 2022 15:31:21 -0500
Samuel Holland <samuel@sholland.org> wrote:

> These files are not included anywhere and do not exist in the Linux
> devicetree source.

Indeed, in contrast to sun8i-q8-common.dtsi, those files here are not
referenced anywhere in the U-Boot tree.
>
> Signed-off-by: Samuel Holland <samuel@sholland.org>

Reviewed-by: Andre Przywara <andre.przywara@arm.com>

Cheers,
Andre

> ---
>
> arch/arm/dts/sun5i-q8-common.dtsi | 180 ------------------------------
> arch/arm/dts/sunxi-q8-common.dtsi | 83 --------------
> 2 files changed, 263 deletions(-)
> delete mode 100644 arch/arm/dts/sun5i-q8-common.dtsi
> delete mode 100644 arch/arm/dts/sunxi-q8-common.dtsi
>
> diff --git a/arch/arm/dts/sun5i-q8-common.dtsi b/arch/arm/dts/sun5i-q8-common.dtsi
> deleted file mode 100644
> index a78e189f66..0000000000
> --- a/arch/arm/dts/sun5i-q8-common.dtsi
> +++ /dev/null
> @@ -1,180 +0,0 @@
> -/*
> - * Copyright 2015 Hans de Goede <hdegoede@redhat.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 "sunxi-q8-common.dtsi"
> -
> -#include <dt-bindings/pwm/pwm.h>
> -
> -/ {
> - aliases {
> - serial0 = &uart1;
> - };
> -
> - backlight: backlight {
> - compatible = "pwm-backlight";
> - pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
> - brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
> - default-brightness-level = <8>;
> - /* TODO: backlight uses axp gpio1 as enable pin */
> - };
> -
> - chosen {
> - stdout-path = "serial0:115200n8";
> - };
> -};
> -
> -&cpu0 {
> - cpu-supply = <&reg_dcdc2>;
> -};
> -
> -&ehci0 {
> - status = "okay";
> -};
> -
> -&i2c0 {
> - axp209: pmic@34 {
> - reg = <0x34>;
> - interrupts = <0>;
> - };
> -};
> -
> -&i2c1 {
> - pcf8563: rtc@51 {
> - compatible = "nxp,pcf8563";
> - reg = <0x51>;
> - };
> -};
> -
> -#include "axp209.dtsi"
> -
> -&mmc0 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_q8>;
> - vmmc-supply = <&reg_vcc3v0>;
> - bus-width = <4>;
> - cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */
> - cd-inverted;
> - status = "okay";
> -};
> -
> -&otg_sram {
> - status = "okay";
> -};
> -
> -&pio {
> - mmc0_cd_pin_q8: mmc0_cd_pin@0 {
> - allwinner,pins = "PG0";
> - allwinner,function = "gpio_in";
> - allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> - allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
> - };
> -
> - usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
> - allwinner,pins = "PG1";
> - allwinner,function = "gpio_in";
> - allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> - allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
> - };
> -
> - usb0_id_detect_pin: usb0_id_detect_pin@0 {
> - allwinner,pins = "PG2";
> - allwinner,function = "gpio_in";
> - allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> - allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
> - };
> -
> - usb0_vbus_pin_a: usb0_vbus_pin@0 {
> - allwinner,pins = "PG12";
> - allwinner,function = "gpio_out";
> - allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> - };
> -};
> -
> -&reg_dcdc2 {
> - regulator-always-on;
> - regulator-min-microvolt = <1000000>;
> - regulator-max-microvolt = <1500000>;
> - regulator-name = "vdd-cpu";
> -};
> -
> -&reg_dcdc3 {
> - regulator-always-on;
> - regulator-min-microvolt = <1000000>;
> - regulator-max-microvolt = <1400000>;
> - regulator-name = "vdd-int-pll";
> -};
> -
> -&reg_ldo1 {
> - regulator-name = "vdd-rtc";
> -};
> -
> -&reg_ldo2 {
> - regulator-always-on;
> - regulator-min-microvolt = <3000000>;
> - regulator-max-microvolt = <3000000>;
> - regulator-name = "avcc";
> -};
> -
> -&reg_usb0_vbus {
> - gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
> - status = "okay";
> -};
> -
> -&uart1 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&uart1_pins_b>;
> - status = "okay";
> -};
> -
> -&usb_otg {
> - dr_mode = "otg";
> - status = "okay";
> -};
> -
> -&usbphy {
> - pinctrl-names = "default";
> - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
> - usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
> - usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
> - usb0_vbus-supply = <&reg_usb0_vbus>;
> - status = "okay";
> -};
> diff --git a/arch/arm/dts/sunxi-q8-common.dtsi b/arch/arm/dts/sunxi-q8-common.dtsi
> deleted file mode 100644
> index b8241462fc..0000000000
> --- a/arch/arm/dts/sunxi-q8-common.dtsi
> +++ /dev/null
> @@ -1,83 +0,0 @@
> -/*
> - * Copyright 2015 Hans de Goede <hdegoede@redhat.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 <dt-bindings/gpio/gpio.h>
> -#include <dt-bindings/input/input.h>
> -#include <dt-bindings/pinctrl/sun4i-a10.h>
> -#include "sunxi-common-regulators.dtsi"
> -
> -&i2c0 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&i2c0_pins_a>;
> - status = "okay";
> -};
> -
> -&i2c1 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&i2c1_pins_a>;
> - status = "okay";
> -};
> -
> -&lradc {
> - vref-supply = <&reg_vcc3v0>;
> - status = "okay";
> -
> - button@200 {
> - label = "Volume Up";
> - linux,code = <KEY_VOLUMEUP>;
> - channel = <0>;
> - voltage = <200000>;
> - };
> -
> - button@400 {
> - label = "Volume Down";
> - linux,code = <KEY_VOLUMEDOWN>;
> - channel = <0>;
> - voltage = <400000>;
> - };
> -};
> -
> -&pwm {
> - pinctrl-names = "default";
> - pinctrl-0 = <&pwm0_pins>;
> - status = "okay";
> -};