-
Notifications
You must be signed in to change notification settings - Fork 25
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add initial support for Sony Xperia Z Ultra (togari) #20
Add initial support for Sony Xperia Z Ultra (togari) #20
Conversation
@@ -1,6 +1,9 @@ | |||
// SPDX-License-Identifier: GPL-2.0 | |||
#include "qcom-msm8974-sony-xperia-rhine.dtsi" | |||
|
|||
/* This device has Maxim touchscreen instead of Synaptics touchscreen. */ | |||
/delete-node/ &blsp1_i2c2; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't delete the i2c node that doesn't make any sense.
There's several options.
- If your device has the maxim touchscreen on the same i2c bus then you can delete that original touchscreen node
- Or you can do &touchscreen { status = "disabled"; }
- Or you can move the touchscreen node from common.dtsi to the devices that do have synaptics touchscreen, as the touchscreen is obviously not common across all Rhine devices. And then you don't need to do anything in this dts file you're writing, just in Rhine.dts*
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hi, i have added an initial config for maxim touchscreen and disable the touch screen node from rhibe common.
2224eb1
to
353ef5d
Compare
I'm currently on holiday until early August so I'll take a proper look then. Thanks! |
353ef5d
to
a0cb12d
Compare
So, I updated the touchscreen config. The maxim touchscreen is used on z2 (sirius) and there is a mainline driver for it. However, I got some issue when trying to enable it. Here is the dmesg. |
a0cb12d
to
dc36ede
Compare
So, I decided to remove the maxim touchscreen config from the dts. i basically follow the config in sony sirius (Z2). But, it seems that in Z2 dts, the config is taken from downstream kernel directly.
/lib/firmware/postmarketos so i just remove it.
I also updated a regulator voltage since it has a different in togari compare to the rest of rhine variant. |
dc36ede
to
dc5a728
Compare
So, I am able to enable charging by setting |
key-camera-focus { | ||
status = "disabled"; | ||
}; | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Better move these two keys away from rhine.dtsi into amami and honami (if they both have those camera key), if togari doesn't have the camera key
// SPDX-License-Identifier: GPL-2.0 | ||
#include "qcom-msm8974-sony-xperia-rhine.dtsi" | ||
|
||
/delete-node/ &touchscreen; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add a comment why this is needed e.g. /* Togari uses a different touchscreen compared to other rhine devices */
clock-frequency = <355000>; | ||
vdd-supply = <&pm8941_l22>; | ||
|
||
touchscreen: maxim_max1187x_tsc@48 { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make it touchscreen@48
. Also FYI when you send this upstream, you need to remove this section since the max1187x driver is not upstream
regulator-max-microvolt = <2600000>; | ||
}; | ||
}; | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since you seemingly just override voltages, do this instead
&pm8941_l23 {
regulator-min-microvolt = <2600000>;
regulator-max-microvolt = <2600000>;
};
Based on the msm8974. Signed-off-by: Kevin Widjaja <[email protected]>
Add the dts for the Z Ultra. This is currently almost the same as Z1 Compact (amami) and Z1 (honami) as they share almost the same hardware. Only USB Networking and volume button are confirmed working. Signed-off-by: Kevin Widjaja <[email protected]>
…and rhine-honami Sony togari does not have dedicated camera button hence it is moved from common rhine dtsi to amami and honami dts files. Signed-off-by: Kevin Widjaja <[email protected]>
Set usb-charge-current-limit to enable charging over USB for all sony-rhine device Signed-off-by: Kevin Widjaja <[email protected]>
294f5ff
to
af918d2
Compare
Sorry for the delays, only now found time to update the msm8974 kernel fork to later versions. I've picked your patches with some modifications to qcom-msm8974-6.11.y, thanks for your contributions! Would be awesome if you could take those and send them upstream so they'll automatically be included in newer kernel releases. Feel free to ping me on Matrix if you need any help with that. |
Hi, thanks. I have been quite busy with work so maybe later. |
Pretty much almost the same as honami and similar to amami. Only just getting it booting mainline kernel so not much is confirmed working other than volume button and usb networking on PMOS. Below are the dmesg for the booted device.