Skip to content

L
linux
Commit 3502e079 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'tegra-for-5.9-arm-dt' of... 

Merge tag 'tegra-for-5.9-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt

ARM: tegra: Device tree changes for v5.9-rc1

This adds device trees for the ASUS Google Nexus 7 and Acer Iconia Tab
A500. In addition there are a slew of fixes to existing device trees in
preparation for validating the DTBs against json-schema.

* tag 'tegra-for-5.9-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: (38 commits)
  ARM: tegra: Add device-tree for ASUS Google Nexus 7
  ARM: tegra: Add device-tree for Acer Iconia Tab A500
  ARM: tegra: Add HDMI supplies on Nyan boards
  ARM: tegra: Add missing DSI controller on Tegra30
  ARM: tegra: Add i2c-bus subnode for DPAUX controllers
  ARM: tegra: The Tegra30 SDHCI is not backwards-compatible
  ARM: tegra: The Tegra30 DC is not backwards-compatible
  ARM: tegra: Remove spurious comma from node name
  ARM: tegra: Add parent clock to DSI output
  ARM: tegra: Use standard names for SRAM nodes
  ARM: tegra: seaboard: Use standard battery bindings
  ARM: tegra: Use standard names for LED nodes
  ARM: tegra: Use numeric unit-addresses
  ARM: tegra: medcom-wide: Remove extra panel power supply
  ARM: tegra: Use proper unit-addresses for OPPs
  ARM: tegra: Add missing clock-names for SDHCI controllers
  ARM: tegra: Fix order of XUSB controller clocks
  ARM: tegra: Add #reset-cells to Tegra124 memory controller
  ARM: tegra: Add missing panel power supplies
  ARM: tegra: Add micro-USB A/B port on Jetson TK1
  ...

