Hi,
On Sun, Nov 21, 2021, at 19:07, Janne Grunau wrote:
> i2c0, i2c1 and i2c3 are used on all M1 devices, i2c2 is only used on
> the 2020 Mac Mini and 13-inch MacBook Pro. All devices have identical
> i2c addresses for the cd321x' and use the same i2c bus.
This should really be two commits: One for the i2c nodes and the other
one to add the cd321x nodes.
>
> Signed-off-by: Janne Grunau <j@xxxxxxxxxx>
> ---
> arch/arm64/boot/dts/apple/t8103-j274.dts | 4 ++
> arch/arm64/boot/dts/apple/t8103-j293.dts | 4 ++
> arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 18 ++++++
> arch/arm64/boot/dts/apple/t8103.dtsi | 73 +++++++++++++++++++++++
> 4 files changed, 99 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/apple/t8103-j274.dts
> b/arch/arm64/boot/dts/apple/t8103-j274.dts
> index 9e01ef70039d..2cd429efba5b 100644
> --- a/arch/arm64/boot/dts/apple/t8103-j274.dts
> +++ b/arch/arm64/boot/dts/apple/t8103-j274.dts
> @@ -39,3 +39,7 @@ ethernet0: ethernet@0,0 {
> local-mac-address = [00 10 18 00 00 00];
> };
> };
> +
> +&i2c2 {
> + status = "okay";
> +};
> diff --git a/arch/arm64/boot/dts/apple/t8103-j293.dts
> b/arch/arm64/boot/dts/apple/t8103-j293.dts
> index 466035f00b69..a3b084d50da3 100644
> --- a/arch/arm64/boot/dts/apple/t8103-j293.dts
> +++ b/arch/arm64/boot/dts/apple/t8103-j293.dts
> @@ -31,3 +31,7 @@ &pcie0_dart_2 {
>
> /delete-node/ &port01;
> /delete-node/ &port02;
> +
> +&i2c2 {
> + status = "okay";
> +};
> diff --git a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
> b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
> index 53d22b434d76..5f748f3f60d2 100644
> --- a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
> +++ b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
> @@ -39,6 +39,24 @@ &serial0 {
> status = "okay";
> };
>
> +&i2c0 {
> + hpm0: tps6598x@38 {
> + compatible = "apple,cd321x";
> + reg = <0x38>;
> + interrupt-parent = <&pinctrl_ap>;
> + interrupts = <106 IRQ_TYPE_LEVEL_LOW>;
> + interrupt-names = "irq";
> + };
> +
> + hpm1: tps6598x@3f {
> + compatible = "apple,cd321x";
> + reg = <0x3f>;
> + interrupt-parent = <&pinctrl_ap>;
> + interrupts = <106 IRQ_TYPE_LEVEL_LOW>;
> + interrupt-names = "irq";
> + };
> +};
> +
> /*
> * Force the bus number assignments so that we can declare some of the
> * on-board devices and properties that are populated by the bootloader
> diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi
> b/arch/arm64/boot/dts/apple/t8103.dtsi
> index c320c8baeb41..6c6dd988bd60 100644
> --- a/arch/arm64/boot/dts/apple/t8103.dtsi
> +++ b/arch/arm64/boot/dts/apple/t8103.dtsi
> @@ -126,6 +126,59 @@ serial0: serial@235200000 {
> status = "disabled";
> };
>
> + i2c0: i2c@235010000 {
> + compatible = "apple,t8103-i2c", "apple,i2c";
> + reg = <0x2 0x35010000 0x0 0x4000>;
> + clocks = <&clk24>;
> + clock-names = "ref";
I don't think we need the clock name here.
> + interrupt-parent = <&aic>;
> + interrupts = <AIC_IRQ 627 IRQ_TYPE_LEVEL_HIGH>;
> + pinctrl-0 = <&i2c0_pins>;
> + pinctrl-names = "default";
> + #address-cells = <0x1>;
> + #size-cells = <0x0>;
> + };
> +
> + i2c1: i2c@235014000 {
> + compatible = "apple,t8103-i2c", "apple,i2c";
> + reg = <0x2 0x35014000 0x0 0x4000>;
> + clocks = <&clk24>;
> + clock-names = "ref";
> + interrupt-parent = <&aic>;
> + interrupts = <AIC_IRQ 628 IRQ_TYPE_LEVEL_HIGH>;
> + pinctrl-0 = <&i2c1_pins>;
> + pinctrl-names = "default";
> + #address-cells = <0x1>;
> + #size-cells = <0x0>;
> + };
> +
> + i2c2: i2c@235018000 {
> + compatible = "apple,t8103-i2c", "apple,i2c";
> + reg = <0x2 0x35018000 0x0 0x4000>;
> + clocks = <&clk24>;
> + clock-names = "ref";
> + interrupt-parent = <&aic>;
> + interrupts = <AIC_IRQ 628 IRQ_TYPE_LEVEL_HIGH>;
Shouldn't this be 629? 628 is already used for i2c1.
> + pinctrl-0 = <&i2c2_pins>;
> + pinctrl-names = "default";
> + #address-cells = <0x1>;
> + #size-cells = <0x0>;
> + status = "disabled"; /* not used in all devices */
> + };
> +
> + i2c3: i2c@23501c000 {
> + compatible = "apple,t8103-i2c", "apple,i2c";
> + reg = <0x2 0x3501c000 0x0 0x4000>;
> + clocks = <&clk24>;
> + clock-names = "ref";
> + interrupt-parent = <&aic>;
> + interrupts = <AIC_IRQ 630 IRQ_TYPE_LEVEL_HIGH>;
> + pinctrl-0 = <&i2c3_pins>;
> + pinctrl-names = "default";
> + #address-cells = <0x1>;
> + #size-cells = <0x0>;
> + };
> +
> aic: interrupt-controller@23b100000 {
> compatible = "apple,t8103-aic", "apple,aic";
> #interrupt-cells = <3>;
> @@ -153,6 +206,26 @@ pinctrl_ap: pinctrl@23c100000 {
> <AIC_IRQ 195 IRQ_TYPE_LEVEL_HIGH>,
> <AIC_IRQ 196 IRQ_TYPE_LEVEL_HIGH>;
>
> + i2c0_pins: i2c0-pins {
> + pinmux = <APPLE_PINMUX(192, 1)>,
> + <APPLE_PINMUX(188, 1)>;
> + };
> +
> + i2c1_pins: i2c1-pins {
> + pinmux = <APPLE_PINMUX(201, 1)>,
> + <APPLE_PINMUX(199, 1)>;
> + };
> +
> + i2c2_pins: i2c2-pins {
> + pinmux = <APPLE_PINMUX(163, 1)>,
> + <APPLE_PINMUX(162, 1)>;
> + };
> +
> + i2c3_pins: i2c3-pins {
> + pinmux = <APPLE_PINMUX(73, 1)>,
> + <APPLE_PINMUX(72, 1)>;
> + };
> +
> pcie_pins: pcie-pins {
> pinmux = <APPLE_PINMUX(150, 1)>,
> <APPLE_PINMUX(151, 1)>,
> --
> 2.34.0
