[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-44-gbb72a46
Brought to you by:
sszy
|
From: Sébastien S. <ss...@us...> - 2014-01-17 08:37:50
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via bb72a46044daba0665966a31f3367358fb467d3a (commit)
via 000d4f69dbd31777ec2c0a8487294082acf7d9ea (commit)
via 0a441ee78102a2ffd4f79e97e8723d56b9154e56 (commit)
via 8f5a434090790b715fcb8ad36a565df6087672ce (commit)
from 2aaf4e9b02ee434b4d44f4cad82f30acc1432699 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bb72a46044daba0665966a31f3367358fb467d3a
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Jan 17 09:37:11 2014 +0100
[LINUX] 3.13: apf6q: this patch fixes a lockdep warning
commit 000d4f69dbd31777ec2c0a8487294082acf7d9ea
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Jan 16 17:45:50 2014 +0100
[LINUX] 3.13: apf6q: add pcie to device tree.
commit 0a441ee78102a2ffd4f79e97e8723d56b9154e56
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Jan 16 15:04:49 2014 +0100
[BUILDROOT] apf6q: move to linux 3.13-rc8
commit 8f5a434090790b715fcb8ad36a565df6087672ce
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Jan 16 14:32:59 2014 +0100
[LINUX] 3.12: apf6q: add wifi and bluetooth to device tree
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6q_defconfig | 2 +-
.../3.12/0450-armadeus-add-apf6q-devicetree.patch | 40 +++++++++---
.../0450-armadeus-add-apf6q-devicetree.patch | 66 ++++++++++++++------
...-imx-drm-Add-mx6-hdmi-transmitter-support.patch | 22 +++---
...around-fec-tx-queue-timeouts-when-SATA-SD.patch | 0
...-ipuv3-crtc-Invert-IPU-DI0-clock-polarity.patch | 0
...inux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch | 0
...479-linux-ARM-mmc-clear-auto-cmd-settings.patch | 0
...c-core-Update-ext_csd-if-touched-by-ioctl.patch | 0
...ess-hardirq-unsafe-lock-in-atomic-context.patch | 45 +++++++++++++
10 files changed, 135 insertions(+), 40 deletions(-)
copy patches/linux/{3.12 => 3.13}/0450-armadeus-add-apf6q-devicetree.patch (73%)
copy patches/linux/{3.12 => 3.13}/0452-linux-0001-imx-drm-Add-mx6-hdmi-transmitter-support.patch (99%)
copy patches/linux/{3.12 => 3.13}/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch (100%)
copy patches/linux/{3.12 => 3.13}/0454-linux-0002-imx-drm-ipuv3-crtc-Invert-IPU-DI0-clock-polarity.patch (100%)
copy patches/linux/{3.12 => 3.13}/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch (100%)
copy patches/linux/{3.12 => 3.13}/0479-linux-ARM-mmc-clear-auto-cmd-settings.patch (100%)
copy patches/linux/{3.12 => 3.13}/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch (100%)
create mode 100644 patches/linux/3.13/0481-V2-1-2-mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch
diff --git a/buildroot/configs/apf6q_defconfig b/buildroot/configs/apf6q_defconfig
index 2360993..d1a770b 100644
--- a/buildroot/configs/apf6q_defconfig
+++ b/buildroot/configs/apf6q_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13-rc8"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch b/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch
index 13f3b65..6de95e4 100644
--- a/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch
+++ b/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch
@@ -2,7 +2,7 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
===================================================================
--- /dev/null
+++ linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
-@@ -0,0 +1,175 @@
+@@ -0,0 +1,197 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -112,12 +112,14 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ >;
+ };
+
-+ pinctrl_uart4_2: uart4grp-2 {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
-+ >;
-+ };
++ pinctrl_uart2_3: uart2grp-3 {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
++ MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
++ MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
++ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
++ >;
++ };
+
+ pinctrl_uart3_3: uart3grp-3 {
+ fsl,pins = <
@@ -126,8 +128,14 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
+ MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1
+ >;
-+ };
++ };
+
++ pinctrl_uart4_2: uart4grp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
++ >;
++ };
+ };
+};
+
@@ -145,6 +153,13 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ status = "okay";
+};
+
++/* Bluetooth */
++&uart2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart2_3>;
++ status = "okay";
++};
++
+/* GSM */
+&uart3 {
+ pinctrl-names = "default";
@@ -163,7 +178,14 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ status = "okay";
+};
+
-+/* Wi-Fi + BT combo chip */
++/* Wi-Fi */
++&usdhc1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc1_2>;
++ status = "okay";
++};
++
++/* microSD */
+&usdhc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc2_2>;
diff --git a/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
similarity index 73%
copy from patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch
copy to patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
index 13f3b65..82c17db 100644
--- a/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch
+++ b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
@@ -1,8 +1,8 @@
-Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+Index: linux-3.13-rc8/arch/arm/boot/dts/imx6q-apf6.dts
===================================================================
--- /dev/null
-+++ linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
-@@ -0,0 +1,175 @@
++++ linux-3.13-rc8/arch/arm/boot/dts/imx6q-apf6.dts
+@@ -0,0 +1,203 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -105,19 +105,22 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ hog {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
-+ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
-+ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
-+ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
++ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
++ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
++ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
++ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
++ MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
+ >;
+ };
+
-+ pinctrl_uart4_2: uart4grp-2 {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
-+ >;
-+ };
++ pinctrl_uart2_3: uart2grp-3 {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
++ MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
++ MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
++ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
++ >;
++ };
+
+ pinctrl_uart3_3: uart3grp-3 {
+ fsl,pins = <
@@ -126,8 +129,14 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
+ MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1
+ >;
-+ };
++ };
+
++ pinctrl_uart4_2: uart4grp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
++ >;
++ };
+ };
+};
+
@@ -138,6 +147,11 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ status = "okay";
+};
+
++&pcie {
++ reset-gpio = <&gpio6 2 0>;
++ status = "okay";
++};
++
+/* GPS */
+&uart1 {
+ pinctrl-names = "default";
@@ -145,6 +159,13 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ status = "okay";
+};
+
++/* Bluetooth */
++&uart2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart2_3>;
++ status = "okay";
++};
++
+/* GSM */
+&uart3 {
+ pinctrl-names = "default";
@@ -163,7 +184,14 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ status = "okay";
+};
+
-+/* Wi-Fi + BT combo chip */
++/* Wi-Fi */
++&usdhc1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc1_2>;
++ status = "okay";
++};
++
++/* microSD */
+&usdhc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc2_2>;
@@ -178,11 +206,11 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.12.7/arch/arm/boot/dts/Makefile
+Index: linux-3.13-rc8/arch/arm/boot/dts/Makefile
===================================================================
---- linux-3.12.7.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.12.7/arch/arm/boot/dts/Makefile
-@@ -136,6 +136,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
+--- linux-3.13-rc8.orig/arch/arm/boot/dts/Makefile
++++ linux-3.13-rc8/arch/arm/boot/dts/Makefile
+@@ -139,6 +139,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
imx6dl-sabreauto.dtb \
imx6dl-sabresd.dtb \
imx6dl-wandboard.dtb \
diff --git a/patches/linux/3.12/0452-linux-0001-imx-drm-Add-mx6-hdmi-transmitter-support.patch b/patches/linux/3.13/0452-linux-0001-imx-drm-Add-mx6-hdmi-transmitter-support.patch
similarity index 99%
copy from patches/linux/3.12/0452-linux-0001-imx-drm-Add-mx6-hdmi-transmitter-support.patch
copy to patches/linux/3.13/0452-linux-0001-imx-drm-Add-mx6-hdmi-transmitter-support.patch
index a944038..63a5a0c 100644
--- a/patches/linux/3.12/0452-linux-0001-imx-drm-Add-mx6-hdmi-transmitter-support.patch
+++ b/patches/linux/3.13/0452-linux-0001-imx-drm-Add-mx6-hdmi-transmitter-support.patch
@@ -1,7 +1,7 @@
-From 13039cb506f5e773d0f8eb467ec5dfd794506be2 Mon Sep 17 00:00:00 2001
+From 46229d8ba38b5a02faabbdbefd7553250a52e762 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fab...@fr...>
Date: Wed, 30 Oct 2013 22:51:44 -0200
-Subject: [PATCH 1/5] imx-drm: Add mx6 hdmi transmitter support
+Subject: [PATCH 1/3] imx-drm: Add mx6 hdmi transmitter support
Add mx6 hdmi transmitter support.
@@ -27,10 +27,10 @@ Signed-off-by: Fabio Estevam <fab...@fr...>
create mode 100644 drivers/staging/imx-drm/imx-hdmi.h
diff --git a/drivers/staging/imx-drm/Kconfig b/drivers/staging/imx-drm/Kconfig
-index 394254f..9c85077 100644
+index 5032ff7..78319ad 100644
--- a/drivers/staging/imx-drm/Kconfig
+++ b/drivers/staging/imx-drm/Kconfig
-@@ -52,3 +52,9 @@ config DRM_IMX_IPUV3
+@@ -53,3 +53,9 @@ config DRM_IMX_IPUV3
depends on DRM_IMX_IPUV3_CORE
help
Choose this if you have a i.MX5 or i.MX6 processor.
@@ -41,13 +41,13 @@ index 394254f..9c85077 100644
+ help
+ Choose this if you want to use HDMI on i.MX6.
diff --git a/drivers/staging/imx-drm/Makefile b/drivers/staging/imx-drm/Makefile
-index bfaf693..79a5588 100644
+index 8742432..4677585 100644
--- a/drivers/staging/imx-drm/Makefile
+++ b/drivers/staging/imx-drm/Makefile
-@@ -9,3 +9,4 @@ obj-$(CONFIG_DRM_IMX_LDB) += imx-ldb.o
- obj-$(CONFIG_DRM_IMX_FB_HELPER) += imx-fbdev.o
- obj-$(CONFIG_DRM_IMX_IPUV3_CORE) += ipu-v3/
- obj-$(CONFIG_DRM_IMX_IPUV3) += ipuv3-crtc.o
+@@ -11,3 +11,4 @@ obj-$(CONFIG_DRM_IMX_IPUV3_CORE) += ipu-v3/
+
+ imx-ipuv3-crtc-objs := ipuv3-crtc.o ipuv3-plane.o
+ obj-$(CONFIG_DRM_IMX_IPUV3) += imx-ipuv3-crtc.o
+obj-$(CONFIG_DRM_IMX_HDMI) += imx-hdmi.o
diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c
new file mode 100644
@@ -3010,7 +3010,7 @@ index 0000000..39b6776
+};
+#endif /* __IMX_HDMI_H__ */
diff --git a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
-index 7086b22..b4e60cf 100644
+index b6d36b3..866e355 100644
--- a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
+++ b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
@@ -212,6 +212,7 @@
@@ -3022,5 +3022,5 @@ index 7086b22..b4e60cf 100644
#define IMX6Q_GPR3_HDMI_MUX_CTL_IPU1_DI0 (0x0 << 2)
#define IMX6Q_GPR3_HDMI_MUX_CTL_IPU1_DI1 (0x1 << 2)
--
-1.8.4.rc3
+1.8.5.1
diff --git a/patches/linux/3.12/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch b/patches/linux/3.13/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
similarity index 100%
copy from patches/linux/3.12/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
copy to patches/linux/3.13/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
diff --git a/patches/linux/3.12/0454-linux-0002-imx-drm-ipuv3-crtc-Invert-IPU-DI0-clock-polarity.patch b/patches/linux/3.13/0454-linux-0002-imx-drm-ipuv3-crtc-Invert-IPU-DI0-clock-polarity.patch
similarity index 100%
copy from patches/linux/3.12/0454-linux-0002-imx-drm-ipuv3-crtc-Invert-IPU-DI0-clock-polarity.patch
copy to patches/linux/3.13/0454-linux-0002-imx-drm-ipuv3-crtc-Invert-IPU-DI0-clock-polarity.patch
diff --git a/patches/linux/3.12/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch b/patches/linux/3.13/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch
similarity index 100%
copy from patches/linux/3.12/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch
copy to patches/linux/3.13/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch
diff --git a/patches/linux/3.12/0479-linux-ARM-mmc-clear-auto-cmd-settings.patch b/patches/linux/3.13/0479-linux-ARM-mmc-clear-auto-cmd-settings.patch
similarity index 100%
copy from patches/linux/3.12/0479-linux-ARM-mmc-clear-auto-cmd-settings.patch
copy to patches/linux/3.13/0479-linux-ARM-mmc-clear-auto-cmd-settings.patch
diff --git a/patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch b/patches/linux/3.13/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
similarity index 100%
copy from patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
copy to patches/linux/3.13/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
diff --git a/patches/linux/3.13/0481-V2-1-2-mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch b/patches/linux/3.13/0481-V2-1-2-mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch
new file mode 100644
index 0000000..8c4dfe3
--- /dev/null
+++ b/patches/linux/3.13/0481-V2-1-2-mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch
@@ -0,0 +1,45 @@
+diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
+index 2a04847..745ee1e 100644
+--- a/drivers/mmc/host/sdhci-esdhc-imx.c
++++ b/drivers/mmc/host/sdhci-esdhc-imx.c
+@@ -576,19 +576,17 @@ static unsigned int esdhc_pltfm_get_max_clock(struct sdhci_host *host)
+ struct pltfm_imx_data *imx_data = pltfm_host->priv;
+ struct esdhc_platform_data *boarddata = &imx_data->boarddata;
+
+- u32 f_host = clk_get_rate(pltfm_host->clk);
+-
+- if (boarddata->f_max && (boarddata->f_max < f_host))
++ if (boarddata->f_max && (boarddata->f_max < pltfm_host->clock))
+ return boarddata->f_max;
+ else
+- return f_host;
++ return pltfm_host->clock;
+ }
+
+ static unsigned int esdhc_pltfm_get_min_clock(struct sdhci_host *host)
+ {
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+
+- return clk_get_rate(pltfm_host->clk) / 256 / 16;
++ return pltfm_host->clock / 256 / 16;
+ }
+
+ static inline void esdhc_pltfm_set_clock(struct sdhci_host *host,
+@@ -596,7 +594,7 @@ static inline void esdhc_pltfm_set_clock(struct sdhci_host *host,
+ {
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct pltfm_imx_data *imx_data = pltfm_host->priv;
+- unsigned int host_clock = clk_get_rate(pltfm_host->clk);
++ unsigned int host_clock = pltfm_host->clock;
+ int pre_div = 2;
+ int div = 1;
+ u32 temp, val;
+@@ -1017,7 +1015,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
+ }
+
+ pltfm_host->clk = imx_data->clk_per;
+-
++ pltfm_host->clock = clk_get_rate(pltfm_host->clk);
+ clk_prepare_enable(imx_data->clk_per);
+ clk_prepare_enable(imx_data->clk_ipg);
+ clk_prepare_enable(imx_data->clk_ahb);
hooks/post-receive
--
armadeus
|