diff --git a/main/linux-postmarketos-qcom/0001-sony-amami-dts.patch b/main/linux-postmarketos-qcom/0001-sony-amami-dts.patch deleted file mode 100644 index 39b72fceb..000000000 --- a/main/linux-postmarketos-qcom/0001-sony-amami-dts.patch +++ /dev/null @@ -1,441 +0,0 @@ -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index d0381e9caf21..57ec846e005b 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -729,6 +729,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \ - qcom-msm8960-cdp.dtb \ - qcom-msm8974-fairphone-fp2.dtb \ - qcom-msm8974-lge-nexus5-hammerhead.dtb \ -+ qcom-msm8974-sony-xperia-amami.dtb \ - qcom-msm8974-sony-xperia-castor.dtb \ - qcom-msm8974-sony-xperia-honami.dtb \ - qcom-mdm9615-wp8548-mangoh-green.dtb -diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-amami.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-amami.dts -new file mode 100644 -index 000000000000..fa6beb54f13a ---- /dev/null -+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-amami.dts -@@ -0,0 +1,423 @@ -+#include "qcom-msm8974.dtsi" -+#include "qcom-pm8841.dtsi" -+#include "qcom-pm8941.dtsi" -+#include -+#include -+#include -+ -+/ { -+ model = "Sony Xperia Z1 Compact"; -+ compatible = "sony,xperia-amami", "qcom,msm8974"; -+ -+ aliases { -+ serial0 = &blsp1_uart2; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ gpio-keys { -+ compatible = "gpio-keys"; -+ input-name = "gpio-keys"; -+ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&gpio_keys_pin_a>; -+ -+ volume-down { -+ label = "volume_down"; -+ gpios = <&pm8941_gpios 2 GPIO_ACTIVE_LOW>; -+ linux,input-type = <1>; -+ linux,code = ; -+ }; -+ -+ camera-snapshot { -+ label = "camera_snapshot"; -+ gpios = <&pm8941_gpios 3 GPIO_ACTIVE_LOW>; -+ linux,input-type = <1>; -+ linux,code = ; -+ }; -+ -+ camera-focus { -+ label = "camera_focus"; -+ gpios = <&pm8941_gpios 4 GPIO_ACTIVE_LOW>; -+ linux,input-type = <1>; -+ linux,code = ; -+ }; -+ -+ volume-up { -+ label = "volume_up"; -+ gpios = <&pm8941_gpios 5 GPIO_ACTIVE_LOW>; -+ linux,input-type = <1>; -+ linux,code = ; -+ }; -+ }; -+ -+ memory@0 { -+ reg = <0 0x40000000>, <0x40000000 0x40000000>; -+ device_type = "memory"; -+ }; -+ -+ smd { -+ rpm { -+ rpm_requests { -+ pm8841-regulators { -+ s1 { -+ regulator-min-microvolt = <675000>; -+ regulator-max-microvolt = <1050000>; -+ }; -+ -+ s2 { -+ regulator-min-microvolt = <500000>; -+ regulator-max-microvolt = <1050000>; -+ }; -+ -+ s3 { -+ regulator-min-microvolt = <500000>; -+ regulator-max-microvolt = <1050000>; -+ }; -+ -+ s4 { -+ regulator-min-microvolt = <500000>; -+ regulator-max-microvolt = <1050000>; -+ }; -+ }; -+ -+ pm8941-regulators { -+ vdd_l1_l3-supply = <&pm8941_s1>; -+ vdd_l2_lvs1_2_3-supply = <&pm8941_s3>; -+ vdd_l4_l11-supply = <&pm8941_s1>; -+ vdd_l5_l7-supply = <&pm8941_s2>; -+ vdd_l6_l12_l14_l15-supply = <&pm8941_s2>; -+ vdd_l9_l10_l17_l22-supply = <&vreg_boost>; -+ vdd_l13_l20_l23_l24-supply = <&vreg_boost>; -+ vdd_l21-supply = <&vreg_boost>; -+ -+ s1 { -+ regulator-min-microvolt = <1300000>; -+ regulator-max-microvolt = <1300000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ s2 { -+ regulator-min-microvolt = <2150000>; -+ regulator-max-microvolt = <2150000>; -+ regulator-boot-on; -+ }; -+ -+ s3 { -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ s4 { -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ }; -+ -+ l1 { -+ regulator-min-microvolt = <1225000>; -+ regulator-max-microvolt = <1225000>; -+ -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ l2 { -+ regulator-min-microvolt = <1200000>; -+ regulator-max-microvolt = <1200000>; -+ }; -+ -+ l3 { -+ regulator-min-microvolt = <1200000>; -+ regulator-max-microvolt = <1200000>; -+ }; -+ -+ l4 { -+ regulator-min-microvolt = <1225000>; -+ regulator-max-microvolt = <1225000>; -+ }; -+ -+ l5 { -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ }; -+ -+ l6 { -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ -+ regulator-boot-on; -+ }; -+ -+ l7 { -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ -+ regulator-boot-on; -+ }; -+ -+ l8 { -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ }; -+ -+ l9 { -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <2950000>; -+ }; -+ -+ l11 { -+ regulator-min-microvolt = <1300000>; -+ regulator-max-microvolt = <1350000>; -+ }; -+ -+ l12 { -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ l13 { -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <2950000>; -+ -+ regulator-boot-on; -+ }; -+ -+ l14 { -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ }; -+ -+ l15 { -+ regulator-min-microvolt = <2050000>; -+ regulator-max-microvolt = <2050000>; -+ }; -+ -+ l16 { -+ regulator-min-microvolt = <2700000>; -+ regulator-max-microvolt = <2700000>; -+ }; -+ -+ l17 { -+ regulator-min-microvolt = <2700000>; -+ regulator-max-microvolt = <2700000>; -+ }; -+ -+ l18 { -+ regulator-min-microvolt = <2850000>; -+ regulator-max-microvolt = <2850000>; -+ }; -+ -+ l19 { -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ }; -+ -+ l20 { -+ regulator-min-microvolt = <2950000>; -+ regulator-max-microvolt = <2950000>; -+ -+ regulator-allow-set-load; -+ regulator-boot-on; -+ regulator-system-load = <200000>; -+ }; -+ -+ l21 { -+ regulator-min-microvolt = <2950000>; -+ regulator-max-microvolt = <2950000>; -+ -+ regulator-boot-on; -+ }; -+ -+ l22 { -+ regulator-min-microvolt = <3000000>; -+ regulator-max-microvolt = <3000000>; -+ }; -+ -+ l23 { -+ regulator-min-microvolt = <2800000>; -+ regulator-max-microvolt = <2800000>; -+ }; -+ -+ l24 { -+ regulator-min-microvolt = <3075000>; -+ regulator-max-microvolt = <3075000>; -+ -+ regulator-boot-on; -+ }; -+ }; -+ }; -+ }; -+ }; -+}; -+ -+&soc { -+ sdhci@f9824900 { -+ status = "ok"; -+ -+ vmmc-supply = <&pm8941_l20>; -+ vqmmc-supply = <&pm8941_s3>; -+ -+ bus-width = <8>; -+ non-removable; -+ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&sdhc1_pin_a>; -+ }; -+ -+ sdhci@f98a4900 { -+ status = "ok"; -+ -+ bus-width = <4>; -+ -+ vmmc-supply = <&pm8941_l21>; -+ vqmmc-supply = <&pm8941_l13>; -+ -+ cd-gpios = <&msmgpio 62 GPIO_ACTIVE_LOW>; -+ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>; -+ }; -+ -+ serial@f991e000 { -+ status = "ok"; -+ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&blsp1_uart2_pin_a>; -+ }; -+ -+ -+ pinctrl@fd510000 { -+ blsp1_uart2_pin_a: blsp1-uart2-pin-active { -+ rx { -+ pins = "gpio5"; -+ function = "blsp_uart2"; -+ -+ drive-strength = <2>; -+ bias-pull-up; -+ }; -+ -+ tx { -+ pins = "gpio4"; -+ function = "blsp_uart2"; -+ -+ drive-strength = <4>; -+ bias-disable; -+ }; -+ }; -+ -+ i2c2_pins: i2c2 { -+ mux { -+ pins = "gpio6", "gpio7"; -+ function = "blsp_i2c2"; -+ -+ drive-strength = <2>; -+ bias-disable; -+ }; -+ }; -+ -+ sdhc1_pin_a: sdhc1-pin-active { -+ clk { -+ pins = "sdc1_clk"; -+ drive-strength = <16>; -+ bias-disable; -+ }; -+ -+ cmd-data { -+ pins = "sdc1_cmd", "sdc1_data"; -+ drive-strength = <10>; -+ bias-pull-up; -+ }; -+ }; -+ -+ sdhc2_cd_pin_a: sdhc2-cd-pin-active { -+ pins = "gpio62"; -+ function = "gpio"; -+ -+ drive-strength = <2>; -+ bias-disable; -+ }; -+ -+ sdhc2_pin_a: sdhc2-pin-active { -+ clk { -+ pins = "sdc2_clk"; -+ drive-strength = <10>; -+ bias-disable; -+ }; -+ -+ cmd-data { -+ pins = "sdc2_cmd", "sdc2_data"; -+ drive-strength = <6>; -+ bias-pull-up; -+ }; -+ }; -+ }; -+ -+ dma-controller@f9944000 { -+ qcom,controlled-remotely; -+ }; -+ -+ usb@f9a55000 { -+ status = "ok"; -+ -+ phys = <&usb_hs1_phy>; -+ phy-select = <&tcsr 0xb000 0>; -+ extcon = <&smbb>, <&usb_id>; -+ vbus-supply = <&chg_otg>; -+ -+ hnp-disable; -+ srp-disable; -+ adp-disable; -+ -+ ulpi { -+ phy@a { -+ status = "ok"; -+ -+ v1p8-supply = <&pm8941_l6>; -+ v3p3-supply = <&pm8941_l24>; -+ -+ extcon = <&smbb>; -+ qcom,init-seq = /bits/ 8 <0x1 0x64>; -+ }; -+ }; -+ }; -+}; -+ -+&spmi_bus { -+ pm8941@0 { -+ charger@1000 { -+ qcom,fast-charge-safe-current = <1300000>; -+ qcom,fast-charge-current-limit = <1300000>; -+ qcom,dc-current-limit = <1300000>; -+ qcom,fast-charge-safe-voltage = <4400000>; -+ qcom,fast-charge-high-threshold-voltage = <4350000>; -+ qcom,fast-charge-low-threshold-voltage = <3400000>; -+ qcom,auto-recharge-threshold-voltage = <4200000>; -+ qcom,minimum-input-voltage = <4300000>; -+ }; -+ -+ gpios@c000 { -+ gpio_keys_pin_a: gpio-keys-active { -+ pins = "gpio2", "gpio3", "gpio4", "gpio5"; -+ function = "normal"; -+ -+ bias-pull-up; -+ power-source = ; -+ }; -+ }; -+ -+ coincell@2800 { -+ status = "ok"; -+ qcom,rset-ohms = <2100>; -+ qcom,vset-millivolts = <3000>; -+ }; -+ }; -+ -+};