Skip to content

More devices for t603x/t8122#512

Open
WhatAmISupposedToPutHere wants to merge 3 commits into
AsahiLinux:asahi-wipfrom
WhatAmISupposedToPutHere:m3-slience
Open

More devices for t603x/t8122#512
WhatAmISupposedToPutHere wants to merge 3 commits into
AsahiLinux:asahi-wipfrom
WhatAmISupposedToPutHere:m3-slience

Conversation

@WhatAmISupposedToPutHere
Copy link
Copy Markdown
Member

Hwmon, SPI flash, and audio output. Tested on a j514c

Signed-off-by: Sasha Finkelstein <k@chaosmail.tech>
Signed-off-by: Sasha Finkelstein <k@chaosmail.tech>
Signed-off-by: Sasha Finkelstein <k@chaosmail.tech>
Copy link
Copy Markdown
Member

@jannau jannau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll merge the hwmon and spi/nvram commits manually and fix the spi compatible issues.
Please split the audio changes into an upstreamable commit (nco, admac, mca and sio_dart) and one for macaudio and speaker and headphone driver

};

spi1: spi@289104000 {
compatible = "apple,t6030-spi", "apple,t8103-spi", "apple,spi";
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this shouldn't carry "apple,spi" as compatible

};

admac: dma-controller@28b200000 {
compatible = "apple,t6030-admac", "apple,t8103-admac", "apple,admac";
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same for "apple,admac", not sure if that is already upstream

};

mca: mca@28b400000 {
compatible = "apple,t6030-mca", "apple,t8103-mca", "apple,mca";
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and "apple,mca"

};

nco: clock-controller@350044000 {
compatible = "apple,t6030-nco", "apple,t8103-nco", "apple,nco";
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and "apple,nco", I won't repeat that for the other .dtsi


/ {
sound {
compatible = "apple,j433-macaudio", "apple,j456-macaudio", "apple,macaudio";
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the m3 imacs have the same speaker amps as the other models so we probably should omit "apple,j456-macaudio". I guess it's fine for now and can be changed when the speakers are added which isn't high priority

};

spi1: spi@2a1104000 {
compatible = "apple,t8122-spi", "apple,spi";
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing "apple,t8103-spi"

};

admac: dma-controller@2a3200000 {
compatible = "apple,t8122-admac", "apple,admac";
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing "apple,t8103-admac"

};

mca: i2s@2a3400000 {
compatible = "apple,t8122-mca", "apple,mca";
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing "apple,t8103-mca"

};

nco: clock-controller@2c0044000 {
compatible = "apple,t8122-nco", "apple,nco";
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing "apple,t8103-nco"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants