* [PATCH next v6 1/2] i2c: hisi: Add initial device tree support
@ 2022-10-18 7:30 Weilong Chen
2022-10-18 7:30 ` [PATCH next v6 2/2] dt-bindings: i2c: add entry for hisilicon,i2c-ascend910 Weilong Chen
2022-10-20 1:45 ` [PATCH next v6 1/2] i2c: hisi: Add initial device tree support Yicong Yang
0 siblings, 2 replies; 5+ messages in thread
From: Weilong Chen @ 2022-10-18 7:30 UTC (permalink / raw)
To: chenweilong, yangyicong, xuwei5, wsa, robh+dt, robh
Cc: linux-i2c, linux-kernel, devicetree
The HiSilicon I2C controller can be used on embedded platform, which
boot from devicetree.
Signed-off-by: Weilong Chen <chenweilong@huawei.com>
---
Change since v5:
- Use hisilicon,i2c-ascend910 as compatible string. For more information about
the SoC at https://e.huawei.com/en/products/cloud-computing-dc/atlas/ascend-910
Link: https://lore.kernel.org/linux-i2c/20220920072215.161331-1-chenweilong@huawei.com/
Change since v4:
- Remove the protection for the headers for ACPI/OF
Link: https://lore.kernel.org/lkml/20220909074842.281232-1-chenweilong@huawei.com/T/
drivers/i2c/busses/Kconfig | 2 +-
drivers/i2c/busses/i2c-hisi.c | 15 ++++++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 264e780ae32e..a2081c03f3c4 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -673,7 +673,7 @@ config I2C_HIGHLANDER
config I2C_HISI
tristate "HiSilicon I2C controller"
- depends on (ARM64 && ACPI) || COMPILE_TEST
+ depends on ARM64 || COMPILE_TEST
help
Say Y here if you want to have Hisilicon I2C controller support
available on the Kunpeng Server.
diff --git a/drivers/i2c/busses/i2c-hisi.c b/drivers/i2c/busses/i2c-hisi.c
index 76c3d8f6fc3c..d58a6d2f1bc6 100644
--- a/drivers/i2c/busses/i2c-hisi.c
+++ b/drivers/i2c/busses/i2c-hisi.c
@@ -5,6 +5,7 @@
* Copyright (c) 2021 HiSilicon Technologies Co., Ltd.
*/
+#include <linux/acpi.h>
#include <linux/bits.h>
#include <linux/bitfield.h>
#include <linux/completion.h>
@@ -13,6 +14,7 @@
#include <linux/io.h>
#include <linux/module.h>
#include <linux/mod_devicetable.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/property.h>
#include <linux/units.h>
@@ -483,17 +485,28 @@ static int hisi_i2c_probe(struct platform_device *pdev)
return 0;
}
+#ifdef CONFIG_ACPI
static const struct acpi_device_id hisi_i2c_acpi_ids[] = {
{ "HISI03D1", 0 },
{ }
};
MODULE_DEVICE_TABLE(acpi, hisi_i2c_acpi_ids);
+#endif
+
+#ifdef CONFIG_OF
+static const struct of_device_id hisi_i2c_dts_ids[] = {
+ { .compatible = "hisilicon,i2c-ascend910", },
+ { }
+};
+MODULE_DEVICE_TABLE(of, hisi_i2c_dts_ids);
+#endif
static struct platform_driver hisi_i2c_driver = {
.probe = hisi_i2c_probe,
.driver = {
.name = "hisi-i2c",
- .acpi_match_table = hisi_i2c_acpi_ids,
+ .acpi_match_table = ACPI_PTR(hisi_i2c_acpi_ids),
+ .of_match_table = of_match_ptr(hisi_i2c_dts_ids),
},
};
module_platform_driver(hisi_i2c_driver);
--
2.31.GIT
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH next v6 2/2] dt-bindings: i2c: add entry for hisilicon,i2c-ascend910
2022-10-18 7:30 [PATCH next v6 1/2] i2c: hisi: Add initial device tree support Weilong Chen
@ 2022-10-18 7:30 ` Weilong Chen
2022-10-20 1:52 ` Yicong Yang
2022-10-21 1:16 ` Rob Herring
2022-10-20 1:45 ` [PATCH next v6 1/2] i2c: hisi: Add initial device tree support Yicong Yang
1 sibling, 2 replies; 5+ messages in thread
From: Weilong Chen @ 2022-10-18 7:30 UTC (permalink / raw)
To: chenweilong, yangyicong, xuwei5, wsa, robh+dt, robh
Cc: linux-i2c, linux-kernel, devicetree
Add the new compatible for HiSilicon i2c.
Signed-off-by: Weilong Chen <chenweilong@huawei.com>
---
Change since v5:
- Use hisilicon,i2c-ascend910 as compatible string. For more information about
the SoC at https://e.huawei.com/en/products/cloud-computing-dc/atlas/ascend-910
- Alphabetic order the MAINTAINERS
Change since v4:
- Add description for SoC specific compatibles.
- Use the clock binding.
- Fix decimal, space, case, unused labels.
Link: https://lore.kernel.org/lkml/20220909074842.281232-1-chenweilong@huawei.com/T/#m4e1c915ead04f4e2e48d69131053a966801625db
.../bindings/i2c/hisilicon,i2c-xxx.yaml | 70 +++++++++++++++++++
MAINTAINERS | 1 +
2 files changed, 71 insertions(+)
create mode 100644 Documentation/devicetree/bindings/i2c/hisilicon,i2c-xxx.yaml
diff --git a/Documentation/devicetree/bindings/i2c/hisilicon,i2c-xxx.yaml b/Documentation/devicetree/bindings/i2c/hisilicon,i2c-xxx.yaml
new file mode 100644
index 000000000000..a7285ddc260d
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/hisilicon,i2c-xxx.yaml
@@ -0,0 +1,70 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/i2c/hisilicon,i2c-xxx.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: HiSilicon common IIC controller Device Tree Bindings
+
+maintainers:
+ - yangyicong@huawei.com
+
+allOf:
+ - $ref: /schemas/i2c/i2c-controller.yaml#
+
+properties:
+ compatible:
+ const: hisilicon,i2c-ascend910
+ description:
+ The HiSilicon common IIC controller can be used for many different
+ types of SoC such as Huawei Ascend AI series chips.
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ clocks:
+ maxItems: 1
+
+ clock-frequency:
+ default: 400000
+
+ i2c-sda-falling-time-ns:
+ default: 343
+
+ i2c-scl-falling-time-ns:
+ default: 203
+
+ i2c-sda-hold-time-ns:
+ default: 830
+
+ i2c-scl-rising-time-ns:
+ default: 365
+
+ i2c-digital-filter-width-ns:
+ default: 0
+
+required:
+ - compatible
+ - reg
+ - interrupts
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ i2c@5038b0000 {
+ compatible = "hisilicon,i2c-ascend910";
+ reg = <0x38b0000 0x10000>;
+ interrupts = <0x0 120 0x4>;
+ i2c-sda-falling-time-ns = <56>;
+ i2c-scl-falling-time-ns = <56>;
+ i2c-sda-hold-time-ns = <56>;
+ i2c-scl-rising-time-ns = <56>;
+ i2c-digital-filter;
+ i2c-digital-filter-width-ns = <0x0>;
+ clocks = <&alg_clk>;
+ clock-frequency = <400000>;
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index ad32dc9c4822..961e4442fb08 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9211,6 +9211,7 @@ M: Yicong Yang <yangyicong@hisilicon.com>
L: linux-i2c@vger.kernel.org
S: Maintained
W: https://www.hisilicon.com
+F: Documentation/devicetree/bindings/i2c/hisilicon,i2c-xxx.yaml
F: drivers/i2c/busses/i2c-hisi.c
HISILICON LPC BUS DRIVER
--
2.31.GIT
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH next v6 1/2] i2c: hisi: Add initial device tree support
2022-10-18 7:30 [PATCH next v6 1/2] i2c: hisi: Add initial device tree support Weilong Chen
2022-10-18 7:30 ` [PATCH next v6 2/2] dt-bindings: i2c: add entry for hisilicon,i2c-ascend910 Weilong Chen
@ 2022-10-20 1:45 ` Yicong Yang
1 sibling, 0 replies; 5+ messages in thread
From: Yicong Yang @ 2022-10-20 1:45 UTC (permalink / raw)
To: Weilong Chen
Cc: linux-i2c, linux-kernel, devicetree, yangyicong, robh+dt, robh,
wsa, xuwei5
On 2022/10/18 15:30, Weilong Chen wrote:
> The HiSilicon I2C controller can be used on embedded platform, which
> boot from devicetree.
>
Still looks good to me:
Acked-by: Yicong Yang <yangyicong@hisilicon.com>
> Signed-off-by: Weilong Chen <chenweilong@huawei.com>
> ---
> Change since v5:
> - Use hisilicon,i2c-ascend910 as compatible string. For more information about
> the SoC at https://e.huawei.com/en/products/cloud-computing-dc/atlas/ascend-910
> Link: https://lore.kernel.org/linux-i2c/20220920072215.161331-1-chenweilong@huawei.com/
>
> Change since v4:
> - Remove the protection for the headers for ACPI/OF
> Link: https://lore.kernel.org/lkml/20220909074842.281232-1-chenweilong@huawei.com/T/
>
> drivers/i2c/busses/Kconfig | 2 +-
> drivers/i2c/busses/i2c-hisi.c | 15 ++++++++++++++-
> 2 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
> index 264e780ae32e..a2081c03f3c4 100644
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -673,7 +673,7 @@ config I2C_HIGHLANDER
>
> config I2C_HISI
> tristate "HiSilicon I2C controller"
> - depends on (ARM64 && ACPI) || COMPILE_TEST
> + depends on ARM64 || COMPILE_TEST
> help
> Say Y here if you want to have Hisilicon I2C controller support
> available on the Kunpeng Server.
> diff --git a/drivers/i2c/busses/i2c-hisi.c b/drivers/i2c/busses/i2c-hisi.c
> index 76c3d8f6fc3c..d58a6d2f1bc6 100644
> --- a/drivers/i2c/busses/i2c-hisi.c
> +++ b/drivers/i2c/busses/i2c-hisi.c
> @@ -5,6 +5,7 @@
> * Copyright (c) 2021 HiSilicon Technologies Co., Ltd.
> */
>
> +#include <linux/acpi.h>
> #include <linux/bits.h>
> #include <linux/bitfield.h>
> #include <linux/completion.h>
> @@ -13,6 +14,7 @@
> #include <linux/io.h>
> #include <linux/module.h>
> #include <linux/mod_devicetable.h>
> +#include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/property.h>
> #include <linux/units.h>
> @@ -483,17 +485,28 @@ static int hisi_i2c_probe(struct platform_device *pdev)
> return 0;
> }
>
> +#ifdef CONFIG_ACPI
> static const struct acpi_device_id hisi_i2c_acpi_ids[] = {
> { "HISI03D1", 0 },
> { }
> };
> MODULE_DEVICE_TABLE(acpi, hisi_i2c_acpi_ids);
> +#endif
> +
> +#ifdef CONFIG_OF
> +static const struct of_device_id hisi_i2c_dts_ids[] = {
> + { .compatible = "hisilicon,i2c-ascend910", },
> + { }
> +};
> +MODULE_DEVICE_TABLE(of, hisi_i2c_dts_ids);
> +#endif
>
> static struct platform_driver hisi_i2c_driver = {
> .probe = hisi_i2c_probe,
> .driver = {
> .name = "hisi-i2c",
> - .acpi_match_table = hisi_i2c_acpi_ids,
> + .acpi_match_table = ACPI_PTR(hisi_i2c_acpi_ids),
> + .of_match_table = of_match_ptr(hisi_i2c_dts_ids),
> },
> };
> module_platform_driver(hisi_i2c_driver);
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH next v6 2/2] dt-bindings: i2c: add entry for hisilicon,i2c-ascend910
2022-10-18 7:30 ` [PATCH next v6 2/2] dt-bindings: i2c: add entry for hisilicon,i2c-ascend910 Weilong Chen
@ 2022-10-20 1:52 ` Yicong Yang
2022-10-21 1:16 ` Rob Herring
1 sibling, 0 replies; 5+ messages in thread
From: Yicong Yang @ 2022-10-20 1:52 UTC (permalink / raw)
To: Weilong Chen
Cc: linux-i2c, linux-kernel, devicetree, yangyicong, wsa, robh,
robh+dt, xuwei5
On 2022/10/18 15:30, Weilong Chen wrote:
> Add the new compatible for HiSilicon i2c.
>
> Signed-off-by: Weilong Chen <chenweilong@huawei.com>
> ---
> Change since v5:
> - Use hisilicon,i2c-ascend910 as compatible string. For more information about
> the SoC at https://e.huawei.com/en/products/cloud-computing-dc/atlas/ascend-910
> - Alphabetic order the MAINTAINERS
>
> Change since v4:
> - Add description for SoC specific compatibles.
> - Use the clock binding.
> - Fix decimal, space, case, unused labels.
> Link: https://lore.kernel.org/lkml/20220909074842.281232-1-chenweilong@huawei.com/T/#m4e1c915ead04f4e2e48d69131053a966801625db
>
> .../bindings/i2c/hisilicon,i2c-xxx.yaml | 70 +++++++++++++++++++
The file name may look a bit strange, but anyway the doc itself looks good to me.
Reviewed-by: Yicong Yang <yangyicong@hisilicon.com>
> MAINTAINERS | 1 +
> 2 files changed, 71 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/i2c/hisilicon,i2c-xxx.yaml
>
> diff --git a/Documentation/devicetree/bindings/i2c/hisilicon,i2c-xxx.yaml b/Documentation/devicetree/bindings/i2c/hisilicon,i2c-xxx.yaml
> new file mode 100644
> index 000000000000..a7285ddc260d
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/i2c/hisilicon,i2c-xxx.yaml
> @@ -0,0 +1,70 @@
> +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: "http://devicetree.org/schemas/i2c/hisilicon,i2c-xxx.yaml#"
> +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
> +
> +title: HiSilicon common IIC controller Device Tree Bindings
> +
> +maintainers:
> + - yangyicong@huawei.com
> +
> +allOf:
> + - $ref: /schemas/i2c/i2c-controller.yaml#
> +
> +properties:
> + compatible:
> + const: hisilicon,i2c-ascend910
> + description:
> + The HiSilicon common IIC controller can be used for many different
> + types of SoC such as Huawei Ascend AI series chips.
> +
> + reg:
> + maxItems: 1
> +
> + interrupts:
> + maxItems: 1
> +
> + clocks:
> + maxItems: 1
> +
> + clock-frequency:
> + default: 400000
> +
> + i2c-sda-falling-time-ns:
> + default: 343
> +
> + i2c-scl-falling-time-ns:
> + default: 203
> +
> + i2c-sda-hold-time-ns:
> + default: 830
> +
> + i2c-scl-rising-time-ns:
> + default: 365
> +
> + i2c-digital-filter-width-ns:
> + default: 0
> +
> +required:
> + - compatible
> + - reg
> + - interrupts
> +
> +unevaluatedProperties: false
> +
> +examples:
> + - |
> + i2c@5038b0000 {
> + compatible = "hisilicon,i2c-ascend910";
> + reg = <0x38b0000 0x10000>;
> + interrupts = <0x0 120 0x4>;
> + i2c-sda-falling-time-ns = <56>;
> + i2c-scl-falling-time-ns = <56>;
> + i2c-sda-hold-time-ns = <56>;
> + i2c-scl-rising-time-ns = <56>;
> + i2c-digital-filter;
> + i2c-digital-filter-width-ns = <0x0>;
> + clocks = <&alg_clk>;
> + clock-frequency = <400000>;
> + };
> diff --git a/MAINTAINERS b/MAINTAINERS
> index ad32dc9c4822..961e4442fb08 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -9211,6 +9211,7 @@ M: Yicong Yang <yangyicong@hisilicon.com>
> L: linux-i2c@vger.kernel.org
> S: Maintained
> W: https://www.hisilicon.com
> +F: Documentation/devicetree/bindings/i2c/hisilicon,i2c-xxx.yaml
> F: drivers/i2c/busses/i2c-hisi.c
>
> HISILICON LPC BUS DRIVER
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH next v6 2/2] dt-bindings: i2c: add entry for hisilicon,i2c-ascend910
2022-10-18 7:30 ` [PATCH next v6 2/2] dt-bindings: i2c: add entry for hisilicon,i2c-ascend910 Weilong Chen
2022-10-20 1:52 ` Yicong Yang
@ 2022-10-21 1:16 ` Rob Herring
1 sibling, 0 replies; 5+ messages in thread
From: Rob Herring @ 2022-10-21 1:16 UTC (permalink / raw)
To: Weilong Chen; +Cc: yangyicong, xuwei5, wsa, linux-i2c, linux-kernel, devicetree
On Tue, Oct 18, 2022 at 03:30:12PM +0800, Weilong Chen wrote:
> Add the new compatible for HiSilicon i2c.
>
> Signed-off-by: Weilong Chen <chenweilong@huawei.com>
> ---
> Change since v5:
> - Use hisilicon,i2c-ascend910 as compatible string. For more information about
> the SoC at https://e.huawei.com/en/products/cloud-computing-dc/atlas/ascend-910
> - Alphabetic order the MAINTAINERS
>
> Change since v4:
> - Add description for SoC specific compatibles.
> - Use the clock binding.
> - Fix decimal, space, case, unused labels.
> Link: https://lore.kernel.org/lkml/20220909074842.281232-1-chenweilong@huawei.com/T/#m4e1c915ead04f4e2e48d69131053a966801625db
>
> .../bindings/i2c/hisilicon,i2c-xxx.yaml | 70 +++++++++++++++++++
hisilicon,i2c-ascend910.yaml
> MAINTAINERS | 1 +
> 2 files changed, 71 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/i2c/hisilicon,i2c-xxx.yaml
>
> diff --git a/Documentation/devicetree/bindings/i2c/hisilicon,i2c-xxx.yaml b/Documentation/devicetree/bindings/i2c/hisilicon,i2c-xxx.yaml
> new file mode 100644
> index 000000000000..a7285ddc260d
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/i2c/hisilicon,i2c-xxx.yaml
> @@ -0,0 +1,70 @@
> +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: "http://devicetree.org/schemas/i2c/hisilicon,i2c-xxx.yaml#"
> +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
> +
> +title: HiSilicon common IIC controller Device Tree Bindings
'HiSilicon common I2C controller'
> +
> +maintainers:
> + - yangyicong@huawei.com
Name and email please.
> +
> +allOf:
> + - $ref: /schemas/i2c/i2c-controller.yaml#
> +
> +properties:
> + compatible:
> + const: hisilicon,i2c-ascend910
> + description:
> + The HiSilicon common IIC controller can be used for many different
I2C
> + types of SoC such as Huawei Ascend AI series chips.
> +
> + reg:
> + maxItems: 1
> +
> + interrupts:
> + maxItems: 1
> +
> + clocks:
> + maxItems: 1
> +
> + clock-frequency:
> + default: 400000
> +
> + i2c-sda-falling-time-ns:
> + default: 343
> +
> + i2c-scl-falling-time-ns:
> + default: 203
> +
> + i2c-sda-hold-time-ns:
> + default: 830
> +
> + i2c-scl-rising-time-ns:
> + default: 365
> +
> + i2c-digital-filter-width-ns:
> + default: 0
> +
> +required:
> + - compatible
> + - reg
> + - interrupts
> +
> +unevaluatedProperties: false
> +
> +examples:
> + - |
> + i2c@5038b0000 {
> + compatible = "hisilicon,i2c-ascend910";
> + reg = <0x38b0000 0x10000>;
> + interrupts = <0x0 120 0x4>;
> + i2c-sda-falling-time-ns = <56>;
> + i2c-scl-falling-time-ns = <56>;
> + i2c-sda-hold-time-ns = <56>;
> + i2c-scl-rising-time-ns = <56>;
> + i2c-digital-filter;
> + i2c-digital-filter-width-ns = <0x0>;
> + clocks = <&alg_clk>;
> + clock-frequency = <400000>;
> + };
> diff --git a/MAINTAINERS b/MAINTAINERS
> index ad32dc9c4822..961e4442fb08 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -9211,6 +9211,7 @@ M: Yicong Yang <yangyicong@hisilicon.com>
> L: linux-i2c@vger.kernel.org
> S: Maintained
> W: https://www.hisilicon.com
> +F: Documentation/devicetree/bindings/i2c/hisilicon,i2c-xxx.yaml
> F: drivers/i2c/busses/i2c-hisi.c
>
> HISILICON LPC BUS DRIVER
> --
> 2.31.GIT
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-10-21 1:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-18 7:30 [PATCH next v6 1/2] i2c: hisi: Add initial device tree support Weilong Chen
2022-10-18 7:30 ` [PATCH next v6 2/2] dt-bindings: i2c: add entry for hisilicon,i2c-ascend910 Weilong Chen
2022-10-20 1:52 ` Yicong Yang
2022-10-21 1:16 ` Rob Herring
2022-10-20 1:45 ` [PATCH next v6 1/2] i2c: hisi: Add initial device tree support Yicong Yang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.