Sasha Finkelstein via B4 Relay 於 2024/11/29 早上6:29 寫道:
> From: Sasha Finkelstein <fnkl.kernel@xxxxxxxxx>
>
> Adds device tree entries for the touchbar digitizer
>
> Co-developed-by: Janne Grunau <j@xxxxxxxxxx>
> Signed-off-by: Janne Grunau <j@xxxxxxxxxx>
> Signed-off-by: Sasha Finkelstein <fnkl.kernel@xxxxxxxxx>
> ---
> arch/arm64/boot/dts/apple/t8103-j293.dts | 26 ++++++++++++++++++++++++++
> arch/arm64/boot/dts/apple/t8103.dtsi | 20 ++++++++++++++++++++
> arch/arm64/boot/dts/apple/t8112-j493.dts | 24 ++++++++++++++++++++++++
> arch/arm64/boot/dts/apple/t8112.dtsi | 14 ++++++++++++++
> 4 files changed, 84 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/apple/t8103-j293.dts b/arch/arm64/boot/dts/apple/t8103-j293.dts
> index 56b0c67bfcda321b60c621de092643017693ff91..c31eb3f6f54268cafc9197a9244a5954fbb42802 100644
> --- a/arch/arm64/boot/dts/apple/t8103-j293.dts
> +++ b/arch/arm64/boot/dts/apple/t8103-j293.dts
> @@ -17,6 +17,14 @@ / {
> compatible = "apple,j293", "apple,t8103", "apple,arm-platform";
> model = "Apple MacBook Pro (13-inch, M1, 2020)";
>
> + /*
> + * All of those are used by the bootloader to pass calibration
> + * blobs and other device-specific properties
> + */
> + aliases {
> + touchbar0 = &touchbar0;
> + };
> +
> led-controller {
> compatible = "pwm-leds";
> led-0 {
> @@ -49,3 +57,21 @@ &i2c4 {
> &fpwm1 {
> status = "okay";
> };
> +
> +&spi0 {
> + status = "okay";
> +
> + touchbar0: touchbar@0 {
> + compatible = "apple,j293-touchbar";
> + reg = <0>;
> + spi-max-frequency = <11500000>;
> + spi-cs-setup-delay-ns = <2000>;
> + spi-cs-hold-delay-ns = <2000>;
> + reset-gpios = <&pinctrl_ap 139 GPIO_ACTIVE_LOW>;
> + interrupts-extended = <&pinctrl_ap 194 IRQ_TYPE_EDGE_FALLING>;
> + firmware-name = "apple/dfrmtfw-j293.bin";
> + touchscreen-size-x = <23045>;
> + touchscreen-size-y = <640>;
> + touchscreen-inverted-y;
> + };
> +};
> diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi
> index 9b0dad6b618444ac6b1c9735c50cccfc3965f947..9b83341a799d9a37578e5461e6b184f81ee7435c 100644
> --- a/arch/arm64/boot/dts/apple/t8103.dtsi
> +++ b/arch/arm64/boot/dts/apple/t8103.dtsi
> @@ -326,6 +326,13 @@ clkref: clock-ref {
> clock-output-names = "clkref";
> };
>
> + clk_200m: clock-200m {
> + compatible = "fixed-clock";
> + #clock-cells = <0>;
> + clock-frequency = <200000000>;
> + clock-output-names = "clk_200m";
> + };
> +
> /*
> * This is a fabulated representation of the input clock
> * to NCO since we don't know the true clock tree.
> @@ -441,6 +448,19 @@ fpwm1: pwm@235044000 {
> status = "disabled";
> };
>
> + spi0: spi@235100000 {
> + compatible = "apple,t8103-spi", "apple,spi";
> + reg = <0x2 0x35100000 0x0 0x4000>;
> + interrupt-parent = <&aic>;
> + interrupts = <AIC_IRQ 614 IRQ_TYPE_LEVEL_HIGH>;
> + cs-gpios = <&pinctrl_ap 109 GPIO_ACTIVE_LOW>;
> + clocks = <&clk_200m>;
> + power-domains = <&ps_spi0>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + status = "disabled"; /* only used in J293 */
> + };
> +
> serial0: serial@235200000 {
> compatible = "apple,s5l-uart";
> reg = <0x2 0x35200000 0x0 0x1000>;
> diff --git a/arch/arm64/boot/dts/apple/t8112-j493.dts b/arch/arm64/boot/dts/apple/t8112-j493.dts
> index 0ad908349f55406783942735a2e9dad54cda00ec..3332cc87cdf1a418c4c2247639baf5d2a42ed3c2 100644
> --- a/arch/arm64/boot/dts/apple/t8112-j493.dts
> +++ b/arch/arm64/boot/dts/apple/t8112-j493.dts
> @@ -17,8 +17,13 @@ / {
> compatible = "apple,j493", "apple,t8112", "apple,arm-platform";
> model = "Apple MacBook Pro (13-inch, M2, 2022)";
>
> + /*
> + * All of those are used by the bootloader to pass calibration
> + * blobs and other device-specific properties
> + */
> aliases {
> bluetooth0 = &bluetooth0;
> + touchbar0 = &touchbar0;
> wifi0 = &wifi0;
> };
>
> @@ -67,3 +72,22 @@ &i2c4 {
> &fpwm1 {
> status = "okay";
> };
> +
> +&spi3 {
> + status = "okay";
> +
> + touchbar0: touchbar@0 {
> + compatible = "apple,j493-touchbar";
> + reg = <0>;
> + spi-max-frequency = <8000000>;
> + spi-cs-setup-delay-ns = <2000>;
> + spi-cs-hold-delay-ns = <2000>;
> +
Remove the empty line
> + reset-gpios = <&pinctrl_ap 170 GPIO_ACTIVE_LOW>;
> + interrupts-extended = <&pinctrl_ap 174 IRQ_TYPE_EDGE_FALLING>;
> + firmware-name = "apple/dfrmtfw-j493.bin";
> + touchscreen-size-x = <23045>;
> + touchscreen-size-y = <640>;
> + touchscreen-inverted-y;
> + };
> +};
> diff --git a/arch/arm64/boot/dts/apple/t8112.dtsi b/arch/arm64/boot/dts/apple/t8112.dtsi
> index 1666e6ab250bc0be9b8318e3c8fc903ccd3f3760..977c1ca5e8c1b566bb3876b6619ea8812b98e072 100644
> --- a/arch/arm64/boot/dts/apple/t8112.dtsi
> +++ b/arch/arm64/boot/dts/apple/t8112.dtsi
> @@ -467,6 +467,20 @@ fpwm1: pwm@235044000 {
> status = "disabled";
> };
>
> + spi3: spi@23510c000 {
> + compatible = "apple,t8112-spi", "apple,spi";
> + reg = <0x2 0x3510c000 0x0 0x4000>;
> + interrupt-parent = <&aic>;
> + interrupts = <AIC_IRQ 751 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&clkref>;
> + pinctrl-0 = <&spi3_pins>;
> + pinctrl-names = "default";
> + power-domains = <&ps_spi3>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + status = "disabled";
/* only used in J493 */ ?
> + };
> +
> serial0: serial@235200000 {
> compatible = "apple,s5l-uart";
> reg = <0x2 0x35200000 0x0 0x1000>;
>
Nick Chan
