Add an entry in the device tree binding for sc7280-zombie.
Documentation/devicetree/bindings/arm/qcom.yaml
Signed-off-by: Owen Yang <[email protected]>
---
Changes in v2:
- Move binding item to Google series bottom.
- Modify DT file for zombie.
Documentation/devicetree/bindings/arm/qcom.yaml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml
index c15a729a6852..f617923f7485 100644
--- a/Documentation/devicetree/bindings/arm/qcom.yaml
+++ b/Documentation/devicetree/bindings/arm/qcom.yaml
@@ -538,6 +538,16 @@ properties:
- const: google,villager-sku512
- const: qcom,sc7280
+ - description: Google Zombie (newest rev)
+ items:
+ - const: google,zombie
+ - const: qcom,sc7280
+
+ - description: Google Zombie with LTE (newest rev)
+ items:
+ - const: google,zombie-sku512
+ - const: qcom,sc7280
+
- items:
- enum:
- xiaomi,lavender
--
2.17.1
Add DT for sc7280-herobrine-zombie
arch/arm64/boot/dts/qcom/Makefile
arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-lte.dts
arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dts
arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi
Signed-off-by: Owen Yang <[email protected]>
---
(no changes since v1)
arch/arm64/boot/dts/qcom/Makefile | 2 +
.../dts/qcom/sc7280-herobrine-zombie-lte.dts | 15 +
.../boot/dts/qcom/sc7280-herobrine-zombie.dts | 16 +
.../dts/qcom/sc7280-herobrine-zombie.dtsi | 310 ++++++++++++++++++
4 files changed, 343 insertions(+)
create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-lte.dts
create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dts
create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 384f2fa50646..e3226d7894ad 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -101,6 +101,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-herobrine-r1.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r0.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1-lte.dtb
+dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie.dtb
+dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie-lte.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp2.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7280-crd-r3.dtb
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-lte.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-lte.dts
new file mode 100644
index 000000000000..2f1da87e5005
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-lte.dts
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Zombie board device tree source
+ *
+ * Copyright 2022 Google LLC.
+ */
+/dts-v1/;
+
+#include "sc7280-herobrine-zombie.dtsi"
+#include "sc7280-herobrine-lte-sku.dtsi"
+
+/ {
+ model = "Google Zombie with LTE";
+ compatible = "google,zombie-sku512", "qcom,sc7280";
+};
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dts
new file mode 100644
index 000000000000..0246c12b2f40
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dts
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Zombie board device tree source
+ *
+ * Copyright 2022 Google LLC.
+ */
+
+/dts-v1/;
+
+#include "sc7280-herobrine-zombie.dtsi"
+#include "sc7280-herobrine-wifi-sku.dtsi"
+
+/ {
+ model = "Google Zombie";
+ compatible = "google,zombie", "qcom,sc7280";
+};
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi
new file mode 100644
index 000000000000..15832620ff5d
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi
@@ -0,0 +1,310 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Zombie board device tree source
+ *
+ * Copyright 2022 Google LLC.
+ */
+/dts-v1/;
+
+#include "sc7280-herobrine.dtsi"
+#include "sc7280-herobrine-audio-rt5682.dtsi"
+
+/*
+ * ADDITIONS TO FIXED REGULATORS DEFINED IN PARENT DEVICE TREE FILES
+ *
+ * Sort order matches the order in the parent files (parents before children).
+ */
+
+&pp3300_codec {
+ status = "okay";
+};
+
+/* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */
+
+ap_tp_i2c: &i2c0 {
+ clock-frequency = <400000>;
+ status = "okay";
+
+ trackpad: trackpad@15 {
+ compatible = "hid-over-i2c";
+ reg = <0x15>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&tp_int_odl>;
+
+ interrupt-parent = <&tlmm>;
+ interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
+
+ hid-descr-addr = <0x01>;
+ vdd-supply = <&pp3300_z1>;
+ post-power-on-delay-ms = <100>;
+
+ wakeup-source;
+ };
+};
+
+&ap_sar_sensor_i2c {
+ status = "okay";
+};
+
+&ap_sar_sensor0 {
+ status = "okay";
+};
+
+&ap_sar_sensor1 {
+ status = "okay";
+};
+
+&mdss_edp {
+ status = "okay";
+};
+
+&mdss_edp_phy {
+ status = "okay";
+};
+
+/* For nvme */
+&pcie1 {
+ status = "okay";
+};
+
+/* For nvme */
+&pcie1_phy {
+ status = "okay";
+};
+
+&pwmleds {
+ status = "okay";
+};
+
+/* For eMMC */
+&sdhc_1 {
+ status = "okay";
+};
+
+/* PINCTRL - ADDITIONS TO NODES IN PARENT DEVICE TREE FILES */
+
+&ts_rst_conn {
+ bias-disable;
+};
+
+/* PINCTRL - BOARD-SPECIFIC */
+
+/*
+ * Methodology for gpio-line-names:
+ * - If a pin goes to herobrine board and is named it gets that name.
+ * - If a pin goes to herobrine board and is not named, it gets no name.
+ * - If a pin is totally internal to Qcard then it gets Qcard name.
+ * - If a pin is not hooked up on Qcard, it gets no name.
+ */
+
+&pm8350c_gpios {
+ gpio-line-names = "FLASH_STROBE_1", /* 1 */
+ "AP_SUSPEND",
+ "PM8008_1_RST_N",
+ "",
+ "",
+ "",
+ "PMIC_EDP_BL_EN",
+ "PMIC_EDP_BL_PWM",
+ "";
+};
+
+&tlmm {
+ gpio-line-names = "AP_TP_I2C_SDA", /* 0 */
+ "AP_TP_I2C_SCL",
+ "SSD_RST_L",
+ "PE_WAKE_ODL",
+ "AP_SAR_SDA",
+ "AP_SAR_SCL",
+ "PRB_SC_GPIO_6",
+ "TP_INT_ODL",
+ "HP_I2C_SDA",
+ "HP_I2C_SCL",
+
+ "GNSS_L1_EN", /* 10 */
+ "GNSS_L5_EN",
+ "SPI_AP_MOSI",
+ "SPI_AP_MISO",
+ "SPI_AP_CLK",
+ "SPI_AP_CS0_L",
+ /*
+ * AP_FLASH_WP is crossystem ABI. Schematics
+ * call it BIOS_FLASH_WP_OD.
+ */
+ "AP_FLASH_WP",
+ "",
+ "AP_EC_INT_L",
+ "",
+
+ "UF_CAM_RST_L", /* 20 */
+ "WF_CAM_RST_L",
+ "UART_AP_TX_DBG_RX",
+ "UART_DBG_TX_AP_RX",
+ "",
+ "PM8008_IRQ_1",
+ "HOST2WLAN_SOL",
+ "WLAN2HOST_SOL",
+ "MOS_BT_UART_CTS",
+ "MOS_BT_UART_RFR",
+
+ "MOS_BT_UART_TX", /* 30 */
+ "MOS_BT_UART_RX",
+ "PRB_SC_GPIO_32",
+ "HUB_RST_L",
+ "",
+ "",
+ "AP_SPI_FP_MISO",
+ "AP_SPI_FP_MOSI",
+ "AP_SPI_FP_CLK",
+ "AP_SPI_FP_CS_L",
+
+ "AP_EC_SPI_MISO", /* 40 */
+ "AP_EC_SPI_MOSI",
+ "AP_EC_SPI_CLK",
+ "AP_EC_SPI_CS_L",
+ "LCM_RST_L",
+ "EARLY_EUD_N",
+ "",
+ "DP_HOT_PLUG_DET",
+ "IO_BRD_MLB_ID0",
+ "IO_BRD_MLB_ID1",
+
+ "IO_BRD_MLB_ID2", /* 50 */
+ "SSD_EN",
+ "TS_I2C_SDA_CONN",
+ "TS_I2C_CLK_CONN",
+ "TS_RST_CONN",
+ "TS_INT_CONN",
+ "AP_I2C_TPM_SDA",
+ "AP_I2C_TPM_SCL",
+ "PRB_SC_GPIO_58",
+ "PRB_SC_GPIO_59",
+
+ "EDP_HOT_PLUG_DET_N", /* 60 */
+ "FP_TO_AP_IRQ_L",
+ "",
+ "AMP_EN",
+ "CAM0_MCLK_GPIO_64",
+ "CAM1_MCLK_GPIO_65",
+ "WF_CAM_MCLK",
+ "PRB_SC_GPIO_67",
+ "FPMCU_BOOT0",
+ "UF_CAM_SDA",
+
+ "UF_CAM_SCL", /* 70 */
+ "",
+ "",
+ "WF_CAM_SDA",
+ "WF_CAM_SCL",
+ "",
+ "",
+ "EN_FP_RAILS",
+ "FP_RST_L",
+ "PCIE1_CLKREQ_ODL",
+
+ "EN_PP3300_DX_EDP", /* 80 */
+ "US_EURO_HS_SEL",
+ "FORCED_USB_BOOT",
+ "WCD_RESET_N",
+ "MOS_WLAN_EN",
+ "MOS_BT_EN",
+ "MOS_SW_CTRL",
+ "MOS_PCIE0_RST",
+ "MOS_PCIE0_CLKREQ_N",
+ "MOS_PCIE0_WAKE_N",
+
+ "MOS_LAA_AS_EN", /* 90 */
+ "SD_CD_ODL",
+ "",
+ "",
+ "MOS_BT_WLAN_SLIMBUS_CLK",
+ "MOS_BT_WLAN_SLIMBUS_DAT0",
+ "HP_MCLK",
+ "HP_BCLK",
+ "HP_DOUT",
+ "HP_DIN",
+
+ "HP_LRCLK", /* 100 */
+ "HP_IRQ",
+ "",
+ "",
+ "GSC_AP_INT_ODL",
+ "EN_PP3300_CODEC",
+ "AMP_BCLK",
+ "AMP_DIN",
+ "AMP_LRCLK",
+ "UIM1_DATA_GPIO_109",
+
+ "UIM1_CLK_GPIO_110", /* 110 */
+ "UIM1_RESET_GPIO_111",
+ "PRB_SC_GPIO_112",
+ "UIM0_DATA",
+ "UIM0_CLK",
+ "UIM0_RST",
+ "UIM0_PRESENT_ODL",
+ "SDM_RFFE0_CLK",
+ "SDM_RFFE0_DATA",
+ "WF_CAM_EN",
+
+ "FASTBOOT_SEL_0", /* 120 */
+ "SC_GPIO_121",
+ "FASTBOOT_SEL_1",
+ "SC_GPIO_123",
+ "FASTBOOT_SEL_2",
+ "SM_RFFE4_CLK_GRFC_8",
+ "SM_RFFE4_DATA_GRFC_9",
+ "WLAN_COEX_UART1_RX",
+ "WLAN_COEX_UART1_TX",
+ "PRB_SC_GPIO_129",
+
+ "LCM_ID0", /* 130 */
+ "LCM_ID1",
+ "",
+ "SDR_QLINK_REQ",
+ "SDR_QLINK_EN",
+ "QLINK0_WMSS_RESET_N",
+ "SMR526_QLINK1_REQ",
+ "SMR526_QLINK1_EN",
+ "SMR526_QLINK1_WMSS_RESET_N",
+ "PRB_SC_GPIO_139",
+
+ "SAR1_IRQ_ODL", /* 140 */
+ "SAR0_IRQ_ODL",
+ "PRB_SC_GPIO_142",
+ "",
+ "WCD_SWR_TX_CLK",
+ "WCD_SWR_TX_DATA0",
+ "WCD_SWR_TX_DATA1",
+ "WCD_SWR_RX_CLK",
+ "WCD_SWR_RX_DATA0",
+ "WCD_SWR_RX_DATA1",
+
+ "DMIC01_CLK", /* 150 */
+ "DMIC01_DATA",
+ "DMIC23_CLK",
+ "DMIC23_DATA",
+ "",
+ "",
+ "EC_IN_RW_ODL",
+ "HUB_EN",
+ "WCD_SWR_TX_DATA2",
+ "",
+
+ "", /* 160 */
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+
+ "", /* 170 */
+ "MOS_BLE_UART_TX",
+ "MOS_BLE_UART_RX",
+ "",
+ "",
+ "";
+};
--
2.17.1
On Tue, Nov 22, 2022 at 08:37:03PM +0800, Owen Yang wrote:
> Add DT for sc7280-herobrine-zombie
>
> arch/arm64/boot/dts/qcom/Makefile
> arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-lte.dts
> arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dts
> arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi
Drop this
> Signed-off-by: Owen Yang <[email protected]>
> ---
>
> (no changes since v1)
A diff between v1 and v2 shows that this is not correct, please provide
accurate change logs
> arch/arm64/boot/dts/qcom/Makefile | 2 +
> .../dts/qcom/sc7280-herobrine-zombie-lte.dts | 15 +
> .../boot/dts/qcom/sc7280-herobrine-zombie.dts | 16 +
> .../dts/qcom/sc7280-herobrine-zombie.dtsi | 310 ++++++++++++++++++
> 4 files changed, 343 insertions(+)
> create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-lte.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi
>
> diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
> index 384f2fa50646..e3226d7894ad 100644
> --- a/arch/arm64/boot/dts/qcom/Makefile
> +++ b/arch/arm64/boot/dts/qcom/Makefile
> @@ -101,6 +101,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-herobrine-r1.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r0.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1-lte.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie-lte.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp2.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7280-crd-r3.dtb
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-lte.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-lte.dts
> new file mode 100644
> index 000000000000..2f1da87e5005
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-lte.dts
> @@ -0,0 +1,15 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Google Zombie board device tree source
> + *
> + * Copyright 2022 Google LLC.
> + */
> +/dts-v1/;
> +
> +#include "sc7280-herobrine-zombie.dtsi"
> +#include "sc7280-herobrine-lte-sku.dtsi"
> +
> +/ {
> + model = "Google Zombie with LTE";
> + compatible = "google,zombie-sku512", "qcom,sc7280";
> +};
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dts
> new file mode 100644
> index 000000000000..0246c12b2f40
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dts
> @@ -0,0 +1,16 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Google Zombie board device tree source
> + *
> + * Copyright 2022 Google LLC.
> + */
> +
> +/dts-v1/;
> +
> +#include "sc7280-herobrine-zombie.dtsi"
> +#include "sc7280-herobrine-wifi-sku.dtsi"
> +
> +/ {
> + model = "Google Zombie";
> + compatible = "google,zombie", "qcom,sc7280";
> +};
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi
> new file mode 100644
> index 000000000000..15832620ff5d
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi
> @@ -0,0 +1,310 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Google Zombie board device tree source
> + *
> + * Copyright 2022 Google LLC.
> + */
> +/dts-v1/;
This was added in v2. It isn't needed, the .dts files which include this file
already make this declaration.
On which tree is this series based? My earlier reply bounced for Bjorn's
old Linaro e-mail address, which suggests that the series might be based
on an older kernel tree (maybe downstream Chrome OS v5.15?). Please make
sure to base patches to upstream lists on the corresponding maintainer
tree/branch or a recent kernel version/rc.
On Tue, Nov 22, 2022 at 08:37:02PM +0800, Owen Yang wrote:
> Add an entry in the device tree binding for sc7280-zombie.
>
> Documentation/devicetree/bindings/arm/qcom.yaml
>
> Signed-off-by: Owen Yang <[email protected]>
> ---
>
> Changes in v2:
> - Move binding item to Google series bottom.
> - Modify DT file for zombie.
>
> Documentation/devicetree/bindings/arm/qcom.yaml | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml
> index c15a729a6852..f617923f7485 100644
> --- a/Documentation/devicetree/bindings/arm/qcom.yaml
> +++ b/Documentation/devicetree/bindings/arm/qcom.yaml
> @@ -538,6 +538,16 @@ properties:
> - const: google,villager-sku512
> - const: qcom,sc7280
>
> + - description: Google Zombie (newest rev)
> + items:
> + - const: google,zombie
> + - const: qcom,sc7280
> +
> + - description: Google Zombie with LTE (newest rev)
> + items:
> + - const: google,zombie-sku512
> + - const: qcom,sc7280
> +
> - items:
> - enum:
> - xiaomi,lavender
> --
> 2.17.1
>
On Tue, Nov 22, 2022 at 08:37:02PM +0800, Owen Yang wrote:
> Add an entry in the device tree binding for sc7280-zombie.
nit: s/an entry/entries/ (there are two of them)
>
> Documentation/devicetree/bindings/arm/qcom.yaml
Drop this
>
> Signed-off-by: Owen Yang <[email protected]>
> ---
>
> Changes in v2:
> - Move binding item to Google series bottom.
> - Modify DT file for zombie.
>
> Documentation/devicetree/bindings/arm/qcom.yaml | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml
> index c15a729a6852..f617923f7485 100644
> --- a/Documentation/devicetree/bindings/arm/qcom.yaml
> +++ b/Documentation/devicetree/bindings/arm/qcom.yaml
> @@ -538,6 +538,16 @@ properties:
> - const: google,villager-sku512
> - const: qcom,sc7280
>
> + - description: Google Zombie (newest rev)
> + items:
> + - const: google,zombie
> + - const: qcom,sc7280
> +
> + - description: Google Zombie with LTE (newest rev)
> + items:
> + - const: google,zombie-sku512
> + - const: qcom,sc7280
> +
> - items:
> - enum:
> - xiaomi,lavender
> --
> 2.17.1
>
On Wed, Nov 23, 2022 at 02:02:38PM +0800, 楊宗翰 wrote:
> Hi Matthias ,
>
> When I run "patman" still get warning "<patch>:36: warning: added, moved or
> deleted file(s), does MAINTAINERS need updating?"
The warning is expected because you added new files. In this case you can
ignore it as it isn't expected that you become the maintainer of the new zombie
DT files.
> And I screenshot my "git gui" as below(attachment "git_gui_screenshot.jpg"):
> [image.png]
>
> The latest git log info as below:
> ---
> commit 4d2b529bce125b83c546aebbc36ecedf76dfc55e (linux_qcom/for-next)
> Merge: 9abf2313adc1 c03fa428ac6e afcd946be11c aec5f36cf676 cea42b8d7966
> aa9f474014b1 37b5e8c48b9d cadaa773bcf1
> Author: Bjorn Andersson <[email protected]>
> Date: Â Tue Nov 15 11:45:55 2022 -0600
>
> Â Â Merge branches 'arm64-defconfig-for-6.2', 'arm64-for-6.2', 'clk-for-6.2',
> 'defconfig-for-6.2', 'drivers-for-6.2', 'dts-for-6.2' and 'arm64-fixes-for-6.1'
> into for-next
> ---
>
> My checkout steps as below:
> $ git remote add linux_qcom git://git.kernel.org/pub/scm/linux/kernel/git/
> qcom/linux.git
> $ git fetch --no-tags linux_qcom
> $ git checkout -b <MyLocalBranchName> linux_qcom/for-next
>
> Is my code base branch still worng? Am I missing something?Â
My understanding is that it is best to base you changes on a branch like
'arm64-for-6.2' as the 'for-next' branch is re-created every time changes
land in one of the '${area}-for-${version}' branches.
No big issue in this case, just use the corresponding '${area}-for-${version}'
branch for future patches/versions :)
> The attachment is "0001-dt-bindings-arm-qcom-Adding-DT-binding-for-
> zombie.patch" patch file,
> Â I have drop "Documentation/devicetree/bindings/arm/qcom.yaml" as your advice.
>
> Matthias Kaehlcke <[email protected]> æ¼ 2022å¹´11æ22æ¥ é±äº æä¸10:
> 28寫éï¼
> On which tree is this series based? My earlier reply bounced for
> Bjorn's
> old Linaro e-mail address, which suggests that the series might be
> based
> on an older kernel tree (maybe downstream Chrome OS v5.15?). Please
> make
> sure to base patches to upstream lists on the corresponding
> maintainer
> tree/branch or a recent kernel version/rc.
>
> On Tue, Nov 22, 2022 at 08:37:02PM +0800, Owen Yang wrote:
> > Add an entry in the device tree binding for sc7280-zombie.
> >
> > Documentation/devicetree/bindings/arm/qcom.yaml
> >
> > Signed-off-by: Owen Yang <[email protected]>
> > ---
> >
> > Changes in v2:
> > - Move binding item to Google series bottom.
> > - Modify DT file for zombie.
> >
> >Â Documentation/devicetree/bindings/arm/qcom.yaml | 10 ++++++++++
> >Â 1 file changed, 10 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/
> Documentation/devicetree/bindings/arm/qcom.yaml
> > index c15a729a6852..f617923f7485 100644
> > --- a/Documentation/devicetree/bindings/arm/qcom.yaml
> > +++ b/Documentation/devicetree/bindings/arm/qcom.yaml
> > @@ -538,6 +538,16 @@ properties:
> >Â Â Â Â Â Â - const: google,villager-sku512
> >Â Â Â Â Â Â - const: qcom,sc7280
> >Â
> > +Â Â Â - description: Google Zombie (newest rev)
> > +Â Â Â Â items:
> > +Â Â Â Â Â - const: google,zombie
> > +Â Â Â Â Â - const: qcom,sc7280
> > +
> > +Â Â Â - description: Google Zombie with LTE (newest rev)
> > +Â Â Â Â items:
> > +Â Â Â Â Â - const: google,zombie-sku512
> > +Â Â Â Â Â - const: qcom,sc7280
> > +
> >Â Â Â Â - items:
> >Â Â Â Â Â Â - enum:
> >Â Â Â Â Â Â Â Â - xiaomi,lavender
> > --
> > 2.17.1
> >
Hi,
On Wed, Nov 23, 2022 at 7:07 AM Matthias Kaehlcke <[email protected]> wrote:
>
> > My checkout steps as below:
> > $ git remote add linux_qcom git://git.kernel.org/pub/scm/linux/kernel/git/
> > qcom/linux.git
> > $ git fetch --no-tags linux_qcom
> > $ git checkout -b <MyLocalBranchName> linux_qcom/for-next
> >
> > Is my code base branch still worng? Am I missing something?Â
>
> My understanding is that it is best to base you changes on a branch like
> 'arm64-for-6.2' as the 'for-next' branch is re-created every time changes
> land in one of the '${area}-for-${version}' branches.
>
> No big issue in this case, just use the corresponding '${area}-for-${version}'
> branch for future patches/versions :)
FWIW, I usually just use Bjron's for-next branch for stuff like this.
While the merge commits in the the Qualcomm "for-next" branch are
re-created every time, because of the way "git" works the git hashes
of the actual patches are the same as the git hashes of the patches in
the separate branches. All the patches in "for-next" should be ones
that are fine to base your patches on.
-Doug
On Mon, Nov 28, 2022 at 08:20:36AM -0800, Doug Anderson wrote:
> Hi,
>
> On Wed, Nov 23, 2022 at 7:07 AM Matthias Kaehlcke <[email protected]> wrote:
> >
> > > My checkout steps as below:
> > > $ git remote add linux_qcom git://git.kernel.org/pub/scm/linux/kernel/git/
> > > qcom/linux.git
> > > $ git fetch --no-tags linux_qcom
> > > $ git checkout -b <MyLocalBranchName> linux_qcom/for-next
> > >
> > > Is my code base branch still worng? Am I missing something?Â
> >
> > My understanding is that it is best to base you changes on a branch like
> > 'arm64-for-6.2' as the 'for-next' branch is re-created every time changes
> > land in one of the '${area}-for-${version}' branches.
> >
> > No big issue in this case, just use the corresponding '${area}-for-${version}'
> > branch for future patches/versions :)
>
> FWIW, I usually just use Bjron's for-next branch for stuff like this.
> While the merge commits in the the Qualcomm "for-next" branch are
> re-created every time, because of the way "git" works the git hashes
> of the actual patches are the same as the git hashes of the patches in
> the separate branches. All the patches in "for-next" should be ones
> that are fine to base your patches on.
I had minor concerns that occasionally tools might get confused it they
try to find the parent tree of a patch based on the unstable hash of
the merge commit in "for-next". Not sure if it is much of an issue in
practice.
Hi,
On Mon, Nov 28, 2022 at 9:07 AM Matthias Kaehlcke <[email protected]> wrote:
>
> On Mon, Nov 28, 2022 at 08:20:36AM -0800, Doug Anderson wrote:
> > Hi,
> >
> > On Wed, Nov 23, 2022 at 7:07 AM Matthias Kaehlcke <[email protected]> wrote:
> > >
> > > > My checkout steps as below:
> > > > $ git remote add linux_qcom git://git.kernel.org/pub/scm/linux/kernel/git/
> > > > qcom/linux.git
> > > > $ git fetch --no-tags linux_qcom
> > > > $ git checkout -b <MyLocalBranchName> linux_qcom/for-next
> > > >
> > > > Is my code base branch still worng? Am I missing something?Â
> > >
> > > My understanding is that it is best to base you changes on a branch like
> > > 'arm64-for-6.2' as the 'for-next' branch is re-created every time changes
> > > land in one of the '${area}-for-${version}' branches.
> > >
> > > No big issue in this case, just use the corresponding '${area}-for-${version}'
> > > branch for future patches/versions :)
> >
> > FWIW, I usually just use Bjron's for-next branch for stuff like this.
> > While the merge commits in the the Qualcomm "for-next" branch are
> > re-created every time, because of the way "git" works the git hashes
> > of the actual patches are the same as the git hashes of the patches in
> > the separate branches. All the patches in "for-next" should be ones
> > that are fine to base your patches on.
>
> I had minor concerns that occasionally tools might get confused it they
> try to find the parent tree of a patch based on the unstable hash of
> the merge commit in "for-next". Not sure if it is much of an issue in
> practice.
It's a fair concern, but I don't _think_ it matters. I think git is
smart enough to handle this in nearly all the cases and I think the
cases where git can't handle it are cases where (perhaps) the for-next
was the correct thing to use anyway.
As a test:
atop for-next:
echo "foo" >> arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
git add -u
git commit -m "add foo"
git format-patch HEAD~
atop arm64-for-6.2:
echo "foo" >> arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
git add -u
git commit -m "add foo arm64"
git format-patch HEAD~
If you diff the two patches created, you can see that they both
contain "index" line. In my case:
index 65601bea0797..b5c9f39737f6 100644
That appears to basically just show a hash of the affected file both
before and after your patch. The merge commits and commits to other
files don't affect this. Specifically, you can see this before making
the change
$ git hash-object -w arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
65601bea07972e75cd1ac880bd43aa3dac62fb76
...and after making the change:
$ git hash-object -w arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
b5c9f39737f67e9ba0a115355ecf95df9a04dba7
So tl;dr is that as long as the files you're touching are identical in
"for-next" and in a specific branch (like arm64-for-6.2) that the
patch files created will actually be exactly the same because all they
contain are the object hashes. You could also imagine the files being
_not_ exactly the same. If two different branches touched the same
file and were merged into "for-next" then it could make a difference.
In that case, though, it would still at least be a plausible choice to
post it against the "for-next" branch because that should represent
the final state.
-Doug