diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-02-09 20:38:05 -0500 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2018-03-08 10:18:08 -0500 |
commit | 0d900bbbae9b3b6a7ff0fc0d7070b8dbe163d17a (patch) | |
tree | 6cc1b0fff8d145ee033ec9f6c7ee81bcc0d63aad | |
parent | 818e8729e1038e3847a4cb2ed7ad8003a1d037ab (diff) |
ARM: tegra: apalis-tk1: Copyright period, spurious newlines
Update the copyright period and get rid of some spurious newlines.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r-- | arch/arm/boot/dts/tegra124-apalis-eval.dts | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra124-apalis.dtsi | 11 |
2 files changed, 3 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts index f1010cefb993..a6ad759dddb4 100644 --- a/arch/arm/boot/dts/tegra124-apalis-eval.dts +++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright 2016 Toradex AG | 2 | * Copyright 2016-2018 Toradex AG |
3 | * | 3 | * |
4 | * This file is dual-licensed: you can use it either under the terms | 4 | * This file is dual-licensed: you can use it either under the terms |
5 | * of the GPL or the X11 license, at your option. Note that this dual | 5 | * of the GPL or the X11 license, at your option. Note that this dual |
@@ -225,9 +225,7 @@ | |||
225 | 225 | ||
226 | backlight: backlight { | 226 | backlight: backlight { |
227 | compatible = "pwm-backlight"; | 227 | compatible = "pwm-backlight"; |
228 | 228 | pwms = <&pwm 3 5000000>; /* BKL1_PWM */ | |
229 | /* BKL1_PWM */ | ||
230 | pwms = <&pwm 3 5000000>; | ||
231 | brightness-levels = <255 231 223 207 191 159 127 0>; | 229 | brightness-levels = <255 231 223 207 191 159 127 0>; |
232 | default-brightness-level = <6>; | 230 | default-brightness-level = <6>; |
233 | /* BKL1_ON */ | 231 | /* BKL1_ON */ |
diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi index b7648ce4565d..65a2161b9b8e 100644 --- a/arch/arm/boot/dts/tegra124-apalis.dtsi +++ b/arch/arm/boot/dts/tegra124-apalis.dtsi | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright 2016 Toradex AG | 2 | * Copyright 2016-2018 Toradex AG |
3 | * | 3 | * |
4 | * This file is dual-licensed: you can use it either under the terms | 4 | * This file is dual-licensed: you can use it either under the terms |
5 | * of the GPL or the X11 license, at your option. Note that this dual | 5 | * of the GPL or the X11 license, at your option. Note that this dual |
@@ -56,7 +56,6 @@ | |||
56 | 56 | ||
57 | pcie@1003000 { | 57 | pcie@1003000 { |
58 | status = "okay"; | 58 | status = "okay"; |
59 | |||
60 | avddio-pex-supply = <&vdd_1v05>; | 59 | avddio-pex-supply = <&vdd_1v05>; |
61 | avdd-pex-pll-supply = <&vdd_1v05>; | 60 | avdd-pex-pll-supply = <&vdd_1v05>; |
62 | avdd-pll-erefe-supply = <&avdd_1v05>; | 61 | avdd-pll-erefe-supply = <&avdd_1v05>; |
@@ -85,7 +84,6 @@ | |||
85 | hdmi@54280000 { | 84 | hdmi@54280000 { |
86 | pll-supply = <®_1v05_avdd_hdmi_pll>; | 85 | pll-supply = <®_1v05_avdd_hdmi_pll>; |
87 | vdd-supply = <®_3v3_avdd_hdmi>; | 86 | vdd-supply = <®_3v3_avdd_hdmi>; |
88 | |||
89 | nvidia,ddc-i2c-bus = <&hdmi_ddc>; | 87 | nvidia,ddc-i2c-bus = <&hdmi_ddc>; |
90 | nvidia,hpd-gpio = | 88 | nvidia,hpd-gpio = |
91 | <&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>; | 89 | <&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>; |
@@ -1600,15 +1598,11 @@ | |||
1600 | compatible = "ams,as3722"; | 1598 | compatible = "ams,as3722"; |
1601 | reg = <0x40>; | 1599 | reg = <0x40>; |
1602 | interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>; | 1600 | interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>; |
1603 | |||
1604 | ams,system-power-controller; | 1601 | ams,system-power-controller; |
1605 | |||
1606 | #interrupt-cells = <2>; | 1602 | #interrupt-cells = <2>; |
1607 | interrupt-controller; | 1603 | interrupt-controller; |
1608 | |||
1609 | gpio-controller; | 1604 | gpio-controller; |
1610 | #gpio-cells = <2>; | 1605 | #gpio-cells = <2>; |
1611 | |||
1612 | pinctrl-names = "default"; | 1606 | pinctrl-names = "default"; |
1613 | pinctrl-0 = <&as3722_default>; | 1607 | pinctrl-0 = <&as3722_default>; |
1614 | 1608 | ||
@@ -1783,7 +1777,6 @@ | |||
1783 | reg = <0x4c>; | 1777 | reg = <0x4c>; |
1784 | interrupt-parent = <&gpio>; | 1778 | interrupt-parent = <&gpio>; |
1785 | interrupts = <TEGRA_GPIO(I, 6) IRQ_TYPE_LEVEL_LOW>; | 1779 | interrupts = <TEGRA_GPIO(I, 6) IRQ_TYPE_LEVEL_LOW>; |
1786 | |||
1787 | #thermal-sensor-cells = <1>; | 1780 | #thermal-sensor-cells = <1>; |
1788 | }; | 1781 | }; |
1789 | }; | 1782 | }; |
@@ -1816,7 +1809,6 @@ | |||
1816 | sata@70020000 { | 1809 | sata@70020000 { |
1817 | phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>; | 1810 | phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>; |
1818 | phy-names = "sata-0"; | 1811 | phy-names = "sata-0"; |
1819 | |||
1820 | avdd-supply = <&vdd_1v05>; | 1812 | avdd-supply = <&vdd_1v05>; |
1821 | hvdd-supply = <®_3v3>; | 1813 | hvdd-supply = <®_3v3>; |
1822 | vddio-supply = <&vdd_1v05>; | 1814 | vddio-supply = <&vdd_1v05>; |
@@ -1830,7 +1822,6 @@ | |||
1830 | <&{/padctl@7009f000/pads/usb2/lanes/usb2-2}>, | 1822 | <&{/padctl@7009f000/pads/usb2/lanes/usb2-2}>, |
1831 | <&{/padctl@7009f000/pads/pcie/lanes/pcie-0}>; | 1823 | <&{/padctl@7009f000/pads/pcie/lanes/pcie-0}>; |
1832 | phy-names = "usb2-0", "usb3-1", "usb2-1", "usb2-2", "usb3-0"; | 1824 | phy-names = "usb2-0", "usb3-1", "usb2-1", "usb2-2", "usb3-0"; |
1833 | |||
1834 | avddio-pex-supply = <&vdd_1v05>; | 1825 | avddio-pex-supply = <&vdd_1v05>; |
1835 | avdd-pll-erefe-supply = <&avdd_1v05>; | 1826 | avdd-pll-erefe-supply = <&avdd_1v05>; |
1836 | avdd-pll-utmip-supply = <&vddio_1v8>; | 1827 | avdd-pll-utmip-supply = <&vddio_1v8>; |