diff options
Diffstat (limited to 'arch')
33 files changed, 544 insertions, 577 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 09006c727f2e..a1ec300bd033 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -232,25 +232,6 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ tegra124-foster.dtb \ tegra124-thor195.dtb \ tegra124-loki-thor195-e2549-a00.dtb \ - tegra124-tn8.dtb \ - tegra124-tn8-p1761.dtb \ - tegra124-tn8-p1761-2gb.dtb \ - tegra124-tn8-p1761-battery.dtb \ - tegra124-tn8-p1761-2gb-battery.dtb \ - tegra124-tn8-e1784-2gb.dtb \ - tegra124-tn8-e1784-battery.dtb \ - tegra124-tn8-aio.dtb \ - tegra124-tn8-battery.dtb \ - tegra124-tn8-a03-00.dtb \ - tegra124-tn8-a03-00-battery.dtb \ - tegra124-tn8-a03-01.dtb \ - tegra124-tn8-a03-01-battery.dtb \ - tegra124-tn8-p1761-a02.dtb \ - tegra124-tn8-p1761-a02-battery.dtb \ - tegra124-e1782_sku1100.dtb \ - tegra124-e1791.dtb \ - tegra124-e1922.dtb \ - tegra124-e1923.dtb \ tegra124-tn8-e1780-1100-a02-01.dtb \ tegra124-tn8-e1780-1100-a02-battery.dtb \ tegra124-tn8-e1780-1100-a02.dtb \ @@ -269,6 +250,9 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ tegra124-tn8-p1761-1270-a03.dtb \ tegra124-tn8-p1761-1470-a00-battery.dtb \ tegra124-tn8-p1761-1470-a00.dtb \ + tegra124-e1782_sku1100.dtb \ + tegra124-e1791.dtb \ + tegra124-e1923.dtb \ tegra124-vcm30_t124.dtb dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \ versatile-pb.dtb diff --git a/arch/arm/boot/dts/tegra124-e1922.dts b/arch/arm/boot/dts/tegra124-e1922.dts deleted file mode 100644 index ddd459b2bf87..000000000000 --- a/arch/arm/boot/dts/tegra124-e1922.dts +++ /dev/null @@ -1,44 +0,0 @@ -/dts-v1/; - -#include "tegra124-tn8.dtsi" -#include "tegra124-platforms/tegra124-tn8-dfll.dtsi" -#include "tegra124-platforms/tegra124-tn8-emc-e1922-1100-a00.dtsi" -#include "tegra124-platforms/tegra124-ardbeg-powermon-e1780-1000-a01.dtsi" -#include "tegra124-platforms/tegra124-tn8-pmic-e1936-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-fixed-e1936-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-sensor-p1761-1470-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-pinmux-p1761-1470-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-gpio-p1761-1470-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" - -/ { - model = "NVIDIA Tegra124 TN8 ERS POP"; - compatible = "nvidia,tn8", "nvidia,tegra124"; - nvidia,dtsfilename = __FILE__; - nvidia,boardids = "1922:1100:0"; - #address-cells = <2>; - #size-cells = <2>; - - chosen { - bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; - linux,initrd-start = <0x85000000>; - linux,initrd-end = <0x851bc400>; - }; - - i2c@7000c400 { - pca9546@71 { - vcc-supply = <&palmas_smps9>; - }; - }; - - pinmux { - unused_lowpower { - pi5 { - nvidia,enable-input = <TEGRA_PIN_ENABLE>; - nvidia,pull = <TEGRA_PIN_PULL_UP>; - nvidia,tristate = <TEGRA_PIN_DISABLE>; - }; - }; - }; -}; - diff --git a/arch/arm/boot/dts/tegra124-tn8-a03-00-battery.dts b/arch/arm/boot/dts/tegra124-tn8-a03-00-battery.dts deleted file mode 100644 index 217c64f3115e..000000000000 --- a/arch/arm/boot/dts/tegra124-tn8-a03-00-battery.dts +++ /dev/null @@ -1,17 +0,0 @@ -#include "tegra124-tn8-a03-00.dts" -#include "tegra124-platforms/tegra124-tn8-sysedp-e1780-1100-a02.dtsi" - -/ { - i2c@7000c000 { - max17048@36 { - status = "okay"; - }; - - bq2419x@6b { - charger { - status = "okay"; - }; - }; - }; -}; - diff --git a/arch/arm/boot/dts/tegra124-tn8-a03-00.dts b/arch/arm/boot/dts/tegra124-tn8-a03-00.dts deleted file mode 100644 index f51065812f9e..000000000000 --- a/arch/arm/boot/dts/tegra124-tn8-a03-00.dts +++ /dev/null @@ -1,71 +0,0 @@ -/* - * arch/arm/boot/dts/tegra124-tn8-a03-00.dts - * - * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved. - * - * This program 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 program 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. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -/dts-v1/; - -#include "tegra124-tn8.dtsi" -#include "tegra124-platforms/tegra124-tn8-dfll.dtsi" -#include "tegra124-platforms/tegra124-tn8-emc-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-powermon-e1780-1100-a01.dtsi" -#include "tegra124-platforms/tegra124-tn8-pmic-e1736-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-fixed-e1736-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-gpio-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-pinmux-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-sensor-e1845-1000-a00.dtsi" -#include "panel-l-wxga-7.dtsi" -#include "tegra124-platforms/tegra124-tn8-hdmi.dtsi" - -/ { - model = "NVIDIA Tegra124 TN8"; - compatible = "nvidia,tn8", "nvidia,tegra124"; - nvidia,dtsfilename = __FILE__; - nvidia,boardids = "1780:1100:3","1845:1000:0","1736:1000:0","1549:1000:0"; - #address-cells = <2>; - #size-cells = <2>; - - chosen { - bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; - linux,initrd-start = <0x85000000>; - linux,initrd-end = <0x851bc400>; - }; - - host1x { - /* tegradc.1 */ - dc@54240000 { - avdd_hdmi-supply = <&palmas_ldoln>; - avdd_hdmi_pll-supply = <&palmas_ldo1>; - vdd_hdmi_5v0-supply = <&vdd_hdmi>; - }; - dsi { - nvidia,dsi-controller-vs = <DSI_VS_1>; - status = "okay"; - panel-l-wxga-7 { - nvidia,dsi-panel-bl-pwm-gpio = <&gpio TEGRA_GPIO(H, 1) 0>; /* PH1 */ - }; - }; - }; - - i2c@7000c400 { - pca9546@71 { - vcc-supply = <&palmas_smps9>; - }; - }; -}; - diff --git a/arch/arm/boot/dts/tegra124-tn8-a03-01-battery.dts b/arch/arm/boot/dts/tegra124-tn8-a03-01-battery.dts deleted file mode 100644 index 54d10957a029..000000000000 --- a/arch/arm/boot/dts/tegra124-tn8-a03-01-battery.dts +++ /dev/null @@ -1,18 +0,0 @@ - -#include "tegra124-tn8-a03-01.dts" -#include "tegra124-platforms/tegra124-tn8-sysedp-e1780-1100-a02.dtsi" - -/ { - i2c@7000c000 { - cw201x@62 { - status = "okay"; - }; - - bq2419x: bq2419x@6b { - charger { - status = "okay"; - }; - }; - }; -}; - diff --git a/arch/arm/boot/dts/tegra124-tn8-a03-01.dts b/arch/arm/boot/dts/tegra124-tn8-a03-01.dts deleted file mode 100644 index 754b4ae17308..000000000000 --- a/arch/arm/boot/dts/tegra124-tn8-a03-01.dts +++ /dev/null @@ -1,76 +0,0 @@ -/* - * arch/arm/boot/dts/tegra124-tn8-a03-01.dts - * - * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved. - * - * This program 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 program 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. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -/dts-v1/; - -#include "tegra124-tn8.dtsi" -#include "tegra124-platforms/tegra124-tn8-dfll.dtsi" -#include "tegra124-platforms/tegra124-tn8-emc-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-powermon-e1780-1100-a01.dtsi" -#include "tegra124-platforms/tegra124-tn8-pmic-e1769-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-fixed-e1769-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-gpio-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-pinmux-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-sensor-e1845-1000-a00.dtsi" -#include "panel-l-wxga-7.dtsi" -#include "tegra124-platforms/tegra124-tn8-hdmi.dtsi" - -/ { - model = "NVIDIA Tegra124 TN8"; - compatible = "nvidia,tn8", "nvidia,tegra124"; - nvidia,dtsfilename = __FILE__; - nvidia,boardids = "1780:1100:3","1845:1000:0","1769:1000:0","1549:1000:0"; - #address-cells = <2>; - #size-cells = <2>; - - chosen { - bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; - linux,initrd-start = <0x85000000>; - linux,initrd-end = <0x851bc400>; - }; - - host1x { - /* tegradc.1 */ - dc@54240000 { - avdd_hdmi-supply = <&palmas_ldoln>; - avdd_hdmi_pll-supply = <&palmas_ldo1>; - vdd_hdmi_5v0-supply = <&vdd_hdmi>; - }; - dsi { - nvidia,dsi-controller-vs = <DSI_VS_1>; - status = "okay"; - panel-l-wxga-7 { - nvidia,dsi-panel-bl-pwm-gpio = <&gpio TEGRA_GPIO(H, 1) 0>; /* PH1 */ - }; - }; - }; - - i2c@7000c400 { - pca9546@71 { - vcc-supply = <&palmas_smps9>; - }; - }; - - gps { - compatible = "mtk,mt3332"; - force-on-gpios = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>; - }; -}; - diff --git a/arch/arm/boot/dts/tegra124-tn8-aio.dts b/arch/arm/boot/dts/tegra124-tn8-aio.dts deleted file mode 100644 index e4ddfbdf693e..000000000000 --- a/arch/arm/boot/dts/tegra124-tn8-aio.dts +++ /dev/null @@ -1,60 +0,0 @@ -/dts-v1/; - -#include "tegra124-tn8.dtsi" -#include "tegra124-platforms/tegra124-tn8-dfll.dtsi" -#include "tegra124-platforms/tegra124-tn8-emc-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-powermon-e1780-1100-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-pmic-e1736-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-fixed-e1736-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-gpio-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-pinmux-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-sensor-e1794-1000-a00.dtsi" - -/ { - model = "NVIDIA Tegra124 TN8"; - compatible = "nvidia,tn8", "nvidia,tegra124"; - nvidia,dtsfilename = __FILE__; - nvidia,boardids = ""; - #address-cells = <2>; - #size-cells = <2>; - - chosen { - bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; - linux,initrd-start = <0x85000000>; - linux,initrd-end = <0x851bc400>; - }; - - i2c@7000c400 { - pca9546@71 { - vcc-supply = <&palmas_smps9>; - }; - }; - - i2c@7000c000 { - tps65913 { - pmic { - ldo1 { - consumers { - c11 { - regulator-consumer-device = "tegradc.0"; - }; - }; - }; - - ldoln { - consumers { - c1 { - regulator-consumer-device = "tegradc.0"; - }; - - c2 { - regulator-consumer-device = "tegradc.0"; - }; - }; - }; - }; - }; - }; -}; - diff --git a/arch/arm/boot/dts/tegra124-tn8-battery.dts b/arch/arm/boot/dts/tegra124-tn8-battery.dts deleted file mode 100644 index 90f6485e3937..000000000000 --- a/arch/arm/boot/dts/tegra124-tn8-battery.dts +++ /dev/null @@ -1,17 +0,0 @@ -#include "tegra124-tn8.dts" -#include "tegra124-platforms/tegra124-tn8-sysedp-e1780-1100-a02.dtsi" - -/ { - i2c@7000c000 { - max17048@36 { - status = "okay"; - }; - - bq2419x@6b { - charger { - status = "okay"; - }; - }; - }; -}; - diff --git a/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a02-01.dts b/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a02-01.dts index 5fc4777d4fad..e4ddfbdf693e 100644 --- a/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a02-01.dts +++ b/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a02-01.dts @@ -1 +1,60 @@ -#include "tegra124-tn8-aio.dts" +/dts-v1/; + +#include "tegra124-tn8.dtsi" +#include "tegra124-platforms/tegra124-tn8-dfll.dtsi" +#include "tegra124-platforms/tegra124-tn8-emc-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-powermon-e1780-1100-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-pmic-e1736-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-fixed-e1736-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-gpio-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-pinmux-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-sensor-e1794-1000-a00.dtsi" + +/ { + model = "NVIDIA Tegra124 TN8"; + compatible = "nvidia,tn8", "nvidia,tegra124"; + nvidia,dtsfilename = __FILE__; + nvidia,boardids = ""; + #address-cells = <2>; + #size-cells = <2>; + + chosen { + bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; + linux,initrd-start = <0x85000000>; + linux,initrd-end = <0x851bc400>; + }; + + i2c@7000c400 { + pca9546@71 { + vcc-supply = <&palmas_smps9>; + }; + }; + + i2c@7000c000 { + tps65913 { + pmic { + ldo1 { + consumers { + c11 { + regulator-consumer-device = "tegradc.0"; + }; + }; + }; + + ldoln { + consumers { + c1 { + regulator-consumer-device = "tegradc.0"; + }; + + c2 { + regulator-consumer-device = "tegradc.0"; + }; + }; + }; + }; + }; + }; +}; + diff --git a/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a02-battery.dts b/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a02-battery.dts index 3467365c07d9..2b3a5f30f53a 100644 --- a/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a02-battery.dts +++ b/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a02-battery.dts @@ -1 +1,17 @@ -#include "tegra124-tn8-battery.dts" +#include "tegra124-tn8-e1780-1100-a02.dts" +#include "tegra124-platforms/tegra124-tn8-sysedp-e1780-1100-a02.dtsi" + +/ { + i2c@7000c000 { + max17048@36 { + status = "okay"; + }; + + bq2419x@6b { + charger { + status = "okay"; + }; + }; + }; +}; + diff --git a/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a02.dts b/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a02.dts index 689862bfe0a0..412a48c51cc1 100644 --- a/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a02.dts +++ b/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a02.dts @@ -1 +1,35 @@ -#include "tegra124-tn8.dts" +/dts-v1/; + +#include "tegra124-tn8.dtsi" +#include "tegra124-platforms/tegra124-tn8-dfll.dtsi" +#include "tegra124-platforms/tegra124-tn8-emc-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-powermon-e1780-1100-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-pmic-e1736-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-fixed-e1736-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-gpio-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-pinmux-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-sensor-e1794-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-camera-e1780-a00.dtsi" + +/ { + model = "NVIDIA Tegra124 TN8"; + compatible = "nvidia,tn8", "nvidia,tegra124"; + nvidia,dtsfilename = __FILE__; + nvidia,boardids = "1780:1100:2","1794:1000:0"; + #address-cells = <2>; + #size-cells = <2>; + + chosen { + bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; + linux,initrd-start = <0x85000000>; + linux,initrd-end = <0x851bc400>; + }; + + i2c@7000c400 { + pca9546@71 { + vcc-supply = <&palmas_smps9>; + }; + }; +}; + diff --git a/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a03-01-battery.dts b/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a03-01-battery.dts index 60a04ea4148a..3918278428a4 100644 --- a/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a03-01-battery.dts +++ b/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a03-01-battery.dts @@ -1 +1,17 @@ -#include "tegra124-tn8-a03-01-battery.dts" +#include "tegra124-tn8-e1780-1100-a03-01.dts" +#include "tegra124-platforms/tegra124-tn8-sysedp-e1780-1100-a02.dtsi" + +/ { + i2c@7000c000 { + cw201x@62 { + status = "okay"; + }; + + bq2419x: bq2419x@6b { + charger { + status = "okay"; + }; + }; + }; +}; + diff --git a/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a03-01.dts b/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a03-01.dts index b59e108028a7..754b4ae17308 100644 --- a/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a03-01.dts +++ b/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a03-01.dts @@ -1 +1,76 @@ -#include "tegra124-tn8-a03-01.dts" +/* + * arch/arm/boot/dts/tegra124-tn8-a03-01.dts + * + * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved. + * + * This program 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 program 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. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +/dts-v1/; + +#include "tegra124-tn8.dtsi" +#include "tegra124-platforms/tegra124-tn8-dfll.dtsi" +#include "tegra124-platforms/tegra124-tn8-emc-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-powermon-e1780-1100-a01.dtsi" +#include "tegra124-platforms/tegra124-tn8-pmic-e1769-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-fixed-e1769-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-gpio-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-pinmux-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-sensor-e1845-1000-a00.dtsi" +#include "panel-l-wxga-7.dtsi" +#include "tegra124-platforms/tegra124-tn8-hdmi.dtsi" + +/ { + model = "NVIDIA Tegra124 TN8"; + compatible = "nvidia,tn8", "nvidia,tegra124"; + nvidia,dtsfilename = __FILE__; + nvidia,boardids = "1780:1100:3","1845:1000:0","1769:1000:0","1549:1000:0"; + #address-cells = <2>; + #size-cells = <2>; + + chosen { + bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; + linux,initrd-start = <0x85000000>; + linux,initrd-end = <0x851bc400>; + }; + + host1x { + /* tegradc.1 */ + dc@54240000 { + avdd_hdmi-supply = <&palmas_ldoln>; + avdd_hdmi_pll-supply = <&palmas_ldo1>; + vdd_hdmi_5v0-supply = <&vdd_hdmi>; + }; + dsi { + nvidia,dsi-controller-vs = <DSI_VS_1>; + status = "okay"; + panel-l-wxga-7 { + nvidia,dsi-panel-bl-pwm-gpio = <&gpio TEGRA_GPIO(H, 1) 0>; /* PH1 */ + }; + }; + }; + + i2c@7000c400 { + pca9546@71 { + vcc-supply = <&palmas_smps9>; + }; + }; + + gps { + compatible = "mtk,mt3332"; + force-on-gpios = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>; + }; +}; + diff --git a/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a03-battery.dts b/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a03-battery.dts index a50b342a1c03..805b17e047ce 100644 --- a/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a03-battery.dts +++ b/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a03-battery.dts @@ -1 +1,17 @@ -#include "tegra124-tn8-a03-00-battery.dts" +#include "tegra124-tn8-e1780-1100-a03.dts" +#include "tegra124-platforms/tegra124-tn8-sysedp-e1780-1100-a02.dtsi" + +/ { + i2c@7000c000 { + max17048@36 { + status = "okay"; + }; + + bq2419x@6b { + charger { + status = "okay"; + }; + }; + }; +}; + diff --git a/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a03.dts b/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a03.dts index 51cc51a8670d..f51065812f9e 100644 --- a/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a03.dts +++ b/arch/arm/boot/dts/tegra124-tn8-e1780-1100-a03.dts @@ -1 +1,71 @@ -#include "tegra124-tn8-a03-00.dts" +/* + * arch/arm/boot/dts/tegra124-tn8-a03-00.dts + * + * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved. + * + * This program 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 program 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. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +/dts-v1/; + +#include "tegra124-tn8.dtsi" +#include "tegra124-platforms/tegra124-tn8-dfll.dtsi" +#include "tegra124-platforms/tegra124-tn8-emc-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-powermon-e1780-1100-a01.dtsi" +#include "tegra124-platforms/tegra124-tn8-pmic-e1736-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-fixed-e1736-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-gpio-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-pinmux-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-sensor-e1845-1000-a00.dtsi" +#include "panel-l-wxga-7.dtsi" +#include "tegra124-platforms/tegra124-tn8-hdmi.dtsi" + +/ { + model = "NVIDIA Tegra124 TN8"; + compatible = "nvidia,tn8", "nvidia,tegra124"; + nvidia,dtsfilename = __FILE__; + nvidia,boardids = "1780:1100:3","1845:1000:0","1736:1000:0","1549:1000:0"; + #address-cells = <2>; + #size-cells = <2>; + + chosen { + bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; + linux,initrd-start = <0x85000000>; + linux,initrd-end = <0x851bc400>; + }; + + host1x { + /* tegradc.1 */ + dc@54240000 { + avdd_hdmi-supply = <&palmas_ldoln>; + avdd_hdmi_pll-supply = <&palmas_ldo1>; + vdd_hdmi_5v0-supply = <&vdd_hdmi>; + }; + dsi { + nvidia,dsi-controller-vs = <DSI_VS_1>; + status = "okay"; + panel-l-wxga-7 { + nvidia,dsi-panel-bl-pwm-gpio = <&gpio TEGRA_GPIO(H, 1) 0>; /* PH1 */ + }; + }; + }; + + i2c@7000c400 { + pca9546@71 { + vcc-supply = <&palmas_smps9>; + }; + }; +}; + diff --git a/arch/arm/boot/dts/tegra124-tn8-e1784-1101-a00-battery.dts b/arch/arm/boot/dts/tegra124-tn8-e1784-1101-a00-battery.dts index 0fa4bb0602dc..7b5f04b3d2f3 100644 --- a/arch/arm/boot/dts/tegra124-tn8-e1784-1101-a00-battery.dts +++ b/arch/arm/boot/dts/tegra124-tn8-e1784-1101-a00-battery.dts @@ -1 +1,16 @@ -#include "tegra124-tn8-e1784-battery.dts" +#include "tegra124-tn8-e1784-1101-a00.dts" + +/ { + i2c@7000c400 { + lc709203f@0b { + status = "okay"; + }; + + hpa2163@6b { + charger { + status = "okay"; + }; + }; + }; +}; + diff --git a/arch/arm/boot/dts/tegra124-tn8-e1784-1101-a00.dts b/arch/arm/boot/dts/tegra124-tn8-e1784-1101-a00.dts index 93ca59ee341c..dee6bb73ed4f 100644 --- a/arch/arm/boot/dts/tegra124-tn8-e1784-1101-a00.dts +++ b/arch/arm/boot/dts/tegra124-tn8-e1784-1101-a00.dts @@ -1 +1,43 @@ -#include "tegra124-tn8-e1784-2gb.dts" +/dts-v1/; + +#include "tegra124-tn8.dtsi" +#include "tegra124-platforms/tegra124-tn8-emc-p1761-1270-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-powermon-e1784-1101-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-pmic-e1936-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-fixed-e1936-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-sensor-p1761-1470-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-pinmux-p1761-1470-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-gpio-p1761-1470-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-camera-e1780-a00.dtsi" + +/ { + model = "NVIDIA Tegra124 TN8 FFD"; + compatible = "nvidia,tn8", "nvidia,tegra124"; + nvidia,dtsfilename = __FILE__; + nvidia,boardids = "1784:1101:0"; + #address-cells = <2>; + #size-cells = <2>; + + chosen { + bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; + linux,initrd-start = <0x85000000>; + linux,initrd-end = <0x851bc400>; + }; + i2c@7000c400 { + pca9546@71 { + vcc-supply = <&palmas_smps9>; + }; + }; + + pinmux { + unused_lowpower { + pi5 { + nvidia,enable-input = <TEGRA_PIN_ENABLE>; + nvidia,pull = <TEGRA_PIN_PULL_UP>; + nvidia,tristate = <TEGRA_PIN_DISABLE>; + }; + }; + }; +}; + diff --git a/arch/arm/boot/dts/tegra124-tn8-e1784-2gb.dts b/arch/arm/boot/dts/tegra124-tn8-e1784-2gb.dts deleted file mode 100644 index dee6bb73ed4f..000000000000 --- a/arch/arm/boot/dts/tegra124-tn8-e1784-2gb.dts +++ /dev/null @@ -1,43 +0,0 @@ -/dts-v1/; - -#include "tegra124-tn8.dtsi" -#include "tegra124-platforms/tegra124-tn8-emc-p1761-1270-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-powermon-e1784-1101-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-pmic-e1936-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-fixed-e1936-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-sensor-p1761-1470-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-pinmux-p1761-1470-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-gpio-p1761-1470-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-camera-e1780-a00.dtsi" - -/ { - model = "NVIDIA Tegra124 TN8 FFD"; - compatible = "nvidia,tn8", "nvidia,tegra124"; - nvidia,dtsfilename = __FILE__; - nvidia,boardids = "1784:1101:0"; - #address-cells = <2>; - #size-cells = <2>; - - chosen { - bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; - linux,initrd-start = <0x85000000>; - linux,initrd-end = <0x851bc400>; - }; - i2c@7000c400 { - pca9546@71 { - vcc-supply = <&palmas_smps9>; - }; - }; - - pinmux { - unused_lowpower { - pi5 { - nvidia,enable-input = <TEGRA_PIN_ENABLE>; - nvidia,pull = <TEGRA_PIN_PULL_UP>; - nvidia,tristate = <TEGRA_PIN_DISABLE>; - }; - }; - }; -}; - diff --git a/arch/arm/boot/dts/tegra124-tn8-e1784-battery.dts b/arch/arm/boot/dts/tegra124-tn8-e1784-battery.dts deleted file mode 100644 index efb61d6acf19..000000000000 --- a/arch/arm/boot/dts/tegra124-tn8-e1784-battery.dts +++ /dev/null @@ -1,16 +0,0 @@ -#include "tegra124-tn8-e1784-2gb.dts" - -/ { - i2c@7000c400 { - lc709203f@0b { - status = "okay"; - }; - - hpa2163@6b { - charger { - status = "okay"; - }; - }; - }; -}; - diff --git a/arch/arm/boot/dts/tegra124-tn8-e1922-1100-a00.dts b/arch/arm/boot/dts/tegra124-tn8-e1922-1100-a00.dts index 4ed7ccd47326..ddd459b2bf87 100644 --- a/arch/arm/boot/dts/tegra124-tn8-e1922-1100-a00.dts +++ b/arch/arm/boot/dts/tegra124-tn8-e1922-1100-a00.dts @@ -1 +1,44 @@ -#include "tegra124-e1922.dts" +/dts-v1/; + +#include "tegra124-tn8.dtsi" +#include "tegra124-platforms/tegra124-tn8-dfll.dtsi" +#include "tegra124-platforms/tegra124-tn8-emc-e1922-1100-a00.dtsi" +#include "tegra124-platforms/tegra124-ardbeg-powermon-e1780-1000-a01.dtsi" +#include "tegra124-platforms/tegra124-tn8-pmic-e1936-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-fixed-e1936-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-sensor-p1761-1470-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-pinmux-p1761-1470-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-gpio-p1761-1470-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" + +/ { + model = "NVIDIA Tegra124 TN8 ERS POP"; + compatible = "nvidia,tn8", "nvidia,tegra124"; + nvidia,dtsfilename = __FILE__; + nvidia,boardids = "1922:1100:0"; + #address-cells = <2>; + #size-cells = <2>; + + chosen { + bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; + linux,initrd-start = <0x85000000>; + linux,initrd-end = <0x851bc400>; + }; + + i2c@7000c400 { + pca9546@71 { + vcc-supply = <&palmas_smps9>; + }; + }; + + pinmux { + unused_lowpower { + pi5 { + nvidia,enable-input = <TEGRA_PIN_ENABLE>; + nvidia,pull = <TEGRA_PIN_PULL_UP>; + nvidia,tristate = <TEGRA_PIN_DISABLE>; + }; + }; + }; +}; + diff --git a/arch/arm/boot/dts/tegra124-tn8-p1761-1270-a00-battery.dts b/arch/arm/boot/dts/tegra124-tn8-p1761-1270-a00-battery.dts index 9c3fc45dd250..6767c99f090e 100644 --- a/arch/arm/boot/dts/tegra124-tn8-p1761-1270-a00-battery.dts +++ b/arch/arm/boot/dts/tegra124-tn8-p1761-1270-a00-battery.dts @@ -1 +1,16 @@ -#include "tegra124-tn8-p1761-2gb-battery.dts" +#include "tegra124-tn8-p1761-1270-a00.dts" +#include "tegra124-platforms/tegra124-tn8-sysedp-e1780-1100-a02.dtsi" + +/ { + i2c@7000c400 { + max17048@36 { + status = "okay"; + }; + + hpa2163@6b { + charger { + status = "okay"; + }; + }; + }; +}; diff --git a/arch/arm/boot/dts/tegra124-tn8-p1761-1270-a00.dts b/arch/arm/boot/dts/tegra124-tn8-p1761-1270-a00.dts index e027d409305e..827fa218c861 100644 --- a/arch/arm/boot/dts/tegra124-tn8-p1761-1270-a00.dts +++ b/arch/arm/boot/dts/tegra124-tn8-p1761-1270-a00.dts @@ -1 +1,30 @@ -#include "tegra124-tn8-p1761-2gb.dts" +/dts-v1/; + +#include "tegra124-tn8.dtsi" +#include "tegra124-platforms/tegra124-tn8-dfll.dtsi" +#include "tegra124-platforms/tegra124-tn8-emc-p1761-1270-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-pmic-e1936-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-fixed-e1936-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-sensor-p1761-1470-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-pinmux-p1761-1470-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-gpio-p1761-1470-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-powermon-p1761-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-camera-p1761-a00.dtsi" + +/ { + model = "NVIDIA Tegra124 TN8 FFD"; + compatible = "nvidia,tn8", "nvidia,tegra124"; + nvidia,dtsfilename = __FILE__; + nvidia,boardids = "1761:1270:0"; + #address-cells = <2>; + #size-cells = <2>; + + chosen { + bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; + linux,initrd-start = <0x85000000>; + linux,initrd-end = <0x851bc400>; + }; + +}; + diff --git a/arch/arm/boot/dts/tegra124-tn8-p1761-1270-a02-battery.dts b/arch/arm/boot/dts/tegra124-tn8-p1761-1270-a02-battery.dts index 8f0a69527953..1e09c5d93813 100644 --- a/arch/arm/boot/dts/tegra124-tn8-p1761-1270-a02-battery.dts +++ b/arch/arm/boot/dts/tegra124-tn8-p1761-1270-a02-battery.dts @@ -1 +1,17 @@ -#include "tegra124-tn8-p1761-a02-battery.dts" +#include "tegra124-tn8-p1761-1270-a02.dts" + +/ { + i2c@7000c400 { + lc709203f@0b { + status = "okay"; + onsemi,kernel-threshold-soc = < 2 >; + }; + + hpa2163@6b { + charger { + status = "okay"; + }; + }; + }; +}; + diff --git a/arch/arm/boot/dts/tegra124-tn8-p1761-1270-a02.dts b/arch/arm/boot/dts/tegra124-tn8-p1761-1270-a02.dts index 2aee8053c1e2..ce986182e121 100644 --- a/arch/arm/boot/dts/tegra124-tn8-p1761-1270-a02.dts +++ b/arch/arm/boot/dts/tegra124-tn8-p1761-1270-a02.dts @@ -1 +1,36 @@ -#include "tegra124-tn8-p1761-a02.dts" +/dts-v1/; + +#include "tegra124-tn8.dtsi" +#include "tegra124-platforms/tegra124-tn8-emc-p1761-1270-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-pmic-e1936-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-fixed-e1936-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-sensor-p1761-1470-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-pinmux-p1761-1470-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-gpio-p1761-1470-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-sysedp-p1761-1270-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-powermon-p1761-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-camera-p1761-a00.dtsi" + +/ { + model = "NVIDIA Tegra124 TN8 FFD"; + compatible = "nvidia,tn8", "nvidia,tegra124"; + nvidia,dtsfilename = __FILE__; + nvidia,boardids = "1761:1270:2"; + #address-cells = <2>; + #size-cells = <2>; + + chosen { + bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; + linux,initrd-start = <0x85000000>; + linux,initrd-end = <0x851bc400>; + }; + + i2c@7000c000 { + max44006@44 { + maxim,gain = <1>; + maxim,als-resolution = "0.75"; + }; + }; +}; + diff --git a/arch/arm/boot/dts/tegra124-tn8-p1761-1470-a00-battery.dts b/arch/arm/boot/dts/tegra124-tn8-p1761-1470-a00-battery.dts index c1a48ec3cf14..7e2bc644940c 100644 --- a/arch/arm/boot/dts/tegra124-tn8-p1761-1470-a00-battery.dts +++ b/arch/arm/boot/dts/tegra124-tn8-p1761-1470-a00-battery.dts @@ -1 +1,16 @@ -#include "tegra124-tn8-p1761-battery.dts" +#include "tegra124-tn8-p1761-1470-a00.dts" +#include "tegra124-platforms/tegra124-tn8-sysedp-e1780-1100-a02.dtsi" + +/ { + i2c@7000c400 { + max17048@36 { + status = "okay"; + }; + + hpa2163@6b { + charger { + status = "okay"; + }; + }; + }; +}; diff --git a/arch/arm/boot/dts/tegra124-tn8-p1761-1470-a00.dts b/arch/arm/boot/dts/tegra124-tn8-p1761-1470-a00.dts index 674c7862fbf2..41a2684daf91 100644 --- a/arch/arm/boot/dts/tegra124-tn8-p1761-1470-a00.dts +++ b/arch/arm/boot/dts/tegra124-tn8-p1761-1470-a00.dts @@ -1 +1,30 @@ -#include "tegra124-tn8-p1761.dts" +/dts-v1/; + +#include "tegra124-tn8.dtsi" +#include "tegra124-platforms/tegra124-tn8-dfll.dtsi" +#include "tegra124-platforms/tegra124-tn8-emc-p1761-1470-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-pmic-e1936-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-fixed-e1936-1000-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-sensor-p1761-1470-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-pinmux-p1761-1470-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-gpio-p1761-1470-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" +#include "tegra124-platforms/tegra124-tn8-powermon-p1761-a00.dtsi" +#include "tegra124-platforms/tegra124-tn8-camera-p1761-a00.dtsi" + +/ { + model = "NVIDIA Tegra124 TN8 FFD"; + compatible = "nvidia,tn8", "nvidia,tegra124"; + nvidia,dtsfilename = __FILE__; + nvidia,boardids = "1761:1470:0"; + #address-cells = <2>; + #size-cells = <2>; + + chosen { + bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; + linux,initrd-start = <0x85000000>; + linux,initrd-end = <0x851bc400>; + }; + +}; + diff --git a/arch/arm/boot/dts/tegra124-tn8-p1761-2gb-battery.dts b/arch/arm/boot/dts/tegra124-tn8-p1761-2gb-battery.dts deleted file mode 100644 index 760b34322ad6..000000000000 --- a/arch/arm/boot/dts/tegra124-tn8-p1761-2gb-battery.dts +++ /dev/null @@ -1,16 +0,0 @@ -#include "tegra124-tn8-p1761-2gb.dts" -#include "tegra124-platforms/tegra124-tn8-sysedp-e1780-1100-a02.dtsi" - -/ { - i2c@7000c400 { - max17048@36 { - status = "okay"; - }; - - hpa2163@6b { - charger { - status = "okay"; - }; - }; - }; -}; diff --git a/arch/arm/boot/dts/tegra124-tn8-p1761-2gb.dts b/arch/arm/boot/dts/tegra124-tn8-p1761-2gb.dts deleted file mode 100644 index 827fa218c861..000000000000 --- a/arch/arm/boot/dts/tegra124-tn8-p1761-2gb.dts +++ /dev/null @@ -1,30 +0,0 @@ -/dts-v1/; - -#include "tegra124-tn8.dtsi" -#include "tegra124-platforms/tegra124-tn8-dfll.dtsi" -#include "tegra124-platforms/tegra124-tn8-emc-p1761-1270-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-pmic-e1936-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-fixed-e1936-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-sensor-p1761-1470-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-pinmux-p1761-1470-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-gpio-p1761-1470-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-powermon-p1761-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-camera-p1761-a00.dtsi" - -/ { - model = "NVIDIA Tegra124 TN8 FFD"; - compatible = "nvidia,tn8", "nvidia,tegra124"; - nvidia,dtsfilename = __FILE__; - nvidia,boardids = "1761:1270:0"; - #address-cells = <2>; - #size-cells = <2>; - - chosen { - bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; - linux,initrd-start = <0x85000000>; - linux,initrd-end = <0x851bc400>; - }; - -}; - diff --git a/arch/arm/boot/dts/tegra124-tn8-p1761-a02-battery.dts b/arch/arm/boot/dts/tegra124-tn8-p1761-a02-battery.dts deleted file mode 100644 index 0eb9f07ff15d..000000000000 --- a/arch/arm/boot/dts/tegra124-tn8-p1761-a02-battery.dts +++ /dev/null @@ -1,17 +0,0 @@ -#include "tegra124-tn8-p1761-a02.dts" - -/ { - i2c@7000c400 { - lc709203f@0b { - status = "okay"; - onsemi,kernel-threshold-soc = < 2 >; - }; - - hpa2163@6b { - charger { - status = "okay"; - }; - }; - }; -}; - diff --git a/arch/arm/boot/dts/tegra124-tn8-p1761-a02.dts b/arch/arm/boot/dts/tegra124-tn8-p1761-a02.dts deleted file mode 100644 index ce986182e121..000000000000 --- a/arch/arm/boot/dts/tegra124-tn8-p1761-a02.dts +++ /dev/null @@ -1,36 +0,0 @@ -/dts-v1/; - -#include "tegra124-tn8.dtsi" -#include "tegra124-platforms/tegra124-tn8-emc-p1761-1270-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-pmic-e1936-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-fixed-e1936-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-sensor-p1761-1470-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-pinmux-p1761-1470-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-gpio-p1761-1470-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-sysedp-p1761-1270-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-powermon-p1761-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-camera-p1761-a00.dtsi" - -/ { - model = "NVIDIA Tegra124 TN8 FFD"; - compatible = "nvidia,tn8", "nvidia,tegra124"; - nvidia,dtsfilename = __FILE__; - nvidia,boardids = "1761:1270:2"; - #address-cells = <2>; - #size-cells = <2>; - - chosen { - bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; - linux,initrd-start = <0x85000000>; - linux,initrd-end = <0x851bc400>; - }; - - i2c@7000c000 { - max44006@44 { - maxim,gain = <1>; - maxim,als-resolution = "0.75"; - }; - }; -}; - diff --git a/arch/arm/boot/dts/tegra124-tn8-p1761-battery.dts b/arch/arm/boot/dts/tegra124-tn8-p1761-battery.dts deleted file mode 100644 index 059eab40fd4d..000000000000 --- a/arch/arm/boot/dts/tegra124-tn8-p1761-battery.dts +++ /dev/null @@ -1,16 +0,0 @@ -#include "tegra124-tn8-p1761.dts" -#include "tegra124-platforms/tegra124-tn8-sysedp-e1780-1100-a02.dtsi" - -/ { - i2c@7000c400 { - max17048@36 { - status = "okay"; - }; - - hpa2163@6b { - charger { - status = "okay"; - }; - }; - }; -}; diff --git a/arch/arm/boot/dts/tegra124-tn8-p1761.dts b/arch/arm/boot/dts/tegra124-tn8-p1761.dts deleted file mode 100644 index 41a2684daf91..000000000000 --- a/arch/arm/boot/dts/tegra124-tn8-p1761.dts +++ /dev/null @@ -1,30 +0,0 @@ -/dts-v1/; - -#include "tegra124-tn8.dtsi" -#include "tegra124-platforms/tegra124-tn8-dfll.dtsi" -#include "tegra124-platforms/tegra124-tn8-emc-p1761-1470-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-pmic-e1936-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-fixed-e1936-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-sensor-p1761-1470-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-pinmux-p1761-1470-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-gpio-p1761-1470-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-powermon-p1761-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-camera-p1761-a00.dtsi" - -/ { - model = "NVIDIA Tegra124 TN8 FFD"; - compatible = "nvidia,tn8", "nvidia,tegra124"; - nvidia,dtsfilename = __FILE__; - nvidia,boardids = "1761:1470:0"; - #address-cells = <2>; - #size-cells = <2>; - - chosen { - bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; - linux,initrd-start = <0x85000000>; - linux,initrd-end = <0x851bc400>; - }; - -}; - diff --git a/arch/arm/boot/dts/tegra124-tn8.dts b/arch/arm/boot/dts/tegra124-tn8.dts deleted file mode 100644 index 412a48c51cc1..000000000000 --- a/arch/arm/boot/dts/tegra124-tn8.dts +++ /dev/null @@ -1,35 +0,0 @@ -/dts-v1/; - -#include "tegra124-tn8.dtsi" -#include "tegra124-platforms/tegra124-tn8-dfll.dtsi" -#include "tegra124-platforms/tegra124-tn8-emc-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-powermon-e1780-1100-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-pmic-e1736-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-fixed-e1736-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-gpio-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-pinmux-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi" -#include "tegra124-platforms/tegra124-tn8-sensor-e1794-1000-a00.dtsi" -#include "tegra124-platforms/tegra124-tn8-camera-e1780-a00.dtsi" - -/ { - model = "NVIDIA Tegra124 TN8"; - compatible = "nvidia,tn8", "nvidia,tegra124"; - nvidia,dtsfilename = __FILE__; - nvidia,boardids = "1780:1100:2","1794:1000:0"; - #address-cells = <2>; - #size-cells = <2>; - - chosen { - bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk"; - linux,initrd-start = <0x85000000>; - linux,initrd-end = <0x851bc400>; - }; - - i2c@7000c400 { - pca9546@71 { - vcc-supply = <&palmas_smps9>; - }; - }; -}; - |