mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-24 13:20:23 +07:00
ARM: tegra: Device tree changes for v5.7-rc1
Minor fixes and additions for 32-bit Tegra SoC device trees. -----BEGIN PGP SIGNATURE----- iQJHBAABCAAxFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAl5rtt4THHRyZWRpbmdA bnZpZGlhLmNvbQAKCRDdI6zXfz6zoXD9EAC6NlnVT2PyJloBd41Rw1TlvgSVV7s5 g2DrliQqL6kIi7EvcaV5e+pyT/AR0012qSIOKFgYceO3r8pEdv1BMbxujsLkTTTv mlut8ZZhKajs2yY0Zm9B4SL6rWXIL6GvO2LA7xwPUzSWG+zJIuupiH2jB9nKE0eo E9k9woYqhHQrOEq/lWn9c235Y/p/gO9XZKJWHJcXNjeabxkcXG5z/JMO9D3TRf2k lB9+fH9U9zfXsWCFsrGloXQfRmjcbU0pNus0f7NL0Xf+GnYxogXywreSnYteJGK/ FCtEdyu5Jy03UhUycZlvAT5vsp5gWHwkyqUKoGId515a9lRVuOfpzEhQdQ4ql4z8 eWxN+5hvuX+XXJtBbk5Fal9gZ0+p2kxOSEB1Y8Bb9mGo46ClSzzjTAKTI2VXFkP8 cn9Slgpa4uQHvkUEBnZjPXIb73kZ1sfFQTUUdWOZLG9wHym6Ag2nLtkn6TPkb6X0 kg5fmVV+HbDJagzV5oFDS4fp1KwY6zvBaifAaTTp4cLUSXOeY9IAFQrC1tXM/B8g Hdicfp/hsOiWNMYRsMEl18C0OqrBT60FgKE5GgIk/rYDW2XHCoWIk1paCSX8Tj2P tcVAKUMyfPAnYYF7UXnNfawgj/JfK7wWvv6503NJaVN4Rf6QVb02ZD3p7iXSGkYt guBhloiD4L5iaw== =qQJM -----END PGP SIGNATURE----- Merge tag 'tegra-for-5.7-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt ARM: tegra: Device tree changes for v5.7-rc1 Minor fixes and additions for 32-bit Tegra SoC device trees. * tag 'tegra-for-5.7-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: Update sound node clocks in device tree ARM: tegra: Add clock-cells property to PMC ARM: tegra: Remove USB 2-0 port from Jetson TK1 padctl Link: https://lore.kernel.org/r/20200313165848.2915133-6-thierry.reding@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
eccbb5e7ee
@ -1296,7 +1296,13 @@ sound {
|
||||
|
||||
clocks = <&tegra_car TEGRA114_CLK_PLL_A>,
|
||||
<&tegra_car TEGRA114_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA114_CLK_EXTERN1>;
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
clock-names = "pll_a", "pll_a_out0", "mclk";
|
||||
|
||||
assigned-clocks = <&tegra_car TEGRA114_CLK_EXTERN1>,
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
|
||||
assigned-clock-parents = <&tegra_car TEGRA114_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA114_CLK_EXTERN1>;
|
||||
};
|
||||
};
|
||||
|
@ -4,6 +4,7 @@
|
||||
#include <dt-bindings/memory/tegra114-mc.h>
|
||||
#include <dt-bindings/pinctrl/pinctrl-tegra.h>
|
||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
#include <dt-bindings/soc/tegra-pmc.h>
|
||||
|
||||
/ {
|
||||
compatible = "nvidia,tegra114";
|
||||
@ -514,11 +515,12 @@ kbc@7000e200 {
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
pmc@7000e400 {
|
||||
tegra_pmc: pmc@7000e400 {
|
||||
compatible = "nvidia,tegra114-pmc";
|
||||
reg = <0x7000e400 0x400>;
|
||||
clocks = <&tegra_car TEGRA114_CLK_PCLK>, <&clk32k_in>;
|
||||
clock-names = "pclk", "clk32k_in";
|
||||
#clock-cells = <1>;
|
||||
};
|
||||
|
||||
fuse@7000f800 {
|
||||
|
@ -2009,8 +2009,14 @@ sound {
|
||||
nvidia,audio-codec = <&sgtl5000>;
|
||||
clocks = <&tegra_car TEGRA124_CLK_PLL_A>,
|
||||
<&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA124_CLK_EXTERN1>;
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
clock-names = "pll_a", "pll_a_out0", "mclk";
|
||||
|
||||
assigned-clocks = <&tegra_car TEGRA124_CLK_EXTERN1>,
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
|
||||
assigned-clock-parents = <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA124_CLK_EXTERN1>;
|
||||
};
|
||||
|
||||
thermal-zones {
|
||||
|
@ -2001,8 +2001,14 @@ sound {
|
||||
nvidia,audio-codec = <&sgtl5000>;
|
||||
clocks = <&tegra_car TEGRA124_CLK_PLL_A>,
|
||||
<&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA124_CLK_EXTERN1>;
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
clock-names = "pll_a", "pll_a_out0", "mclk";
|
||||
|
||||
assigned-clocks = <&tegra_car TEGRA124_CLK_EXTERN1>,
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
|
||||
assigned-clock-parents = <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA124_CLK_EXTERN1>;
|
||||
};
|
||||
|
||||
thermal-zones {
|
||||
|
@ -1782,12 +1782,6 @@ sata-0 {
|
||||
};
|
||||
|
||||
ports {
|
||||
/* Micro A/B */
|
||||
usb2-0 {
|
||||
status = "okay";
|
||||
mode = "otg";
|
||||
};
|
||||
|
||||
/* Mini PCIe */
|
||||
usb2-1 {
|
||||
status = "okay";
|
||||
@ -2058,8 +2052,14 @@ sound {
|
||||
|
||||
clocks = <&tegra_car TEGRA124_CLK_PLL_A>,
|
||||
<&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA124_CLK_EXTERN1>;
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
clock-names = "pll_a", "pll_a_out0", "mclk";
|
||||
|
||||
assigned-clocks = <&tegra_car TEGRA124_CLK_EXTERN1>,
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
|
||||
assigned-clock-parents = <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA124_CLK_EXTERN1>;
|
||||
};
|
||||
|
||||
thermal-zones {
|
||||
|
@ -788,9 +788,15 @@ sound {
|
||||
|
||||
clocks = <&tegra_car TEGRA124_CLK_PLL_A>,
|
||||
<&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA124_CLK_EXTERN1>;
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
clock-names = "pll_a", "pll_a_out0", "mclk";
|
||||
|
||||
assigned-clocks = <&tegra_car TEGRA124_CLK_EXTERN1>,
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
|
||||
assigned-clock-parents = <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA124_CLK_EXTERN1>;
|
||||
|
||||
nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(I, 7) GPIO_ACTIVE_HIGH>;
|
||||
nvidia,mic-det-gpios =
|
||||
<&gpio TEGRA_GPIO(R, 7) GPIO_ACTIVE_HIGH>;
|
||||
|
@ -1266,8 +1266,14 @@ sound {
|
||||
|
||||
clocks = <&tegra_car TEGRA124_CLK_PLL_A>,
|
||||
<&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA124_CLK_EXTERN1>;
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
clock-names = "pll_a", "pll_a_out0", "mclk";
|
||||
|
||||
assigned-clocks = <&tegra_car TEGRA124_CLK_EXTERN1>,
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
|
||||
assigned-clock-parents = <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA124_CLK_EXTERN1>;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -6,6 +6,7 @@
|
||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
#include <dt-bindings/reset/tegra124-car.h>
|
||||
#include <dt-bindings/thermal/tegra124-soctherm.h>
|
||||
#include <dt-bindings/soc/tegra-pmc.h>
|
||||
|
||||
/ {
|
||||
compatible = "nvidia,tegra124";
|
||||
@ -595,11 +596,12 @@ rtc@7000e000 {
|
||||
clocks = <&tegra_car TEGRA124_CLK_RTC>;
|
||||
};
|
||||
|
||||
pmc@7000e400 {
|
||||
tegra_pmc: pmc@7000e400 {
|
||||
compatible = "nvidia,tegra124-pmc";
|
||||
reg = <0x0 0x7000e400 0x0 0x400>;
|
||||
clocks = <&tegra_car TEGRA124_CLK_PCLK>, <&clk32k_in>;
|
||||
clock-names = "pclk", "clk32k_in";
|
||||
#clock-cells = <1>;
|
||||
};
|
||||
|
||||
fuse@7000f800 {
|
||||
|
@ -4,6 +4,7 @@
|
||||
#include <dt-bindings/memory/tegra20-mc.h>
|
||||
#include <dt-bindings/pinctrl/pinctrl-tegra.h>
|
||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
#include <dt-bindings/soc/tegra-pmc.h>
|
||||
|
||||
/ {
|
||||
compatible = "nvidia,tegra20";
|
||||
@ -608,11 +609,12 @@ kbc@7000e200 {
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
pmc@7000e400 {
|
||||
tegra_pmc: pmc@7000e400 {
|
||||
compatible = "nvidia,tegra20-pmc";
|
||||
reg = <0x7000e400 0x400>;
|
||||
clocks = <&tegra_car TEGRA20_CLK_PCLK>, <&clk32k_in>;
|
||||
clock-names = "pclk", "clk32k_in";
|
||||
#clock-cells = <1>;
|
||||
};
|
||||
|
||||
mc: memory-controller@7000f000 {
|
||||
|
@ -1189,7 +1189,13 @@ sound {
|
||||
nvidia,audio-codec = <&sgtl5000>;
|
||||
clocks = <&tegra_car TEGRA30_CLK_PLL_A>,
|
||||
<&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA30_CLK_EXTERN1>;
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
clock-names = "pll_a", "pll_a_out0", "mclk";
|
||||
|
||||
assigned-clocks = <&tegra_car TEGRA30_CLK_EXTERN1>,
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
|
||||
assigned-clock-parents = <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA30_CLK_EXTERN1>;
|
||||
};
|
||||
};
|
||||
|
@ -1171,7 +1171,13 @@ sound {
|
||||
nvidia,audio-codec = <&sgtl5000>;
|
||||
clocks = <&tegra_car TEGRA30_CLK_PLL_A>,
|
||||
<&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA30_CLK_EXTERN1>;
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
clock-names = "pll_a", "pll_a_out0", "mclk";
|
||||
|
||||
assigned-clocks = <&tegra_car TEGRA30_CLK_EXTERN1>,
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
|
||||
assigned-clock-parents = <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA30_CLK_EXTERN1>;
|
||||
};
|
||||
};
|
||||
|
@ -2111,7 +2111,13 @@ sound {
|
||||
|
||||
clocks = <&tegra_car TEGRA30_CLK_PLL_A>,
|
||||
<&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA30_CLK_EXTERN1>;
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
clock-names = "pll_a", "pll_a_out0", "mclk";
|
||||
|
||||
assigned-clocks = <&tegra_car TEGRA30_CLK_EXTERN1>,
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
|
||||
assigned-clock-parents = <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA30_CLK_EXTERN1>;
|
||||
};
|
||||
};
|
||||
|
@ -619,8 +619,14 @@ sound {
|
||||
|
||||
clocks = <&tegra_car TEGRA30_CLK_PLL_A>,
|
||||
<&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA30_CLK_EXTERN1>;
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
clock-names = "pll_a", "pll_a_out0", "mclk";
|
||||
|
||||
assigned-clocks = <&tegra_car TEGRA30_CLK_EXTERN1>,
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
|
||||
assigned-clock-parents = <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA30_CLK_EXTERN1>;
|
||||
};
|
||||
|
||||
gpio-keys {
|
||||
|
@ -1030,8 +1030,14 @@ sound {
|
||||
nvidia,audio-codec = <&sgtl5000>;
|
||||
clocks = <&tegra_car TEGRA30_CLK_PLL_A>,
|
||||
<&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA30_CLK_EXTERN1>;
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
clock-names = "pll_a", "pll_a_out0", "mclk";
|
||||
|
||||
assigned-clocks = <&tegra_car TEGRA30_CLK_EXTERN1>,
|
||||
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
|
||||
|
||||
assigned-clock-parents = <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
|
||||
<&tegra_car TEGRA30_CLK_EXTERN1>;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -4,6 +4,7 @@
|
||||
#include <dt-bindings/memory/tegra30-mc.h>
|
||||
#include <dt-bindings/pinctrl/pinctrl-tegra.h>
|
||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
#include <dt-bindings/soc/tegra-pmc.h>
|
||||
|
||||
/ {
|
||||
compatible = "nvidia,tegra30";
|
||||
@ -714,11 +715,12 @@ kbc@7000e200 {
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
pmc@7000e400 {
|
||||
tegra_pmc: pmc@7000e400 {
|
||||
compatible = "nvidia,tegra30-pmc";
|
||||
reg = <0x7000e400 0x400>;
|
||||
clocks = <&tegra_car TEGRA30_CLK_PCLK>, <&clk32k_in>;
|
||||
clock-names = "pclk", "clk32k_in";
|
||||
#clock-cells = <1>;
|
||||
};
|
||||
|
||||
mc: memory-controller@7000f000 {
|
||||
|
Loading…
Reference in New Issue
Block a user