| Message ID | 20231109215007.66826-5-macroalpha82@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | rockchip: Add Powkiddy RK2023 | expand |
On 09/11/2023 22:50, Chris Morgan wrote: > From: Chris Morgan <macromorgan@hotmail.com> > > Add support for the Powkiddy RK2023. The Powkiddy RK2023 is a handheld > gaming device with a 3.5 inch screen powered by the Rockchip RK3566 > SoC. The device is almost identical to the Anbernic RG353P except it > lacks eMMC, a function button, a touch screen, no UART headers on the > board, and the panel has slightly different timings. > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com> > --- > arch/arm64/boot/dts/rockchip/Makefile | 1 + > .../dts/rockchip/rk3566-powkiddy-rk2023.dts | 161 ++++++++++++++++++ > 2 files changed, 162 insertions(+) > create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts > > diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile > index a18f33bf0c0e..f969618da352 100644 > --- a/arch/arm64/boot/dts/rockchip/Makefile > +++ b/arch/arm64/boot/dts/rockchip/Makefile > @@ -78,6 +78,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg503.dtb > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rgb30.dtb > +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rk2023.dtb > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-radxa-cm3-io.dtb > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts b/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts > new file mode 100644 > index 000000000000..5740412f6b2b > --- /dev/null > +++ b/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts > @@ -0,0 +1,161 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > + > +/dts-v1/; > + > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/input/linux-event-codes.h> > +#include <dt-bindings/pinctrl/rockchip.h> > +#include "rk3566-anbernic-rg353x.dtsi" > + > +/ { > + model = "RK2023"; > + compatible = "powkiddy,rk2023", "rockchip,rk3566"; > + > + aliases { > + mmc1 = &sdmmc0; > + mmc2 = &sdmmc1; > + mmc3 = &sdmmc2; > + }; > + > + battery: battery { > + compatible = "simple-battery"; > + charge-full-design-microamp-hours = <3151000>; > + charge-term-current-microamp = <300000>; > + constant-charge-current-max-microamp = <2000000>; > + constant-charge-voltage-max-microvolt = <4250000>; > + factory-internal-resistance-micro-ohms = <117000>; > + voltage-max-design-microvolt = <4172000>; > + voltage-min-design-microvolt = <3400000>; > + > + ocv-capacity-celsius = <20>; > + ocv-capacity-table-0 = <4172000 100>, <4092000 95>, <4035000 90>, <3990000 85>, > + <3939000 80>, <3895000 75>, <3852000 70>, <3807000 65>, > + <3762000 60>, <3713000 55>, <3672000 50>, <3647000 45>, > + <3629000 40>, <3613000 35>, <3598000 30>, <3578000 25>, > + <3550000 20>, <3519000 15>, <3479000 10>, <3438000 5>, > + <3400000 0>; > + }; > + > + /* Channels reversed for headphones. */ > + sound { > + compatible = "simple-audio-card"; > + simple-audio-card,name = "rk817_int"; > + simple-audio-card,format = "i2s"; > + simple-audio-card,hp-det-gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; > + simple-audio-card,mclk-fs = <256>; > + simple-audio-card,widgets = > + "Microphone", "Mic Jack", > + "Headphone", "Headphones", > + "Speaker", "Internal Speakers"; > + simple-audio-card,routing = > + "MICL", "Mic Jack", > + "Headphones", "HPOL", > + "Headphones", "HPOR", > + "Internal Speakers", "SPKO"; > + > + simple-audio-card,codec { > + sound-dai = <&rk817>; > + }; > + > + simple-audio-card,cpu { > + sound-dai = <&i2s1_8ch>; > + }; > + }; > + > +}; > + > +/delete-node/ &adc_keys; > + > +&chosen { > + /delete-property/ stdout-path; > +}; If you have to delete so many nodes and properties, this means your common DTSI is not that common. Common DTSI means there is shared hardware. If you take shared hardware and put it into another board, pieces of the shared hardware do not disappear. Best regards, Krzysztof
On Fri, Nov 10, 2023 at 02:14:23PM +0100, Krzysztof Kozlowski wrote: > On 09/11/2023 22:50, Chris Morgan wrote: > > From: Chris Morgan <macromorgan@hotmail.com> > > > > Add support for the Powkiddy RK2023. The Powkiddy RK2023 is a handheld > > gaming device with a 3.5 inch screen powered by the Rockchip RK3566 > > SoC. The device is almost identical to the Anbernic RG353P except it > > lacks eMMC, a function button, a touch screen, no UART headers on the > > board, and the panel has slightly different timings. > > > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com> > > --- > > arch/arm64/boot/dts/rockchip/Makefile | 1 + > > .../dts/rockchip/rk3566-powkiddy-rk2023.dts | 161 ++++++++++++++++++ > > 2 files changed, 162 insertions(+) > > create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts > > > > diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile > > index a18f33bf0c0e..f969618da352 100644 > > --- a/arch/arm64/boot/dts/rockchip/Makefile > > +++ b/arch/arm64/boot/dts/rockchip/Makefile > > @@ -78,6 +78,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg503.dtb > > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb > > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb > > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rgb30.dtb > > +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rk2023.dtb > > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb > > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb > > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-radxa-cm3-io.dtb > > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts b/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts > > new file mode 100644 > > index 000000000000..5740412f6b2b > > --- /dev/null > > +++ b/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts > > @@ -0,0 +1,161 @@ > > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > + > > +/dts-v1/; > > + > > +#include <dt-bindings/gpio/gpio.h> > > +#include <dt-bindings/input/linux-event-codes.h> > > +#include <dt-bindings/pinctrl/rockchip.h> > > +#include "rk3566-anbernic-rg353x.dtsi" > > + > > +/ { > > + model = "RK2023"; > > + compatible = "powkiddy,rk2023", "rockchip,rk3566"; > > + > > + aliases { > > + mmc1 = &sdmmc0; > > + mmc2 = &sdmmc1; > > + mmc3 = &sdmmc2; > > + }; > > + > > + battery: battery { > > + compatible = "simple-battery"; > > + charge-full-design-microamp-hours = <3151000>; > > + charge-term-current-microamp = <300000>; > > + constant-charge-current-max-microamp = <2000000>; > > + constant-charge-voltage-max-microvolt = <4250000>; > > + factory-internal-resistance-micro-ohms = <117000>; > > + voltage-max-design-microvolt = <4172000>; > > + voltage-min-design-microvolt = <3400000>; > > + > > + ocv-capacity-celsius = <20>; > > + ocv-capacity-table-0 = <4172000 100>, <4092000 95>, <4035000 90>, <3990000 85>, > > + <3939000 80>, <3895000 75>, <3852000 70>, <3807000 65>, > > + <3762000 60>, <3713000 55>, <3672000 50>, <3647000 45>, > > + <3629000 40>, <3613000 35>, <3598000 30>, <3578000 25>, > > + <3550000 20>, <3519000 15>, <3479000 10>, <3438000 5>, > > + <3400000 0>; > > + }; > > + > > + /* Channels reversed for headphones. */ > > + sound { > > + compatible = "simple-audio-card"; > > + simple-audio-card,name = "rk817_int"; > > + simple-audio-card,format = "i2s"; > > + simple-audio-card,hp-det-gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; > > + simple-audio-card,mclk-fs = <256>; > > + simple-audio-card,widgets = > > + "Microphone", "Mic Jack", > > + "Headphone", "Headphones", > > + "Speaker", "Internal Speakers"; > > + simple-audio-card,routing = > > + "MICL", "Mic Jack", > > + "Headphones", "HPOL", > > + "Headphones", "HPOR", > > + "Internal Speakers", "SPKO"; > > + > > + simple-audio-card,codec { > > + sound-dai = <&rk817>; > > + }; > > + > > + simple-audio-card,cpu { > > + sound-dai = <&i2s1_8ch>; > > + }; > > + }; > > + > > +}; > > + > > +/delete-node/ &adc_keys; > > + > > +&chosen { > > + /delete-property/ stdout-path; > > +}; > > If you have to delete so many nodes and properties, this means your > common DTSI is not that common. > > Common DTSI means there is shared hardware. If you take shared hardware > and put it into another board, pieces of the shared hardware do not > disappear. > > > Best regards, > Krzysztof > I can redo this with a different top-level dtsi so I won't have to delete so much if that helps. I'll redo both the RGB30 and RK2023 so that they use a common dtsi and no longer rely on the Anberic one. I'll do that and submit a V3. Thank you.
On 10/11/2023 15:30, Chris Morgan wrote: > On Fri, Nov 10, 2023 at 02:14:23PM +0100, Krzysztof Kozlowski wrote: >>> + >>> +/delete-node/ &adc_keys; >>> + >>> +&chosen { >>> + /delete-property/ stdout-path; >>> +}; >> >> If you have to delete so many nodes and properties, this means your >> common DTSI is not that common. >> >> Common DTSI means there is shared hardware. If you take shared hardware >> and put it into another board, pieces of the shared hardware do not >> disappear. >> >> >> Best regards, >> Krzysztof >> > > I can redo this with a different top-level dtsi so I won't have to > delete so much if that helps. I'll redo both the RGB30 and RK2023 > so that they use a common dtsi and no longer rely on the Anberic > one. I'll do that and submit a V3. I am not sure whether you need another top-level DTSI, but maybe rather move things from common DTSI to each boards. Or you are using wrong common DTSI. You are supposed to reference common DTSI if the hardware parts are common. Don't use some DTSI just because DTS looks similar. I did not investigate your hardware to give recommendation how DTS should look like. But judging from node removals, something is not done obvious way. Best regards, Krzysztof
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index a18f33bf0c0e..f969618da352 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -78,6 +78,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg503.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rgb30.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-powkiddy-rk2023.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-radxa-cm3-io.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts b/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts new file mode 100644 index 000000000000..5740412f6b2b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts @@ -0,0 +1,161 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/pinctrl/rockchip.h> +#include "rk3566-anbernic-rg353x.dtsi" + +/ { + model = "RK2023"; + compatible = "powkiddy,rk2023", "rockchip,rk3566"; + + aliases { + mmc1 = &sdmmc0; + mmc2 = &sdmmc1; + mmc3 = &sdmmc2; + }; + + battery: battery { + compatible = "simple-battery"; + charge-full-design-microamp-hours = <3151000>; + charge-term-current-microamp = <300000>; + constant-charge-current-max-microamp = <2000000>; + constant-charge-voltage-max-microvolt = <4250000>; + factory-internal-resistance-micro-ohms = <117000>; + voltage-max-design-microvolt = <4172000>; + voltage-min-design-microvolt = <3400000>; + + ocv-capacity-celsius = <20>; + ocv-capacity-table-0 = <4172000 100>, <4092000 95>, <4035000 90>, <3990000 85>, + <3939000 80>, <3895000 75>, <3852000 70>, <3807000 65>, + <3762000 60>, <3713000 55>, <3672000 50>, <3647000 45>, + <3629000 40>, <3613000 35>, <3598000 30>, <3578000 25>, + <3550000 20>, <3519000 15>, <3479000 10>, <3438000 5>, + <3400000 0>; + }; + + /* Channels reversed for headphones. */ + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "rk817_int"; + simple-audio-card,format = "i2s"; + simple-audio-card,hp-det-gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,widgets = + "Microphone", "Mic Jack", + "Headphone", "Headphones", + "Speaker", "Internal Speakers"; + simple-audio-card,routing = + "MICL", "Mic Jack", + "Headphones", "HPOL", + "Headphones", "HPOR", + "Internal Speakers", "SPKO"; + + simple-audio-card,codec { + sound-dai = <&rk817>; + }; + + simple-audio-card,cpu { + sound-dai = <&i2s1_8ch>; + }; + }; + +}; + +/delete-node/ &adc_keys; + +&chosen { + /delete-property/ stdout-path; +}; + +&cru { + assigned-clocks = <&pmucru CLK_RTC_32K>, <&cru PLL_GPLL>, + <&pmucru PLL_PPLL>, <&cru PLL_VPLL>; + assigned-clock-rates = <32768>, <1200000000>, + <200000000>, <115200000>; +}; + +&gpio_keys_control { + button-r1 { + gpios = <&gpio3 RK_PB3 GPIO_ACTIVE_LOW>; + label = "TR"; + linux,code = <BTN_TR>; + }; + + button-r2 { + gpios = <&gpio3 RK_PB4 GPIO_ACTIVE_LOW>; + label = "TR2"; + linux,code = <BTN_TR2>; + }; +}; + +/delete-node/ &{/i2c@fdd40000/regulator@40}; + +&i2c0 { + vdd_cpu: regulator@1c { + compatible = "tcs,tcs4525"; + reg = <0x1c>; + fcs,suspend-voltage-selector = <1>; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <712500>; + regulator-max-microvolt = <1390000>; + regulator-name = "vdd_cpu"; + regulator-ramp-delay = <2300>; + vin-supply = <&vcc_sys>; + regulator-state-mem { + regulator-off-in-suspend; + }; + }; +}; + +/* + * Device has 2 controllable LEDs (a red and a green) along with a red + * LED that cannot be controlled and is always on when device is + * powered. + */ + +/delete-node/ &{/pwm-leds/led-2}; + +&leds { + green_led: led-0 { + color = <LED_COLOR_ID_GREEN>; + function = LED_FUNCTION_STATUS; + max-brightness = <255>; + pwms = <&pwm6 0 25000 0>; + }; + + red_led: led-1 { + color = <LED_COLOR_ID_RED>; + function = LED_FUNCTION_CHARGING; + max-brightness = <255>; + pwms = <&pwm7 0 25000 0>; + }; + +}; + +&panel { + compatible = "powkiddy,rk2023-panel", "newvision,nv3051d"; +}; + +&pwm5 { + status = "disabled"; +}; + +&rk817 { + rk817_charger: charger { + monitored-battery = <&battery>; + rockchip,resistor-sense-micro-ohms = <10000>; + rockchip,sleep-enter-current-microamp = <300000>; + rockchip,sleep-filter-current-microamp = <100000>; + }; +}; + +/* There is no UART header visible on the board for this device. */ +&uart2 { + status = "disabled"; +}; + +/delete-node/ &vibrator;