drop arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch from everywhere

diff --git a/queue-4.19/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch b/queue-4.19/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
deleted file mode 100644 (file)
index 8c85e1f..0000000
--- a/queue-4.19/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 4a00ef094cfafd1fd3fd7c7c57157d57c7ba51ab Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 13 Sep 2022 13:23:18 +0900
-Subject: arm64: dts: uniphier: Add USB-device support for PXs3 reference board
-
-From: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-
-[ Upstream commit 19fee1a1096d21ab1f1e712148b5417bda2939a2 ]
-
-PXs3 reference board can change each USB port 0 and 1 to device mode
-with jumpers. Prepare devicetree sources for USB port 0 and 1.
-
-This specifies dr_mode, pinctrl, and some quirks and removes nodes for
-unused phys and vbus-supply properties.
-
-Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-Link: https://lore.kernel.org/r/20220913042321.4817-8-hayashi.kunihiko@socionext.com'
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/uniphier-pinctrl.dtsi       | 10 +++++
- arch/arm64/boot/dts/socionext/Makefile        |  4 +-
- .../socionext/uniphier-pxs3-ref-gadget0.dts   | 41 +++++++++++++++++++
- .../socionext/uniphier-pxs3-ref-gadget1.dts   | 40 ++++++++++++++++++
- 4 files changed, 94 insertions(+), 1 deletion(-)
- create mode 100644 arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
- create mode 100644 arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-
-diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-index 51f0e69f49fd..21cc91110439 100644
---- a/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-+++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-@@ -156,11 +156,21 @@
-               function = "usb0";
-       };
- 
-+      pinctrl_usb0_device: usb0-device {
-+              groups = "usb0_device";
-+              function = "usb0";
-+      };
-+
-       pinctrl_usb1: usb1 {
-               groups = "usb1";
-               function = "usb1";
-       };
- 
-+      pinctrl_usb1_device: usb1-device {
-+              groups = "usb1_device";
-+              function = "usb1";
-+      };
-+
-       pinctrl_usb2: usb2 {
-               groups = "usb2";
-               function = "usb2";
-diff --git a/arch/arm64/boot/dts/socionext/Makefile b/arch/arm64/boot/dts/socionext/Makefile
-index d45441249cb5..c922d9303b69 100644
---- a/arch/arm64/boot/dts/socionext/Makefile
-+++ b/arch/arm64/boot/dts/socionext/Makefile
-@@ -4,4 +4,6 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \
-       uniphier-ld11-ref.dtb \
-       uniphier-ld20-global.dtb \
-       uniphier-ld20-ref.dtb \
--      uniphier-pxs3-ref.dtb
-+      uniphier-pxs3-ref.dtb \
-+      uniphier-pxs3-ref-gadget0.dtb \
-+      uniphier-pxs3-ref-gadget1.dtb
-diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
-new file mode 100644
-index 000000000000..7069f51bc120
---- /dev/null
-+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
-@@ -0,0 +1,41 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+//
-+// Device Tree Source for UniPhier PXs3 Reference Board (for USB-Device #0)
-+//
-+// Copyright (C) 2021 Socionext Inc.
-+//   Author: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-+
-+/dts-v1/;
-+#include "uniphier-pxs3-ref.dts"
-+
-+/ {
-+      model = "UniPhier PXs3 Reference Board (USB-Device #0)";
-+};
-+
-+/* I2C3 pinctrl is shared with USB*VBUSIN */
-+&i2c3 {
-+      status = "disabled";
-+};
-+
-+&usb0 {
-+      status = "okay";
-+      dr_mode = "peripheral";
-+      pinctrl-0 = <&pinctrl_usb0_device>;
-+      snps,dis_enblslpm_quirk;
-+      snps,dis_u2_susphy_quirk;
-+      snps,dis_u3_susphy_quirk;
-+      snps,usb2_gadget_lpm_disable;
-+      phy-names = "usb2-phy", "usb3-phy";
-+      phys = <&usb0_hsphy0>, <&usb0_ssphy0>;
-+};
-+
-+&usb0_hsphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+&usb0_ssphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+/delete-node/ &usb0_hsphy1;
-+/delete-node/ &usb0_ssphy1;
-diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-new file mode 100644
-index 000000000000..a3cfa8113ffb
---- /dev/null
-+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-@@ -0,0 +1,40 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+//
-+// Device Tree Source for UniPhier PXs3 Reference Board (for USB-Device #1)
-+//
-+// Copyright (C) 2021 Socionext Inc.
-+//   Author: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-+
-+/dts-v1/;
-+#include "uniphier-pxs3-ref.dts"
-+
-+/ {
-+      model = "UniPhier PXs3 Reference Board (USB-Device #1)";
-+};
-+
-+/* I2C3 pinctrl is shared with USB*VBUSIN */
-+&i2c3 {
-+      status = "disabled";
-+};
-+
-+&usb1 {
-+      status = "okay";
-+      dr_mode = "peripheral";
-+      pinctrl-0 = <&pinctrl_usb1_device>;
-+      snps,dis_enblslpm_quirk;
-+      snps,dis_u2_susphy_quirk;
-+      snps,dis_u3_susphy_quirk;
-+      snps,usb2_gadget_lpm_disable;
-+      phy-names = "usb2-phy", "usb3-phy";
-+      phys = <&usb1_hsphy0>, <&usb1_ssphy0>;
-+};
-+
-+&usb1_hsphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+&usb1_ssphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+/delete-node/ &usb1_hsphy1;
--- 
-2.35.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 9d93b32a7f6fee170081b5eddbb0c1ea925e99eb..2d545a97ef22332cc458bb3128ff6ea43bf27f82 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -208,7 +208,6 @@ arm-dts-imx6qp-add-missing-properties-for-sram.patch
 arm-dts-imx6sl-add-missing-properties-for-sram.patch
 arm-dts-imx6sll-add-missing-properties-for-sram.patch
 arm-dts-imx6sx-add-missing-properties-for-sram.patch
-arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
 selftests-cpu-hotplug-use-return-instead-of-exit.patch
 media-cx88-fix-a-null-ptr-deref-bug-in-buffer_prepar.patch
 scsi-3w-9xxx-avoid-disabling-device-if-failing-to-en.patch

diff --git a/queue-5.10/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch b/queue-5.10/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
deleted file mode 100644 (file)
index 8032377..0000000
--- a/queue-5.10/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From d8fd9703c6fa6d8dc90b7aee4c3b1ab05599d2f4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 13 Sep 2022 13:23:18 +0900
-Subject: arm64: dts: uniphier: Add USB-device support for PXs3 reference board
-
-From: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-
-[ Upstream commit 19fee1a1096d21ab1f1e712148b5417bda2939a2 ]
-
-PXs3 reference board can change each USB port 0 and 1 to device mode
-with jumpers. Prepare devicetree sources for USB port 0 and 1.
-
-This specifies dr_mode, pinctrl, and some quirks and removes nodes for
-unused phys and vbus-supply properties.
-
-Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-Link: https://lore.kernel.org/r/20220913042321.4817-8-hayashi.kunihiko@socionext.com'
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/uniphier-pinctrl.dtsi       | 10 +++++
- arch/arm64/boot/dts/socionext/Makefile        |  4 +-
- .../socionext/uniphier-pxs3-ref-gadget0.dts   | 41 +++++++++++++++++++
- .../socionext/uniphier-pxs3-ref-gadget1.dts   | 40 ++++++++++++++++++
- 4 files changed, 94 insertions(+), 1 deletion(-)
- create mode 100644 arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
- create mode 100644 arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-
-diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-index c0fd029b37e5..f909ec2e5333 100644
---- a/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-+++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-@@ -196,11 +196,21 @@
-               function = "usb0";
-       };
- 
-+      pinctrl_usb0_device: usb0-device {
-+              groups = "usb0_device";
-+              function = "usb0";
-+      };
-+
-       pinctrl_usb1: usb1 {
-               groups = "usb1";
-               function = "usb1";
-       };
- 
-+      pinctrl_usb1_device: usb1-device {
-+              groups = "usb1_device";
-+              function = "usb1";
-+      };
-+
-       pinctrl_usb2: usb2 {
-               groups = "usb2";
-               function = "usb2";
-diff --git a/arch/arm64/boot/dts/socionext/Makefile b/arch/arm64/boot/dts/socionext/Makefile
-index dda3da33614b..33989a9643ac 100644
---- a/arch/arm64/boot/dts/socionext/Makefile
-+++ b/arch/arm64/boot/dts/socionext/Makefile
-@@ -5,4 +5,6 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \
-       uniphier-ld20-akebi96.dtb \
-       uniphier-ld20-global.dtb \
-       uniphier-ld20-ref.dtb \
--      uniphier-pxs3-ref.dtb
-+      uniphier-pxs3-ref.dtb \
-+      uniphier-pxs3-ref-gadget0.dtb \
-+      uniphier-pxs3-ref-gadget1.dtb
-diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
-new file mode 100644
-index 000000000000..7069f51bc120
---- /dev/null
-+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
-@@ -0,0 +1,41 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+//
-+// Device Tree Source for UniPhier PXs3 Reference Board (for USB-Device #0)
-+//
-+// Copyright (C) 2021 Socionext Inc.
-+//   Author: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-+
-+/dts-v1/;
-+#include "uniphier-pxs3-ref.dts"
-+
-+/ {
-+      model = "UniPhier PXs3 Reference Board (USB-Device #0)";
-+};
-+
-+/* I2C3 pinctrl is shared with USB*VBUSIN */
-+&i2c3 {
-+      status = "disabled";
-+};
-+
-+&usb0 {
-+      status = "okay";
-+      dr_mode = "peripheral";
-+      pinctrl-0 = <&pinctrl_usb0_device>;
-+      snps,dis_enblslpm_quirk;
-+      snps,dis_u2_susphy_quirk;
-+      snps,dis_u3_susphy_quirk;
-+      snps,usb2_gadget_lpm_disable;
-+      phy-names = "usb2-phy", "usb3-phy";
-+      phys = <&usb0_hsphy0>, <&usb0_ssphy0>;
-+};
-+
-+&usb0_hsphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+&usb0_ssphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+/delete-node/ &usb0_hsphy1;
-+/delete-node/ &usb0_ssphy1;
-diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-new file mode 100644
-index 000000000000..a3cfa8113ffb
---- /dev/null
-+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-@@ -0,0 +1,40 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+//
-+// Device Tree Source for UniPhier PXs3 Reference Board (for USB-Device #1)
-+//
-+// Copyright (C) 2021 Socionext Inc.
-+//   Author: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-+
-+/dts-v1/;
-+#include "uniphier-pxs3-ref.dts"
-+
-+/ {
-+      model = "UniPhier PXs3 Reference Board (USB-Device #1)";
-+};
-+
-+/* I2C3 pinctrl is shared with USB*VBUSIN */
-+&i2c3 {
-+      status = "disabled";
-+};
-+
-+&usb1 {
-+      status = "okay";
-+      dr_mode = "peripheral";
-+      pinctrl-0 = <&pinctrl_usb1_device>;
-+      snps,dis_enblslpm_quirk;
-+      snps,dis_u2_susphy_quirk;
-+      snps,dis_u3_susphy_quirk;
-+      snps,usb2_gadget_lpm_disable;
-+      phy-names = "usb2-phy", "usb3-phy";
-+      phys = <&usb1_hsphy0>, <&usb1_ssphy0>;
-+};
-+
-+&usb1_hsphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+&usb1_ssphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+/delete-node/ &usb1_hsphy1;
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 43e066e3eabd65b31fd77360d2a50e188d5d8a7f..5a980afe10d56c040bf8ef3d015c26d0c856a169 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -383,7 +383,6 @@ arm-dts-imx6sx-add-missing-properties-for-sram.patch
 kselftest-arm64-fix-validatation-termination-record-.patch
 arm64-dts-imx8mq-librem5-add-bq25895-as-max17055-s-p.patch
 btrfs-scrub-try-to-fix-super-block-errors.patch
-arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
 selftests-cpu-hotplug-use-return-instead-of-exit.patch
 clk-zynqmp-fix-stack-out-of-bounds-in-strncpy.patch
 media-cx88-fix-a-null-ptr-deref-bug-in-buffer_prepar.patch

diff --git a/queue-5.15/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch b/queue-5.15/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
deleted file mode 100644 (file)
index 948f7a7..0000000
--- a/queue-5.15/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From cf893ac7f2414bcf92b3b8a076db6850e30a664f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 13 Sep 2022 13:23:18 +0900
-Subject: arm64: dts: uniphier: Add USB-device support for PXs3 reference board
-
-From: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-
-[ Upstream commit 19fee1a1096d21ab1f1e712148b5417bda2939a2 ]
-
-PXs3 reference board can change each USB port 0 and 1 to device mode
-with jumpers. Prepare devicetree sources for USB port 0 and 1.
-
-This specifies dr_mode, pinctrl, and some quirks and removes nodes for
-unused phys and vbus-supply properties.
-
-Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-Link: https://lore.kernel.org/r/20220913042321.4817-8-hayashi.kunihiko@socionext.com'
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/uniphier-pinctrl.dtsi       | 10 +++++
- arch/arm64/boot/dts/socionext/Makefile        |  4 +-
- .../socionext/uniphier-pxs3-ref-gadget0.dts   | 41 +++++++++++++++++++
- .../socionext/uniphier-pxs3-ref-gadget1.dts   | 40 ++++++++++++++++++
- 4 files changed, 94 insertions(+), 1 deletion(-)
- create mode 100644 arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
- create mode 100644 arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-
-diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-index c0fd029b37e5..f909ec2e5333 100644
---- a/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-+++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-@@ -196,11 +196,21 @@
-               function = "usb0";
-       };
- 
-+      pinctrl_usb0_device: usb0-device {
-+              groups = "usb0_device";
-+              function = "usb0";
-+      };
-+
-       pinctrl_usb1: usb1 {
-               groups = "usb1";
-               function = "usb1";
-       };
- 
-+      pinctrl_usb1_device: usb1-device {
-+              groups = "usb1_device";
-+              function = "usb1";
-+      };
-+
-       pinctrl_usb2: usb2 {
-               groups = "usb2";
-               function = "usb2";
-diff --git a/arch/arm64/boot/dts/socionext/Makefile b/arch/arm64/boot/dts/socionext/Makefile
-index dda3da33614b..33989a9643ac 100644
---- a/arch/arm64/boot/dts/socionext/Makefile
-+++ b/arch/arm64/boot/dts/socionext/Makefile
-@@ -5,4 +5,6 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \
-       uniphier-ld20-akebi96.dtb \
-       uniphier-ld20-global.dtb \
-       uniphier-ld20-ref.dtb \
--      uniphier-pxs3-ref.dtb
-+      uniphier-pxs3-ref.dtb \
-+      uniphier-pxs3-ref-gadget0.dtb \
-+      uniphier-pxs3-ref-gadget1.dtb
-diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
-new file mode 100644
-index 000000000000..7069f51bc120
---- /dev/null
-+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
-@@ -0,0 +1,41 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+//
-+// Device Tree Source for UniPhier PXs3 Reference Board (for USB-Device #0)
-+//
-+// Copyright (C) 2021 Socionext Inc.
-+//   Author: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-+
-+/dts-v1/;
-+#include "uniphier-pxs3-ref.dts"
-+
-+/ {
-+      model = "UniPhier PXs3 Reference Board (USB-Device #0)";
-+};
-+
-+/* I2C3 pinctrl is shared with USB*VBUSIN */
-+&i2c3 {
-+      status = "disabled";
-+};
-+
-+&usb0 {
-+      status = "okay";
-+      dr_mode = "peripheral";
-+      pinctrl-0 = <&pinctrl_usb0_device>;
-+      snps,dis_enblslpm_quirk;
-+      snps,dis_u2_susphy_quirk;
-+      snps,dis_u3_susphy_quirk;
-+      snps,usb2_gadget_lpm_disable;
-+      phy-names = "usb2-phy", "usb3-phy";
-+      phys = <&usb0_hsphy0>, <&usb0_ssphy0>;
-+};
-+
-+&usb0_hsphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+&usb0_ssphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+/delete-node/ &usb0_hsphy1;
-+/delete-node/ &usb0_ssphy1;
-diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-new file mode 100644
-index 000000000000..a3cfa8113ffb
---- /dev/null
-+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-@@ -0,0 +1,40 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+//
-+// Device Tree Source for UniPhier PXs3 Reference Board (for USB-Device #1)
-+//
-+// Copyright (C) 2021 Socionext Inc.
-+//   Author: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-+
-+/dts-v1/;
-+#include "uniphier-pxs3-ref.dts"
-+
-+/ {
-+      model = "UniPhier PXs3 Reference Board (USB-Device #1)";
-+};
-+
-+/* I2C3 pinctrl is shared with USB*VBUSIN */
-+&i2c3 {
-+      status = "disabled";
-+};
-+
-+&usb1 {
-+      status = "okay";
-+      dr_mode = "peripheral";
-+      pinctrl-0 = <&pinctrl_usb1_device>;
-+      snps,dis_enblslpm_quirk;
-+      snps,dis_u2_susphy_quirk;
-+      snps,dis_u3_susphy_quirk;
-+      snps,usb2_gadget_lpm_disable;
-+      phy-names = "usb2-phy", "usb3-phy";
-+      phys = <&usb1_hsphy0>, <&usb1_ssphy0>;
-+};
-+
-+&usb1_hsphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+&usb1_ssphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+/delete-node/ &usb1_hsphy1;
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index d5e36578149b937dfe87dca73dd3287d2d77c874..2b7efabae5e7e64b53649c4c93bf67aed6201b25 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -512,7 +512,6 @@ arm64-dts-imx8mq-librem5-add-bq25895-as-max17055-s-p.patch
 btrfs-dump-extra-info-if-one-free-space-cache-has-mo.patch
 btrfs-scrub-try-to-fix-super-block-errors.patch
 btrfs-don-t-print-information-about-space-cache-or-t.patch
-arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
 arm-9242-1-kasan-only-map-modules-if-config_kasan_vm.patch
 selftests-cpu-hotplug-use-return-instead-of-exit.patch
 clk-zynqmp-fix-stack-out-of-bounds-in-strncpy.patch

diff --git a/queue-5.19/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch b/queue-5.19/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
deleted file mode 100644 (file)
index 9bfd593..0000000
--- a/queue-5.19/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 17d489618fc2fe4d9cf72b10c9c50bd08b219348 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 13 Sep 2022 13:23:18 +0900
-Subject: arm64: dts: uniphier: Add USB-device support for PXs3 reference board
-
-From: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-
-[ Upstream commit 19fee1a1096d21ab1f1e712148b5417bda2939a2 ]
-
-PXs3 reference board can change each USB port 0 and 1 to device mode
-with jumpers. Prepare devicetree sources for USB port 0 and 1.
-
-This specifies dr_mode, pinctrl, and some quirks and removes nodes for
-unused phys and vbus-supply properties.
-
-Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-Link: https://lore.kernel.org/r/20220913042321.4817-8-hayashi.kunihiko@socionext.com'
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/uniphier-pinctrl.dtsi       | 10 +++++
- arch/arm64/boot/dts/socionext/Makefile        |  4 +-
- .../socionext/uniphier-pxs3-ref-gadget0.dts   | 41 +++++++++++++++++++
- .../socionext/uniphier-pxs3-ref-gadget1.dts   | 40 ++++++++++++++++++
- 4 files changed, 94 insertions(+), 1 deletion(-)
- create mode 100644 arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
- create mode 100644 arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-
-diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-index c0fd029b37e5..f909ec2e5333 100644
---- a/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-+++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-@@ -196,11 +196,21 @@
-               function = "usb0";
-       };
- 
-+      pinctrl_usb0_device: usb0-device {
-+              groups = "usb0_device";
-+              function = "usb0";
-+      };
-+
-       pinctrl_usb1: usb1 {
-               groups = "usb1";
-               function = "usb1";
-       };
- 
-+      pinctrl_usb1_device: usb1-device {
-+              groups = "usb1_device";
-+              function = "usb1";
-+      };
-+
-       pinctrl_usb2: usb2 {
-               groups = "usb2";
-               function = "usb2";
-diff --git a/arch/arm64/boot/dts/socionext/Makefile b/arch/arm64/boot/dts/socionext/Makefile
-index dda3da33614b..33989a9643ac 100644
---- a/arch/arm64/boot/dts/socionext/Makefile
-+++ b/arch/arm64/boot/dts/socionext/Makefile
-@@ -5,4 +5,6 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \
-       uniphier-ld20-akebi96.dtb \
-       uniphier-ld20-global.dtb \
-       uniphier-ld20-ref.dtb \
--      uniphier-pxs3-ref.dtb
-+      uniphier-pxs3-ref.dtb \
-+      uniphier-pxs3-ref-gadget0.dtb \
-+      uniphier-pxs3-ref-gadget1.dtb
-diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
-new file mode 100644
-index 000000000000..7069f51bc120
---- /dev/null
-+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
-@@ -0,0 +1,41 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+//
-+// Device Tree Source for UniPhier PXs3 Reference Board (for USB-Device #0)
-+//
-+// Copyright (C) 2021 Socionext Inc.
-+//   Author: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-+
-+/dts-v1/;
-+#include "uniphier-pxs3-ref.dts"
-+
-+/ {
-+      model = "UniPhier PXs3 Reference Board (USB-Device #0)";
-+};
-+
-+/* I2C3 pinctrl is shared with USB*VBUSIN */
-+&i2c3 {
-+      status = "disabled";
-+};
-+
-+&usb0 {
-+      status = "okay";
-+      dr_mode = "peripheral";
-+      pinctrl-0 = <&pinctrl_usb0_device>;
-+      snps,dis_enblslpm_quirk;
-+      snps,dis_u2_susphy_quirk;
-+      snps,dis_u3_susphy_quirk;
-+      snps,usb2_gadget_lpm_disable;
-+      phy-names = "usb2-phy", "usb3-phy";
-+      phys = <&usb0_hsphy0>, <&usb0_ssphy0>;
-+};
-+
-+&usb0_hsphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+&usb0_ssphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+/delete-node/ &usb0_hsphy1;
-+/delete-node/ &usb0_ssphy1;
-diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-new file mode 100644
-index 000000000000..a3cfa8113ffb
---- /dev/null
-+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-@@ -0,0 +1,40 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+//
-+// Device Tree Source for UniPhier PXs3 Reference Board (for USB-Device #1)
-+//
-+// Copyright (C) 2021 Socionext Inc.
-+//   Author: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-+
-+/dts-v1/;
-+#include "uniphier-pxs3-ref.dts"
-+
-+/ {
-+      model = "UniPhier PXs3 Reference Board (USB-Device #1)";
-+};
-+
-+/* I2C3 pinctrl is shared with USB*VBUSIN */
-+&i2c3 {
-+      status = "disabled";
-+};
-+
-+&usb1 {
-+      status = "okay";
-+      dr_mode = "peripheral";
-+      pinctrl-0 = <&pinctrl_usb1_device>;
-+      snps,dis_enblslpm_quirk;
-+      snps,dis_u2_susphy_quirk;
-+      snps,dis_u3_susphy_quirk;
-+      snps,usb2_gadget_lpm_disable;
-+      phy-names = "usb2-phy", "usb3-phy";
-+      phys = <&usb1_hsphy0>, <&usb1_ssphy0>;
-+};
-+
-+&usb1_hsphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+&usb1_ssphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+/delete-node/ &usb1_hsphy1;
--- 
-2.35.1
-

diff --git a/queue-5.19/series b/queue-5.19/series
index 8b4416eccb6e65b569bd219d51fa53f7f9945345..41dc534352b90e167a89cd342198a187e4c7017c 100644 (file)
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -701,7 +701,6 @@ btrfs-scrub-properly-report-super-block-errors-in-sy.patch
 btrfs-scrub-try-to-fix-super-block-errors.patch
 btrfs-don-t-print-information-about-space-cache-or-t.patch
 btrfs-call-__btrfs_remove_free_space_cache_locked-on.patch
-arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
 arm-9233-1-stacktrace-skip-frame-pointer-boundary-ch.patch
 arm-9234-1-stacktrace-avoid-duplicate-saving-of-exce.patch
 arm-9242-1-kasan-only-map-modules-if-config_kasan_vm.patch

diff --git a/queue-5.4/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch b/queue-5.4/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
deleted file mode 100644 (file)
index 1d1f0a3..0000000
--- a/queue-5.4/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From cfc2b10074748f7293fe2baa6d23b31ffc9b9fde Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 13 Sep 2022 13:23:18 +0900
-Subject: arm64: dts: uniphier: Add USB-device support for PXs3 reference board
-
-From: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-
-[ Upstream commit 19fee1a1096d21ab1f1e712148b5417bda2939a2 ]
-
-PXs3 reference board can change each USB port 0 and 1 to device mode
-with jumpers. Prepare devicetree sources for USB port 0 and 1.
-
-This specifies dr_mode, pinctrl, and some quirks and removes nodes for
-unused phys and vbus-supply properties.
-
-Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-Link: https://lore.kernel.org/r/20220913042321.4817-8-hayashi.kunihiko@socionext.com'
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/uniphier-pinctrl.dtsi       | 10 +++++
- arch/arm64/boot/dts/socionext/Makefile        |  4 +-
- .../socionext/uniphier-pxs3-ref-gadget0.dts   | 41 +++++++++++++++++++
- .../socionext/uniphier-pxs3-ref-gadget1.dts   | 40 ++++++++++++++++++
- 4 files changed, 94 insertions(+), 1 deletion(-)
- create mode 100644 arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
- create mode 100644 arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-
-diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-index 1fee5ffbfb9c..2c1e0a6b0b6a 100644
---- a/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-+++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-@@ -181,11 +181,21 @@
-               function = "usb0";
-       };
- 
-+      pinctrl_usb0_device: usb0-device {
-+              groups = "usb0_device";
-+              function = "usb0";
-+      };
-+
-       pinctrl_usb1: usb1 {
-               groups = "usb1";
-               function = "usb1";
-       };
- 
-+      pinctrl_usb1_device: usb1-device {
-+              groups = "usb1_device";
-+              function = "usb1";
-+      };
-+
-       pinctrl_usb2: usb2 {
-               groups = "usb2";
-               function = "usb2";
-diff --git a/arch/arm64/boot/dts/socionext/Makefile b/arch/arm64/boot/dts/socionext/Makefile
-index d45441249cb5..c922d9303b69 100644
---- a/arch/arm64/boot/dts/socionext/Makefile
-+++ b/arch/arm64/boot/dts/socionext/Makefile
-@@ -4,4 +4,6 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \
-       uniphier-ld11-ref.dtb \
-       uniphier-ld20-global.dtb \
-       uniphier-ld20-ref.dtb \
--      uniphier-pxs3-ref.dtb
-+      uniphier-pxs3-ref.dtb \
-+      uniphier-pxs3-ref-gadget0.dtb \
-+      uniphier-pxs3-ref-gadget1.dtb
-diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
-new file mode 100644
-index 000000000000..7069f51bc120
---- /dev/null
-+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
-@@ -0,0 +1,41 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+//
-+// Device Tree Source for UniPhier PXs3 Reference Board (for USB-Device #0)
-+//
-+// Copyright (C) 2021 Socionext Inc.
-+//   Author: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-+
-+/dts-v1/;
-+#include "uniphier-pxs3-ref.dts"
-+
-+/ {
-+      model = "UniPhier PXs3 Reference Board (USB-Device #0)";
-+};
-+
-+/* I2C3 pinctrl is shared with USB*VBUSIN */
-+&i2c3 {
-+      status = "disabled";
-+};
-+
-+&usb0 {
-+      status = "okay";
-+      dr_mode = "peripheral";
-+      pinctrl-0 = <&pinctrl_usb0_device>;
-+      snps,dis_enblslpm_quirk;
-+      snps,dis_u2_susphy_quirk;
-+      snps,dis_u3_susphy_quirk;
-+      snps,usb2_gadget_lpm_disable;
-+      phy-names = "usb2-phy", "usb3-phy";
-+      phys = <&usb0_hsphy0>, <&usb0_ssphy0>;
-+};
-+
-+&usb0_hsphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+&usb0_ssphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+/delete-node/ &usb0_hsphy1;
-+/delete-node/ &usb0_ssphy1;
-diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-new file mode 100644
-index 000000000000..a3cfa8113ffb
---- /dev/null
-+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-@@ -0,0 +1,40 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+//
-+// Device Tree Source for UniPhier PXs3 Reference Board (for USB-Device #1)
-+//
-+// Copyright (C) 2021 Socionext Inc.
-+//   Author: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-+
-+/dts-v1/;
-+#include "uniphier-pxs3-ref.dts"
-+
-+/ {
-+      model = "UniPhier PXs3 Reference Board (USB-Device #1)";
-+};
-+
-+/* I2C3 pinctrl is shared with USB*VBUSIN */
-+&i2c3 {
-+      status = "disabled";
-+};
-+
-+&usb1 {
-+      status = "okay";
-+      dr_mode = "peripheral";
-+      pinctrl-0 = <&pinctrl_usb1_device>;
-+      snps,dis_enblslpm_quirk;
-+      snps,dis_u2_susphy_quirk;
-+      snps,dis_u3_susphy_quirk;
-+      snps,usb2_gadget_lpm_disable;
-+      phy-names = "usb2-phy", "usb3-phy";
-+      phys = <&usb1_hsphy0>, <&usb1_ssphy0>;
-+};
-+
-+&usb1_hsphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+&usb1_ssphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+/delete-node/ &usb1_hsphy1;
--- 
-2.35.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 2e2264278c1fa6e3065ce8333134b152aed30fc6..ff7dc6dbfbec154c37e0f5c5ddbf0cc2224468ac 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -229,7 +229,6 @@ arm-dts-imx6sl-add-missing-properties-for-sram.patch
 arm-dts-imx6sll-add-missing-properties-for-sram.patch
 arm-dts-imx6sx-add-missing-properties-for-sram.patch
 btrfs-scrub-try-to-fix-super-block-errors.patch
-arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
 selftests-cpu-hotplug-use-return-instead-of-exit.patch
 clk-zynqmp-fix-stack-out-of-bounds-in-strncpy.patch
 media-cx88-fix-a-null-ptr-deref-bug-in-buffer_prepar.patch

diff --git a/queue-6.0/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch b/queue-6.0/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
deleted file mode 100644 (file)
index bf0ab13..0000000
--- a/queue-6.0/arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From b6dbe3bd3da7ae3cc28ab6b79c440d73a0abce8c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 13 Sep 2022 13:23:18 +0900
-Subject: arm64: dts: uniphier: Add USB-device support for PXs3 reference board
-
-From: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-
-[ Upstream commit 19fee1a1096d21ab1f1e712148b5417bda2939a2 ]
-
-PXs3 reference board can change each USB port 0 and 1 to device mode
-with jumpers. Prepare devicetree sources for USB port 0 and 1.
-
-This specifies dr_mode, pinctrl, and some quirks and removes nodes for
-unused phys and vbus-supply properties.
-
-Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-Link: https://lore.kernel.org/r/20220913042321.4817-8-hayashi.kunihiko@socionext.com'
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/uniphier-pinctrl.dtsi       | 10 +++++
- arch/arm64/boot/dts/socionext/Makefile        |  4 +-
- .../socionext/uniphier-pxs3-ref-gadget0.dts   | 41 +++++++++++++++++++
- .../socionext/uniphier-pxs3-ref-gadget1.dts   | 40 ++++++++++++++++++
- 4 files changed, 94 insertions(+), 1 deletion(-)
- create mode 100644 arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
- create mode 100644 arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-
-diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-index c0fd029b37e5..f909ec2e5333 100644
---- a/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-+++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
-@@ -196,11 +196,21 @@
-               function = "usb0";
-       };
- 
-+      pinctrl_usb0_device: usb0-device {
-+              groups = "usb0_device";
-+              function = "usb0";
-+      };
-+
-       pinctrl_usb1: usb1 {
-               groups = "usb1";
-               function = "usb1";
-       };
- 
-+      pinctrl_usb1_device: usb1-device {
-+              groups = "usb1_device";
-+              function = "usb1";
-+      };
-+
-       pinctrl_usb2: usb2 {
-               groups = "usb2";
-               function = "usb2";
-diff --git a/arch/arm64/boot/dts/socionext/Makefile b/arch/arm64/boot/dts/socionext/Makefile
-index dda3da33614b..33989a9643ac 100644
---- a/arch/arm64/boot/dts/socionext/Makefile
-+++ b/arch/arm64/boot/dts/socionext/Makefile
-@@ -5,4 +5,6 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \
-       uniphier-ld20-akebi96.dtb \
-       uniphier-ld20-global.dtb \
-       uniphier-ld20-ref.dtb \
--      uniphier-pxs3-ref.dtb
-+      uniphier-pxs3-ref.dtb \
-+      uniphier-pxs3-ref-gadget0.dtb \
-+      uniphier-pxs3-ref-gadget1.dtb
-diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
-new file mode 100644
-index 000000000000..7069f51bc120
---- /dev/null
-+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
-@@ -0,0 +1,41 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+//
-+// Device Tree Source for UniPhier PXs3 Reference Board (for USB-Device #0)
-+//
-+// Copyright (C) 2021 Socionext Inc.
-+//   Author: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-+
-+/dts-v1/;
-+#include "uniphier-pxs3-ref.dts"
-+
-+/ {
-+      model = "UniPhier PXs3 Reference Board (USB-Device #0)";
-+};
-+
-+/* I2C3 pinctrl is shared with USB*VBUSIN */
-+&i2c3 {
-+      status = "disabled";
-+};
-+
-+&usb0 {
-+      status = "okay";
-+      dr_mode = "peripheral";
-+      pinctrl-0 = <&pinctrl_usb0_device>;
-+      snps,dis_enblslpm_quirk;
-+      snps,dis_u2_susphy_quirk;
-+      snps,dis_u3_susphy_quirk;
-+      snps,usb2_gadget_lpm_disable;
-+      phy-names = "usb2-phy", "usb3-phy";
-+      phys = <&usb0_hsphy0>, <&usb0_ssphy0>;
-+};
-+
-+&usb0_hsphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+&usb0_ssphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+/delete-node/ &usb0_hsphy1;
-+/delete-node/ &usb0_ssphy1;
-diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-new file mode 100644
-index 000000000000..a3cfa8113ffb
---- /dev/null
-+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-@@ -0,0 +1,40 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+//
-+// Device Tree Source for UniPhier PXs3 Reference Board (for USB-Device #1)
-+//
-+// Copyright (C) 2021 Socionext Inc.
-+//   Author: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
-+
-+/dts-v1/;
-+#include "uniphier-pxs3-ref.dts"
-+
-+/ {
-+      model = "UniPhier PXs3 Reference Board (USB-Device #1)";
-+};
-+
-+/* I2C3 pinctrl is shared with USB*VBUSIN */
-+&i2c3 {
-+      status = "disabled";
-+};
-+
-+&usb1 {
-+      status = "okay";
-+      dr_mode = "peripheral";
-+      pinctrl-0 = <&pinctrl_usb1_device>;
-+      snps,dis_enblslpm_quirk;
-+      snps,dis_u2_susphy_quirk;
-+      snps,dis_u3_susphy_quirk;
-+      snps,usb2_gadget_lpm_disable;
-+      phy-names = "usb2-phy", "usb3-phy";
-+      phys = <&usb1_hsphy0>, <&usb1_ssphy0>;
-+};
-+
-+&usb1_hsphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+&usb1_ssphy0 {
-+      /delete-property/ vbus-supply;
-+};
-+
-+/delete-node/ &usb1_hsphy1;
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index a3783753fbe251166c398387ccc1c50126625e39..b4383ea38ce88ea4c963c5795e31cb8ead061d7f 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -775,7 +775,6 @@ btrfs-scrub-properly-report-super-block-errors-in-sy.patch
 btrfs-scrub-try-to-fix-super-block-errors.patch
 btrfs-don-t-print-information-about-space-cache-or-t.patch
 btrfs-call-__btrfs_remove_free_space_cache_locked-on.patch
-arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch
 arm-9233-1-stacktrace-skip-frame-pointer-boundary-ch.patch
 arm-9234-1-stacktrace-avoid-duplicate-saving-of-exce.patch
 arm-9242-1-kasan-only-map-modules-if-config_kasan_vm.patch