Unverified Commit 86d3858e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

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

This contains various cleanup patches to 32-bit ARM Tegra device trees
and enables USB OTG mode on the Nexus 7.

* tag 'tegra-for-5.16-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Remove useless usb-ehci compatible string
  ARM: tegra: Remove unused backlight-boot-off property
  ARM: tegra: nexus7: Enable USB OTG mode
  ARM: tegra: Add new properties to USB PHY device-tree nodes
  ARM: tegra: Update Broadcom Bluetooth device-tree nodes
  ARM: tegra: acer-a500: Correct compatible of ak8975 magnetometer

Link: https://lore.kernel.org/r/20211008201132.1678814-6-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2a9c7b90 96f4adcd

arch/arm/boot/dts/tegra114.dtsi

+6 −2
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ mmc@78000600 { 
	};



	usb@7d000000 {

		compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci", "usb-ehci";

		compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci";

		reg = <0x7d000000 0x4000>;

		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;

		phy_type = "utmi";
@@ -706,6 +706,7 @@ phy1: usb-phy@7d000000 { 
		compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";

		reg = <0x7d000000 0x4000>,

		      <0x7d000000 0x4000>;

		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;

		phy_type = "utmi";

		clocks = <&tegra_car TEGRA114_CLK_USBD>,

			 <&tegra_car TEGRA114_CLK_PLL_U>,
@@ -725,11 +726,12 @@ phy1: usb-phy@7d000000 { 
		nvidia,hsdiscon-level = <5>;

		nvidia,xcvr-hsslew = <12>;

		nvidia,has-utmi-pad-registers;

		nvidia,pmc = <&tegra_pmc 0>;

		status = "disabled";

	};



	usb@7d008000 {

		compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci", "usb-ehci";

		compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci";

		reg = <0x7d008000 0x4000>;

		interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;

		phy_type = "utmi";
@@ -744,6 +746,7 @@ phy3: usb-phy@7d008000 { 
		compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";

		reg = <0x7d008000 0x4000>,

		      <0x7d000000 0x4000>;

		interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;

		phy_type = "utmi";

		clocks = <&tegra_car TEGRA114_CLK_USB3>,

			 <&tegra_car TEGRA114_CLK_PLL_U>,
@@ -762,6 +765,7 @@ phy3: usb-phy@7d008000 { 
		nvidia,hssquelch-level = <2>;

		nvidia,hsdiscon-level = <5>;

		nvidia,xcvr-hsslew = <12>;

		nvidia,pmc = <&tegra_pmc 2>;

		status = "disabled";

	};

arch/arm/boot/dts/tegra124.dtsi

+9 −3
Original line number Diff line number Diff line
@@ -1079,7 +1079,7 @@ tegra_i2s4: i2s@70301400 { 
	};



	usb@7d000000 {

		compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";

		compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci";

		reg = <0x0 0x7d000000 0x0 0x4000>;

		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;

		phy_type = "utmi";
@@ -1094,6 +1094,7 @@ phy1: usb-phy@7d000000 { 
		compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";

		reg = <0x0 0x7d000000 0x0 0x4000>,

		      <0x0 0x7d000000 0x0 0x4000>;

		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;

		phy_type = "utmi";

		clocks = <&tegra_car TEGRA124_CLK_USBD>,

			 <&tegra_car TEGRA124_CLK_PLL_U>,
@@ -1113,11 +1114,12 @@ phy1: usb-phy@7d000000 { 
		nvidia,hsdiscon-level = <5>;

		nvidia,xcvr-hsslew = <12>;

		nvidia,has-utmi-pad-registers;

		nvidia,pmc = <&tegra_pmc 0>;

		status = "disabled";

	};



	usb@7d004000 {

		compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";

		compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci";

		reg = <0x0 0x7d004000 0x0 0x4000>;

		interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;

		phy_type = "utmi";
@@ -1132,6 +1134,7 @@ phy2: usb-phy@7d004000 { 
		compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";

		reg = <0x0 0x7d004000 0x0 0x4000>,

		      <0x0 0x7d000000 0x0 0x4000>;

		interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;

		phy_type = "utmi";

		clocks = <&tegra_car TEGRA124_CLK_USB2>,

			 <&tegra_car TEGRA124_CLK_PLL_U>,
@@ -1150,11 +1153,12 @@ phy2: usb-phy@7d004000 { 
		nvidia,hssquelch-level = <2>;

		nvidia,hsdiscon-level = <5>;

		nvidia,xcvr-hsslew = <12>;

		nvidia,pmc = <&tegra_pmc 1>;

		status = "disabled";

	};



	usb@7d008000 {

		compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";

		compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci";

		reg = <0x0 0x7d008000 0x0 0x4000>;

		interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;

		phy_type = "utmi";
@@ -1169,6 +1173,7 @@ phy3: usb-phy@7d008000 { 
		compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";

		reg = <0x0 0x7d008000 0x0 0x4000>,

		      <0x0 0x7d000000 0x0 0x4000>;

		interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;

		phy_type = "utmi";

		clocks = <&tegra_car TEGRA124_CLK_USB3>,

			 <&tegra_car TEGRA124_CLK_PLL_U>,
@@ -1187,6 +1192,7 @@ phy3: usb-phy@7d008000 { 
		nvidia,hssquelch-level = <2>;

		nvidia,hsdiscon-level = <5>;

		nvidia,xcvr-hsslew = <12>;

		nvidia,pmc = <&tegra_pmc 2>;

		status = "disabled";

	};

arch/arm/boot/dts/tegra20-acer-a500-picasso.dts

+5 −2
Original line number Diff line number Diff line
@@ -393,6 +393,10 @@ uartc: serial@70006200 { 
		bluetooth {

			compatible = "brcm,bcm4329-bt";



			interrupt-parent = <&gpio>;

			interrupts = <TEGRA_GPIO(U, 6) IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "host-wakeup";



			/* PLLP 216MHz / 16 / 4 */

			max-speed = <3375000>;
@@ -403,7 +407,6 @@ bluetooth { 
			vddio-supply = <&vdd_1v8_sys>;



			device-wakeup-gpios = <&gpio TEGRA_GPIO(U, 1) GPIO_ACTIVE_HIGH>;

			host-wakeup-gpios =   <&gpio TEGRA_GPIO(U, 6) GPIO_ACTIVE_HIGH>;

			shutdown-gpios =      <&gpio TEGRA_GPIO(U, 0) GPIO_ACTIVE_HIGH>;

		};

	};
@@ -543,7 +546,7 @@ i2c@7000d000 { 
		status = "okay";



		magnetometer@c {

			compatible = "ak,ak8975";

			compatible = "asahi-kasei,ak8975";

			reg = <0x0c>;



			interrupt-parent = <&gpio>;

arch/arm/boot/dts/tegra20-paz00.dts

+0 −2
Original line number Diff line number Diff line
@@ -573,8 +573,6 @@ backlight: backlight { 


		brightness-levels = <0 16 32 48 64 80 96 112 128 144 160 176 192 208 224 240 255>;

		default-brightness-level = <10>;



		backlight-boot-off;

	};



	clk32k_in: clock@0 {

arch/arm/boot/dts/tegra20.dtsi

+9 −4
Original line number Diff line number Diff line
@@ -744,11 +744,10 @@ pci@2,0 { 
	};



	usb@c5000000 {

		compatible = "nvidia,tegra20-ehci", "usb-ehci";

		compatible = "nvidia,tegra20-ehci";

		reg = <0xc5000000 0x4000>;

		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;

		phy_type = "utmi";

		nvidia,has-legacy-mode;

		clocks = <&tegra_car TEGRA20_CLK_USBD>;

		resets = <&tegra_car 22>;

		reset-names = "usb";
@@ -761,6 +760,7 @@ phy1: usb-phy@c5000000 { 
		compatible = "nvidia,tegra20-usb-phy";

		reg = <0xc5000000 0x4000>,

		      <0xc5000000 0x4000>;

		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;

		phy_type = "utmi";

		clocks = <&tegra_car TEGRA20_CLK_USBD>,

			 <&tegra_car TEGRA20_CLK_PLL_U>,
@@ -779,11 +779,12 @@ phy1: usb-phy@c5000000 { 
		nvidia,xcvr-lsfslew = <1>;

		nvidia,xcvr-lsrslew = <1>;

		nvidia,has-utmi-pad-registers;

		nvidia,pmc = <&tegra_pmc 0>;

		status = "disabled";

	};



	usb@c5004000 {

		compatible = "nvidia,tegra20-ehci", "usb-ehci";

		compatible = "nvidia,tegra20-ehci";

		reg = <0xc5004000 0x4000>;

		interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;

		phy_type = "ulpi";
@@ -797,6 +798,7 @@ usb@c5004000 { 
	phy2: usb-phy@c5004000 {

		compatible = "nvidia,tegra20-usb-phy";

		reg = <0xc5004000 0x4000>;

		interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;

		phy_type = "ulpi";

		clocks = <&tegra_car TEGRA20_CLK_USB2>,

			 <&tegra_car TEGRA20_CLK_PLL_U>,
@@ -805,11 +807,12 @@ phy2: usb-phy@c5004000 { 
		resets = <&tegra_car 58>, <&tegra_car 22>;

		reset-names = "usb", "utmi-pads";

		#phy-cells = <0>;

		nvidia,pmc = <&tegra_pmc 1>;

		status = "disabled";

	};



	usb@c5008000 {

		compatible = "nvidia,tegra20-ehci", "usb-ehci";

		compatible = "nvidia,tegra20-ehci";

		reg = <0xc5008000 0x4000>;

		interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;

		phy_type = "utmi";
@@ -824,6 +827,7 @@ phy3: usb-phy@c5008000 { 
		compatible = "nvidia,tegra20-usb-phy";

		reg = <0xc5008000 0x4000>,

		      <0xc5000000 0x4000>;

		interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;

		phy_type = "utmi";

		clocks = <&tegra_car TEGRA20_CLK_USB3>,

			 <&tegra_car TEGRA20_CLK_PLL_U>,
@@ -840,6 +844,7 @@ phy3: usb-phy@c5008000 { 
		nvidia,xcvr-setup = <9>;

		nvidia,xcvr-lsfslew = <2>;

		nvidia,xcvr-lsrslew = <2>;

		nvidia,pmc = <&tegra_pmc 2>;

		status = "disabled";

	};