Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp3718495rwb; Sat, 12 Nov 2022 11:11:22 -0800 (PST) X-Google-Smtp-Source: AA0mqf5gyieYK30blCzmC4XA5inbxUCnVKSuEm6buDSg70OSRffy1iCu5s42sF8pzk4gZqTeB8Tn X-Received: by 2002:a17:907:8b0d:b0:78d:857d:b4a8 with SMTP id sz13-20020a1709078b0d00b0078d857db4a8mr5555630ejc.495.1668280282198; Sat, 12 Nov 2022 11:11:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668280282; cv=none; d=google.com; s=arc-20160816; b=LXDAdSGtPzQu9821KEu+0+zqsXEXFpWg5wzqO3FOQXzynAj7uVBYguyj/kQVRqO8V4 uJiEZwj5Hj7CCxmD6ZghK2GXWpQk6cmUQX11Us6ldLwaCGG0IisMEdoc41UvSz8Q0adO wO7gnbk9p//dJ7TBGb4XaIJLlM0evpCUaHHo/Lgp5RQiCKFgswnXIp+nfBM71727Z+4d wFEelEeKoez7PkaIc3VKqgipAAr2Lb12A+rqX3heuKPvBYH+OwNcgIGbjjqko/24Gl3u uaPD5TmNfh9yQkkwORfMeKE4UeKNp3OdTmFfuawQgWVQSfcIxWKcTTGhFLq2Md0/Wsdw EskA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=mWh9wGOJbVMVFl9EVTTnI0eZN39M+e0dNVEaBQn/EQY=; b=upuyBVbuYw9TKet5BpkldCHDw2PnPuVgxRoE5Onu6RoRhmNP7aKtO3DRMbFmcmJG2i urqFBgV1JNWEg6q7CO84NG2pau2FLgUlnrwGAAAEKB5MhbIXiVGZmdOOScHwICm+SHH5 FAUVEhGnHGq/MGQPCcmStU8fj5VD6LSLEVkqpAIZDBW4EK6bgquzbPeVrP/g09Z/h6yw kHPdZQlZmBNeKsFD5TTDLlQLPsewSdPVHheZnht1eFqc0cbIhYeK2QUHCKWY8oLIyX/m g7Ff5CcX5pH7aS6IrSqz8tD2dkh67RvGD7DEFsahLH78qewPuAPjErZSBIfaBK+VEg6X lTJg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=sntech.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qa34-20020a17090786a200b007adb2862222si4807954ejc.828.2022.11.12.11.10.58; Sat, 12 Nov 2022 11:11:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=sntech.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234883AbiKLRsb (ORCPT + 90 others); Sat, 12 Nov 2022 12:48:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234859AbiKLRs2 (ORCPT ); Sat, 12 Nov 2022 12:48:28 -0500 Received: from gloria.sntech.de (gloria.sntech.de [185.11.138.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B15AA12743; Sat, 12 Nov 2022 09:48:20 -0800 (PST) Received: from ip5b412258.dynamic.kabel-deutschland.de ([91.65.34.88] helo=diego.localnet) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1otubw-0006kc-CX; Sat, 12 Nov 2022 18:48:08 +0100 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: linux-rockchip@lists.infradead.org, Rob Herring , Krzysztof Kozlowski , Maya Matuszczyk Cc: =?ISO-8859-1?Q?Jo=E3o_H_=2E?= Spies , Chris Morgan , Maya Matuszczyk , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 1/5] arm64: dts: rockchip: Move most of Odroid Go Advance DTS into a DTSI Date: Sat, 12 Nov 2022 18:48:07 +0100 Message-ID: <5094751.31r3eYUQgx@diego> In-Reply-To: <20221112143411.517906-2-maccraft123mc@gmail.com> References: <20221112143411.517906-1-maccraft123mc@gmail.com> <20221112143411.517906-2-maccraft123mc@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_PASS, T_SPF_HELO_TEMPERROR autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Am Samstag, 12. November 2022, 15:34:07 CET schrieb Maya Matuszczyk: > To support more devices that are clones of this device or minor > revisions without duplication move most of go2's dts into a dtsi file. > > Signed-off-by: Maya Matuszczyk > --- > .../boot/dts/rockchip/rk3326-odroid-go.dtsi | 600 +++++++++++++++++ > .../boot/dts/rockchip/rk3326-odroid-go2.dts | 620 +----------------- shouldn't the dtsi be named after the go2? ... aka ...odroid-go2.dtsi? Also, please provide a changelog for the changes done between versions. The --cover-letter option for git format-patch provides a nice space for that. Thanks Heiko > 2 files changed, 609 insertions(+), 611 deletions(-) > create mode 100644 arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi > > diff --git a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi > new file mode 100644 > index 000000000000..bab99b1b4299 > --- /dev/null > +++ b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi > @@ -0,0 +1,600 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Copyright (c) 2019 Hardkernel Co., Ltd > + * Copyright (c) 2020 Theobroma Systems Design und Consulting GmbH > + * Copyright (c) 2022 Maya Matuszczyk > + */ > + > +/dts-v1/; > +#include > +#include > +#include > +#include "rk3326.dtsi" > + > +/ { > + aliases { > + mmc0 = &sdmmc; > + }; > + > + chosen { > + stdout-path = "serial2:115200n8"; > + }; > + > + backlight: backlight { > + compatible = "pwm-backlight"; > + power-supply = <&vcc_bl>; > + pwms = <&pwm1 0 25000 0>; > + }; > + > + builtin_gamepad: gpio-keys { > + compatible = "gpio-keys"; > + pinctrl-names = "default"; > + pinctrl-0 = <&btn_pins>; > + > + button-sw1 { > + gpios = <&gpio1 RK_PB4 GPIO_ACTIVE_LOW>; > + label = "DPAD-UP"; > + linux,code = ; > + }; > + button-sw2 { > + gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_LOW>; > + label = "DPAD-DOWN"; > + linux,code = ; > + }; > + button-sw3 { > + gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_LOW>; > + label = "DPAD-LEFT"; > + linux,code = ; > + }; > + button-sw4 { > + gpios = <&gpio1 RK_PB7 GPIO_ACTIVE_LOW>; > + label = "DPAD-RIGHT"; > + linux,code = ; > + }; > + button-sw5 { > + gpios = <&gpio1 RK_PA2 GPIO_ACTIVE_LOW>; > + label = "BTN-A"; > + linux,code = ; > + }; > + button-sw6 { > + gpios = <&gpio1 RK_PA5 GPIO_ACTIVE_LOW>; > + label = "BTN-B"; > + linux,code = ; > + }; > + button-sw7 { > + gpios = <&gpio1 RK_PA6 GPIO_ACTIVE_LOW>; > + label = "BTN-Y"; > + linux,code = ; > + }; > + button-sw8 { > + gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_LOW>; > + label = "BTN-X"; > + linux,code = ; > + }; > + button-sw9 { > + gpios = <&gpio2 RK_PA0 GPIO_ACTIVE_LOW>; > + label = "F1"; > + linux,code = ; > + }; > + button-sw10 { > + gpios = <&gpio2 RK_PA1 GPIO_ACTIVE_LOW>; > + label = "F2"; > + linux,code = ; > + }; > + button-sw11 { > + gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>; > + label = "F3"; > + linux,code = ; > + }; > + button-sw12 { > + gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_LOW>; > + label = "F4"; > + linux,code = ; > + }; > + button-sw13 { > + gpios = <&gpio2 RK_PA4 GPIO_ACTIVE_LOW>; > + label = "F5"; > + linux,code = ; > + }; > + button-sw14 { > + gpios = <&gpio2 RK_PA5 GPIO_ACTIVE_LOW>; > + label = "F6"; > + linux,code = ; > + }; > + button-sw15 { > + gpios = <&gpio2 RK_PA6 GPIO_ACTIVE_LOW>; > + label = "TOP-LEFT"; > + linux,code = ; > + }; > + button-sw16 { > + gpios = <&gpio2 RK_PA7 GPIO_ACTIVE_LOW>; > + label = "TOP-RIGHT"; > + linux,code = ; > + }; > + }; > + > + leds: gpio-leds { > + compatible = "gpio-leds"; > + pinctrl-names = "default"; > + pinctrl-0 = <&blue_led_pin>; > + > + blue_led: led-0 { > + label = "blue:heartbeat"; > + gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; > + linux,default-trigger = "heartbeat"; > + }; > + }; > + > + rk817-sound { > + compatible = "simple-audio-card"; > + simple-audio-card,name = "Analog"; > + simple-audio-card,format = "i2s"; > + simple-audio-card,hp-det-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>; > + simple-audio-card,mclk-fs = <256>; > + simple-audio-card,widgets = > + "Microphone", "Mic Jack", > + "Headphone", "Headphones", > + "Speaker", "Speaker"; > + simple-audio-card,routing = > + "MICL", "Mic Jack", > + "Headphones", "HPOL", > + "Headphones", "HPOR", > + "Speaker", "SPKO"; > + > + simple-audio-card,codec { > + sound-dai = <&rk817>; > + }; > + > + simple-audio-card,cpu { > + sound-dai = <&i2s1_2ch>; > + }; > + }; > + > + vccsys: vccsys { > + compatible = "regulator-fixed"; > + regulator-name = "vcc3v8_sys"; > + regulator-always-on; > + regulator-min-microvolt = <3800000>; > + regulator-max-microvolt = <3800000>; > + }; > + > + vcc_host: vcc_host { > + compatible = "regulator-fixed"; > + regulator-name = "vcc_host"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + > + gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + regulator-always-on; > + regulator-boot-on; > + vin-supply = <&usb_midu>; > + }; > +}; > + > +&cpu0 { > + cpu-supply = <&vdd_arm>; > +}; > + > +&cpu1 { > + cpu-supply = <&vdd_arm>; > +}; > + > +&cpu2 { > + cpu-supply = <&vdd_arm>; > +}; > + > +&cpu3 { > + cpu-supply = <&vdd_arm>; > +}; > + > +&cru { > + assigned-clocks = <&cru PLL_NPLL>, > + <&cru ACLK_BUS_PRE>, <&cru ACLK_PERI_PRE>, > + <&cru HCLK_BUS_PRE>, <&cru HCLK_PERI_PRE>, > + <&cru PCLK_BUS_PRE>, <&cru SCLK_GPU>, > + <&cru PLL_CPLL>; > + > + assigned-clock-rates = <1188000000>, > + <200000000>, <200000000>, > + <150000000>, <150000000>, > + <100000000>, <200000000>, > + <17000000>; > +}; > + > +&display_subsystem { > + status = "okay"; > +}; > + > +&dsi { > + status = "okay"; > + > + ports { > + mipi_out: port@1 { > + reg = <1>; > + > + mipi_out_panel: endpoint { > + remote-endpoint = <&mipi_in_panel>; > + }; > + }; > + }; > + > + internal_display: panel@0 { > + reg = <0>; > + backlight = <&backlight>; > + iovcc-supply = <&vcc_lcd>; > + reset-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_LOW>; > + rotation = <270>; > + vdd-supply = <&vcc_lcd>; > + > + port { > + mipi_in_panel: endpoint { > + remote-endpoint = <&mipi_out_panel>; > + }; > + }; > + }; > +}; > + > +&dsi_dphy { > + status = "okay"; > +}; > + > +&gpu { > + mali-supply = <&vdd_logic>; > + status = "okay"; > +}; > + > +&i2c0 { > + clock-frequency = <400000>; > + i2c-scl-falling-time-ns = <16>; > + i2c-scl-rising-time-ns = <280>; > + status = "okay"; > + > + rk817: pmic@20 { > + compatible = "rockchip,rk817"; > + reg = <0x20>; > + interrupt-parent = <&gpio0>; > + interrupts = ; > + clock-output-names = "rk808-clkout1", "xin32k"; > + clock-names = "mclk"; > + clocks = <&cru SCLK_I2S1_OUT>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pmic_int>, <&i2s1_2ch_mclk>; > + wakeup-source; > + #clock-cells = <1>; > + #sound-dai-cells = <0>; > + > + vcc1-supply = <&vccsys>; > + vcc2-supply = <&vccsys>; > + vcc3-supply = <&vccsys>; > + vcc4-supply = <&vccsys>; > + vcc5-supply = <&vccsys>; > + vcc6-supply = <&vccsys>; > + vcc7-supply = <&vccsys>; > + vcc8-supply = <&vccsys>; > + > + regulators { > + vdd_logic: DCDC_REG1 { > + regulator-name = "vdd_logic"; > + regulator-min-microvolt = <950000>; > + regulator-max-microvolt = <1150000>; > + regulator-ramp-delay = <6001>; > + regulator-always-on; > + regulator-boot-on; > + > + regulator-state-mem { > + regulator-on-in-suspend; > + regulator-suspend-microvolt = <950000>; > + }; > + }; > + > + vdd_arm: DCDC_REG2 { > + regulator-name = "vdd_arm"; > + regulator-min-microvolt = <950000>; > + regulator-max-microvolt = <1350000>; > + regulator-ramp-delay = <6001>; > + regulator-always-on; > + regulator-boot-on; > + > + regulator-state-mem { > + regulator-off-in-suspend; > + regulator-suspend-microvolt = <950000>; > + }; > + }; > + > + vcc_ddr: DCDC_REG3 { > + regulator-name = "vcc_ddr"; > + regulator-always-on; > + regulator-boot-on; > + > + regulator-state-mem { > + regulator-on-in-suspend; > + }; > + }; > + > + vcc_3v3: DCDC_REG4 { > + regulator-name = "vcc_3v3"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + regulator-boot-on; > + > + regulator-state-mem { > + regulator-off-in-suspend; > + regulator-suspend-microvolt = <3300000>; > + }; > + }; > + > + vcc_1v8: LDO_REG2 { > + regulator-name = "vcc_1v8"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-always-on; > + regulator-boot-on; > + > + regulator-state-mem { > + regulator-on-in-suspend; > + regulator-suspend-microvolt = <1800000>; > + }; > + }; > + > + vdd_1v0: LDO_REG3 { > + regulator-name = "vdd_1v0"; > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <1000000>; > + regulator-always-on; > + regulator-boot-on; > + > + regulator-state-mem { > + regulator-on-in-suspend; > + regulator-suspend-microvolt = <1000000>; > + }; > + }; > + > + vcc3v3_pmu: LDO_REG4 { > + regulator-name = "vcc3v3_pmu"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + regulator-boot-on; > + > + regulator-state-mem { > + regulator-on-in-suspend; > + regulator-suspend-microvolt = <3300000>; > + }; > + }; > + > + vccio_sd: LDO_REG5 { > + regulator-name = "vccio_sd"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + regulator-boot-on; > + > + regulator-state-mem { > + regulator-on-in-suspend; > + regulator-suspend-microvolt = <3300000>; > + }; > + }; > + > + vcc_sd: LDO_REG6 { > + regulator-name = "vcc_sd"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-boot-on; > + > + regulator-state-mem { > + regulator-on-in-suspend; > + regulator-suspend-microvolt = <3300000>; > + }; > + }; > + > + vcc_bl: LDO_REG7 { > + regulator-name = "vcc_bl"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + > + regulator-state-mem { > + regulator-off-in-suspend; > + regulator-suspend-microvolt = <3300000>; > + }; > + }; > + > + vcc_lcd: LDO_REG8 { > + regulator-name = "vcc_lcd"; > + regulator-min-microvolt = <2800000>; > + regulator-max-microvolt = <2800000>; > + > + regulator-state-mem { > + regulator-off-in-suspend; > + regulator-suspend-microvolt = <2800000>; > + }; > + }; > + > + LDO_REG9 { > + /* unused */ > + }; > + > + usb_midu: BOOST { > + regulator-name = "usb_midu"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5400000>; > + regulator-always-on; > + regulator-boot-on; > + }; > + }; > + > + rk817_charger: charger { > + rockchip,resistor-sense-micro-ohms = <10000>; > + rockchip,sleep-enter-current-microamp = <300000>; > + rockchip,sleep-filter-current-microamp = <100000>; > + }; > + > + rk817_codec: codec { > + rockchip,mic-in-differential; > + }; > + }; > +}; > + > +/* EXT Header(P2): 7(SCL:GPIO0.C2), 8(SDA:GPIO0.C3) */ > +&i2c1 { > + clock-frequency = <400000>; > + status = "okay"; > +}; > + > +/* I2S 1 Channel Used */ > +&i2s1_2ch { > + status = "okay"; > +}; > + > +&io_domains { > + vccio1-supply = <&vcc_3v3>; > + vccio2-supply = <&vccio_sd>; > + vccio3-supply = <&vcc_3v3>; > + vccio4-supply = <&vcc_3v3>; > + vccio5-supply = <&vcc_3v3>; > + vccio6-supply = <&vcc_3v3>; > + status = "okay"; > +}; > + > +&pmu_io_domains { > + pmuio1-supply = <&vcc3v3_pmu>; > + pmuio2-supply = <&vcc3v3_pmu>; > + status = "okay"; > +}; > + > +&pwm1 { > + status = "okay"; > +}; > + > +&saradc { > + vref-supply = <&vcc_1v8>; > + status = "okay"; > +}; > + > +&sdmmc { > + cap-sd-highspeed; > + card-detect-delay = <200>; > + cd-gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_LOW>; /*[> CD GPIO <]*/ > + sd-uhs-sdr12; > + sd-uhs-sdr25; > + sd-uhs-sdr50; > + sd-uhs-sdr104; > + vmmc-supply = <&vcc_sd>; > + vqmmc-supply = <&vccio_sd>; > + status = "okay"; > +}; > + > +&sfc { > + pinctrl-0 = <&sfc_clk &sfc_cs0 &sfc_bus2>; > + pinctrl-names = "default"; > + #address-cells = <1>; > + #size-cells = <0>; > + status = "okay"; > + > + flash@0 { > + compatible = "jedec,spi-nor"; > + reg = <0>; > + spi-max-frequency = <108000000>; > + spi-rx-bus-width = <2>; > + spi-tx-bus-width = <1>; > + }; > +}; > + > +&tsadc { > + status = "okay"; > +}; > + > +&u2phy { > + status = "okay"; > + > + u2phy_host: host-port { > + status = "okay"; > + }; > + > + u2phy_otg: otg-port { > + status = "disabled"; > + }; > +}; > + > +&usb20_otg { > + status = "okay"; > +}; > + > +/* EXT Header(P2): 2(RXD:GPIO1.C0),3(TXD:.C1),4(CTS:.C2),5(RTS:.C3) */ > +&uart1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart1_xfer &uart1_cts>; > + status = "okay"; > +}; > + > +&uart2 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart2m1_xfer>; > + status = "okay"; > +}; > + > +&vopb { > + status = "okay"; > +}; > + > +&vopb_mmu { > + status = "okay"; > +}; > + > +&pinctrl { > + btns { > + btn_pins: btn-pins { > + rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>, > + <1 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>, > + <1 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>, > + <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>, > + <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>, > + <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>, > + <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>, > + <1 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>, > + <2 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>, > + <2 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>, > + <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>, > + <2 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>, > + <2 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>, > + <2 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>, > + <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>, > + <2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>; > + }; > + }; > + > + headphone { > + hp_det: hp-det { > + rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_down>; > + }; > + }; > + > + leds { > + blue_led_pin: blue-led-pin { > + rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + }; > + > + pmic { > + dc_det: dc-det { > + rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + > + pmic_int: pmic-int { > + rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; > + }; > + > + soc_slppin_gpio: soc_slppin_gpio { > + rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_output_low>; > + }; > + > + soc_slppin_rst: soc_slppin_rst { > + rockchip,pins = <0 RK_PA4 2 &pcfg_pull_none>; > + }; > + > + soc_slppin_slp: soc_slppin_slp { > + rockchip,pins = <0 RK_PA4 1 &pcfg_pull_none>; > + }; > + }; > +}; > diff --git a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts > index 72899a714310..4702183b673c 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts > @@ -2,30 +2,21 @@ > /* > * Copyright (c) 2019 Hardkernel Co., Ltd > * Copyright (c) 2020 Theobroma Systems Design und Consulting GmbH > + * Copyright (c) 2022 Maya Matuszczyk > */ > > /dts-v1/; > -#include > -#include > -#include > -#include "rk3326.dtsi" > +#include "rk3326-odroid-go.dtsi" > > / { > model = "ODROID-GO Advance"; > compatible = "hardkernel,rk3326-odroid-go2", "rockchip,rk3326"; > > - aliases { > - mmc0 = &sdmmc; > - }; > - > - chosen { > - stdout-path = "serial2:115200n8"; > - }; > - > - adc-joystick { > + analog_sticks: adc-joystick { > compatible = "adc-joystick"; > io-channels = <&saradc 1>, > <&saradc 2>; > + poll-interval = <60>; > #address-cells = <1>; > #size-cells = <0>; > > @@ -46,12 +37,6 @@ axis@1 { > }; > }; > > - backlight: backlight { > - compatible = "pwm-backlight"; > - power-supply = <&vcc_bl>; > - pwms = <&pwm1 0 25000 0>; > - }; > - > battery: battery { > compatible = "simple-battery"; > charge-full-design-microamp-hours = <3000000>; > @@ -63,606 +48,19 @@ battery: battery { > voltage-min-design-microvolt = <3500000>; > > ocv-capacity-celsius = <20>; > - ocv-capacity-table-0 = <4046950 100>, <4001920 95>, <3967900 90>, <3919950 85>, > + ocv-capacity-table-0 = <4046950 100>, <4001920 95>, <3967900 90>, <3919950 85>, > <3888450 80>, <3861850 75>, <3831540 70>, <3799130 65>, > <3768190 60>, <3745650 55>, <3726610 50>, <3711630 45>, > <3696720 40>, <3685660 35>, <3674950 30>, <3663050 25>, > <3649470 20>, <3635260 15>, <3616920 10>, <3592440 5>, > <3574170 0>; > }; > - > - gpio-keys { > - compatible = "gpio-keys"; > - pinctrl-names = "default"; > - pinctrl-0 = <&btn_pins>; > - > - /* > - * *** ODROIDGO2-Advance Switch layout *** > - * |------------------------------------------------| > - * | sw15 sw16 | > - * |------------------------------------------------| > - * | sw1 |-------------------| sw8 | > - * | sw3 sw4 | | sw7 sw5 | > - * | sw2 | LCD Display | sw6 | > - * | | | | > - * | |-------------------| | > - * | sw9 sw10 sw11 sw12 sw13 sw14 | > - * |------------------------------------------------| > - */ > - > - button-sw1 { > - gpios = <&gpio1 RK_PB4 GPIO_ACTIVE_LOW>; > - label = "DPAD-UP"; > - linux,code = ; > - }; > - button-sw2 { > - gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_LOW>; > - label = "DPAD-DOWN"; > - linux,code = ; > - }; > - button-sw3 { > - gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_LOW>; > - label = "DPAD-LEFT"; > - linux,code = ; > - }; > - button-sw4 { > - gpios = <&gpio1 RK_PB7 GPIO_ACTIVE_LOW>; > - label = "DPAD-RIGHT"; > - linux,code = ; > - }; > - button-sw5 { > - gpios = <&gpio1 RK_PA2 GPIO_ACTIVE_LOW>; > - label = "BTN-A"; > - linux,code = ; > - }; > - button-sw6 { > - gpios = <&gpio1 RK_PA5 GPIO_ACTIVE_LOW>; > - label = "BTN-B"; > - linux,code = ; > - }; > - button-sw7 { > - gpios = <&gpio1 RK_PA6 GPIO_ACTIVE_LOW>; > - label = "BTN-Y"; > - linux,code = ; > - }; > - button-sw8 { > - gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_LOW>; > - label = "BTN-X"; > - linux,code = ; > - }; > - button-sw9 { > - gpios = <&gpio2 RK_PA0 GPIO_ACTIVE_LOW>; > - label = "F1"; > - linux,code = ; > - }; > - button-sw10 { > - gpios = <&gpio2 RK_PA1 GPIO_ACTIVE_LOW>; > - label = "F2"; > - linux,code = ; > - }; > - button-sw11 { > - gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>; > - label = "F3"; > - linux,code = ; > - }; > - button-sw12 { > - gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_LOW>; > - label = "F4"; > - linux,code = ; > - }; > - button-sw13 { > - gpios = <&gpio2 RK_PA4 GPIO_ACTIVE_LOW>; > - label = "F5"; > - linux,code = ; > - }; > - button-sw14 { > - gpios = <&gpio2 RK_PA5 GPIO_ACTIVE_LOW>; > - label = "F6"; > - linux,code = ; > - }; > - button-sw15 { > - gpios = <&gpio2 RK_PA6 GPIO_ACTIVE_LOW>; > - label = "TOP-LEFT"; > - linux,code = ; > - }; > - button-sw16 { > - gpios = <&gpio2 RK_PA7 GPIO_ACTIVE_LOW>; > - label = "TOP-RIGHT"; > - linux,code = ; > - }; > - }; > - > - leds: gpio-leds { > - compatible = "gpio-leds"; > - pinctrl-names = "default"; > - pinctrl-0 = <&blue_led_pin>; > - > - blue_led: led-0 { > - label = "blue:heartbeat"; > - gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; > - linux,default-trigger = "heartbeat"; > - }; > - }; > - > - rk817-sound { > - compatible = "simple-audio-card"; > - simple-audio-card,name = "Analog"; > - simple-audio-card,format = "i2s"; > - simple-audio-card,hp-det-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>; > - simple-audio-card,mclk-fs = <256>; > - simple-audio-card,widgets = > - "Microphone", "Mic Jack", > - "Headphone", "Headphones", > - "Speaker", "Speaker"; > - simple-audio-card,routing = > - "MICL", "Mic Jack", > - "Headphones", "HPOL", > - "Headphones", "HPOR", > - "Speaker", "SPKO"; > - > - simple-audio-card,codec { > - sound-dai = <&rk817>; > - }; > - > - simple-audio-card,cpu { > - sound-dai = <&i2s1_2ch>; > - }; > - }; > - > - vccsys: vccsys { > - compatible = "regulator-fixed"; > - regulator-name = "vcc3v8_sys"; > - regulator-always-on; > - regulator-min-microvolt = <3800000>; > - regulator-max-microvolt = <3800000>; > - }; > - > - vcc_host: vcc_host { > - compatible = "regulator-fixed"; > - regulator-name = "vcc_host"; > - regulator-min-microvolt = <5000000>; > - regulator-max-microvolt = <5000000>; > - > - gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; > - enable-active-high; > - regulator-always-on; > - regulator-boot-on; > - vin-supply = <&usb_midu>; > - }; > -}; > - > -&cpu0 { > - cpu-supply = <&vdd_arm>; > -}; > - > -&cpu1 { > - cpu-supply = <&vdd_arm>; > -}; > - > -&cpu2 { > - cpu-supply = <&vdd_arm>; > -}; > - > -&cpu3 { > - cpu-supply = <&vdd_arm>; > -}; > - > -&cru { > - assigned-clocks = <&cru PLL_NPLL>, > - <&cru ACLK_BUS_PRE>, <&cru ACLK_PERI_PRE>, > - <&cru HCLK_BUS_PRE>, <&cru HCLK_PERI_PRE>, > - <&cru PCLK_BUS_PRE>, <&cru SCLK_GPU>, > - <&cru PLL_CPLL>; > - > - assigned-clock-rates = <1188000000>, > - <200000000>, <200000000>, > - <150000000>, <150000000>, > - <100000000>, <200000000>, > - <17000000>; > }; > > -&display_subsystem { > - status = "okay"; > +&internal_display { > + compatible = "elida,kd35t133"; > }; > > -&dsi { > - status = "okay"; > - > - ports { > - mipi_out: port@1 { > - reg = <1>; > - > - mipi_out_panel: endpoint { > - remote-endpoint = <&mipi_in_panel>; > - }; > - }; > - }; > - > - panel@0 { > - compatible = "elida,kd35t133"; > - reg = <0>; > - backlight = <&backlight>; > - iovcc-supply = <&vcc_lcd>; > - reset-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_LOW>; > - rotation = <270>; > - vdd-supply = <&vcc_lcd>; > - > - port { > - mipi_in_panel: endpoint { > - remote-endpoint = <&mipi_out_panel>; > - }; > - }; > - }; > -}; > - > -&dsi_dphy { > - status = "okay"; > -}; > - > -&gpu { > - mali-supply = <&vdd_logic>; > - status = "okay"; > -}; > - > -&i2c0 { > - clock-frequency = <400000>; > - i2c-scl-falling-time-ns = <16>; > - i2c-scl-rising-time-ns = <280>; > - status = "okay"; > - > - rk817: pmic@20 { > - compatible = "rockchip,rk817"; > - reg = <0x20>; > - interrupt-parent = <&gpio0>; > - interrupts = ; > - clock-output-names = "rk808-clkout1", "xin32k"; > - clock-names = "mclk"; > - clocks = <&cru SCLK_I2S1_OUT>; > - pinctrl-names = "default"; > - pinctrl-0 = <&pmic_int>, <&i2s1_2ch_mclk>; > - wakeup-source; > - #clock-cells = <1>; > - #sound-dai-cells = <0>; > - > - vcc1-supply = <&vccsys>; > - vcc2-supply = <&vccsys>; > - vcc3-supply = <&vccsys>; > - vcc4-supply = <&vccsys>; > - vcc5-supply = <&vccsys>; > - vcc6-supply = <&vccsys>; > - vcc7-supply = <&vccsys>; > - vcc8-supply = <&vccsys>; > - > - regulators { > - vdd_logic: DCDC_REG1 { > - regulator-name = "vdd_logic"; > - regulator-min-microvolt = <950000>; > - regulator-max-microvolt = <1150000>; > - regulator-ramp-delay = <6001>; > - regulator-always-on; > - regulator-boot-on; > - > - regulator-state-mem { > - regulator-on-in-suspend; > - regulator-suspend-microvolt = <950000>; > - }; > - }; > - > - vdd_arm: DCDC_REG2 { > - regulator-name = "vdd_arm"; > - regulator-min-microvolt = <950000>; > - regulator-max-microvolt = <1350000>; > - regulator-ramp-delay = <6001>; > - regulator-always-on; > - regulator-boot-on; > - > - regulator-state-mem { > - regulator-off-in-suspend; > - regulator-suspend-microvolt = <950000>; > - }; > - }; > - > - vcc_ddr: DCDC_REG3 { > - regulator-name = "vcc_ddr"; > - regulator-always-on; > - regulator-boot-on; > - > - regulator-state-mem { > - regulator-on-in-suspend; > - }; > - }; > - > - vcc_3v3: DCDC_REG4 { > - regulator-name = "vcc_3v3"; > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > - regulator-always-on; > - regulator-boot-on; > - > - regulator-state-mem { > - regulator-off-in-suspend; > - regulator-suspend-microvolt = <3300000>; > - }; > - }; > - > - vcc_1v8: LDO_REG2 { > - regulator-name = "vcc_1v8"; > - regulator-min-microvolt = <1800000>; > - regulator-max-microvolt = <1800000>; > - regulator-always-on; > - regulator-boot-on; > - > - regulator-state-mem { > - regulator-on-in-suspend; > - regulator-suspend-microvolt = <1800000>; > - }; > - }; > - > - vdd_1v0: LDO_REG3 { > - regulator-name = "vdd_1v0"; > - regulator-min-microvolt = <1000000>; > - regulator-max-microvolt = <1000000>; > - regulator-always-on; > - regulator-boot-on; > - > - regulator-state-mem { > - regulator-on-in-suspend; > - regulator-suspend-microvolt = <1000000>; > - }; > - }; > - > - vcc3v3_pmu: LDO_REG4 { > - regulator-name = "vcc3v3_pmu"; > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > - regulator-always-on; > - regulator-boot-on; > - > - regulator-state-mem { > - regulator-on-in-suspend; > - regulator-suspend-microvolt = <3300000>; > - }; > - }; > - > - vccio_sd: LDO_REG5 { > - regulator-name = "vccio_sd"; > - regulator-min-microvolt = <1800000>; > - regulator-max-microvolt = <3300000>; > - regulator-always-on; > - regulator-boot-on; > - > - regulator-state-mem { > - regulator-on-in-suspend; > - regulator-suspend-microvolt = <3300000>; > - }; > - }; > - > - vcc_sd: LDO_REG6 { > - regulator-name = "vcc_sd"; > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > - regulator-boot-on; > - > - regulator-state-mem { > - regulator-on-in-suspend; > - regulator-suspend-microvolt = <3300000>; > - }; > - }; > - > - vcc_bl: LDO_REG7 { > - regulator-name = "vcc_bl"; > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > - > - regulator-state-mem { > - regulator-off-in-suspend; > - regulator-suspend-microvolt = <3300000>; > - }; > - }; > - > - vcc_lcd: LDO_REG8 { > - regulator-name = "vcc_lcd"; > - regulator-min-microvolt = <2800000>; > - regulator-max-microvolt = <2800000>; > - > - regulator-state-mem { > - regulator-off-in-suspend; > - regulator-suspend-microvolt = <2800000>; > - }; > - }; > - > - vcc_cam: LDO_REG9 { > - regulator-name = "vcc_cam"; > - regulator-min-microvolt = <3000000>; > - regulator-max-microvolt = <3000000>; > - > - regulator-state-mem { > - regulator-off-in-suspend; > - regulator-suspend-microvolt = <3000000>; > - }; > - }; > - > - usb_midu: BOOST { > - regulator-name = "usb_midu"; > - regulator-min-microvolt = <5000000>; > - regulator-max-microvolt = <5400000>; > - regulator-always-on; > - regulator-boot-on; > - }; > - }; > - > - rk817_charger: charger { > - monitored-battery = <&battery>; > - rockchip,resistor-sense-micro-ohms = <10000>; > - rockchip,sleep-enter-current-microamp = <300000>; > - rockchip,sleep-filter-current-microamp = <100000>; > - }; > - > - rk817_codec: codec { > - rockchip,mic-in-differential; > - }; > - }; > -}; > - > -/* EXT Header(P2): 7(SCL:GPIO0.C2), 8(SDA:GPIO0.C3) */ > -&i2c1 { > - clock-frequency = <400000>; > - status = "okay"; > -}; > - > -/* I2S 1 Channel Used */ > -&i2s1_2ch { > - status = "okay"; > -}; > - > -&io_domains { > - vccio1-supply = <&vcc_3v3>; > - vccio2-supply = <&vccio_sd>; > - vccio3-supply = <&vcc_3v3>; > - vccio4-supply = <&vcc_3v3>; > - vccio5-supply = <&vcc_3v3>; > - vccio6-supply = <&vcc_3v3>; > - status = "okay"; > -}; > - > -&pmu_io_domains { > - pmuio1-supply = <&vcc3v3_pmu>; > - pmuio2-supply = <&vcc3v3_pmu>; > - status = "okay"; > -}; > - > -&pwm1 { > - status = "okay"; > -}; > - > -&saradc { > - vref-supply = <&vcc_1v8>; > - status = "okay"; > -}; > - > -&sdmmc { > - cap-sd-highspeed; > - card-detect-delay = <200>; > - cd-gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_LOW>; /*[> CD GPIO <]*/ > - sd-uhs-sdr12; > - sd-uhs-sdr25; > - sd-uhs-sdr50; > - sd-uhs-sdr104; > - vmmc-supply = <&vcc_sd>; > - vqmmc-supply = <&vccio_sd>; > - status = "okay"; > -}; > - > -&sfc { > - pinctrl-0 = <&sfc_clk &sfc_cs0 &sfc_bus2>; > - pinctrl-names = "default"; > - #address-cells = <1>; > - #size-cells = <0>; > - status = "okay"; > - > - flash@0 { > - compatible = "jedec,spi-nor"; > - reg = <0>; > - spi-max-frequency = <108000000>; > - spi-rx-bus-width = <2>; > - spi-tx-bus-width = <1>; > - }; > -}; > - > -&tsadc { > - status = "okay"; > -}; > - > -&u2phy { > - status = "okay"; > - > - u2phy_host: host-port { > - status = "okay"; > - }; > - > - u2phy_otg: otg-port { > - status = "disabled"; > - }; > -}; > - > -&usb20_otg { > - status = "okay"; > -}; > - > -/* EXT Header(P2): 2(RXD:GPIO1.C0),3(TXD:.C1),4(CTS:.C2),5(RTS:.C3) */ > -&uart1 { > - pinctrl-names = "default"; > - pinctrl-0 = <&uart1_xfer &uart1_cts>; > - status = "okay"; > -}; > - > -&uart2 { > - pinctrl-names = "default"; > - pinctrl-0 = <&uart2m1_xfer>; > - status = "okay"; > -}; > - > -&vopb { > - status = "okay"; > -}; > - > -&vopb_mmu { > - status = "okay"; > -}; > - > -&pinctrl { > - btns { > - btn_pins: btn-pins { > - rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>, > - <1 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>, > - <1 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>, > - <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>, > - <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>, > - <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>, > - <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>, > - <1 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>, > - <2 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>, > - <2 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>, > - <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>, > - <2 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>, > - <2 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>, > - <2 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>, > - <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>, > - <2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>; > - }; > - }; > - > - headphone { > - hp_det: hp-det { > - rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_down>; > - }; > - }; > - > - leds { > - blue_led_pin: blue-led-pin { > - rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; > - }; > - }; > - > - pmic { > - dc_det: dc-det { > - rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; > - }; > - > - pmic_int: pmic-int { > - rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; > - }; > - > - soc_slppin_gpio: soc_slppin_gpio { > - rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_output_low>; > - }; > - > - soc_slppin_rst: soc_slppin_rst { > - rockchip,pins = <0 RK_PA4 2 &pcfg_pull_none>; > - }; > - > - soc_slppin_slp: soc_slppin_slp { > - rockchip,pins = <0 RK_PA4 1 &pcfg_pull_none>; > - }; > - }; > +&rk817_charger { > + monitored-battery = <&battery>; > }; >