forked from luck/tmp_suning_uos_patched
ARM: tegra: Changes for v5.10-rc1
These changes extend support on the Nexus 7 and Acer A500 devices. -----BEGIN PGP SIGNATURE----- iQJHBAABCAAxFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAl9kyuoTHHRyZWRpbmdA bnZpZGlhLmNvbQAKCRDdI6zXfz6zoY2jD/97+Ac4DgPunfTUHMRowwQfT2ftwErl WKMtU/QYgZaWRtC2DDdpfXiGcA4S1IsbPy51spdCfvhEltgxpzEr41B6MO3uDuKa uG/iI8zUzOazYMm0cuQS5xMDuMdZmxp+dL4hvWfhWKQWwM1zAS7OR4xBAiYlylxP UA7kkU8AaH9AbIYm/bcUP512HODt1qPKDii7THxPEDubqFuMtIsFmeMayA0r/gsn TrsFbZSIsTCo7+uJBW2UKxoIt+Bxd46wlWCp0F8gwxjPW0VHOeL9DSmY80FwXebm 5//vB2rzdNx6SmZcuFQX2hbGT2ooUijJv02hS7u4ifWr9zmjU37Do3DsdEyypcyh /5/CO5UlyxgSvWco5neIo13sYszh5jv76F+OC6DtI3dmD1jessvfnr1HbWJCR/Pu 3R2cfQV6eAK7ksHjERncxDogrWr5SNsQVdAvH0pFnlaCdNjHUq6ogsPK6OgoXyh1 IgMz8DQHgRBDrSrskQqojQJ3J3sfEv3m/CXhSE/4aTYQMhaORhWhLZtabIc6NxoP +YOBb0Kj4dd6ULHV8zzXV9T1kMN5C+RHeqsTTQtFE2IZa3WZ3cRVUenkRgma2wFL ZFnTl68h4h3oQ9gzm40zcxuJu/YmR/KFQ2tE1KK088DolGxS1GRqtQvWIYZLiGp7 FRfLjE0dxcL3BA== =MvQD -----END PGP SIGNATURE----- Merge tag 'tegra-for-5.10-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt ARM: tegra: Changes for v5.10-rc1 These changes extend support on the Nexus 7 and Acer A500 devices. * tag 'tegra-for-5.10-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: nexus7: Add SMB347 battery charger ARM: tegra: nexus7: Add touchscreen ARM: tegra: nexus7: Use PLLC for WiFi MMC clock parent ARM: tegra: acer-a500: Use PLLC for WiFi MMC clock parent ARM: tegra: acer-a500: Set WiFi MMC clock rate to 50 MHz ARM: tegra: acer-a500: Correct PINCTRL configuration ARM: tegra: acer-a500: Remove atmel,cfg_name property ARM: tegra: acer-a500: Add aliases for MMC ARM: tegra: nexus7: Add aliases for MMC dt-bindings: power: supply: Add device-tree binding for Summit SMB3xx dt-bindings: tegra: pmc: Add Tegra234 support dt-bindings: fuse: tegra: Add Tegra234 support dt-bindings: tegra: Add Tegra234 VDK compatible dt-bindings: misc: tegra186-misc: Add Tegra234 support dt-bindings: misc: tegra186-misc: Add missing compatible string dt-bindings: misc: tegra-apbmisc: Add missing compatible strings Link: https://lore.kernel.org/r/20200918150303.3938852-4-thierry.reding@gmail.com Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
commit
7d0c5aee96
|
|
@ -14,6 +14,10 @@ / {
|
|||
compatible = "acer,picasso", "nvidia,tegra20";
|
||||
|
||||
aliases {
|
||||
mmc0 = &sdmmc4; /* eMMC */
|
||||
mmc1 = &sdmmc3; /* MicroSD */
|
||||
mmc2 = &sdmmc1; /* WiFi */
|
||||
|
||||
rtc0 = &pmic;
|
||||
rtc1 = "/rtc@7000e000";
|
||||
|
||||
|
|
@ -314,16 +318,24 @@ drive_ddc {
|
|||
nvidia,pins = "drive_ddc",
|
||||
"drive_vi1",
|
||||
"drive_sdio1";
|
||||
nvidia,pull-up-strength = <31>;
|
||||
nvidia,pull-down-strength = <31>;
|
||||
nvidia,schmitt = <TEGRA_PIN_ENABLE>;
|
||||
nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_4>;
|
||||
nvidia,high-speed-mode = <TEGRA_PIN_DISABLE>;
|
||||
nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_1>;
|
||||
nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_SLOWEST>;
|
||||
nvidia,slew-rate-falling = <TEGRA_PIN_SLEW_RATE_SLOWEST>;
|
||||
};
|
||||
drive_dbg {
|
||||
nvidia,pins = "drive_dbg",
|
||||
"drive_vi2",
|
||||
"drive_at1",
|
||||
"drive_ao1";
|
||||
nvidia,pull-up-strength = <31>;
|
||||
nvidia,pull-down-strength = <31>;
|
||||
nvidia,schmitt = <TEGRA_PIN_ENABLE>;
|
||||
nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_4>;
|
||||
nvidia,high-speed-mode = <TEGRA_PIN_DISABLE>;
|
||||
nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_1>;
|
||||
nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>;
|
||||
nvidia,slew-rate-falling = <TEGRA_PIN_SLEW_RATE_FASTEST>;
|
||||
};
|
||||
|
|
@ -431,8 +443,6 @@ touchscreen@4c {
|
|||
compatible = "atmel,maxtouch";
|
||||
reg = <0x4c>;
|
||||
|
||||
atmel,cfg_name = "maxtouch-acer-iconia-tab-a500.cfg";
|
||||
|
||||
interrupt-parent = <&gpio>;
|
||||
interrupts = <TEGRA_GPIO(V, 6) IRQ_TYPE_LEVEL_LOW>;
|
||||
|
||||
|
|
@ -720,13 +730,17 @@ brcm_wifi_pwrseq: wifi-pwrseq {
|
|||
power-off-delay-us = <300>;
|
||||
};
|
||||
|
||||
mmc@c8000000 {
|
||||
sdmmc1: mmc@c8000000 {
|
||||
status = "okay";
|
||||
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
max-frequency = <25000000>;
|
||||
assigned-clocks = <&tegra_car TEGRA20_CLK_SDMMC1>;
|
||||
assigned-clock-parents = <&tegra_car TEGRA20_CLK_PLL_C>;
|
||||
assigned-clock-rates = <50000000>;
|
||||
|
||||
max-frequency = <50000000>;
|
||||
keep-power-in-suspend;
|
||||
bus-width = <4>;
|
||||
non-removable;
|
||||
|
|
@ -745,7 +759,7 @@ wifi@1 {
|
|||
};
|
||||
};
|
||||
|
||||
mmc@c8000400 {
|
||||
sdmmc3: mmc@c8000400 {
|
||||
status = "okay";
|
||||
bus-width = <4>;
|
||||
cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
|
||||
|
|
@ -754,7 +768,7 @@ mmc@c8000400 {
|
|||
vqmmc-supply = <&vdd_3v3_sys>;
|
||||
};
|
||||
|
||||
mmc@c8000600 {
|
||||
sdmmc4: mmc@c8000600 {
|
||||
status = "okay";
|
||||
bus-width = <8>;
|
||||
vmmc-supply = <&vcore_emmc>;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
#include <dt-bindings/input/gpio-keys.h>
|
||||
#include <dt-bindings/input/input.h>
|
||||
#include <dt-bindings/power/summit,smb347-charger.h>
|
||||
#include <dt-bindings/thermal/thermal.h>
|
||||
|
||||
#include "tegra30.dtsi"
|
||||
|
|
@ -10,6 +11,9 @@
|
|||
|
||||
/ {
|
||||
aliases {
|
||||
mmc0 = &sdmmc4; /* eMMC */
|
||||
mmc1 = &sdmmc3; /* WiFi */
|
||||
|
||||
rtc0 = &pmic;
|
||||
rtc1 = "/rtc@7000e000";
|
||||
|
||||
|
|
@ -836,6 +840,24 @@ pwm: pwm@7000a000 {
|
|||
i2c@7000c400 {
|
||||
clock-frequency = <400000>;
|
||||
status = "okay";
|
||||
|
||||
touchscreen@10 {
|
||||
compatible ="elan,ektf3624";
|
||||
reg = <0x10>;
|
||||
|
||||
interrupt-parent = <&gpio>;
|
||||
interrupts = <TEGRA_GPIO(H, 4) IRQ_TYPE_LEVEL_LOW>;
|
||||
|
||||
reset-gpios = <&gpio TEGRA_GPIO(H, 6) GPIO_ACTIVE_LOW>;
|
||||
|
||||
vcc33-supply = <&vcc_3v3_ts>;
|
||||
vccio-supply = <&vcc_3v3_ts>;
|
||||
|
||||
touchscreen-size-x = <2112>;
|
||||
touchscreen-size-y = <1280>;
|
||||
touchscreen-swapped-x-y;
|
||||
touchscreen-inverted-x;
|
||||
};
|
||||
};
|
||||
|
||||
i2c@7000c500 {
|
||||
|
|
@ -901,9 +923,24 @@ nct72: temperature-sensor@4c {
|
|||
#thermal-sensor-cells = <1>;
|
||||
};
|
||||
|
||||
battery@55 {
|
||||
fuel-gauge@55 {
|
||||
compatible = "ti,bq27541";
|
||||
reg = <0x55>;
|
||||
power-supplies = <&power_supply>;
|
||||
monitored-battery = <&battery_cell>;
|
||||
};
|
||||
|
||||
power_supply: charger@6a {
|
||||
compatible = "summit,smb347";
|
||||
reg = <0x6a>;
|
||||
|
||||
interrupt-parent = <&gpio>;
|
||||
interrupts = <TEGRA_GPIO(V, 1) IRQ_TYPE_EDGE_BOTH>;
|
||||
|
||||
summit,enable-charge-control = <SMB3XX_CHG_ENABLE_PIN_ACTIVE_LOW>;
|
||||
summit,enable-usb-charging;
|
||||
|
||||
monitored-battery = <&battery_cell>;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -936,12 +973,17 @@ brcm_wifi_pwrseq: wifi-pwrseq {
|
|||
power-off-delay-us = <300>;
|
||||
};
|
||||
|
||||
mmc@78000400 {
|
||||
sdmmc3: mmc@78000400 {
|
||||
status = "okay";
|
||||
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
assigned-clocks = <&tegra_car TEGRA30_CLK_SDMMC3>;
|
||||
assigned-clock-parents = <&tegra_car TEGRA30_CLK_PLL_C>;
|
||||
assigned-clock-rates = <50000000>;
|
||||
|
||||
max-frequency = <50000000>;
|
||||
keep-power-in-suspend;
|
||||
bus-width = <4>;
|
||||
non-removable;
|
||||
|
|
@ -960,7 +1002,7 @@ wifi@1 {
|
|||
};
|
||||
};
|
||||
|
||||
mmc@78000600 {
|
||||
sdmmc4: mmc@78000600 {
|
||||
status = "okay";
|
||||
bus-width = <8>;
|
||||
vmmc-supply = <&vcore_emmc>;
|
||||
|
|
@ -993,6 +1035,12 @@ backlight: backlight {
|
|||
default-brightness-level = <15>;
|
||||
};
|
||||
|
||||
battery_cell: battery-cell {
|
||||
compatible = "simple-battery";
|
||||
constant-charge-current-max-microamp = <1800000>;
|
||||
operating-range-celsius = <0 45>;
|
||||
};
|
||||
|
||||
/* PMIC has a built-in 32KHz oscillator which is used by PMC */
|
||||
clk32k_in: clock@0 {
|
||||
compatible = "fixed-clock";
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user