Commit a258e3f8 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'tegra-for-4.2-dt' of...

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

Merge "ARM: tegra: Devicetree changes for v4.2-rc1" from Thierry Reding:

Contains a couple of fixes and additions to device tree files. The most
notable change is a fix for a misapplied patch that was only exposed by
a recent change in the regulator subsystem that caused USB to break on
Tegra124 recently.

Other than that there are a more or less random assortment of additions
to enable various features on a couple of boards.

* tag 'tegra-for-4.2-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Fix hda2codec_2x clock and reset names
  ARM: tegra: Add Tegra30 HDA support
  ARM: tegra: Cardhu device-tree comment spelling fix
  ARM: tegra: venice2: Set min-/max-microvolt for VDD_LED supply
  ARM: tegra: venice2: Mark eMMC as non-removable
  ARM: tegra: jetson-tk1: Enable HDA support
  ARM: tegra: Add missing HDMI +5V regulator
  ARM: tegra: cardhu: Add power and volume keys
  ARM: tegra: Correct which USB controller has the UTMI pad registers
parents 2cac46a4 869bd180
...@@ -1647,6 +1647,10 @@ sata@0,70020000 { ...@@ -1647,6 +1647,10 @@ sata@0,70020000 {
target-12v-supply = <&vdd_12v0_sata>; target-12v-supply = <&vdd_12v0_sata>;
}; };
hda@0,70030000 {
status = "okay";
};
padctl@0,7009f000 { padctl@0,7009f000 {
pinctrl-0 = <&padctl_default>; pinctrl-0 = <&padctl_default>;
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -899,6 +899,7 @@ sdhci@0,700b0400 { ...@@ -899,6 +899,7 @@ sdhci@0,700b0400 {
sdhci@0,700b0600 { sdhci@0,700b0600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
non-removable;
}; };
ahub@0,70300000 { ahub@0,70300000 {
...@@ -1040,6 +1041,8 @@ vdd_led: regulator@5 { ...@@ -1040,6 +1041,8 @@ vdd_led: regulator@5 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <5>; reg = <5>;
regulator-name = "+VDD_LED"; regulator-name = "+VDD_LED";
regulator-min-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>;
......
...@@ -633,11 +633,11 @@ hda@0,70030000 { ...@@ -633,11 +633,11 @@ hda@0,70030000 {
clocks = <&tegra_car TEGRA124_CLK_HDA>, clocks = <&tegra_car TEGRA124_CLK_HDA>,
<&tegra_car TEGRA124_CLK_HDA2HDMI>, <&tegra_car TEGRA124_CLK_HDA2HDMI>,
<&tegra_car TEGRA124_CLK_HDA2CODEC_2X>; <&tegra_car TEGRA124_CLK_HDA2CODEC_2X>;
clock-names = "hda", "hda2hdmi", "hdacodec_2x"; clock-names = "hda", "hda2hdmi", "hda2codec_2x";
resets = <&tegra_car 125>, /* hda */ resets = <&tegra_car 125>, /* hda */
<&tegra_car 128>, /* hda2hdmi */ <&tegra_car 128>, /* hda2hdmi */
<&tegra_car 111>; /* hda2codec_2x */ <&tegra_car 111>; /* hda2codec_2x */
reset-names = "hda", "hda2hdmi", "hdacodec_2x"; reset-names = "hda", "hda2hdmi", "hda2codec_2x";
status = "disabled"; status = "disabled";
}; };
...@@ -826,7 +826,7 @@ phy1: usb-phy@0,7d000000 { ...@@ -826,7 +826,7 @@ phy1: usb-phy@0,7d000000 {
<&tegra_car TEGRA124_CLK_PLL_U>, <&tegra_car TEGRA124_CLK_PLL_U>,
<&tegra_car TEGRA124_CLK_USBD>; <&tegra_car TEGRA124_CLK_USBD>;
clock-names = "reg", "pll_u", "utmi-pads"; clock-names = "reg", "pll_u", "utmi-pads";
resets = <&tegra_car 59>, <&tegra_car 22>; resets = <&tegra_car 22>, <&tegra_car 22>;
reset-names = "usb", "utmi-pads"; reset-names = "usb", "utmi-pads";
nvidia,hssync-start-delay = <0>; nvidia,hssync-start-delay = <0>;
nvidia,idle-wait-delay = <17>; nvidia,idle-wait-delay = <17>;
...@@ -838,6 +838,7 @@ phy1: usb-phy@0,7d000000 { ...@@ -838,6 +838,7 @@ phy1: usb-phy@0,7d000000 {
nvidia,hssquelch-level = <2>; nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>; nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>; nvidia,xcvr-hsslew = <12>;
nvidia,has-utmi-pad-registers;
status = "disabled"; status = "disabled";
}; };
...@@ -862,7 +863,7 @@ phy2: usb-phy@0,7d004000 { ...@@ -862,7 +863,7 @@ phy2: usb-phy@0,7d004000 {
<&tegra_car TEGRA124_CLK_PLL_U>, <&tegra_car TEGRA124_CLK_PLL_U>,
<&tegra_car TEGRA124_CLK_USBD>; <&tegra_car TEGRA124_CLK_USBD>;
clock-names = "reg", "pll_u", "utmi-pads"; clock-names = "reg", "pll_u", "utmi-pads";
resets = <&tegra_car 22>, <&tegra_car 22>; resets = <&tegra_car 58>, <&tegra_car 22>;
reset-names = "usb", "utmi-pads"; reset-names = "usb", "utmi-pads";
nvidia,hssync-start-delay = <0>; nvidia,hssync-start-delay = <0>;
nvidia,idle-wait-delay = <17>; nvidia,idle-wait-delay = <17>;
...@@ -874,7 +875,6 @@ phy2: usb-phy@0,7d004000 { ...@@ -874,7 +875,6 @@ phy2: usb-phy@0,7d004000 {
nvidia,hssquelch-level = <2>; nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>; nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>; nvidia,xcvr-hsslew = <12>;
nvidia,has-utmi-pad-registers;
status = "disabled"; status = "disabled";
}; };
...@@ -899,7 +899,7 @@ phy3: usb-phy@0,7d008000 { ...@@ -899,7 +899,7 @@ phy3: usb-phy@0,7d008000 {
<&tegra_car TEGRA124_CLK_PLL_U>, <&tegra_car TEGRA124_CLK_PLL_U>,
<&tegra_car TEGRA124_CLK_USBD>; <&tegra_car TEGRA124_CLK_USBD>;
clock-names = "reg", "pll_u", "utmi-pads"; clock-names = "reg", "pll_u", "utmi-pads";
resets = <&tegra_car 58>, <&tegra_car 22>; resets = <&tegra_car 59>, <&tegra_car 22>;
reset-names = "usb", "utmi-pads"; reset-names = "usb", "utmi-pads";
nvidia,hssync-start-delay = <0>; nvidia,hssync-start-delay = <0>;
nvidia,idle-wait-delay = <17>; nvidia,idle-wait-delay = <17>;
......
...@@ -31,6 +31,7 @@ hdmi@54280000 { ...@@ -31,6 +31,7 @@ hdmi@54280000 {
vdd-supply = <&hdmi_vdd_reg>; vdd-supply = <&hdmi_vdd_reg>;
pll-supply = <&hdmi_pll_reg>; pll-supply = <&hdmi_pll_reg>;
hdmi-supply = <&vdd_hdmi>;
nvidia,ddc-i2c-bus = <&hdmi_ddc>; nvidia,ddc-i2c-bus = <&hdmi_ddc>;
nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7) nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
...@@ -893,6 +894,17 @@ vdd_bl_reg: regulator@5 { ...@@ -893,6 +894,17 @@ vdd_bl_reg: regulator@5 {
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 {
compatible = "regulator-fixed";
reg = <6>;
regulator-name = "VDDIO_HDMI";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_HIGH>;
enable-active-high;
vin-supply = <&vdd_5v0_reg>;
};
}; };
sound { sound {
......
#include <dt-bindings/input/input.h>
#include "tegra30.dtsi" #include "tegra30.dtsi"
/** /**
...@@ -12,7 +13,7 @@ ...@@ -12,7 +13,7 @@
* tegra30-cardhu-a04.dts. * tegra30-cardhu-a04.dts.
* The identification of board is done in two ways, by looking the sticker * The identification of board is done in two ways, by looking the sticker
* on PCB and by reading board id eeprom. * on PCB and by reading board id eeprom.
* The stciker will have number like 600-81291-1000-002 C.3. In this 4th * The sticker will have number like 600-81291-1000-002 C.3. In this 4th
* number is the fab version like here it is 002 and hence fab version A02. * number is the fab version like here it is 002 and hence fab version A02.
* The (downstream internal) U-Boot of Cardhu display the board-id as * The (downstream internal) U-Boot of Cardhu display the board-id as
* follows: * follows:
...@@ -615,4 +616,31 @@ sound { ...@@ -615,4 +616,31 @@ sound {
<&tegra_car TEGRA30_CLK_EXTERN1>; <&tegra_car TEGRA30_CLK_EXTERN1>;
clock-names = "pll_a", "pll_a_out0", "mclk"; clock-names = "pll_a", "pll_a_out0", "mclk";
}; };
gpio-keys {
compatible = "gpio-keys";
power {
label = "Power";
interrupt-parent = <&pmic>;
interrupts = <2 0>;
linux,code = <KEY_POWER>;
debounce-interval = <100>;
gpio-key,wakeup;
};
volume-down {
label = "Volume Down";
gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
debounce-interval = <10>;
};
volume-up {
label = "Volume Up";
gpios = <&gpio TEGRA_GPIO(R, 1) GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
debounce-interval = <10>;
};
};
}; };
...@@ -654,6 +654,21 @@ fuse@7000f800 { ...@@ -654,6 +654,21 @@ fuse@7000f800 {
reset-names = "fuse"; reset-names = "fuse";
}; };
hda@70030000 {
compatible = "nvidia,tegra30-hda";
reg = <0x70030000 0x10000>;
interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA30_CLK_HDA>,
<&tegra_car TEGRA30_CLK_HDA2HDMI>,
<&tegra_car TEGRA30_CLK_HDA2CODEC_2X>;
clock-names = "hda", "hda2hdmi", "hda2codec_2x";
resets = <&tegra_car 125>, /* hda */
<&tegra_car 128>, /* hda2hdmi */
<&tegra_car 111>; /* hda2codec_2x */
reset-names = "hda", "hda2hdmi", "hda2codec_2x";
status = "disabled";
};
ahub@70080000 { ahub@70080000 {
compatible = "nvidia,tegra30-ahub"; compatible = "nvidia,tegra30-ahub";
reg = <0x70080000 0x200 reg = <0x70080000 0x200
......
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