Link: https://lore.kernel.org/r/20200717161300.1661002-5-thierry.reding@gmail.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 28ef26f6 2720008f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 7251 additions and 2195 deletions
arch/arm/boot/dts/Makefile
View file @ 3502e079
...@@ -1198,6 +1198,7 @@ dtb-$(CONFIG_MACH_SUNIV) += \ ...@@ -1198,6 +1198,7 @@ dtb-$(CONFIG_MACH_SUNIV) += \
dtb-$(CONFIG_ARCH_TANGO) += \ dtb-$(CONFIG_ARCH_TANGO) += \
tango4-vantage-1172.dtb tango4-vantage-1172.dtb
dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \
tegra20-acer-a500-picasso.dtb \
tegra20-harmony.dtb \ tegra20-harmony.dtb \
tegra20-colibri-eval-v3.dtb \ tegra20-colibri-eval-v3.dtb \
tegra20-colibri-iris.dtb \ tegra20-colibri-iris.dtb \
...@@ -1211,6 +1212,9 @@ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \ ...@@ -1211,6 +1212,9 @@ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \
dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += \ dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += \
tegra30-apalis-eval.dtb \ tegra30-apalis-eval.dtb \
tegra30-apalis-v1.1-eval.dtb \ tegra30-apalis-v1.1-eval.dtb \
tegra30-asus-nexus7-grouper-PM269.dtb \
tegra30-asus-nexus7-grouper-E1565.dtb \
tegra30-asus-nexus7-tilapia-E1565.dtb \
tegra30-beaver.dtb \ tegra30-beaver.dtb \
tegra30-cardhu-a02.dtb \ tegra30-cardhu-a02.dtb \
tegra30-cardhu-a04.dtb \ tegra30-cardhu-a04.dtb \
......
arch/arm/boot/dts/tegra114-dalmore.dts
View file @ 3502e079
...@@ -769,7 +769,6 @@ i2c@7000c000 { ...@@ -769,7 +769,6 @@ i2c@7000c000 {
battery: smart-battery@b { battery: smart-battery@b {
compatible = "ti,bq20z45", "sbs,sbs-battery"; compatible = "ti,bq20z45", "sbs,sbs-battery";
reg = <0xb>; reg = <0xb>;
battery-name = "battery";
sbs,i2c-retry-count = <2>; sbs,i2c-retry-count = <2>;
sbs,poll-retry-count = <100>; sbs,poll-retry-count = <100>;
power-supplies = <&charger>; power-supplies = <&charger>;
...@@ -1109,14 +1108,14 @@ i2s@70080400 { ...@@ -1109,14 +1108,14 @@ i2s@70080400 {
}; };
}; };
sdhci@78000400 { mmc@78000400 {
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_HIGH>; wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_HIGH>;
bus-width = <4>; bus-width = <4>;
status = "okay"; status = "okay";
}; };
sdhci@78000600 { mmc@78000600 {
bus-width = <8>; bus-width = <8>;
status = "okay"; status = "okay";
non-removable; non-removable;
...@@ -1152,17 +1151,10 @@ backlight: backlight { ...@@ -1152,17 +1151,10 @@ backlight: backlight {
default-brightness-level = <6>; default-brightness-level = <6>;
}; };
clocks { clk32k_in: clock@0 {
compatible = "simple-bus"; compatible = "fixed-clock";
#address-cells = <1>; clock-frequency = <32768>;
#size-cells = <0>; #clock-cells = <0>;
clk32k_in: clock@0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-frequency = <32768>;
};
}; };
gpio-keys { gpio-keys {
...@@ -1194,83 +1186,70 @@ volume_up { ...@@ -1194,83 +1186,70 @@ volume_up {
}; };
}; };
regulators { vdd_ac_bat_reg: regulator@0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "vdd_ac_bat";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
vdd_ac_bat_reg: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "vdd_ac_bat";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-always-on;
};
dvdd_ts_reg: regulator@1 { dvdd_ts_reg: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "dvdd_ts";
regulator-name = "dvdd_ts"; regulator-min-microvolt = <1800000>;
regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; enable-active-high;
enable-active-high; gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>; };
};
usb1_vbus_reg: regulator@3 { usb1_vbus_reg: regulator@3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "usb1_vbus";
regulator-name = "usb1_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; enable-active-high;
enable-active-high; gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>; gpio-open-drain;
gpio-open-drain; vin-supply = <&tps65090_dcdc1_reg>;
vin-supply = <&tps65090_dcdc1_reg>; };
};
usb3_vbus_reg: regulator@4 { usb3_vbus_reg: regulator@4 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>; regulator-name = "usb2_vbus";
regulator-name = "usb2_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; enable-active-high;
enable-active-high; gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>; gpio-open-drain;
gpio-open-drain; vin-supply = <&tps65090_dcdc1_reg>;
vin-supply = <&tps65090_dcdc1_reg>; };
};
vdd_hdmi_reg: regulator@5 { vdd_hdmi_reg: regulator@5 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <5>; regulator-name = "vdd_hdmi_5v0";
regulator-name = "vdd_hdmi_5v0"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; vin-supply = <&tps65090_dcdc1_reg>;
vin-supply = <&tps65090_dcdc1_reg>; };
};
vdd_cam_1v8_reg: regulator@6 { vdd_cam_1v8_reg: regulator@6 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <6>; regulator-name = "vdd_cam_1v8_reg";
regulator-name = "vdd_cam_1v8_reg"; regulator-min-microvolt = <1800000>;
regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; enable-active-high;
enable-active-high; gpio = <&palmas_gpio 6 0>;
gpio = <&palmas_gpio 6 0>; };
};
vdd_5v0_hdmi: regulator@7 { vdd_5v0_hdmi: regulator@7 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <7>; regulator-name = "VDD_5V0_HDMI_CON";
regulator-name = "VDD_5V0_HDMI_CON"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&tps65090_dcdc1_reg>;
vin-supply = <&tps65090_dcdc1_reg>;
};
}; };
sound { sound {
......
arch/arm/boot/dts/tegra114-roth.dts
View file @ 3502e079
...@@ -37,7 +37,7 @@ host1x@50000000 { ...@@ -37,7 +37,7 @@ host1x@50000000 {
dsi@54300000 { dsi@54300000 {
status = "okay"; status = "okay";
vdd-supply = <&vdd_1v2_ap>; avdd-dsi-csi-supply = <&vdd_1v2_ap>;
panel@0 { panel@0 {
compatible = "lg,lh500wx1-sd03"; compatible = "lg,lh500wx1-sd03";
...@@ -962,7 +962,7 @@ pmc@7000e400 { ...@@ -962,7 +962,7 @@ pmc@7000e400 {
}; };
/* SD card */ /* SD card */
sdhci@78000400 { mmc@78000400 {
status = "okay"; status = "okay";
bus-width = <4>; bus-width = <4>;
vqmmc-supply = <&vddio_sdmmc3>; vqmmc-supply = <&vddio_sdmmc3>;
...@@ -971,7 +971,7 @@ sdhci@78000400 { ...@@ -971,7 +971,7 @@ sdhci@78000400 {
}; };
/* eMMC */ /* eMMC */
sdhci@78000600 { mmc@78000600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
...@@ -1016,17 +1016,10 @@ backlight: backlight { ...@@ -1016,17 +1016,10 @@ backlight: backlight {
enable-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>; enable-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
}; };
clocks { clk32k_in: clock@0 {
compatible = "simple-bus"; compatible = "fixed-clock";
#address-cells = <1>; clock-frequency = <32768>;
#size-cells = <0>; #clock-cells = <0>;
clk32k_in: clock@0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-frequency = <32768>;
};
}; };
gpio-keys { gpio-keys {
...@@ -1052,76 +1045,64 @@ power { ...@@ -1052,76 +1045,64 @@ power {
}; };
}; };
regulators { lcd_bl_en: regulator@0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "lcd_bl_en";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
lcd_bl_en: regulator@0 { regulator-boot-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "lcd_bl_en";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-boot-on;
};
vdd_lcd: regulator@1 { vdd_lcd: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "vdd_lcd_1v8";
regulator-name = "vdd_lcd_1v8"; regulator-min-microvolt = <1800000>;
regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; vin-supply = <&vdd_1v8>;
vin-supply = <&vdd_1v8>; enable-active-high;
enable-active-high; gpio = <&gpio TEGRA_GPIO(U, 4) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(U, 4) GPIO_ACTIVE_HIGH>; regulator-boot-on;
regulator-boot-on; };
};
regulator@2 { regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "vdd_1v8_ts";
regulator-name = "vdd_1v8_ts"; regulator-min-microvolt = <1800000>;
regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; gpio = <&gpio TEGRA_GPIO(K, 3) GPIO_ACTIVE_LOW>;
gpio = <&gpio TEGRA_GPIO(K, 3) GPIO_ACTIVE_LOW>; regulator-boot-on;
regulator-boot-on; };
};
regulator@3 { regulator@3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "vdd_3v3_ts";
regulator-name = "vdd_3v3_ts"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; enable-active-high;
enable-active-high; gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>; regulator-boot-on;
regulator-boot-on; };
};
regulator@4 { regulator@4 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>; regulator-name = "vdd_1v8_com";
regulator-name = "vdd_1v8_com"; regulator-min-microvolt = <1800000>;
regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; vin-supply = <&vdd_1v8>;
vin-supply = <&vdd_1v8>; enable-active-high;
enable-active-high; gpio = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_HIGH>; regulator-boot-on;
regulator-boot-on; };
};
regulator@5 { regulator@5 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <5>; regulator-name = "vdd_3v3_com";
regulator-name = "vdd_3v3_com"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; vin-supply = <&vdd_3v3_sys>;
vin-supply = <&vdd_3v3_sys>; enable-active-high;
enable-active-high; gpio = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_HIGH>; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on;
};
}; };
}; };
arch/arm/boot/dts/tegra114-tn7.dts
View file @ 3502e079
...@@ -37,7 +37,7 @@ host1x@50000000 { ...@@ -37,7 +37,7 @@ host1x@50000000 {
dsi@54300000 { dsi@54300000 {
status = "okay"; status = "okay";
vdd-supply = <&vdd_1v2_ap>; avdd-dsi-csi-supply = <&vdd_1v2_ap>;
panel@0 { panel@0 {
compatible = "lg,ld070wx3-sl01"; compatible = "lg,ld070wx3-sl01";
...@@ -242,7 +242,7 @@ pmc@7000e400 { ...@@ -242,7 +242,7 @@ pmc@7000e400 {
}; };
/* eMMC */ /* eMMC */
sdhci@78000600 { mmc@78000600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
...@@ -273,17 +273,10 @@ backlight: backlight { ...@@ -273,17 +273,10 @@ backlight: backlight {
power-supply = <&lcd_bl_en>; power-supply = <&lcd_bl_en>;
}; };
clocks { clk32k_in: clock@0 {
compatible = "simple-bus"; compatible = "fixed-clock";
#address-cells = <1>; clock-frequency = <32768>;
#size-cells = <0>; #clock-cells = <0>;
clk32k_in: clock@0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-frequency = <32768>;
};
}; };
gpio-keys { gpio-keys {
...@@ -309,44 +302,35 @@ volume_up { ...@@ -309,44 +302,35 @@ volume_up {
}; };
}; };
regulators { /* FIXME: output of BQ24192 */
compatible = "simple-bus"; vs_sys: regulator@0 {
#address-cells = <1>; compatible = "regulator-fixed";
#size-cells = <0>; regulator-name = "VS_SYS";
regulator-min-microvolt = <4200000>;
/* FIXME: output of BQ24192 */ regulator-max-microvolt = <4200000>;
vs_sys: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; regulator-boot-on;
reg = <0>; };
regulator-name = "VS_SYS";
regulator-min-microvolt = <4200000>;
regulator-max-microvolt = <4200000>;
regulator-always-on;
regulator-boot-on;
};
lcd_bl_en: regulator@1 { lcd_bl_en: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "VDD_LCD_BL";
regulator-name = "VDD_LCD_BL"; regulator-min-microvolt = <16500000>;
regulator-min-microvolt = <16500000>; regulator-max-microvolt = <16500000>;
regulator-max-microvolt = <16500000>; gpio = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vs_sys>;
vin-supply = <&vs_sys>; regulator-boot-on;
regulator-boot-on; };
};
vdd_lcd: regulator@2 { vdd_lcd: regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "VD_LCD_1V8";
regulator-name = "VD_LCD_1V8"; regulator-min-microvolt = <1800000>;
regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; gpio = <&palmas_gpio 4 GPIO_ACTIVE_HIGH>;
gpio = <&palmas_gpio 4 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_1v8>;
vin-supply = <&vdd_1v8>; regulator-boot-on;
regulator-boot-on;
};
}; };
}; };
arch/arm/boot/dts/tegra114.dtsi
View file @ 3502e079
...@@ -18,11 +18,13 @@ memory@80000000 { ...@@ -18,11 +18,13 @@ memory@80000000 {
}; };
host1x@50000000 { host1x@50000000 {
compatible = "nvidia,tegra114-host1x", "simple-bus"; compatible = "nvidia,tegra114-host1x";
reg = <0x50000000 0x00028000>; reg = <0x50000000 0x00028000>;
interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */ interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
<GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */ <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
interrupt-names = "syncpt", "host1x";
clocks = <&tegra_car TEGRA114_CLK_HOST1X>; clocks = <&tegra_car TEGRA114_CLK_HOST1X>;
clock-names = "host1x";
resets = <&tegra_car 28>; resets = <&tegra_car 28>;
reset-names = "host1x"; reset-names = "host1x";
iommus = <&mc TEGRA_SWGROUP_HC>; iommus = <&mc TEGRA_SWGROUP_HC>;
...@@ -33,7 +35,7 @@ host1x@50000000 { ...@@ -33,7 +35,7 @@ host1x@50000000 {
ranges = <0x54000000 0x54000000 0x01000000>; ranges = <0x54000000 0x54000000 0x01000000>;
gr2d@54140000 { gr2d@54140000 {
compatible = "nvidia,tegra114-gr2d", "nvidia,tegra20-gr2d"; compatible = "nvidia,tegra114-gr2d";
reg = <0x54140000 0x00040000>; reg = <0x54140000 0x00040000>;
interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA114_CLK_GR2D>; clocks = <&tegra_car TEGRA114_CLK_GR2D>;
...@@ -44,7 +46,7 @@ gr2d@54140000 { ...@@ -44,7 +46,7 @@ gr2d@54140000 {
}; };
gr3d@54180000 { gr3d@54180000 {
compatible = "nvidia,tegra114-gr3d", "nvidia,tegra20-gr3d"; compatible = "nvidia,tegra114-gr3d";
reg = <0x54180000 0x00040000>; reg = <0x54180000 0x00040000>;
clocks = <&tegra_car TEGRA114_CLK_GR3D>; clocks = <&tegra_car TEGRA114_CLK_GR3D>;
resets = <&tegra_car 24>; resets = <&tegra_car 24>;
...@@ -54,7 +56,7 @@ gr3d@54180000 { ...@@ -54,7 +56,7 @@ gr3d@54180000 {
}; };
dc@54200000 { dc@54200000 {
compatible = "nvidia,tegra114-dc", "nvidia,tegra20-dc"; compatible = "nvidia,tegra114-dc";
reg = <0x54200000 0x00040000>; reg = <0x54200000 0x00040000>;
interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA114_CLK_DISP1>, clocks = <&tegra_car TEGRA114_CLK_DISP1>,
...@@ -73,7 +75,7 @@ rgb { ...@@ -73,7 +75,7 @@ rgb {
}; };
dc@54240000 { dc@54240000 {
compatible = "nvidia,tegra114-dc", "nvidia,tegra20-dc"; compatible = "nvidia,tegra114-dc";
reg = <0x54240000 0x00040000>; reg = <0x54240000 0x00040000>;
interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA114_CLK_DISP2>, clocks = <&tegra_car TEGRA114_CLK_DISP2>,
...@@ -253,14 +255,14 @@ gpio: gpio@6000d000 { ...@@ -253,14 +255,14 @@ gpio: gpio@6000d000 {
apbmisc@70000800 { apbmisc@70000800 {
compatible = "nvidia,tegra114-apbmisc", "nvidia,tegra20-apbmisc"; compatible = "nvidia,tegra114-apbmisc", "nvidia,tegra20-apbmisc";
reg = <0x70000800 0x64 /* Chip revision */ reg = <0x70000800 0x64>, /* Chip revision */
0x70000008 0x04>; /* Strapping options */ <0x70000008 0x04>; /* Strapping options */
}; };
pinmux: pinmux@70000868 { pinmux: pinmux@70000868 {
compatible = "nvidia,tegra114-pinmux"; compatible = "nvidia,tegra114-pinmux";
reg = <0x70000868 0x148 /* Pad control registers */ reg = <0x70000868 0x148>, /* Pad control registers */
0x70003000 0x40c>; /* Mux registers */ <0x70003000 0x40c>; /* Mux registers */
}; };
/* /*
...@@ -644,41 +646,45 @@ mipi: mipi@700e3000 { ...@@ -644,41 +646,45 @@ mipi: mipi@700e3000 {
#nvidia,mipi-calibrate-cells = <1>; #nvidia,mipi-calibrate-cells = <1>;
}; };
sdhci@78000000 { mmc@78000000 {
compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci"; compatible = "nvidia,tegra114-sdhci";
reg = <0x78000000 0x200>; reg = <0x78000000 0x200>;
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA114_CLK_SDMMC1>; clocks = <&tegra_car TEGRA114_CLK_SDMMC1>;
clock-names = "sdhci";
resets = <&tegra_car 14>; resets = <&tegra_car 14>;
reset-names = "sdhci"; reset-names = "sdhci";
status = "disabled"; status = "disabled";
}; };
sdhci@78000200 { mmc@78000200 {
compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci"; compatible = "nvidia,tegra114-sdhci";
reg = <0x78000200 0x200>; reg = <0x78000200 0x200>;
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA114_CLK_SDMMC2>; clocks = <&tegra_car TEGRA114_CLK_SDMMC2>;
clock-names = "sdhci";
resets = <&tegra_car 9>; resets = <&tegra_car 9>;
reset-names = "sdhci"; reset-names = "sdhci";
status = "disabled"; status = "disabled";
}; };
sdhci@78000400 { mmc@78000400 {
compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci"; compatible = "nvidia,tegra114-sdhci";
reg = <0x78000400 0x200>; reg = <0x78000400 0x200>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA114_CLK_SDMMC3>; clocks = <&tegra_car TEGRA114_CLK_SDMMC3>;
clock-names = "sdhci";
resets = <&tegra_car 69>; resets = <&tegra_car 69>;
reset-names = "sdhci"; reset-names = "sdhci";
status = "disabled"; status = "disabled";
}; };
sdhci@78000600 { mmc@78000600 {
compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci"; compatible = "nvidia,tegra114-sdhci";
reg = <0x78000600 0x200>; reg = <0x78000600 0x200>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA114_CLK_SDMMC4>; clocks = <&tegra_car TEGRA114_CLK_SDMMC4>;
clock-names = "sdhci";
resets = <&tegra_car 15>; resets = <&tegra_car 15>;
reset-names = "sdhci"; reset-names = "sdhci";
status = "disabled"; status = "disabled";
...@@ -698,7 +704,8 @@ usb@7d000000 { ...@@ -698,7 +704,8 @@ usb@7d000000 {
phy1: usb-phy@7d000000 { phy1: usb-phy@7d000000 {
compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy"; compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x7d000000 0x4000 0x7d000000 0x4000>; reg = <0x7d000000 0x4000>,
<0x7d000000 0x4000>;
phy_type = "utmi"; phy_type = "utmi";
clocks = <&tegra_car TEGRA114_CLK_USBD>, clocks = <&tegra_car TEGRA114_CLK_USBD>,
<&tegra_car TEGRA114_CLK_PLL_U>, <&tegra_car TEGRA114_CLK_PLL_U>,
...@@ -706,6 +713,7 @@ phy1: usb-phy@7d000000 { ...@@ -706,6 +713,7 @@ phy1: usb-phy@7d000000 {
clock-names = "reg", "pll_u", "utmi-pads"; clock-names = "reg", "pll_u", "utmi-pads";
resets = <&tegra_car 22>, <&tegra_car 22>; resets = <&tegra_car 22>, <&tegra_car 22>;
reset-names = "usb", "utmi-pads"; reset-names = "usb", "utmi-pads";
#phy-cells = <0>;
nvidia,hssync-start-delay = <0>; nvidia,hssync-start-delay = <0>;
nvidia,idle-wait-delay = <17>; nvidia,idle-wait-delay = <17>;
nvidia,elastic-limit = <16>; nvidia,elastic-limit = <16>;
...@@ -734,7 +742,8 @@ usb@7d008000 { ...@@ -734,7 +742,8 @@ usb@7d008000 {
phy3: usb-phy@7d008000 { phy3: usb-phy@7d008000 {
compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy"; compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x7d008000 0x4000 0x7d000000 0x4000>; reg = <0x7d008000 0x4000>,
<0x7d000000 0x4000>;
phy_type = "utmi"; phy_type = "utmi";
clocks = <&tegra_car TEGRA114_CLK_USB3>, clocks = <&tegra_car TEGRA114_CLK_USB3>,
<&tegra_car TEGRA114_CLK_PLL_U>, <&tegra_car TEGRA114_CLK_PLL_U>,
...@@ -742,6 +751,7 @@ phy3: usb-phy@7d008000 { ...@@ -742,6 +751,7 @@ phy3: usb-phy@7d008000 {
clock-names = "reg", "pll_u", "utmi-pads"; clock-names = "reg", "pll_u", "utmi-pads";
resets = <&tegra_car 59>, <&tegra_car 22>; resets = <&tegra_car 59>, <&tegra_car 22>;
reset-names = "usb", "utmi-pads"; reset-names = "usb", "utmi-pads";
#phy-cells = <0>;
nvidia,hssync-start-delay = <0>; nvidia,hssync-start-delay = <0>;
nvidia,idle-wait-delay = <17>; nvidia,idle-wait-delay = <17>;
nvidia,elastic-limit = <16>; nvidia,elastic-limit = <16>;
......
arch/arm/boot/dts/tegra124-apalis-eval.dts
View file @ 3502e079
...@@ -130,7 +130,7 @@ usb@70090000 { ...@@ -130,7 +130,7 @@ usb@70090000 {
}; };
/* Apalis MMC1 */ /* Apalis MMC1 */
sdhci@700b0000 { mmc@700b0000 {
status = "okay"; status = "okay";
bus-width = <4>; bus-width = <4>;
/* MMC1_CD# */ /* MMC1_CD# */
...@@ -139,7 +139,7 @@ sdhci@700b0000 { ...@@ -139,7 +139,7 @@ sdhci@700b0000 {
}; };
/* Apalis SD1 */ /* Apalis SD1 */
sdhci@700b0400 { mmc@700b0400 {
status = "okay"; status = "okay";
bus-width = <4>; bus-width = <4>;
/* SD1_CD# */ /* SD1_CD# */
......
arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
View file @ 3502e079
...@@ -132,7 +132,7 @@ usb@70090000 { ...@@ -132,7 +132,7 @@ usb@70090000 {
}; };
/* Apalis MMC1 */ /* Apalis MMC1 */
sdhci@700b0000 { mmc@700b0000 {
status = "okay"; status = "okay";
bus-width = <4>; bus-width = <4>;
/* MMC1_CD# */ /* MMC1_CD# */
...@@ -141,7 +141,7 @@ sdhci@700b0000 { ...@@ -141,7 +141,7 @@ sdhci@700b0000 {
}; };
/* Apalis SD1 */ /* Apalis SD1 */
sdhci@700b0400 { mmc@700b0400 {
status = "okay"; status = "okay";
bus-width = <4>; bus-width = <4>;
/* SD1_CD# */ /* SD1_CD# */
......
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
View file @ 3502e079
...@@ -40,7 +40,7 @@ pci@2,0 { ...@@ -40,7 +40,7 @@ pci@2,0 {
phy-names = "pcie-0"; phy-names = "pcie-0";
status = "okay"; status = "okay";
pcie@0 { ethernet@0,0 {
reg = <0 0 0 0 0>; reg = <0 0 0 0 0>;
local-mac-address = [00 00 00 00 00 00]; local-mac-address = [00 00 00 00 00 00];
}; };
...@@ -1562,6 +1562,7 @@ i2c@7000d000 { ...@@ -1562,6 +1562,7 @@ i2c@7000d000 {
sgtl5000: codec@a { sgtl5000: codec@a {
compatible = "fsl,sgtl5000"; compatible = "fsl,sgtl5000";
reg = <0x0a>; reg = <0x0a>;
#sound-dai-cells = <0>;
VDDA-supply = <&reg_module_3v3_audio>; VDDA-supply = <&reg_module_3v3_audio>;
VDDD-supply = <&reg_1v8_vddio>; VDDD-supply = <&reg_1v8_vddio>;
VDDIO-supply = <&reg_1v8_vddio>; VDDIO-supply = <&reg_1v8_vddio>;
...@@ -1916,7 +1917,7 @@ usb3-1 { ...@@ -1916,7 +1917,7 @@ usb3-1 {
}; };
/* eMMC */ /* eMMC */
sdhci@700b0600 { mmc@700b0600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
......
arch/arm/boot/dts/tegra124-apalis.dtsi
View file @ 3502e079
...@@ -39,7 +39,7 @@ pci@2,0 { ...@@ -39,7 +39,7 @@ pci@2,0 {
phy-names = "pcie-0"; phy-names = "pcie-0";
status = "okay"; status = "okay";
pcie@0 { ethernet@0,0 {
reg = <0 0 0 0 0>; reg = <0 0 0 0 0>;
local-mac-address = [00 00 00 00 00 00]; local-mac-address = [00 00 00 00 00 00];
}; };
...@@ -1555,6 +1555,7 @@ i2c@7000d000 { ...@@ -1555,6 +1555,7 @@ i2c@7000d000 {
sgtl5000: codec@a { sgtl5000: codec@a {
compatible = "fsl,sgtl5000"; compatible = "fsl,sgtl5000";
reg = <0x0a>; reg = <0x0a>;
#sound-dai-cells = <0>;
VDDA-supply = <&reg_module_3v3_audio>; VDDA-supply = <&reg_module_3v3_audio>;
VDDD-supply = <&reg_1v8_vddio>; VDDD-supply = <&reg_1v8_vddio>;
VDDIO-supply = <&reg_1v8_vddio>; VDDIO-supply = <&reg_1v8_vddio>;
...@@ -1908,7 +1909,7 @@ usb3-1 { ...@@ -1908,7 +1909,7 @@ usb3-1 {
}; };
/* eMMC */ /* eMMC */
sdhci@700b0600 { mmc@700b0600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
......
arch/arm/boot/dts/tegra124-jetson-tk1.dts
View file @ 3502e079
...@@ -1782,6 +1782,12 @@ sata-0 { ...@@ -1782,6 +1782,12 @@ sata-0 {
}; };
ports { ports {
/* Micro A/B */
usb2-0 {
status = "okay";
mode = "host";
};
/* Mini PCIe */ /* Mini PCIe */
usb2-1 { usb2-1 {
status = "okay"; status = "okay";
...@@ -1804,7 +1810,7 @@ usb3-0 { ...@@ -1804,7 +1810,7 @@ usb3-0 {
}; };
/* SD card */ /* SD card */
sdhci@700b0400 { mmc@700b0400 {
status = "okay"; status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>; power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
...@@ -1814,7 +1820,7 @@ sdhci@700b0400 { ...@@ -1814,7 +1820,7 @@ sdhci@700b0400 {
}; };
/* eMMC */ /* eMMC */
sdhci@700b0600 { mmc@700b0600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
...@@ -1862,17 +1868,10 @@ usb-phy@7d008000 { ...@@ -1862,17 +1868,10 @@ usb-phy@7d008000 {
vbus-supply = <&vdd_usb3_vbus>; vbus-supply = <&vdd_usb3_vbus>;
}; };
clocks { clk32k_in: clock@0 {
compatible = "simple-bus"; compatible = "fixed-clock";
#address-cells = <1>; clock-frequency = <32768>;
#size-cells = <0>; #clock-cells = <0>;
clk32k_in: clock@0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-frequency = <32768>;
};
}; };
cpus { cpus {
...@@ -1893,145 +1892,127 @@ power { ...@@ -1893,145 +1892,127 @@ power {
}; };
}; };
regulators { vdd_mux: regulator@0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "+VDD_MUX";
#size-cells = <0>; regulator-min-microvolt = <12000000>;
regulator-max-microvolt = <12000000>;
vdd_mux: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; regulator-boot-on;
reg = <0>; };
regulator-name = "+VDD_MUX";
regulator-min-microvolt = <12000000>;
regulator-max-microvolt = <12000000>;
regulator-always-on;
regulator-boot-on;
};
vdd_5v0_sys: regulator@1 { vdd_5v0_sys: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "+5V_SYS";
regulator-name = "+5V_SYS"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; vin-supply = <&vdd_mux>;
vin-supply = <&vdd_mux>; };
};
vdd_3v3_sys: regulator@2 { vdd_3v3_sys: regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "+3.3V_SYS";
regulator-name = "+3.3V_SYS"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; vin-supply = <&vdd_mux>;
vin-supply = <&vdd_mux>; };
};
vdd_3v3_run: regulator@3 { vdd_3v3_run: regulator@3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "+3.3V_RUN";
regulator-name = "+3.3V_RUN"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
gpio = <&pmic 1 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_3v3_sys>;
vin-supply = <&vdd_3v3_sys>; };
};
vdd_3v3_hdmi: regulator@4 { vdd_3v3_hdmi: regulator@4 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>; regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
regulator-name = "+3.3V_AVDD_HDMI_AP_GATED"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; vin-supply = <&vdd_3v3_run>;
vin-supply = <&vdd_3v3_run>; };
};
vdd_usb1_vbus: regulator@7 { vdd_usb1_vbus: regulator@5 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <7>; regulator-name = "+USB0_VBUS_SW";
regulator-name = "+USB0_VBUS_SW"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; gpio-open-drain;
gpio-open-drain; vin-supply = <&vdd_5v0_sys>;
vin-supply = <&vdd_5v0_sys>; };
};
vdd_usb3_vbus: regulator@8 { vdd_usb3_vbus: regulator@6 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <8>; regulator-name = "+5V_USB_HS";
regulator-name = "+5V_USB_HS"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; gpio-open-drain;
gpio-open-drain; vin-supply = <&vdd_5v0_sys>;
vin-supply = <&vdd_5v0_sys>; };
};
vdd_3v3_lp0: regulator@10 { vdd_3v3_lp0: regulator@7 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <10>; regulator-name = "+3.3V_LP0";
regulator-name = "+3.3V_LP0"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
gpio = <&pmic 2 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_3v3_sys>;
vin-supply = <&vdd_3v3_sys>; };
};
vdd_hdmi_pll: regulator@11 { vdd_hdmi_pll: regulator@8 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <11>; regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL"; regulator-min-microvolt = <1050000>;
regulator-min-microvolt = <1050000>; regulator-max-microvolt = <1050000>;
regulator-max-microvolt = <1050000>; gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>; vin-supply = <&vdd_1v05_run>;
vin-supply = <&vdd_1v05_run>; };
};
vdd_5v0_hdmi: regulator@12 { vdd_5v0_hdmi: regulator@9 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <12>; regulator-name = "+5V_HDMI_CON";
regulator-name = "+5V_HDMI_CON"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_5v0_sys>;
vin-supply = <&vdd_5v0_sys>; };
};
/* Molex power connector */ /* Molex power connector */
vdd_5v0_sata: regulator@13 { vdd_5v0_sata: regulator@10 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <13>; regulator-name = "+5V_SATA";
regulator-name = "+5V_SATA"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio TEGRA_GPIO(EE, 2) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(EE, 2) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_5v0_sys>;
vin-supply = <&vdd_5v0_sys>; };
};
vdd_12v0_sata: regulator@14 { vdd_12v0_sata: regulator@11 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <14>; regulator-name = "+12V_SATA";
regulator-name = "+12V_SATA"; regulator-min-microvolt = <12000000>;
regulator-min-microvolt = <12000000>; regulator-max-microvolt = <12000000>;
regulator-max-microvolt = <12000000>; gpio = <&gpio TEGRA_GPIO(EE, 2) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(EE, 2) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_mux>;
vin-supply = <&vdd_mux>;
};
}; };
sound { sound {
......
arch/arm/boot/dts/tegra124-nyan-big.dts
View file @ 3502e079
...@@ -16,11 +16,12 @@ / { ...@@ -16,11 +16,12 @@ / {
panel: panel { panel: panel {
compatible = "auo,b133xtn01"; compatible = "auo,b133xtn01";
power-supply = <&vdd_3v3_panel>;
backlight = <&backlight>; backlight = <&backlight>;
ddc-i2c-bus = <&dpaux>; ddc-i2c-bus = <&dpaux>;
}; };
sdhci@700b0400 { /* SD Card on this bus */ mmc@700b0400 { /* SD Card on this bus */
wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>; wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
}; };
......
arch/arm/boot/dts/tegra124-nyan-blaze.dts
View file @ 3502e079
...@@ -18,6 +18,7 @@ / { ...@@ -18,6 +18,7 @@ / {
panel: panel { panel: panel {
compatible = "samsung,ltn140at29-301"; compatible = "samsung,ltn140at29-301";
power-supply = <&vdd_3v3_panel>;
backlight = <&backlight>; backlight = <&backlight>;
ddc-i2c-bus = <&dpaux>; ddc-i2c-bus = <&dpaux>;
}; };
......
arch/arm/boot/dts/tegra124-nyan.dtsi
View file @ 3502e079
...@@ -48,6 +48,9 @@ hdmi@54280000 { ...@@ -48,6 +48,9 @@ hdmi@54280000 {
sor@54540000 { sor@54540000 {
status = "okay"; status = "okay";
avdd-io-hdmi-dp-supply = <&vdd_3v3_hdmi>;
vdd-hdmi-dp-pll-supply = <&vdd_hdmi_pll>;
nvidia,dpaux = <&dpaux>; nvidia,dpaux = <&dpaux>;
nvidia,panel = <&panel>; nvidia,panel = <&panel>;
}; };
...@@ -495,7 +498,7 @@ sdhci0_pwrseq: sdhci0_pwrseq { ...@@ -495,7 +498,7 @@ sdhci0_pwrseq: sdhci0_pwrseq {
reset-gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>; reset-gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>;
}; };
sdhci@700b0000 { /* WiFi/BT on this bus */ mmc@700b0000 { /* WiFi/BT on this bus */
status = "okay"; status = "okay";
bus-width = <4>; bus-width = <4>;
no-1-8-v; no-1-8-v;
...@@ -506,7 +509,7 @@ sdhci@700b0000 { /* WiFi/BT on this bus */ ...@@ -506,7 +509,7 @@ sdhci@700b0000 { /* WiFi/BT on this bus */
keep-power-in-suspend; keep-power-in-suspend;
}; };
sdhci@700b0400 { /* SD Card on this bus */ mmc@700b0400 { /* SD Card on this bus */
status = "okay"; status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>; power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
...@@ -515,7 +518,7 @@ sdhci@700b0400 { /* SD Card on this bus */ ...@@ -515,7 +518,7 @@ sdhci@700b0400 { /* SD Card on this bus */
vqmmc-supply = <&vddio_sdmmc3>; vqmmc-supply = <&vddio_sdmmc3>;
}; };
sdhci@700b0600 { /* eMMC on this bus */ mmc@700b0600 { /* eMMC on this bus */
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
no-1-8-v; no-1-8-v;
...@@ -579,17 +582,10 @@ backlight: backlight { ...@@ -579,17 +582,10 @@ backlight: backlight {
256>; 256>;
}; };
clocks { clk32k_in: clock@0 {
compatible = "simple-bus"; compatible = "fixed-clock";
#address-cells = <1>; clock-frequency = <32768>;
#size-cells = <0>; #clock-cells = <0>;
clk32k_in: clock@0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-frequency = <32768>;
};
}; };
cpus { cpus {
...@@ -619,157 +615,138 @@ power { ...@@ -619,157 +615,138 @@ power {
}; };
}; };
regulators { vdd_mux: regulator@0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "+VDD_MUX";
#size-cells = <0>; regulator-min-microvolt = <12000000>;
regulator-max-microvolt = <12000000>;
vdd_mux: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; regulator-boot-on;
reg = <0>; };
regulator-name = "+VDD_MUX";
regulator-min-microvolt = <12000000>;
regulator-max-microvolt = <12000000>;
regulator-always-on;
regulator-boot-on;
};
vdd_5v0_sys: regulator@1 { vdd_5v0_sys: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "+5V_SYS";
regulator-name = "+5V_SYS"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; vin-supply = <&vdd_mux>;
vin-supply = <&vdd_mux>; };
};
vdd_3v3_sys: regulator@2 { vdd_3v3_sys: regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "+3.3V_SYS";
regulator-name = "+3.3V_SYS"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; vin-supply = <&vdd_mux>;
vin-supply = <&vdd_mux>; };
};
vdd_3v3_run: regulator@3 { vdd_3v3_run: regulator@3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "+3.3V_RUN";
regulator-name = "+3.3V_RUN"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
gpio = <&pmic 1 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_3v3_sys>;
vin-supply = <&vdd_3v3_sys>; };
};
vdd_3v3_hdmi: regulator@4 { vdd_3v3_hdmi: regulator@4 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>; regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
regulator-name = "+3.3V_AVDD_HDMI_AP_GATED"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; vin-supply = <&vdd_3v3_run>;
vin-supply = <&vdd_3v3_run>; };
};
vdd_led: regulator@5 { vdd_led: regulator@5 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <5>; regulator-name = "+VDD_LED";
regulator-name = "+VDD_LED"; gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_mux>;
vin-supply = <&vdd_mux>; };
};
vdd_5v0_ts: regulator@6 { vdd_5v0_ts: regulator@6 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <6>; regulator-name = "+5V_VDD_TS_SW";
regulator-name = "+5V_VDD_TS_SW"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-boot-on;
regulator-boot-on; gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_5v0_sys>;
vin-supply = <&vdd_5v0_sys>; };
};
vdd_usb1_vbus: regulator@7 { vdd_usb1_vbus: regulator@7 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <7>; regulator-name = "+5V_USB_HS";
regulator-name = "+5V_USB_HS"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; gpio-open-drain;
gpio-open-drain; vin-supply = <&vdd_5v0_sys>;
vin-supply = <&vdd_5v0_sys>; };
};
vdd_usb3_vbus: regulator@8 { vdd_usb3_vbus: regulator@8 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <8>; regulator-name = "+5V_USB_SS";
regulator-name = "+5V_USB_SS"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; gpio-open-drain;
gpio-open-drain; vin-supply = <&vdd_5v0_sys>;
vin-supply = <&vdd_5v0_sys>; };
};
vdd_3v3_panel: regulator@9 { vdd_3v3_panel: regulator@9 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <9>; regulator-name = "+3.3V_PANEL";
regulator-name = "+3.3V_PANEL"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; gpio = <&pmic 4 GPIO_ACTIVE_HIGH>;
gpio = <&pmic 4 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_3v3_run>;
vin-supply = <&vdd_3v3_run>; };
};
vdd_3v3_lp0: regulator@10 { vdd_3v3_lp0: regulator@10 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <10>; regulator-name = "+3.3V_LP0";
regulator-name = "+3.3V_LP0"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; /*
/* * TODO: find a way to wire this up with the USB EHCI
* TODO: find a way to wire this up with the USB EHCI * controllers so that it can be enabled on demand.
* controllers so that it can be enabled on demand. */
*/ regulator-always-on;
regulator-always-on; gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
gpio = <&pmic 2 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_3v3_sys>;
vin-supply = <&vdd_3v3_sys>; };
};
vdd_hdmi_pll: regulator@11 { vdd_hdmi_pll: regulator@11 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <11>; regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL"; regulator-min-microvolt = <1050000>;
regulator-min-microvolt = <1050000>; regulator-max-microvolt = <1050000>;
regulator-max-microvolt = <1050000>; gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>; vin-supply = <&vdd_1v05_run>;
vin-supply = <&vdd_1v05_run>; };
};
vdd_5v0_hdmi: regulator@12 { vdd_5v0_hdmi: regulator@12 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <12>; regulator-name = "+5V_HDMI_CON";
regulator-name = "+5V_HDMI_CON"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_5v0_sys>;
vin-supply = <&vdd_5v0_sys>;
};
}; };
sound { sound {
......
arch/arm/boot/dts/tegra124-venice2.dts
View file @ 3502e079
...@@ -1002,7 +1002,7 @@ usb3-1 { ...@@ -1002,7 +1002,7 @@ usb3-1 {
}; };
}; };
sdhci@700b0400 { mmc@700b0400 {
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>; cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>; power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>; wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
...@@ -1011,7 +1011,7 @@ sdhci@700b0400 { ...@@ -1011,7 +1011,7 @@ sdhci@700b0400 {
vqmmc-supply = <&vddio_sdmmc3>; vqmmc-supply = <&vddio_sdmmc3>;
}; };
sdhci@700b0600 { mmc@700b0600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
...@@ -1061,17 +1061,10 @@ backlight: backlight { ...@@ -1061,17 +1061,10 @@ backlight: backlight {
default-brightness-level = <6>; default-brightness-level = <6>;
}; };
clocks { clk32k_in: clock@0 {
compatible = "simple-bus"; compatible = "fixed-clock";
#address-cells = <1>; clock-frequency = <32768>;
#size-cells = <0>; #clock-cells = <0>;
clk32k_in: clock@0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-frequency = <32768>;
};
}; };
gpio-keys { gpio-keys {
...@@ -1088,164 +1081,145 @@ power { ...@@ -1088,164 +1081,145 @@ power {
panel: panel { panel: panel {
compatible = "lg,lp129qe"; compatible = "lg,lp129qe";
power-supply = <&vdd_3v3_panel>;
backlight = <&backlight>; backlight = <&backlight>;
ddc-i2c-bus = <&dpaux>; ddc-i2c-bus = <&dpaux>;
}; };
regulators { vdd_mux: regulator@0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "+VDD_MUX";
#size-cells = <0>; regulator-min-microvolt = <12000000>;
regulator-max-microvolt = <12000000>;
vdd_mux: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; regulator-boot-on;
reg = <0>; };
regulator-name = "+VDD_MUX";
regulator-min-microvolt = <12000000>;
regulator-max-microvolt = <12000000>;
regulator-always-on;
regulator-boot-on;
};
vdd_5v0_sys: regulator@1 { vdd_5v0_sys: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "+5V_SYS";
regulator-name = "+5V_SYS"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; vin-supply = <&vdd_mux>;
vin-supply = <&vdd_mux>; };
};
vdd_3v3_sys: regulator@2 { vdd_3v3_sys: regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "+3.3V_SYS";
regulator-name = "+3.3V_SYS"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; vin-supply = <&vdd_mux>;
vin-supply = <&vdd_mux>; };
};
vdd_3v3_run: regulator@3 { vdd_3v3_run: regulator@3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "+3.3V_RUN";
regulator-name = "+3.3V_RUN"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
gpio = <&pmic 1 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_3v3_sys>;
vin-supply = <&vdd_3v3_sys>; };
};
vdd_3v3_hdmi: regulator@4 { vdd_3v3_hdmi: regulator@4 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>; regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
regulator-name = "+3.3V_AVDD_HDMI_AP_GATED"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; vin-supply = <&vdd_3v3_run>;
vin-supply = <&vdd_3v3_run>; };
};
vdd_led: regulator@5 { vdd_led: regulator@5 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <5>; regulator-name = "+VDD_LED";
regulator-name = "+VDD_LED"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_mux>;
vin-supply = <&vdd_mux>; };
};
vdd_5v0_ts: regulator@6 { vdd_5v0_ts: regulator@6 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <6>; regulator-name = "+5V_VDD_TS_SW";
regulator-name = "+5V_VDD_TS_SW"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-boot-on;
regulator-boot-on; gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_5v0_sys>;
vin-supply = <&vdd_5v0_sys>; };
};
vdd_usb1_vbus: regulator@7 { vdd_usb1_vbus: regulator@7 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <7>; regulator-name = "+5V_USB_HS";
regulator-name = "+5V_USB_HS"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; gpio-open-drain;
gpio-open-drain; vin-supply = <&vdd_5v0_sys>;
vin-supply = <&vdd_5v0_sys>; };
};
vdd_usb3_vbus: regulator@8 { vdd_usb3_vbus: regulator@8 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <8>; regulator-name = "+5V_USB_SS";
regulator-name = "+5V_USB_SS"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; gpio-open-drain;
gpio-open-drain; vin-supply = <&vdd_5v0_sys>;
vin-supply = <&vdd_5v0_sys>; };
};
vdd_3v3_panel: regulator@9 { vdd_3v3_panel: regulator@9 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <9>; regulator-name = "+3.3V_PANEL";
regulator-name = "+3.3V_PANEL"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; gpio = <&pmic 4 GPIO_ACTIVE_HIGH>;
gpio = <&pmic 4 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_3v3_run>;
vin-supply = <&vdd_3v3_run>; };
};
vdd_3v3_lp0: regulator@10 { vdd_3v3_lp0: regulator@10 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <10>; regulator-name = "+3.3V_LP0";
regulator-name = "+3.3V_LP0"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; /*
/* * TODO: find a way to wire this up with the USB EHCI
* TODO: find a way to wire this up with the USB EHCI * controllers so that it can be enabled on demand.
* controllers so that it can be enabled on demand. */
*/ regulator-always-on;
regulator-always-on; gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
gpio = <&pmic 2 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_3v3_sys>;
vin-supply = <&vdd_3v3_sys>; };
};
vdd_hdmi_pll: regulator@11 { vdd_hdmi_pll: regulator@11 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <11>; regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL"; regulator-min-microvolt = <1050000>;
regulator-min-microvolt = <1050000>; regulator-max-microvolt = <1050000>;
regulator-max-microvolt = <1050000>; gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>; vin-supply = <&vdd_1v05_run>;
vin-supply = <&vdd_1v05_run>; };
};
vdd_5v0_hdmi: regulator@12 { vdd_5v0_hdmi: regulator@12 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <12>; regulator-name = "+5V_HDMI_CON";
regulator-name = "+5V_HDMI_CON"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_5v0_sys>;
vin-supply = <&vdd_5v0_sys>;
};
}; };
sound { sound {
......
arch/arm/boot/dts/tegra124.dtsi
View file @ 3502e079
...@@ -22,9 +22,9 @@ memory@80000000 { ...@@ -22,9 +22,9 @@ memory@80000000 {
pcie@1003000 { pcie@1003000 {
compatible = "nvidia,tegra124-pcie"; compatible = "nvidia,tegra124-pcie";
device_type = "pci"; device_type = "pci";
reg = <0x0 0x01003000 0x0 0x00000800 /* PADS registers */ reg = <0x0 0x01003000 0x0 0x00000800>, /* PADS registers */
0x0 0x01003800 0x0 0x00000800 /* AFI registers */ <0x0 0x01003800 0x0 0x00000800>, /* AFI registers */
0x0 0x02000000 0x0 0x10000000>; /* configuration space */ <0x0 0x02000000 0x0 0x10000000>; /* configuration space */
reg-names = "pads", "afi", "cs"; reg-names = "pads", "afi", "cs";
interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>, /* controller interrupt */ interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>, /* controller interrupt */
<GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */ <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
...@@ -38,11 +38,11 @@ pcie@1003000 { ...@@ -38,11 +38,11 @@ pcie@1003000 {
#address-cells = <3>; #address-cells = <3>;
#size-cells = <2>; #size-cells = <2>;
ranges = <0x82000000 0 0x01000000 0x0 0x01000000 0 0x00001000 /* port 0 configuration space */ ranges = <0x02000000 0 0x01000000 0x0 0x01000000 0 0x00001000>, /* port 0 configuration space */
0x82000000 0 0x01001000 0x0 0x01001000 0 0x00001000 /* port 1 configuration space */ <0x02000000 0 0x01001000 0x0 0x01001000 0 0x00001000>, /* port 1 configuration space */
0x81000000 0 0x0 0x0 0x12000000 0 0x00010000 /* downstream I/O (64 KiB) */ <0x01000000 0 0x0 0x0 0x12000000 0 0x00010000>, /* downstream I/O (64 KiB) */
0x82000000 0 0x13000000 0x0 0x13000000 0 0x0d000000 /* non-prefetchable memory (208 MiB) */ <0x02000000 0 0x13000000 0x0 0x13000000 0 0x0d000000>, /* non-prefetchable memory (208 MiB) */
0xc2000000 0 0x20000000 0x0 0x20000000 0 0x20000000>; /* prefetchable memory (512 MiB) */ <0x42000000 0 0x20000000 0x0 0x20000000 0 0x20000000>; /* prefetchable memory (512 MiB) */
clocks = <&tegra_car TEGRA124_CLK_PCIE>, clocks = <&tegra_car TEGRA124_CLK_PCIE>,
<&tegra_car TEGRA124_CLK_AFI>, <&tegra_car TEGRA124_CLK_AFI>,
...@@ -85,11 +85,13 @@ pci@2,0 { ...@@ -85,11 +85,13 @@ pci@2,0 {
}; };
host1x@50000000 { host1x@50000000 {
compatible = "nvidia,tegra124-host1x", "simple-bus"; compatible = "nvidia,tegra124-host1x";
reg = <0x0 0x50000000 0x0 0x00034000>; reg = <0x0 0x50000000 0x0 0x00034000>;
interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */ interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
<GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */ <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
interrupt-names = "syncpt", "host1x";
clocks = <&tegra_car TEGRA124_CLK_HOST1X>; clocks = <&tegra_car TEGRA124_CLK_HOST1X>;
clock-names = "host1x";
resets = <&tegra_car 28>; resets = <&tegra_car 28>;
reset-names = "host1x"; reset-names = "host1x";
iommus = <&mc TEGRA_SWGROUP_HC>; iommus = <&mc TEGRA_SWGROUP_HC>;
...@@ -103,9 +105,8 @@ dc@54200000 { ...@@ -103,9 +105,8 @@ dc@54200000 {
compatible = "nvidia,tegra124-dc"; compatible = "nvidia,tegra124-dc";
reg = <0x0 0x54200000 0x0 0x00040000>; reg = <0x0 0x54200000 0x0 0x00040000>;
interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA124_CLK_DISP1>, clocks = <&tegra_car TEGRA124_CLK_DISP1>;
<&tegra_car TEGRA124_CLK_PLL_P>; clock-names = "dc";
clock-names = "dc", "parent";
resets = <&tegra_car 27>; resets = <&tegra_car 27>;
reset-names = "dc"; reset-names = "dc";
...@@ -118,9 +119,8 @@ dc@54240000 { ...@@ -118,9 +119,8 @@ dc@54240000 {
compatible = "nvidia,tegra124-dc"; compatible = "nvidia,tegra124-dc";
reg = <0x0 0x54240000 0x0 0x00040000>; reg = <0x0 0x54240000 0x0 0x00040000>;
interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA124_CLK_DISP2>, clocks = <&tegra_car TEGRA124_CLK_DISP2>;
<&tegra_car TEGRA124_CLK_PLL_P>; clock-names = "dc";
clock-names = "dc", "parent";
resets = <&tegra_car 26>; resets = <&tegra_car 26>;
reset-names = "dc"; reset-names = "dc";
...@@ -178,6 +178,11 @@ dpaux: dpaux@545c0000 { ...@@ -178,6 +178,11 @@ dpaux: dpaux@545c0000 {
resets = <&tegra_car 181>; resets = <&tegra_car 181>;
reset-names = "dpaux"; reset-names = "dpaux";
status = "disabled"; status = "disabled";
i2c-bus {
#address-cells = <1>;
#size-cells = <0>;
};
}; };
}; };
...@@ -622,6 +627,7 @@ mc: memory-controller@70019000 { ...@@ -622,6 +627,7 @@ mc: memory-controller@70019000 {
interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>; #iommu-cells = <1>;
#reset-cells = <1>;
}; };
emc: external-memory-controller@7001b000 { emc: external-memory-controller@7001b000 {
...@@ -679,8 +685,8 @@ usb@70090000 { ...@@ -679,8 +685,8 @@ usb@70090000 {
<&tegra_car TEGRA124_CLK_XUSB_HOST_SRC>, <&tegra_car TEGRA124_CLK_XUSB_HOST_SRC>,
<&tegra_car TEGRA124_CLK_XUSB_FALCON_SRC>, <&tegra_car TEGRA124_CLK_XUSB_FALCON_SRC>,
<&tegra_car TEGRA124_CLK_XUSB_SS>, <&tegra_car TEGRA124_CLK_XUSB_SS>,
<&tegra_car TEGRA124_CLK_XUSB_SS_DIV2>,
<&tegra_car TEGRA124_CLK_XUSB_SS_SRC>, <&tegra_car TEGRA124_CLK_XUSB_SS_SRC>,
<&tegra_car TEGRA124_CLK_XUSB_SS_DIV2>,
<&tegra_car TEGRA124_CLK_XUSB_HS_SRC>, <&tegra_car TEGRA124_CLK_XUSB_HS_SRC>,
<&tegra_car TEGRA124_CLK_XUSB_FS_SRC>, <&tegra_car TEGRA124_CLK_XUSB_FS_SRC>,
<&tegra_car TEGRA124_CLK_PLL_U_480M>, <&tegra_car TEGRA124_CLK_PLL_U_480M>,
...@@ -688,7 +694,7 @@ usb@70090000 { ...@@ -688,7 +694,7 @@ usb@70090000 {
<&tegra_car TEGRA124_CLK_PLL_E>; <&tegra_car TEGRA124_CLK_PLL_E>;
clock-names = "xusb_host", "xusb_host_src", clock-names = "xusb_host", "xusb_host_src",
"xusb_falcon_src", "xusb_ss", "xusb_falcon_src", "xusb_ss",
"xusb_ss_div2", "xusb_ss_src", "xusb_ss_src", "xusb_ss_div2",
"xusb_hs_src", "xusb_fs_src", "xusb_hs_src", "xusb_fs_src",
"pll_u_480m", "clk_m", "pll_e"; "pll_u_480m", "clk_m", "pll_e";
resets = <&tegra_car 89>, <&tegra_car 156>, resets = <&tegra_car 89>, <&tegra_car 156>,
...@@ -833,41 +839,45 @@ usb3-1 { ...@@ -833,41 +839,45 @@ usb3-1 {
}; };
}; };
sdhci@700b0000 { mmc@700b0000 {
compatible = "nvidia,tegra124-sdhci"; compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0000 0x0 0x200>; reg = <0x0 0x700b0000 0x0 0x200>;
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA124_CLK_SDMMC1>; clocks = <&tegra_car TEGRA124_CLK_SDMMC1>;
clock-names = "sdhci";
resets = <&tegra_car 14>; resets = <&tegra_car 14>;
reset-names = "sdhci"; reset-names = "sdhci";
status = "disabled"; status = "disabled";
}; };
sdhci@700b0200 { mmc@700b0200 {
compatible = "nvidia,tegra124-sdhci"; compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0200 0x0 0x200>; reg = <0x0 0x700b0200 0x0 0x200>;
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA124_CLK_SDMMC2>; clocks = <&tegra_car TEGRA124_CLK_SDMMC2>;
clock-names = "sdhci";
resets = <&tegra_car 9>; resets = <&tegra_car 9>;
reset-names = "sdhci"; reset-names = "sdhci";
status = "disabled"; status = "disabled";
}; };
sdhci@700b0400 { mmc@700b0400 {
compatible = "nvidia,tegra124-sdhci"; compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0400 0x0 0x200>; reg = <0x0 0x700b0400 0x0 0x200>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA124_CLK_SDMMC3>; clocks = <&tegra_car TEGRA124_CLK_SDMMC3>;
clock-names = "sdhci";
resets = <&tegra_car 69>; resets = <&tegra_car 69>;
reset-names = "sdhci"; reset-names = "sdhci";
status = "disabled"; status = "disabled";
}; };
sdhci@700b0600 { mmc@700b0600 {
compatible = "nvidia,tegra124-sdhci"; compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0600 0x0 0x200>; reg = <0x0 0x700b0600 0x0 0x200>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA124_CLK_SDMMC4>; clocks = <&tegra_car TEGRA124_CLK_SDMMC4>;
clock-names = "sdhci";
resets = <&tegra_car 15>; resets = <&tegra_car 15>;
reset-names = "sdhci"; reset-names = "sdhci";
status = "disabled"; status = "disabled";
...@@ -885,8 +895,8 @@ cec@70015000 { ...@@ -885,8 +895,8 @@ cec@70015000 {
soctherm: thermal-sensor@700e2000 { soctherm: thermal-sensor@700e2000 {
compatible = "nvidia,tegra124-soctherm"; compatible = "nvidia,tegra124-soctherm";
reg = <0x0 0x700e2000 0x0 0x600 /* SOC_THERM reg_base */ reg = <0x0 0x700e2000 0x0 0x600>, /* SOC_THERM reg_base */
0x0 0x60006000 0x0 0x400>; /* CAR reg_base */ <0x0 0x60006000 0x0 0x400>; /* CAR reg_base */
reg-names = "soctherm-reg", "car-reg"; reg-names = "soctherm-reg", "car-reg";
interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA124_CLK_TSENSOR>, clocks = <&tegra_car TEGRA124_CLK_TSENSOR>,
...@@ -1056,6 +1066,7 @@ phy1: usb-phy@7d000000 { ...@@ -1056,6 +1066,7 @@ phy1: usb-phy@7d000000 {
clock-names = "reg", "pll_u", "utmi-pads"; clock-names = "reg", "pll_u", "utmi-pads";
resets = <&tegra_car 22>, <&tegra_car 22>; resets = <&tegra_car 22>, <&tegra_car 22>;
reset-names = "usb", "utmi-pads"; reset-names = "usb", "utmi-pads";
#phy-cells = <0>;
nvidia,hssync-start-delay = <0>; nvidia,hssync-start-delay = <0>;
nvidia,idle-wait-delay = <17>; nvidia,idle-wait-delay = <17>;
nvidia,elastic-limit = <16>; nvidia,elastic-limit = <16>;
...@@ -1093,6 +1104,7 @@ phy2: usb-phy@7d004000 { ...@@ -1093,6 +1104,7 @@ phy2: usb-phy@7d004000 {
clock-names = "reg", "pll_u", "utmi-pads"; clock-names = "reg", "pll_u", "utmi-pads";
resets = <&tegra_car 58>, <&tegra_car 22>; resets = <&tegra_car 58>, <&tegra_car 22>;
reset-names = "usb", "utmi-pads"; reset-names = "usb", "utmi-pads";
#phy-cells = <0>;
nvidia,hssync-start-delay = <0>; nvidia,hssync-start-delay = <0>;
nvidia,idle-wait-delay = <17>; nvidia,idle-wait-delay = <17>;
nvidia,elastic-limit = <16>; nvidia,elastic-limit = <16>;
...@@ -1129,6 +1141,7 @@ phy3: usb-phy@7d008000 { ...@@ -1129,6 +1141,7 @@ phy3: usb-phy@7d008000 {
clock-names = "reg", "pll_u", "utmi-pads"; clock-names = "reg", "pll_u", "utmi-pads";
resets = <&tegra_car 59>, <&tegra_car 22>; resets = <&tegra_car 59>, <&tegra_car 22>;
reset-names = "usb", "utmi-pads"; reset-names = "usb", "utmi-pads";
#phy-cells = <0>;
nvidia,hssync-start-delay = <0>; nvidia,hssync-start-delay = <0>;
nvidia,idle-wait-delay = <17>; nvidia,idle-wait-delay = <17>;
nvidia,elastic-limit = <16>; nvidia,elastic-limit = <16>;
......
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts 0 → 100644
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra20-colibri-eval-v3.dts
View file @ 3502e079
...@@ -183,7 +183,7 @@ can@0 { ...@@ -183,7 +183,7 @@ can@0 {
}; };
/* SD/MMC */ /* SD/MMC */
sdhci@c8000600 { mmc@c8000600 {
status = "okay"; status = "okay";
bus-width = <4>; bus-width = <4>;
cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */ cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */
......
arch/arm/boot/dts/tegra20-colibri-iris.dts
View file @ 3502e079
...@@ -171,7 +171,7 @@ spi@7000da00 { ...@@ -171,7 +171,7 @@ spi@7000da00 {
}; };
/* SD/MMC */ /* SD/MMC */
sdhci@c8000600 { mmc@c8000600 {
status = "okay"; status = "okay";
bus-width = <4>; bus-width = <4>;
cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */ cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */
......
arch/arm/boot/dts/tegra20-cpu-opp-microvolt.dtsi
View file @ 3502e079
...@@ -2,199 +2,199 @@ ...@@ -2,199 +2,199 @@
/ { / {
cpu0_opp_table: cpu_opp_table0 { cpu0_opp_table: cpu_opp_table0 {
opp@216000000_750 { opp@216000000,750 {
opp-microvolt = <750000 750000 1125000>; opp-microvolt = <750000 750000 1125000>;
}; };
opp@216000000_800 { opp@216000000,800 {
opp-microvolt = <800000 800000 1125000>; opp-microvolt = <800000 800000 1125000>;
}; };
opp@312000000_750 { opp@312000000,750 {
opp-microvolt = <750000 750000 1125000>; opp-microvolt = <750000 750000 1125000>;
}; };
opp@312000000_800 { opp@312000000,800 {
opp-microvolt = <800000 800000 1125000>; opp-microvolt = <800000 800000 1125000>;
}; };
opp@456000000_750 { opp@456000000,750 {
opp-microvolt = <750000 750000 1125000>; opp-microvolt = <750000 750000 1125000>;
}; };
opp@456000000_800 { opp@456000000,800 {
opp-microvolt = <800000 800000 1125000>; opp-microvolt = <800000 800000 1125000>;
}; };
opp@456000000_800_2_2 { opp@456000000,800,2,2 {
opp-microvolt = <800000 800000 1125000>; opp-microvolt = <800000 800000 1125000>;
}; };
opp@456000000_800_3_2 { opp@456000000,800,3,2 {
opp-microvolt = <800000 800000 1125000>; opp-microvolt = <800000 800000 1125000>;
}; };
opp@456000000_825 { opp@456000000,825 {
opp-microvolt = <825000 825000 1125000>; opp-microvolt = <825000 825000 1125000>;
}; };
opp@608000000_750 { opp@608000000,750 {
opp-microvolt = <750000 750000 1125000>; opp-microvolt = <750000 750000 1125000>;
}; };
opp@608000000_800 { opp@608000000,800 {
opp-microvolt = <800000 800000 1125000>; opp-microvolt = <800000 800000 1125000>;
}; };
opp@608000000_800_3_2 { opp@608000000,800,3,2 {
opp-microvolt = <800000 800000 1125000>; opp-microvolt = <800000 800000 1125000>;
}; };
opp@608000000_825 { opp@608000000,825 {
opp-microvolt = <825000 825000 1125000>; opp-microvolt = <825000 825000 1125000>;
}; };
opp@608000000_850 { opp@608000000,850 {
opp-microvolt = <850000 850000 1125000>; opp-microvolt = <850000 850000 1125000>;
}; };
opp@608000000_900 { opp@608000000,900 {
opp-microvolt = <900000 900000 1125000>; opp-microvolt = <900000 900000 1125000>;
}; };
opp@760000000_775 { opp@760000000,775 {
opp-microvolt = <775000 775000 1125000>; opp-microvolt = <775000 775000 1125000>;
}; };
opp@760000000_800 { opp@760000000,800 {
opp-microvolt = <800000 800000 1125000>; opp-microvolt = <800000 800000 1125000>;
}; };
opp@760000000_850 { opp@760000000,850 {
opp-microvolt = <850000 850000 1125000>; opp-microvolt = <850000 850000 1125000>;
}; };
opp@760000000_875 { opp@760000000,875 {
opp-microvolt = <875000 875000 1125000>; opp-microvolt = <875000 875000 1125000>;
}; };
opp@760000000_875_1_1 { opp@760000000,875,1,1 {
opp-microvolt = <875000 875000 1125000>; opp-microvolt = <875000 875000 1125000>;
}; };
opp@760000000_875_0_2 { opp@760000000,875,0,2 {
opp-microvolt = <875000 875000 1125000>; opp-microvolt = <875000 875000 1125000>;
}; };
opp@760000000_875_1_2 { opp@760000000,875,1,2 {
opp-microvolt = <875000 875000 1125000>; opp-microvolt = <875000 875000 1125000>;
}; };
opp@760000000_900 { opp@760000000,900 {
opp-microvolt = <900000 900000 1125000>; opp-microvolt = <900000 900000 1125000>;
}; };
opp@760000000_975 { opp@760000000,975 {
opp-microvolt = <975000 975000 1125000>; opp-microvolt = <975000 975000 1125000>;
}; };
opp@816000000_800 { opp@816000000,800 {
opp-microvolt = <800000 800000 1125000>; opp-microvolt = <800000 800000 1125000>;
}; };
opp@816000000_850 { opp@816000000,850 {
opp-microvolt = <850000 850000 1125000>; opp-microvolt = <850000 850000 1125000>;
}; };
opp@816000000_875 { opp@816000000,875 {
opp-microvolt = <875000 875000 1125000>; opp-microvolt = <875000 875000 1125000>;
}; };
opp@816000000_950 { opp@816000000,950 {
opp-microvolt = <950000 950000 1125000>; opp-microvolt = <950000 950000 1125000>;
}; };
opp@816000000_1000 { opp@816000000,1000 {
opp-microvolt = <1000000 1000000 1125000>; opp-microvolt = <1000000 1000000 1125000>;
}; };
opp@912000000_850 { opp@912000000,850 {
opp-microvolt = <850000 850000 1125000>; opp-microvolt = <850000 850000 1125000>;
}; };
opp@912000000_900 { opp@912000000,900 {
opp-microvolt = <900000 900000 1125000>; opp-microvolt = <900000 900000 1125000>;
}; };
opp@912000000_925 { opp@912000000,925 {
opp-microvolt = <925000 925000 1125000>; opp-microvolt = <925000 925000 1125000>;
}; };
opp@912000000_950 { opp@912000000,950 {
opp-microvolt = <950000 950000 1125000>; opp-microvolt = <950000 950000 1125000>;
}; };
opp@912000000_950_0_2 { opp@912000000,950,0,2 {
opp-microvolt = <950000 950000 1125000>; opp-microvolt = <950000 950000 1125000>;
}; };
opp@912000000_950_2_2 { opp@912000000,950,2,2 {
opp-microvolt = <950000 950000 1125000>; opp-microvolt = <950000 950000 1125000>;
}; };
opp@912000000_1000 { opp@912000000,1000 {
opp-microvolt = <1000000 1000000 1125000>; opp-microvolt = <1000000 1000000 1125000>;
}; };
opp@912000000_1050 { opp@912000000,1050 {
opp-microvolt = <1050000 1050000 1125000>; opp-microvolt = <1050000 1050000 1125000>;
}; };
opp@1000000000_875 { opp@1000000000,875 {
opp-microvolt = <875000 875000 1125000>; opp-microvolt = <875000 875000 1125000>;
}; };
opp@1000000000_900 { opp@1000000000,900 {
opp-microvolt = <900000 900000 1125000>; opp-microvolt = <900000 900000 1125000>;
}; };
opp@1000000000_950 { opp@1000000000,950 {
opp-microvolt = <950000 950000 1125000>; opp-microvolt = <950000 950000 1125000>;
}; };
opp@1000000000_975 { opp@1000000000,975 {
opp-microvolt = <975000 975000 1125000>; opp-microvolt = <975000 975000 1125000>;
}; };
opp@1000000000_1000 { opp@1000000000,1000 {
opp-microvolt = <1000000 1000000 1125000>; opp-microvolt = <1000000 1000000 1125000>;
}; };
opp@1000000000_1000_0_2 { opp@1000000000,1000,0,2 {
opp-microvolt = <1000000 1000000 1125000>; opp-microvolt = <1000000 1000000 1125000>;
}; };
opp@1000000000_1025 { opp@1000000000,1025 {
opp-microvolt = <1025000 1025000 1125000>; opp-microvolt = <1025000 1025000 1125000>;
}; };
opp@1000000000_1100 { opp@1000000000,1100 {
opp-microvolt = <1100000 1100000 1125000>; opp-microvolt = <1100000 1100000 1125000>;
}; };
opp@1200000000_1000 { opp@1200000000,1000 {
opp-microvolt = <1000000 1000000 1125000>; opp-microvolt = <1000000 1000000 1125000>;
}; };
opp@1200000000_1050 { opp@1200000000,1050 {
opp-microvolt = <1050000 1050000 1125000>; opp-microvolt = <1050000 1050000 1125000>;
}; };
opp@1200000000_1100 { opp@1200000000,1100 {
opp-microvolt = <1100000 1100000 1125000>; opp-microvolt = <1100000 1100000 1125000>;
}; };
opp@1200000000_1125 { opp@1200000000,1125 {
opp-microvolt = <1125000 1125000 1125000>; opp-microvolt = <1125000 1125000 1125000>;
}; };
}; };
......
arch/arm/boot/dts/tegra20-cpu-opp.dtsi
View file @ 3502e079
...@@ -5,295 +5,295 @@ cpu0_opp_table: cpu_opp_table0 { ...@@ -5,295 +5,295 @@ cpu0_opp_table: cpu_opp_table0 {
compatible = "operating-points-v2"; compatible = "operating-points-v2";
opp-shared; opp-shared;
opp@216000000_750 { opp@216000000,750 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x0F 0x0003>; opp-supported-hw = <0x0F 0x0003>;
opp-hz = /bits/ 64 <216000000>; opp-hz = /bits/ 64 <216000000>;
}; };
opp@216000000_800 { opp@216000000,800 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x0F 0x0004>; opp-supported-hw = <0x0F 0x0004>;
opp-hz = /bits/ 64 <216000000>; opp-hz = /bits/ 64 <216000000>;
}; };
opp@312000000_750 { opp@312000000,750 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x0F 0x0003>; opp-supported-hw = <0x0F 0x0003>;
opp-hz = /bits/ 64 <312000000>; opp-hz = /bits/ 64 <312000000>;
}; };
opp@312000000_800 { opp@312000000,800 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x0F 0x0004>; opp-supported-hw = <0x0F 0x0004>;
opp-hz = /bits/ 64 <312000000>; opp-hz = /bits/ 64 <312000000>;
}; };
opp@456000000_750 { opp@456000000,750 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x0C 0x0003>; opp-supported-hw = <0x0C 0x0003>;
opp-hz = /bits/ 64 <456000000>; opp-hz = /bits/ 64 <456000000>;
}; };
opp@456000000_800 { opp@456000000,800 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x03 0x0006>; opp-supported-hw = <0x03 0x0006>;
opp-hz = /bits/ 64 <456000000>; opp-hz = /bits/ 64 <456000000>;
}; };
opp@456000000_800_2_2 { opp@456000000,800,2,2 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x04 0x0004>; opp-supported-hw = <0x04 0x0004>;
opp-hz = /bits/ 64 <456000000>; opp-hz = /bits/ 64 <456000000>;
}; };
opp@456000000_800_3_2 { opp@456000000,800,3,2 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x08 0x0004>; opp-supported-hw = <0x08 0x0004>;
opp-hz = /bits/ 64 <456000000>; opp-hz = /bits/ 64 <456000000>;
}; };
opp@456000000_825 { opp@456000000,825 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x03 0x0001>; opp-supported-hw = <0x03 0x0001>;
opp-hz = /bits/ 64 <456000000>; opp-hz = /bits/ 64 <456000000>;
}; };
opp@608000000_750 { opp@608000000,750 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x08 0x0003>; opp-supported-hw = <0x08 0x0003>;
opp-hz = /bits/ 64 <608000000>; opp-hz = /bits/ 64 <608000000>;
}; };
opp@608000000_800 { opp@608000000,800 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x04 0x0006>; opp-supported-hw = <0x04 0x0006>;
opp-hz = /bits/ 64 <608000000>; opp-hz = /bits/ 64 <608000000>;
}; };
opp@608000000_800_3_2 { opp@608000000,800,3,2 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x08 0x0004>; opp-supported-hw = <0x08 0x0004>;
opp-hz = /bits/ 64 <608000000>; opp-hz = /bits/ 64 <608000000>;
}; };
opp@608000000_825 { opp@608000000,825 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x04 0x0001>; opp-supported-hw = <0x04 0x0001>;
opp-hz = /bits/ 64 <608000000>; opp-hz = /bits/ 64 <608000000>;
}; };
opp@608000000_850 { opp@608000000,850 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x03 0x0006>; opp-supported-hw = <0x03 0x0006>;
opp-hz = /bits/ 64 <608000000>; opp-hz = /bits/ 64 <608000000>;
}; };
opp@608000000_900 { opp@608000000,900 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x03 0x0001>; opp-supported-hw = <0x03 0x0001>;
opp-hz = /bits/ 64 <608000000>; opp-hz = /bits/ 64 <608000000>;
}; };
opp@760000000_775 { opp@760000000,775 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x08 0x0003>; opp-supported-hw = <0x08 0x0003>;
opp-hz = /bits/ 64 <760000000>; opp-hz = /bits/ 64 <760000000>;
}; };
opp@760000000_800 { opp@760000000,800 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x08 0x0004>; opp-supported-hw = <0x08 0x0004>;
opp-hz = /bits/ 64 <760000000>; opp-hz = /bits/ 64 <760000000>;
}; };
opp@760000000_850 { opp@760000000,850 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x04 0x0006>; opp-supported-hw = <0x04 0x0006>;
opp-hz = /bits/ 64 <760000000>; opp-hz = /bits/ 64 <760000000>;
}; };
opp@760000000_875 { opp@760000000,875 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x04 0x0001>; opp-supported-hw = <0x04 0x0001>;
opp-hz = /bits/ 64 <760000000>; opp-hz = /bits/ 64 <760000000>;
}; };
opp@760000000_875_1_1 { opp@760000000,875,1,1 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x02 0x0002>; opp-supported-hw = <0x02 0x0002>;
opp-hz = /bits/ 64 <760000000>; opp-hz = /bits/ 64 <760000000>;
}; };
opp@760000000_875_0_2 { opp@760000000,875,0,2 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x01 0x0004>; opp-supported-hw = <0x01 0x0004>;
opp-hz = /bits/ 64 <760000000>; opp-hz = /bits/ 64 <760000000>;
}; };
opp@760000000_875_1_2 { opp@760000000,875,1,2 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x02 0x0004>; opp-supported-hw = <0x02 0x0004>;
opp-hz = /bits/ 64 <760000000>; opp-hz = /bits/ 64 <760000000>;
}; };
opp@760000000_900 { opp@760000000,900 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x01 0x0002>; opp-supported-hw = <0x01 0x0002>;
opp-hz = /bits/ 64 <760000000>; opp-hz = /bits/ 64 <760000000>;
}; };
opp@760000000_975 { opp@760000000,975 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x03 0x0001>; opp-supported-hw = <0x03 0x0001>;
opp-hz = /bits/ 64 <760000000>; opp-hz = /bits/ 64 <760000000>;
}; };
opp@816000000_800 { opp@816000000,800 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x08 0x0007>; opp-supported-hw = <0x08 0x0007>;
opp-hz = /bits/ 64 <816000000>; opp-hz = /bits/ 64 <816000000>;
}; };
opp@816000000_850 { opp@816000000,850 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x04 0x0002>; opp-supported-hw = <0x04 0x0002>;
opp-hz = /bits/ 64 <816000000>; opp-hz = /bits/ 64 <816000000>;
}; };
opp@816000000_875 { opp@816000000,875 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x04 0x0005>; opp-supported-hw = <0x04 0x0005>;
opp-hz = /bits/ 64 <816000000>; opp-hz = /bits/ 64 <816000000>;
}; };
opp@816000000_950 { opp@816000000,950 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x03 0x0006>; opp-supported-hw = <0x03 0x0006>;
opp-hz = /bits/ 64 <816000000>; opp-hz = /bits/ 64 <816000000>;
}; };
opp@816000000_1000 { opp@816000000,1000 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x03 0x0001>; opp-supported-hw = <0x03 0x0001>;
opp-hz = /bits/ 64 <816000000>; opp-hz = /bits/ 64 <816000000>;
}; };
opp@912000000_850 { opp@912000000,850 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x08 0x0007>; opp-supported-hw = <0x08 0x0007>;
opp-hz = /bits/ 64 <912000000>; opp-hz = /bits/ 64 <912000000>;
}; };
opp@912000000_900 { opp@912000000,900 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x04 0x0002>; opp-supported-hw = <0x04 0x0002>;
opp-hz = /bits/ 64 <912000000>; opp-hz = /bits/ 64 <912000000>;
}; };
opp@912000000_925 { opp@912000000,925 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x04 0x0001>; opp-supported-hw = <0x04 0x0001>;
opp-hz = /bits/ 64 <912000000>; opp-hz = /bits/ 64 <912000000>;
}; };
opp@912000000_950 { opp@912000000,950 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x02 0x0006>; opp-supported-hw = <0x02 0x0006>;
opp-hz = /bits/ 64 <912000000>; opp-hz = /bits/ 64 <912000000>;
}; };
opp@912000000_950_0_2 { opp@912000000,950,0,2 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x01 0x0004>; opp-supported-hw = <0x01 0x0004>;
opp-hz = /bits/ 64 <912000000>; opp-hz = /bits/ 64 <912000000>;
}; };
opp@912000000_950_2_2 { opp@912000000,950,2,2 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x04 0x0004>; opp-supported-hw = <0x04 0x0004>;
opp-hz = /bits/ 64 <912000000>; opp-hz = /bits/ 64 <912000000>;
}; };
opp@912000000_1000 { opp@912000000,1000 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x01 0x0002>; opp-supported-hw = <0x01 0x0002>;
opp-hz = /bits/ 64 <912000000>; opp-hz = /bits/ 64 <912000000>;
}; };
opp@912000000_1050 { opp@912000000,1050 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x03 0x0001>; opp-supported-hw = <0x03 0x0001>;
opp-hz = /bits/ 64 <912000000>; opp-hz = /bits/ 64 <912000000>;
}; };
opp@1000000000_875 { opp@1000000000,875 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x08 0x0007>; opp-supported-hw = <0x08 0x0007>;
opp-hz = /bits/ 64 <1000000000>; opp-hz = /bits/ 64 <1000000000>;
}; };
opp@1000000000_900 { opp@1000000000,900 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x04 0x0002>; opp-supported-hw = <0x04 0x0002>;
opp-hz = /bits/ 64 <1000000000>; opp-hz = /bits/ 64 <1000000000>;
}; };
opp@1000000000_950 { opp@1000000000,950 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x04 0x0004>; opp-supported-hw = <0x04 0x0004>;
opp-hz = /bits/ 64 <1000000000>; opp-hz = /bits/ 64 <1000000000>;
}; };
opp@1000000000_975 { opp@1000000000,975 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x04 0x0001>; opp-supported-hw = <0x04 0x0001>;
opp-hz = /bits/ 64 <1000000000>; opp-hz = /bits/ 64 <1000000000>;
}; };
opp@1000000000_1000 { opp@1000000000,1000 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x02 0x0006>; opp-supported-hw = <0x02 0x0006>;
opp-hz = /bits/ 64 <1000000000>; opp-hz = /bits/ 64 <1000000000>;
}; };
opp@1000000000_1000_0_2 { opp@1000000000,1000,0,2 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x01 0x0004>; opp-supported-hw = <0x01 0x0004>;
opp-hz = /bits/ 64 <1000000000>; opp-hz = /bits/ 64 <1000000000>;
}; };
opp@1000000000_1025 { opp@1000000000,1025 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x01 0x0002>; opp-supported-hw = <0x01 0x0002>;
opp-hz = /bits/ 64 <1000000000>; opp-hz = /bits/ 64 <1000000000>;
}; };
opp@1000000000_1100 { opp@1000000000,1100 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x03 0x0001>; opp-supported-hw = <0x03 0x0001>;
opp-hz = /bits/ 64 <1000000000>; opp-hz = /bits/ 64 <1000000000>;
}; };
opp@1200000000_1000 { opp@1200000000,1000 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x08 0x0004>; opp-supported-hw = <0x08 0x0004>;
opp-hz = /bits/ 64 <1200000000>; opp-hz = /bits/ 64 <1200000000>;
}; };
opp@1200000000_1050 { opp@1200000000,1050 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x04 0x0004>; opp-supported-hw = <0x04 0x0004>;
opp-hz = /bits/ 64 <1200000000>; opp-hz = /bits/ 64 <1200000000>;
}; };
opp@1200000000_1100 { opp@1200000000,1100 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x02 0x0004>; opp-supported-hw = <0x02 0x0004>;
opp-hz = /bits/ 64 <1200000000>; opp-hz = /bits/ 64 <1200000000>;
}; };
opp@1200000000_1125 { opp@1200000000,1125 {
clock-latency-ns = <400000>; clock-latency-ns = <400000>;
opp-supported-hw = <0x01 0x0004>; opp-supported-hw = <0x01 0x0004>;
opp-hz = /bits/ 64 <1200000000>; opp-hz = /bits/ 64 <1200000000>;
......
arch/arm/boot/dts/tegra20-harmony.dts
View file @ 3502e079
...@@ -613,7 +613,7 @@ usb-phy@c5008000 { ...@@ -613,7 +613,7 @@ usb-phy@c5008000 {
status = "okay"; status = "okay";
}; };
sdhci@c8000200 { mmc@c8000200 {
status = "okay"; status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>; cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>; wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
...@@ -621,7 +621,7 @@ sdhci@c8000200 { ...@@ -621,7 +621,7 @@ sdhci@c8000200 {
bus-width = <4>; bus-width = <4>;
}; };
sdhci@c8000600 { mmc@c8000600 {
status = "okay"; status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>; cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>; wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
...@@ -640,17 +640,10 @@ backlight: backlight { ...@@ -640,17 +640,10 @@ backlight: backlight {
default-brightness-level = <6>; default-brightness-level = <6>;
}; };
clocks { clk32k_in: clock@0 {
compatible = "simple-bus"; compatible = "fixed-clock";
#address-cells = <1>; clock-frequency = <32768>;
#size-cells = <0>; #clock-cells = <0>;
clk32k_in: clock@0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-frequency = <32768>;
};
}; };
gpio-keys { gpio-keys {
...@@ -673,79 +666,66 @@ panel: panel { ...@@ -673,79 +666,66 @@ panel: panel {
backlight = <&backlight>; backlight = <&backlight>;
}; };
regulators { vdd_5v0_reg: regulator@0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "vdd_5v0";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
vdd_5v0_reg: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "vdd_5v0";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-always-on;
};
regulator@1 { regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "vdd_1v5";
regulator-name = "vdd_1v5"; regulator-min-microvolt = <1500000>;
regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
regulator-max-microvolt = <1500000>; gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
gpio = <&pmic 0 GPIO_ACTIVE_HIGH>; };
};
regulator@2 { regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "vdd_1v2";
regulator-name = "vdd_1v2"; regulator-min-microvolt = <1200000>;
regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>;
regulator-max-microvolt = <1200000>; gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
gpio = <&pmic 1 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; };
};
pci_vdd_reg: regulator@3 { pci_vdd_reg: regulator@3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "vdd_1v05";
regulator-name = "vdd_1v05"; regulator-min-microvolt = <1050000>;
regulator-min-microvolt = <1050000>; regulator-max-microvolt = <1050000>;
regulator-max-microvolt = <1050000>; gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
gpio = <&pmic 2 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; };
};
vdd_pnl_reg: regulator@4 { vdd_pnl_reg: regulator@4 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>; regulator-name = "vdd_pnl";
regulator-name = "vdd_pnl"; regulator-min-microvolt = <2800000>;
regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; };
};
vdd_bl_reg: regulator@5 { vdd_bl_reg: regulator@5 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <5>; regulator-name = "vdd_bl";
regulator-name = "vdd_bl"; regulator-min-microvolt = <2800000>;
regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; };
};
vdd_5v0_hdmi: regulator@6 { vdd_5v0_hdmi: regulator@6 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <6>; regulator-name = "VDDIO_HDMI";
regulator-name = "VDDIO_HDMI"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio TEGRA_GPIO(T, 2) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(T, 2) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_5v0_reg>;
vin-supply = <&vdd_5v0_reg>;
};
}; };
sound { sound {
......
arch/arm/boot/dts/tegra20-medcom-wide.dts
View file @ 3502e079
...@@ -59,7 +59,7 @@ backlight: backlight { ...@@ -59,7 +59,7 @@ backlight: backlight {
panel: panel { panel: panel {
compatible = "innolux,n156bge-l21"; compatible = "innolux,n156bge-l21";
power-supply = <&vdd_1v8_reg>, <&vdd_3v3_reg>; power-supply = <&vdd_1v8_reg>; // <&vdd_3v3_reg>;
enable-gpios = <&gpio TEGRA_GPIO(B, 2) GPIO_ACTIVE_HIGH>; enable-gpios = <&gpio TEGRA_GPIO(B, 2) GPIO_ACTIVE_HIGH>;
backlight = <&backlight>; backlight = <&backlight>;
...@@ -92,44 +92,38 @@ sound { ...@@ -92,44 +92,38 @@ sound {
clock-names = "pll_a", "pll_a_out0", "mclk"; clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
regulators { vcc_24v_reg: regulator@100 {
vcc_24v_reg: regulator@100 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "vcc_24v";
reg = <100>; regulator-min-microvolt = <24000000>;
regulator-name = "vcc_24v"; regulator-max-microvolt = <24000000>;
regulator-min-microvolt = <24000000>; regulator-always-on;
regulator-max-microvolt = <24000000>; };
regulator-always-on;
};
vdd_5v0_reg: regulator@101 { vdd_5v0_reg: regulator@101 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <101>; regulator-name = "vdd_5v0";
regulator-name = "vdd_5v0"; vin-supply = <&vcc_24v_reg>;
vin-supply = <&vcc_24v_reg>; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-always-on;
regulator-always-on; };
};
vdd_3v3_reg: regulator@102 { vdd_3v3_reg: regulator@102 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <102>; regulator-name = "vdd_3v3";
regulator-name = "vdd_3v3"; vin-supply = <&vcc_24v_reg>;
vin-supply = <&vcc_24v_reg>; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-always-on;
regulator-always-on; };
};
vdd_1v8_reg: regulator@103 { vdd_1v8_reg: regulator@103 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <103>; regulator-name = "vdd_1v8";
regulator-name = "vdd_1v8"; vin-supply = <&vdd_3v3_reg>;
vin-supply = <&vdd_3v3_reg>; regulator-min-microvolt = <1800000>;
regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-always-on;
regulator-always-on;
};
}; };
}; };
arch/arm/boot/dts/tegra20-paz00.dts
View file @ 3502e079
...@@ -314,7 +314,7 @@ nvec@7000c500 { ...@@ -314,7 +314,7 @@ nvec@7000c500 {
memory-controller@7000f400 { memory-controller@7000f400 {
nvidia,use-ram-code; nvidia,use-ram-code;
emc-tables@hynix { emc-tables@0 {
nvidia,ram-code = <0x0>; nvidia,ram-code = <0x0>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -543,7 +543,7 @@ usb-phy@c5008000 { ...@@ -543,7 +543,7 @@ usb-phy@c5008000 {
status = "okay"; status = "okay";
}; };
sdhci@c8000000 { mmc@c8000000 {
status = "okay"; status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_LOW>; cd-gpios = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>; wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
...@@ -551,7 +551,7 @@ sdhci@c8000000 { ...@@ -551,7 +551,7 @@ sdhci@c8000000 {
bus-width = <4>; bus-width = <4>;
}; };
sdhci@c8000600 { mmc@c8000600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
...@@ -569,17 +569,10 @@ backlight: backlight { ...@@ -569,17 +569,10 @@ backlight: backlight {
backlight-boot-off; backlight-boot-off;
}; };
clocks { clk32k_in: clock@0 {
compatible = "simple-bus"; compatible = "fixed-clock";
#address-cells = <1>; clock-frequency = <32768>;
#size-cells = <0>; #clock-cells = <0>;
clk32k_in: clock@0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-frequency = <32768>;
};
}; };
gpio-keys { gpio-keys {
...@@ -596,7 +589,7 @@ wakeup { ...@@ -596,7 +589,7 @@ wakeup {
gpio-leds { gpio-leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
wifi { led-0 {
label = "wifi-led"; label = "wifi-led";
gpios = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>; gpios = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
linux,default-trigger = "rfkill0"; linux,default-trigger = "rfkill0";
...@@ -613,30 +606,22 @@ panel: panel { ...@@ -613,30 +606,22 @@ panel: panel {
backlight = <&backlight>; backlight = <&backlight>;
}; };
regulators { p5valw_reg: regulator@0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "+5valw";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
p5valw_reg: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "+5valw";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-always-on;
};
vdd_pnl_reg: regulator@1 { vdd_pnl_reg: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "+3VS,vdd_pnl";
regulator-name = "+3VS,vdd_pnl"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-boot-on;
regulator-boot-on; gpio = <&gpio TEGRA_GPIO(A, 4) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(A, 4) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high;
};
}; };
sound { sound {
......
arch/arm/boot/dts/tegra20-plutux.dts
View file @ 3502e079
...@@ -60,44 +60,38 @@ sound { ...@@ -60,44 +60,38 @@ sound {
clock-names = "pll_a", "pll_a_out0", "mclk"; clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
regulators { vcc_24v_reg: regulator@100 {
vcc_24v_reg: regulator@100 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "vcc_24v";
reg = <100>; regulator-min-microvolt = <24000000>;
regulator-name = "vcc_24v"; regulator-max-microvolt = <24000000>;
regulator-min-microvolt = <24000000>; regulator-always-on;
regulator-max-microvolt = <24000000>; };
regulator-always-on;
};
vdd_5v0_reg: regulator@101 { vdd_5v0_reg: regulator@101 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <101>; regulator-name = "vdd_5v0";
regulator-name = "vdd_5v0"; vin-supply = <&vcc_24v_reg>;
vin-supply = <&vcc_24v_reg>; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-always-on;
regulator-always-on; };
};
vdd_3v3_reg: regulator@102 { vdd_3v3_reg: regulator@102 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <102>; regulator-name = "vdd_3v3";
regulator-name = "vdd_3v3"; vin-supply = <&vcc_24v_reg>;
vin-supply = <&vcc_24v_reg>; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-always-on;
regulator-always-on; };
};
vdd_1v8_reg: regulator@103 { vdd_1v8_reg: regulator@103 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <103>; regulator-name = "vdd_1v8";
regulator-name = "vdd_1v8"; vin-supply = <&vdd_3v3_reg>;
vin-supply = <&vdd_3v3_reg>; regulator-min-microvolt = <1800000>;
regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-always-on;
regulator-always-on;
};
}; };
}; };
arch/arm/boot/dts/tegra20-seaboard.dts
View file @ 3502e079
...@@ -394,10 +394,10 @@ lvds_ddc: i2c@1 { ...@@ -394,10 +394,10 @@ lvds_ddc: i2c@1 {
#size-cells = <0>; #size-cells = <0>;
smart-battery@b { smart-battery@b {
compatible = "ti,bq20z75", "smart-battery-1.1"; compatible = "ti,bq20z75", "sbs,sbs-battery";
reg = <0xb>; reg = <0xb>;
ti,i2c-retry-count = <2>; sbs,i2c-retry-count = <2>;
ti,poll-retry-count = <10>; sbs,poll-retry-count = <10>;
}; };
}; };
}; };
...@@ -760,14 +760,14 @@ usb-phy@c5008000 { ...@@ -760,14 +760,14 @@ usb-phy@c5008000 {
status = "okay"; status = "okay";
}; };
sdhci@c8000000 { mmc@c8000000 {
status = "okay"; status = "okay";
power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>; power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
bus-width = <4>; bus-width = <4>;
keep-power-in-suspend; keep-power-in-suspend;
}; };
sdhci@c8000400 { mmc@c8000400 {
status = "okay"; status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>; cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>; wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
...@@ -775,7 +775,7 @@ sdhci@c8000400 { ...@@ -775,7 +775,7 @@ sdhci@c8000400 {
bus-width = <4>; bus-width = <4>;
}; };
sdhci@c8000600 { mmc@c8000600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
...@@ -792,17 +792,10 @@ backlight: backlight { ...@@ -792,17 +792,10 @@ backlight: backlight {
default-brightness-level = <6>; default-brightness-level = <6>;
}; };
clocks { clk32k_in: clock@0 {
compatible = "simple-bus"; compatible = "fixed-clock";
#address-cells = <1>; clock-frequency = <32768>;
#size-cells = <0>; #clock-cells = <0>;
clk32k_in: clock@0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-frequency = <32768>;
};
}; };
gpio-keys { gpio-keys {
...@@ -835,81 +828,68 @@ panel: panel { ...@@ -835,81 +828,68 @@ panel: panel {
ddc-i2c-bus = <&lvds_ddc>; ddc-i2c-bus = <&lvds_ddc>;
}; };
regulators { vdd_5v0_reg: regulator@0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "vdd_5v0";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
vdd_5v0_reg: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "vdd_5v0";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-always-on;
};
regulator@1 { regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "vdd_1v5";
regulator-name = "vdd_1v5"; regulator-min-microvolt = <1500000>;
regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
regulator-max-microvolt = <1500000>; gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
gpio = <&pmic 0 GPIO_ACTIVE_HIGH>; };
};
regulator@2 { regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "vdd_1v2";
regulator-name = "vdd_1v2"; regulator-min-microvolt = <1200000>;
regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>;
regulator-max-microvolt = <1200000>; gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
gpio = <&pmic 1 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; };
};
vbus_reg: regulator@3 { vbus_reg: regulator@3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "vdd_vbus_wup1";
regulator-name = "vdd_vbus_wup1"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; enable-active-high;
enable-active-high; gpio = <&gpio TEGRA_GPIO(D, 0) 0>;
gpio = <&gpio TEGRA_GPIO(D, 0) 0>; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; };
};
vdd_pnl_reg: regulator@4 { vdd_pnl_reg: regulator@4 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>; regulator-name = "vdd_pnl";
regulator-name = "vdd_pnl"; regulator-min-microvolt = <2800000>;
regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; };
};
vdd_bl_reg: regulator@5 { vdd_bl_reg: regulator@5 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <5>; regulator-name = "vdd_bl";
regulator-name = "vdd_bl"; regulator-min-microvolt = <2800000>;
regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; };
};
vdd_hdmi: regulator@6 { vdd_hdmi: regulator@6 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <6>; regulator-name = "VDDIO_HDMI";
regulator-name = "VDDIO_HDMI"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; vin-supply = <&vdd_5v0_reg>;
vin-supply = <&vdd_5v0_reg>;
};
}; };
sound { sound {
......
arch/arm/boot/dts/tegra20-tamonten.dtsi
View file @ 3502e079
...@@ -495,40 +495,25 @@ usb-phy@c5008000 { ...@@ -495,40 +495,25 @@ usb-phy@c5008000 {
status = "okay"; status = "okay";
}; };
sdhci@c8000600 { mmc@c8000600 {
cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>; cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>; wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
bus-width = <4>; bus-width = <4>;
status = "okay"; status = "okay";
}; };
clocks { clk32k_in: clock@0 {
compatible = "simple-bus"; compatible = "fixed-clock";
#address-cells = <1>; clock-frequency = <32768>;
#size-cells = <0>; #clock-cells = <0>;
clk32k_in: clock@0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-frequency = <32768>;
};
}; };
regulators { pci_vdd_reg: regulator@1 {
compatible = "simple-bus"; compatible = "regulator-fixed";
regulator-name = "vdd_1v05";
#address-cells = <1>; regulator-min-microvolt = <1050000>;
#size-cells = <0>; regulator-max-microvolt = <1050000>;
gpio = <&pmic 2 0>;
pci_vdd_reg: regulator@1 { enable-active-high;
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "vdd_1v05";
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
gpio = <&pmic 2 0>;
enable-active-high;
};
}; };
}; };
arch/arm/boot/dts/tegra20-tec.dts
View file @ 3502e079
...@@ -69,44 +69,38 @@ sound { ...@@ -69,44 +69,38 @@ sound {
clock-names = "pll_a", "pll_a_out0", "mclk"; clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
regulators { vcc_24v_reg: regulator@100 {
vcc_24v_reg: regulator@100 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "vcc_24v";
reg = <100>; regulator-min-microvolt = <24000000>;
regulator-name = "vcc_24v"; regulator-max-microvolt = <24000000>;
regulator-min-microvolt = <24000000>; regulator-always-on;
regulator-max-microvolt = <24000000>; };
regulator-always-on;
};
vdd_5v0_reg: regulator@101 { vdd_5v0_reg: regulator@101 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <101>; regulator-name = "vdd_5v0";
regulator-name = "vdd_5v0"; vin-supply = <&vcc_24v_reg>;
vin-supply = <&vcc_24v_reg>; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-always-on;
regulator-always-on; };
};
vdd_3v3_reg: regulator@102 { vdd_3v3_reg: regulator@102 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <102>; regulator-name = "vdd_3v3";
regulator-name = "vdd_3v3"; vin-supply = <&vcc_24v_reg>;
vin-supply = <&vcc_24v_reg>; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-always-on;
regulator-always-on; };
};
vdd_1v8_reg: regulator@103 { vdd_1v8_reg: regulator@103 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <103>; regulator-name = "vdd_1v8";
regulator-name = "vdd_1v8"; vin-supply = <&vdd_3v3_reg>;
vin-supply = <&vdd_3v3_reg>; regulator-min-microvolt = <1800000>;
regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-always-on;
regulator-always-on;
};
}; };
}; };
arch/arm/boot/dts/tegra20-trimslice.dts
View file @ 3502e079
...@@ -366,30 +366,23 @@ usb-phy@c5008000 { ...@@ -366,30 +366,23 @@ usb-phy@c5008000 {
status = "okay"; status = "okay";
}; };
sdhci@c8000000 { mmc@c8000000 {
status = "okay"; status = "okay";
broken-cd; broken-cd;
bus-width = <4>; bus-width = <4>;
}; };
sdhci@c8000600 { mmc@c8000600 {
status = "okay"; status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(P, 1) GPIO_ACTIVE_LOW>; cd-gpios = <&gpio TEGRA_GPIO(P, 1) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>; wp-gpios = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
bus-width = <4>; bus-width = <4>;
}; };
clocks { clk32k_in: clock@0 {
compatible = "simple-bus"; compatible = "fixed-clock";
#address-cells = <1>; clock-frequency = <32768>;
#size-cells = <0>; #clock-cells = <0>;
clk32k_in: clock@0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-frequency = <32768>;
};
}; };
gpio-keys { gpio-keys {
...@@ -408,58 +401,47 @@ poweroff { ...@@ -408,58 +401,47 @@ poweroff {
gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>; gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>;
}; };
regulators { hdmi_vdd_reg: regulator@0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "avdd_hdmi";
#size-cells = <0>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
hdmi_vdd_reg: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "avdd_hdmi";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
hdmi_pll_reg: regulator@1 { hdmi_pll_reg: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "avdd_hdmi_pll";
regulator-name = "avdd_hdmi_pll"; regulator-min-microvolt = <1800000>;
regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-always-on;
regulator-always-on; };
};
vbus_reg: regulator@2 { vbus_reg: regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "usb1_vbus";
regulator-name = "usb1_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; enable-active-high;
enable-active-high; gpio = <&gpio TEGRA_GPIO(V, 2) 0>;
gpio = <&gpio TEGRA_GPIO(V, 2) 0>; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; };
};
pci_clk_reg: regulator@3 { pci_clk_reg: regulator@3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "pci_clk";
regulator-name = "pci_clk"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-always-on;
regulator-always-on; };
};
pci_vdd_reg: regulator@4 { pci_vdd_reg: regulator@4 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>; regulator-name = "pci_vdd";
regulator-name = "pci_vdd"; regulator-min-microvolt = <1050000>;
regulator-min-microvolt = <1050000>; regulator-max-microvolt = <1050000>;
regulator-max-microvolt = <1050000>; regulator-always-on;
regulator-always-on;
};
}; };
sound { sound {
......
arch/arm/boot/dts/tegra20-ventana.dts
View file @ 3502e079
...@@ -554,14 +554,14 @@ usb-phy@c5008000 { ...@@ -554,14 +554,14 @@ usb-phy@c5008000 {
status = "okay"; status = "okay";
}; };
sdhci@c8000000 { mmc@c8000000 {
status = "okay"; status = "okay";
power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>; power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
bus-width = <4>; bus-width = <4>;
keep-power-in-suspend; keep-power-in-suspend;
}; };
sdhci@c8000400 { mmc@c8000400 {
status = "okay"; status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>; cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>; wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
...@@ -569,7 +569,7 @@ sdhci@c8000400 { ...@@ -569,7 +569,7 @@ sdhci@c8000400 {
bus-width = <4>; bus-width = <4>;
}; };
sdhci@c8000600 { mmc@c8000600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
...@@ -586,17 +586,10 @@ backlight: backlight { ...@@ -586,17 +586,10 @@ backlight: backlight {
default-brightness-level = <6>; default-brightness-level = <6>;
}; };
clocks { clk32k_in: clock@0 {
compatible = "simple-bus"; compatible = "fixed-clock";
#address-cells = <1>; clock-frequency = <32768>;
#size-cells = <0>; #clock-cells = <0>;
clk32k_in: clock@0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-frequency = <32768>;
};
}; };
gpio-keys { gpio-keys {
...@@ -620,58 +613,47 @@ panel: panel { ...@@ -620,58 +613,47 @@ panel: panel {
ddc-i2c-bus = <&lvds_ddc>; ddc-i2c-bus = <&lvds_ddc>;
}; };
regulators { vdd_5v0_reg: regulator@0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "vdd_5v0";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
vdd_5v0_reg: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "vdd_5v0";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-always-on;
};
regulator@1 { regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "vdd_1v5";
regulator-name = "vdd_1v5"; regulator-min-microvolt = <1500000>;
regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
regulator-max-microvolt = <1500000>; gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
gpio = <&pmic 0 GPIO_ACTIVE_HIGH>; };
};
regulator@2 { regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "vdd_1v2";
regulator-name = "vdd_1v2"; regulator-min-microvolt = <1200000>;
regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>;
regulator-max-microvolt = <1200000>; gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
gpio = <&pmic 1 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; };
};
vdd_pnl_reg: regulator@3 { vdd_pnl_reg: regulator@3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "vdd_pnl";
regulator-name = "vdd_pnl"; regulator-min-microvolt = <2800000>;
regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; };
};
vdd_bl_reg: regulator@4 { vdd_bl_reg: regulator@4 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>; regulator-name = "vdd_bl";
regulator-name = "vdd_bl"; regulator-min-microvolt = <2800000>;
regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high;
};
}; };
sound { sound {
......
arch/arm/boot/dts/tegra20.dtsi
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra30-apalis-eval.dts
View file @ 3502e079
...@@ -120,7 +120,7 @@ spi@7000dc00 { ...@@ -120,7 +120,7 @@ spi@7000dc00 {
}; };
/* Apalis SD1 */ /* Apalis SD1 */
sdhci@78000000 { mmc@78000000 {
status = "okay"; status = "okay";
bus-width = <4>; bus-width = <4>;
/* SD1_CD# */ /* SD1_CD# */
...@@ -129,7 +129,7 @@ sdhci@78000000 { ...@@ -129,7 +129,7 @@ sdhci@78000000 {
}; };
/* Apalis MMC1 */ /* Apalis MMC1 */
sdhci@78000400 { mmc@78000400 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
/* MMC1_CD# */ /* MMC1_CD# */
......
arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts
View file @ 3502e079
...@@ -121,7 +121,7 @@ spi@7000dc00 { ...@@ -121,7 +121,7 @@ spi@7000dc00 {
}; };
/* Apalis SD1 */ /* Apalis SD1 */
sdhci@78000000 { mmc@78000000 {
status = "okay"; status = "okay";
bus-width = <4>; bus-width = <4>;
/* SD1_CD# */ /* SD1_CD# */
...@@ -130,7 +130,7 @@ sdhci@78000000 { ...@@ -130,7 +130,7 @@ sdhci@78000000 {
}; };
/* Apalis MMC1 */ /* Apalis MMC1 */
sdhci@78000400 { mmc@78000400 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
/* MMC1_CD# */ /* MMC1_CD# */
...@@ -248,8 +248,8 @@ reg_vddio_sdmmc3: regulator-vddio-sdmmc3 { ...@@ -248,8 +248,8 @@ reg_vddio_sdmmc3: regulator-vddio-sdmmc3 {
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-type = "voltage"; regulator-type = "voltage";
gpios = <&gpio TEGRA_GPIO(J, 5) GPIO_ACTIVE_HIGH>; gpios = <&gpio TEGRA_GPIO(J, 5) GPIO_ACTIVE_HIGH>;
states = <1800000 0x0 states = <1800000 0x0>,
3300000 0x1>; <3300000 0x1>;
startup-delay-us = <100000>; startup-delay-us = <100000>;
vin-supply = <&vddio_sdmmc_1v8_reg>; vin-supply = <&vddio_sdmmc_1v8_reg>;
}; };
......
arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi
View file @ 3502e079
...@@ -37,7 +37,7 @@ pci@3,0 { ...@@ -37,7 +37,7 @@ pci@3,0 {
status = "okay"; status = "okay";
nvidia,num-lanes = <1>; nvidia,num-lanes = <1>;
pcie@0 { ethernet@0,0 {
reg = <0 0 0 0 0>; reg = <0 0 0 0 0>;
local-mac-address = [00 00 00 00 00 00]; local-mac-address = [00 00 00 00 00 00];
}; };
...@@ -855,6 +855,7 @@ i2c@7000d000 { ...@@ -855,6 +855,7 @@ i2c@7000d000 {
sgtl5000: codec@a { sgtl5000: codec@a {
compatible = "fsl,sgtl5000"; compatible = "fsl,sgtl5000";
reg = <0x0a>; reg = <0x0a>;
#sound-dai-cells = <0>;
VDDA-supply = <&reg_module_3v3_audio>; VDDA-supply = <&reg_module_3v3_audio>;
VDDD-supply = <&reg_1v8_vio>; VDDD-supply = <&reg_1v8_vio>;
VDDIO-supply = <&reg_module_3v3>; VDDIO-supply = <&reg_module_3v3>;
...@@ -1112,7 +1113,7 @@ i2s@70080500 { ...@@ -1112,7 +1113,7 @@ i2s@70080500 {
}; };
/* eMMC */ /* eMMC */
sdhci@78000600 { mmc@78000600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
......
arch/arm/boot/dts/tegra30-apalis.dtsi
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra30-asus-nexus7-grouper-E1565.dts 0 → 100644
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra30-asus-nexus7-grouper-PM269.dts 0 → 100644
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi 0 → 100644
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra30-asus-nexus7-grouper-maxim-pmic.dtsi 0 → 100644
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra30-asus-nexus7-grouper-ti-pmic.dtsi 0 → 100644
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra30-asus-nexus7-grouper.dtsi 0 → 100644
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra30-asus-nexus7-tilapia-E1565.dts 0 → 100644
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra30-asus-nexus7-tilapia.dtsi 0 → 100644
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra30-beaver.dts
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra30-cardhu-a02.dts
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra30-cardhu-a04.dts
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra30-cardhu.dtsi
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra30-colibri.dtsi
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra30-cpu-opp.dtsi
View file @ 3502e079
This diff is collapsed.
arch/arm/boot/dts/tegra30.dtsi
View file @ 3502e079
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7