diff mbox series

[3/4] ARM: dts: imx: add devicetree for Kobo Libra H2O

Message ID 20210918141627.2142457-4-andreas@kemnade.info (mailing list archive)
State Superseded
Headers show
Series ARM: dts: add E70K02 based eBook readers | expand

Commit Message

Andreas Kemnade Sept. 18, 2021, 2:16 p.m. UTC
This adds a devicetree for the Kobo Libra H2O Ebook reader. It is based on
boards called e70k02. It is equipped with an imx6sll SoC.

Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
---
 arch/arm/boot/dts/Makefile                 |   3 +-
 arch/arm/boot/dts/imx6sll-kobo-librah2o.dts | 339 +++++++++++++++++++++
 2 files changed, 341 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/imx6sll-kobo-librah2o.dts

Comments

Krzysztof Kozlowski Sept. 22, 2021, 7:41 a.m. UTC | #1
On Sat, 18 Sept 2021 at 16:55, Andreas Kemnade <andreas@kemnade.info> wrote:
>
> This adds a devicetree for the Kobo Libra H2O Ebook reader. It is based on
> boards called e70k02. It is equipped with an imx6sll SoC.
>
> Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
> ---
>  arch/arm/boot/dts/Makefile                 |   3 +-
>  arch/arm/boot/dts/imx6sll-kobo-librah2o.dts | 339 +++++++++++++++++++++
>  2 files changed, 341 insertions(+), 1 deletion(-)
>  create mode 100644 arch/arm/boot/dts/imx6sll-kobo-librah2o.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 7e0934180724..78fc26ff2cac 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -638,7 +638,8 @@ dtb-$(CONFIG_SOC_IMX6SL) += \
>         imx6sl-warp.dtb
>  dtb-$(CONFIG_SOC_IMX6SLL) += \
>         imx6sll-evk.dtb \
> -       imx6sll-kobo-clarahd.dtb
> +       imx6sll-kobo-clarahd.dtb \
> +       imx6sll-kobo-librah2o.dtb
>  dtb-$(CONFIG_SOC_IMX6SX) += \
>         imx6sx-nitrogen6sx.dtb \
>         imx6sx-sabreauto.dtb \
> diff --git a/arch/arm/boot/dts/imx6sll-kobo-librah2o.dts b/arch/arm/boot/dts/imx6sll-kobo-librah2o.dts
> new file mode 100644
> index 000000000000..44522f6a54ca
> --- /dev/null
> +++ b/arch/arm/boot/dts/imx6sll-kobo-librah2o.dts
> @@ -0,0 +1,339 @@
> +// SPDX-License-Identifier: (GPL-2.0)
> +/*
> + * Device tree for the Kobo Libra H2O ebook reader
> + *
> + * Name on mainboard is: 37NB-E70K0M+6A3
> + * Serials start with: E70K02 (a number also seen in
> + * vendor kernel sources)
> + *
> + * This mainboard seems to be equipped with different SoCs.
> + * In the Kobo Libra H2O ebook reader it is an i.MX6SLL
> + *
> + * Copyright 2021 Andreas Kemnade
> + * based on works
> + * Copyright 2016 Freescale Semiconductor, Inc.
> + */
> +
> +/dts-v1/;
> +
> +#include <dt-bindings/input/input.h>
> +#include <dt-bindings/gpio/gpio.h>
> +#include "imx6sll.dtsi"
> +#include "e70k02.dtsi"
> +
> +/ {
> +       model = "Kobo Libra H2O";
> +       compatible = "kobo,librah2o", "fsl,imx6sll";
> +};
> +
> +&clks {
> +       assigned-clocks = <&clks IMX6SLL_CLK_PLL4_AUDIO_DIV>;
> +       assigned-clock-rates = <393216000>;
> +};
> +
> +&cpu0 {
> +       arm-supply = <&dcdc3_reg>;
> +       soc-supply = <&dcdc1_reg>;
> +};
> +
> +&gpio_keys {
> +       pinctrl-names = "default";
> +       pinctrl-0 = <&pinctrl_gpio_keys>;
> +};
> +
> +&i2c1 {
> +       pinctrl-names = "default","sleep";
> +       pinctrl-0 = <&pinctrl_i2c1>;
> +       pinctrl-1 = <&pinctrl_i2c1_sleep>;
> +};
> +
> +&i2c2 {
> +       pinctrl-names = "default","sleep";
> +       pinctrl-0 = <&pinctrl_i2c2>;
> +       pinctrl-1 = <&pinctrl_i2c2_sleep>;
> +};
> +
> +&i2c3 {
> +       pinctrl-names = "default";
> +       pinctrl-0 = <&pinctrl_i2c3>;
> +};
> +
> +&iomuxc {
> +       pinctrl-names = "default";
> +       pinctrl-0 = <&pinctrl_hog>;
> +
> +       pinctrl_gpio_keys: gpio-keysgrp {
> +               fsl,pins = <
> +                       MX6SLL_PAD_GPIO4_IO25__GPIO4_IO25       0x17059 /* PWR_SW */
> +                       MX6SLL_PAD_GPIO4_IO23__GPIO4_IO23       0x17059 /* HALL_EN */
> +                       MX6SLL_PAD_KEY_COL4__GPIO4_IO00         0x17059 /* PAGE_UP */
> +                       MX6SLL_PAD_KEY_COL5__GPIO4_IO02         0x17059 /* PAGE_DOWN */
> +               >;
> +       };
> +
> +       pinctrl_hog: hoggrp {
> +               fsl,pins = <
> +                       MX6SLL_PAD_LCD_DATA01__GPIO2_IO21       0x79
> +                       MX6SLL_PAD_LCD_DATA04__GPIO2_IO24       0x79
> +                       MX6SLL_PAD_LCD_DATA05__GPIO2_IO25       0x79
> +                       MX6SLL_PAD_LCD_DATA06__GPIO2_IO26       0x79
> +                       MX6SLL_PAD_LCD_DATA07__GPIO2_IO27       0x79
> +                       MX6SLL_PAD_LCD_DATA08__GPIO2_IO28       0x79
> +                       MX6SLL_PAD_LCD_DATA09__GPIO2_IO29       0x79
> +                       MX6SLL_PAD_LCD_DATA10__GPIO2_IO30       0x79
> +                       MX6SLL_PAD_LCD_DATA11__GPIO2_IO31       0x79
> +                       MX6SLL_PAD_LCD_DATA12__GPIO3_IO00       0x79
> +                       MX6SLL_PAD_LCD_DATA13__GPIO3_IO01       0x79
> +                       MX6SLL_PAD_LCD_DATA14__GPIO3_IO02       0x79
> +                       MX6SLL_PAD_LCD_DATA15__GPIO3_IO03       0x79
> +                       MX6SLL_PAD_LCD_DATA16__GPIO3_IO04       0x79
> +                       MX6SLL_PAD_LCD_DATA17__GPIO3_IO05       0x79
> +                       MX6SLL_PAD_LCD_DATA18__GPIO3_IO06       0x79
> +                       MX6SLL_PAD_LCD_DATA19__GPIO3_IO07       0x79
> +                       MX6SLL_PAD_LCD_DATA20__GPIO3_IO08       0x79
> +                       MX6SLL_PAD_LCD_DATA21__GPIO3_IO09       0x79
> +                       MX6SLL_PAD_LCD_DATA22__GPIO3_IO10       0x79
> +                       MX6SLL_PAD_LCD_DATA23__GPIO3_IO11       0x79
> +                       MX6SLL_PAD_LCD_CLK__GPIO2_IO15          0x79
> +                       MX6SLL_PAD_LCD_ENABLE__GPIO2_IO16       0x79
> +                       MX6SLL_PAD_LCD_HSYNC__GPIO2_IO17        0x79
> +                       MX6SLL_PAD_LCD_VSYNC__GPIO2_IO18        0x79
> +                       MX6SLL_PAD_LCD_RESET__GPIO2_IO19        0x79
> +                       MX6SLL_PAD_GPIO4_IO21__GPIO4_IO21       0x79
> +                       MX6SLL_PAD_GPIO4_IO26__GPIO4_IO26       0x79
> +                       MX6SLL_PAD_KEY_COL3__GPIO3_IO30         0x79
> +                       MX6SLL_PAD_KEY_ROW7__GPIO4_IO07         0x79
> +                       MX6SLL_PAD_ECSPI2_MOSI__GPIO4_IO13      0x79
> +               >;
> +       };
> +
> +       pinctrl_i2c1: i2c1grp {
> +               fsl,pins = <
> +                       MX6SLL_PAD_I2C1_SCL__I2C1_SCL   0x4001f8b1
> +                       MX6SLL_PAD_I2C1_SDA__I2C1_SDA   0x4001f8b1
> +               >;
> +       };
> +
> +       pinctrl_i2c1_sleep: i2c1grp-sleep {
> +               fsl,pins = <
> +                       MX6SLL_PAD_I2C1_SCL__I2C1_SCL   0x400108b1
> +                       MX6SLL_PAD_I2C1_SDA__I2C1_SDA   0x400108b1
> +               >;
> +       };
> +
> +       pinctrl_i2c2: i2c2grp {
> +               fsl,pins = <
> +                       MX6SLL_PAD_I2C2_SCL__I2C2_SCL   0x4001f8b1
> +                       MX6SLL_PAD_I2C2_SDA__I2C2_SDA   0x4001f8b1
> +               >;
> +       };
> +
> +       pinctrl_i2c2_sleep: i2c2grp-sleep {
> +               fsl,pins = <
> +                       MX6SLL_PAD_I2C2_SCL__I2C2_SCL   0x400108b1
> +                       MX6SLL_PAD_I2C2_SDA__I2C2_SDA   0x400108b1
> +               >;
> +       };
> +
> +       pinctrl_i2c3: i2c3grp {
> +               fsl,pins = <
> +                       MX6SLL_PAD_REF_CLK_24M__I2C3_SCL 0x4001f8b1
> +                       MX6SLL_PAD_REF_CLK_32K__I2C3_SDA 0x4001f8b1
> +               >;
> +       };
> +
> +       pinctrl_led: ledgrp {
> +               fsl,pins = <
> +                       MX6SLL_PAD_GPIO4_IO17__GPIO4_IO17       0x10059
> +               >;
> +       };
> +
> +       pinctrl_lm3630a_bl_gpio: lm3630a-bl-gpiogrp {
> +               fsl,pins = <
> +                       MX6SLL_PAD_EPDC_PWR_CTRL3__GPIO2_IO10   0x10059 /* HWEN */
> +               >;
> +       };
> +
> +       pinctrl_ricoh_gpio: ricoh-gpiogrp {
> +               fsl,pins = <
> +                       MX6SLL_PAD_GPIO4_IO20__GPIO4_IO20       0x1b8b1 /* ricoh619 chg */
> +                       MX6SLL_PAD_GPIO4_IO19__GPIO4_IO19       0x1b8b1 /* ricoh619 irq */
> +                       MX6SLL_PAD_KEY_COL2__GPIO3_IO28         0x1b8b1 /* ricoh619 bat_low_int */
> +               >;
> +       };
> +
> +       pinctrl_uart1: uart1grp {
> +               fsl,pins = <
> +                       MX6SLL_PAD_UART1_TXD__UART1_DCE_TX 0x1b0b1
> +                       MX6SLL_PAD_UART1_RXD__UART1_DCE_RX 0x1b0b1
> +               >;
> +       };
> +
> +       pinctrl_usbotg1: usbotg1grp {
> +               fsl,pins = <
> +                       MX6SLL_PAD_EPDC_PWR_COM__USB_OTG1_ID 0x17059
> +               >;
> +       };
> +
> +       pinctrl_usdhc1: usdhc1grp {
> +               fsl,pins = <
> +                       MX6SLL_PAD_SD1_CMD__SD1_CMD     0x17059
> +                       MX6SLL_PAD_SD1_CLK__SD1_CLK     0x17059
> +                       MX6SLL_PAD_SD1_DATA0__SD1_DATA0 0x17059
> +                       MX6SLL_PAD_SD1_DATA1__SD1_DATA1 0x17059
> +                       MX6SLL_PAD_SD1_DATA2__SD1_DATA2 0x17059
> +                       MX6SLL_PAD_SD1_DATA3__SD1_DATA3 0x17059
> +                       MX6SLL_PAD_SD1_DATA4__SD1_DATA4 0x17059
> +                       MX6SLL_PAD_SD1_DATA5__SD1_DATA5 0x17059
> +                       MX6SLL_PAD_SD1_DATA6__SD1_DATA6 0x17059
> +                       MX6SLL_PAD_SD1_DATA7__SD1_DATA7 0x17059
> +               >;
> +       };
> +
> +       pinctrl_usdhc1_100mhz: usdhc1grp_100mhz {

Thanks for the patch.

This does not look like passing the schema validation. Please run
dtbs_check. The node names should use hyphens and end with "grp"
suffix. This remark applies to other cases below.

Best regards,
Krzysztof
Andreas Kemnade Sept. 22, 2021, 8:38 p.m. UTC | #2
Hi,

On Wed, 22 Sep 2021 09:41:39 +0200
Krzysztof Kozlowski <krzk@kernel.org> wrote:

[...]
> > +       pinctrl_usdhc1_100mhz: usdhc1grp_100mhz {  
> 
> Thanks for the patch.
> 
> This does not look like passing the schema validation. Please run
> dtbs_check. The node names should use hyphens and end with "grp"
> suffix. This remark applies to other cases below.
> 
dtbs_check reports a lot of errors originating from imx6sll.dtsi and
friends. But nothing added by me. But yes, node names should use
hyphens, that is documented. I will fix that.

But having -grp at the end for these things with a frequency in the
name is uncommon.
$ grep -R :.*100mhz arch/arm/boot/dts/imx6s*.dts
arch/arm/boot/dts/imx6sl-evk.dts:		pinctrl_usdhc1_100mhz: usdhc1grp100mhz {
arch/arm/boot/dts/imx6sl-evk.dts:		pinctrl_usdhc2_100mhz: usdhc2grp100mhz {
arch/arm/boot/dts/imx6sl-evk.dts:		pinctrl_usdhc3_100mhz: usdhc3grp100mhz {
arch/arm/boot/dts/imx6sll-evk.dts:	pinctrl_usdhc1_100mhz: usdhc1grp_100mhz {
arch/arm/boot/dts/imx6sll-evk.dts:	pinctrl_usdhc3_100mhz: usdhc3grp_100mhz {
arch/arm/boot/dts/imx6sll-kobo-clarahd.dts:	pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
arch/arm/boot/dts/imx6sll-kobo-clarahd.dts:	pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
arch/arm/boot/dts/imx6sll-kobo-librah2o.dts:	pinctrl_usdhc1_100mhz: usdhc1grp-100mhz {
arch/arm/boot/dts/imx6sll-kobo-librah2o.dts:	pinctrl_usdhc3_100mhz: usdhc3grp_100mhz {
arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts:	pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts:	pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
arch/arm/boot/dts/imx6sl-tolino-shine3.dts:	pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
arch/arm/boot/dts/imx6sl-tolino-shine3.dts:	pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
arch/arm/boot/dts/imx6sl-tolino-vision5.dts:	pinctrl_usdhc1_100mhz: usdhc1grp-100mhz {
arch/arm/boot/dts/imx6sl-tolino-vision5.dts:	pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
arch/arm/boot/dts/imx6sl-warp.dts:		pinctrl_usdhc2_100mhz: usdhc2grp100mhz {
arch/arm/boot/dts/imx6sl-warp.dts:		pinctrl_usdhc3_100mhz: usdhc3grp100mhz {
arch/arm/boot/dts/imx6sx-nitrogen6sx.dts:	pinctrl_usdhc4_100mhz: usdhc4-100mhzgrp {
arch/arm/boot/dts/imx6sx-sabreauto.dts:	pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
arch/arm/boot/dts/imx6sx-softing-vining-2000.dts:	pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
arch/arm/boot/dts/imx6sx-softing-vining-2000.dts:	pinctrl_usdhc4_100mhz: usdhc4-100mhz {

Regards,
Andreas
Krzysztof Kozlowski Sept. 23, 2021, 6:26 a.m. UTC | #3
On Wed, 22 Sept 2021 at 22:38, Andreas Kemnade <andreas@kemnade.info> wrote:
>
> Hi,
>
> On Wed, 22 Sep 2021 09:41:39 +0200
> Krzysztof Kozlowski <krzk@kernel.org> wrote:
>
> [...]
> > > +       pinctrl_usdhc1_100mhz: usdhc1grp_100mhz {
> >
> > Thanks for the patch.
> >
> > This does not look like passing the schema validation. Please run
> > dtbs_check. The node names should use hyphens and end with "grp"
> > suffix. This remark applies to other cases below.
> >
> dtbs_check reports a lot of errors originating from imx6sll.dtsi and
> friends. But nothing added by me. But yes, node names should use
> hyphens, that is documented. I will fix that.
>
> But having -grp at the end for these things with a frequency in the
> name is uncommon.
> $ grep -R :.*100mhz arch/arm/boot/dts/imx6s*.dts
> arch/arm/boot/dts/imx6sl-evk.dts:               pinctrl_usdhc1_100mhz: usdhc1grp100mhz {
> arch/arm/boot/dts/imx6sl-evk.dts:               pinctrl_usdhc2_100mhz: usdhc2grp100mhz {
> arch/arm/boot/dts/imx6sl-evk.dts:               pinctrl_usdhc3_100mhz: usdhc3grp100mhz {
> arch/arm/boot/dts/imx6sll-evk.dts:      pinctrl_usdhc1_100mhz: usdhc1grp_100mhz {
> arch/arm/boot/dts/imx6sll-evk.dts:      pinctrl_usdhc3_100mhz: usdhc3grp_100mhz {
> arch/arm/boot/dts/imx6sll-kobo-clarahd.dts:     pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
> arch/arm/boot/dts/imx6sll-kobo-clarahd.dts:     pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
> arch/arm/boot/dts/imx6sll-kobo-librah2o.dts:    pinctrl_usdhc1_100mhz: usdhc1grp-100mhz {
> arch/arm/boot/dts/imx6sll-kobo-librah2o.dts:    pinctrl_usdhc3_100mhz: usdhc3grp_100mhz {
> arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts:   pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
> arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts:   pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
> arch/arm/boot/dts/imx6sl-tolino-shine3.dts:     pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
> arch/arm/boot/dts/imx6sl-tolino-shine3.dts:     pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
> arch/arm/boot/dts/imx6sl-tolino-vision5.dts:    pinctrl_usdhc1_100mhz: usdhc1grp-100mhz {
> arch/arm/boot/dts/imx6sl-tolino-vision5.dts:    pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
> arch/arm/boot/dts/imx6sl-warp.dts:              pinctrl_usdhc2_100mhz: usdhc2grp100mhz {
> arch/arm/boot/dts/imx6sl-warp.dts:              pinctrl_usdhc3_100mhz: usdhc3grp100mhz {
> arch/arm/boot/dts/imx6sx-nitrogen6sx.dts:       pinctrl_usdhc4_100mhz: usdhc4-100mhzgrp {
> arch/arm/boot/dts/imx6sx-sabreauto.dts: pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
> arch/arm/boot/dts/imx6sx-softing-vining-2000.dts:       pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
> arch/arm/boot/dts/imx6sx-softing-vining-2000.dts:       pinctrl_usdhc4_100mhz: usdhc4-100mhz {

I was fixing primarily arm64 boards and did not touch that many of armv7:
grep -R :.*100mhz.*grp arch/arm64/boot/dts/freescale/* | wc -l
46

Best regards,
Krzysztof
Andreas Kemnade Sept. 23, 2021, 10:54 a.m. UTC | #4
Hi,

On Thu, 23 Sep 2021 08:26:58 +0200
Krzysztof Kozlowski <krzk@kernel.org> wrote:

> On Wed, 22 Sept 2021 at 22:38, Andreas Kemnade <andreas@kemnade.info> wrote:
> >
> > Hi,
> >
> > On Wed, 22 Sep 2021 09:41:39 +0200
> > Krzysztof Kozlowski <krzk@kernel.org> wrote:
> >
> > [...]  
> > > > +       pinctrl_usdhc1_100mhz: usdhc1grp_100mhz {  
> > >
> > > Thanks for the patch.
> > >
> > > This does not look like passing the schema validation. Please run
> > > dtbs_check. The node names should use hyphens and end with "grp"
> > > suffix. This remark applies to other cases below.
> > >  
> > dtbs_check reports a lot of errors originating from imx6sll.dtsi and
> > friends. But nothing added by me. But yes, node names should use
> > hyphens, that is documented. I will fix that.
> >
> > But having -grp at the end for these things with a frequency in the
> > name is uncommon.
> > $ grep -R :.*100mhz arch/arm/boot/dts/imx6s*.dts
> > arch/arm/boot/dts/imx6sl-evk.dts:               pinctrl_usdhc1_100mhz: usdhc1grp100mhz {
> > arch/arm/boot/dts/imx6sl-evk.dts:               pinctrl_usdhc2_100mhz: usdhc2grp100mhz {
> > arch/arm/boot/dts/imx6sl-evk.dts:               pinctrl_usdhc3_100mhz: usdhc3grp100mhz {
> > arch/arm/boot/dts/imx6sll-evk.dts:      pinctrl_usdhc1_100mhz: usdhc1grp_100mhz {
> > arch/arm/boot/dts/imx6sll-evk.dts:      pinctrl_usdhc3_100mhz: usdhc3grp_100mhz {
> > arch/arm/boot/dts/imx6sll-kobo-clarahd.dts:     pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
> > arch/arm/boot/dts/imx6sll-kobo-clarahd.dts:     pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
> > arch/arm/boot/dts/imx6sll-kobo-librah2o.dts:    pinctrl_usdhc1_100mhz: usdhc1grp-100mhz {
> > arch/arm/boot/dts/imx6sll-kobo-librah2o.dts:    pinctrl_usdhc3_100mhz: usdhc3grp_100mhz {
> > arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts:   pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
> > arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts:   pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
> > arch/arm/boot/dts/imx6sl-tolino-shine3.dts:     pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
> > arch/arm/boot/dts/imx6sl-tolino-shine3.dts:     pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
> > arch/arm/boot/dts/imx6sl-tolino-vision5.dts:    pinctrl_usdhc1_100mhz: usdhc1grp-100mhz {
> > arch/arm/boot/dts/imx6sl-tolino-vision5.dts:    pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
> > arch/arm/boot/dts/imx6sl-warp.dts:              pinctrl_usdhc2_100mhz: usdhc2grp100mhz {
> > arch/arm/boot/dts/imx6sl-warp.dts:              pinctrl_usdhc3_100mhz: usdhc3grp100mhz {
> > arch/arm/boot/dts/imx6sx-nitrogen6sx.dts:       pinctrl_usdhc4_100mhz: usdhc4-100mhzgrp {
> > arch/arm/boot/dts/imx6sx-sabreauto.dts: pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
> > arch/arm/boot/dts/imx6sx-softing-vining-2000.dts:       pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
> > arch/arm/boot/dts/imx6sx-softing-vining-2000.dts:       pinctrl_usdhc4_100mhz: usdhc4-100mhz {  
> 
> I was fixing primarily arm64 boards and did not touch that many of armv7:
> grep -R :.*100mhz.*grp arch/arm64/boot/dts/freescale/* | wc -l
> 46
>
I will send a v2 with the 100mhz style used there. I will not clean up
dtbs_check issues originating from imx6sl[l].dtsi in this series. That
would be an issue for a separate series. 

Regards,
Andreas
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 7e0934180724..78fc26ff2cac 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -638,7 +638,8 @@  dtb-$(CONFIG_SOC_IMX6SL) += \
 	imx6sl-warp.dtb
 dtb-$(CONFIG_SOC_IMX6SLL) += \
 	imx6sll-evk.dtb \
-	imx6sll-kobo-clarahd.dtb
+	imx6sll-kobo-clarahd.dtb \
+	imx6sll-kobo-librah2o.dtb
 dtb-$(CONFIG_SOC_IMX6SX) += \
 	imx6sx-nitrogen6sx.dtb \
 	imx6sx-sabreauto.dtb \
diff --git a/arch/arm/boot/dts/imx6sll-kobo-librah2o.dts b/arch/arm/boot/dts/imx6sll-kobo-librah2o.dts
new file mode 100644
index 000000000000..44522f6a54ca
--- /dev/null
+++ b/arch/arm/boot/dts/imx6sll-kobo-librah2o.dts
@@ -0,0 +1,339 @@ 
+// SPDX-License-Identifier: (GPL-2.0)
+/*
+ * Device tree for the Kobo Libra H2O ebook reader
+ *
+ * Name on mainboard is: 37NB-E70K0M+6A3
+ * Serials start with: E70K02 (a number also seen in
+ * vendor kernel sources)
+ *
+ * This mainboard seems to be equipped with different SoCs.
+ * In the Kobo Libra H2O ebook reader it is an i.MX6SLL
+ *
+ * Copyright 2021 Andreas Kemnade
+ * based on works
+ * Copyright 2016 Freescale Semiconductor, Inc.
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+#include "imx6sll.dtsi"
+#include "e70k02.dtsi"
+
+/ {
+	model = "Kobo Libra H2O";
+	compatible = "kobo,librah2o", "fsl,imx6sll";
+};
+
+&clks {
+	assigned-clocks = <&clks IMX6SLL_CLK_PLL4_AUDIO_DIV>;
+	assigned-clock-rates = <393216000>;
+};
+
+&cpu0 {
+	arm-supply = <&dcdc3_reg>;
+	soc-supply = <&dcdc1_reg>;
+};
+
+&gpio_keys {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_gpio_keys>;
+};
+
+&i2c1 {
+	pinctrl-names = "default","sleep";
+	pinctrl-0 = <&pinctrl_i2c1>;
+	pinctrl-1 = <&pinctrl_i2c1_sleep>;
+};
+
+&i2c2 {
+	pinctrl-names = "default","sleep";
+	pinctrl-0 = <&pinctrl_i2c2>;
+	pinctrl-1 = <&pinctrl_i2c2_sleep>;
+};
+
+&i2c3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c3>;
+};
+
+&iomuxc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hog>;
+
+	pinctrl_gpio_keys: gpio-keysgrp {
+		fsl,pins = <
+			MX6SLL_PAD_GPIO4_IO25__GPIO4_IO25	0x17059	/* PWR_SW */
+			MX6SLL_PAD_GPIO4_IO23__GPIO4_IO23	0x17059	/* HALL_EN */
+			MX6SLL_PAD_KEY_COL4__GPIO4_IO00		0x17059	/* PAGE_UP */
+			MX6SLL_PAD_KEY_COL5__GPIO4_IO02		0x17059	/* PAGE_DOWN */
+		>;
+	};
+
+	pinctrl_hog: hoggrp {
+		fsl,pins = <
+			MX6SLL_PAD_LCD_DATA01__GPIO2_IO21	0x79
+			MX6SLL_PAD_LCD_DATA04__GPIO2_IO24	0x79
+			MX6SLL_PAD_LCD_DATA05__GPIO2_IO25	0x79
+			MX6SLL_PAD_LCD_DATA06__GPIO2_IO26	0x79
+			MX6SLL_PAD_LCD_DATA07__GPIO2_IO27	0x79
+			MX6SLL_PAD_LCD_DATA08__GPIO2_IO28	0x79
+			MX6SLL_PAD_LCD_DATA09__GPIO2_IO29	0x79
+			MX6SLL_PAD_LCD_DATA10__GPIO2_IO30	0x79
+			MX6SLL_PAD_LCD_DATA11__GPIO2_IO31	0x79
+			MX6SLL_PAD_LCD_DATA12__GPIO3_IO00	0x79
+			MX6SLL_PAD_LCD_DATA13__GPIO3_IO01	0x79
+			MX6SLL_PAD_LCD_DATA14__GPIO3_IO02	0x79
+			MX6SLL_PAD_LCD_DATA15__GPIO3_IO03	0x79
+			MX6SLL_PAD_LCD_DATA16__GPIO3_IO04	0x79
+			MX6SLL_PAD_LCD_DATA17__GPIO3_IO05	0x79
+			MX6SLL_PAD_LCD_DATA18__GPIO3_IO06	0x79
+			MX6SLL_PAD_LCD_DATA19__GPIO3_IO07	0x79
+			MX6SLL_PAD_LCD_DATA20__GPIO3_IO08	0x79
+			MX6SLL_PAD_LCD_DATA21__GPIO3_IO09	0x79
+			MX6SLL_PAD_LCD_DATA22__GPIO3_IO10	0x79
+			MX6SLL_PAD_LCD_DATA23__GPIO3_IO11	0x79
+			MX6SLL_PAD_LCD_CLK__GPIO2_IO15		0x79
+			MX6SLL_PAD_LCD_ENABLE__GPIO2_IO16	0x79
+			MX6SLL_PAD_LCD_HSYNC__GPIO2_IO17	0x79
+			MX6SLL_PAD_LCD_VSYNC__GPIO2_IO18	0x79
+			MX6SLL_PAD_LCD_RESET__GPIO2_IO19	0x79
+			MX6SLL_PAD_GPIO4_IO21__GPIO4_IO21	0x79
+			MX6SLL_PAD_GPIO4_IO26__GPIO4_IO26	0x79
+			MX6SLL_PAD_KEY_COL3__GPIO3_IO30		0x79
+			MX6SLL_PAD_KEY_ROW7__GPIO4_IO07		0x79
+			MX6SLL_PAD_ECSPI2_MOSI__GPIO4_IO13	0x79
+		>;
+	};
+
+	pinctrl_i2c1: i2c1grp {
+		fsl,pins = <
+			MX6SLL_PAD_I2C1_SCL__I2C1_SCL   0x4001f8b1
+			MX6SLL_PAD_I2C1_SDA__I2C1_SDA   0x4001f8b1
+		>;
+	};
+
+	pinctrl_i2c1_sleep: i2c1grp-sleep {
+		fsl,pins = <
+			MX6SLL_PAD_I2C1_SCL__I2C1_SCL   0x400108b1
+			MX6SLL_PAD_I2C1_SDA__I2C1_SDA   0x400108b1
+		>;
+	};
+
+	pinctrl_i2c2: i2c2grp {
+		fsl,pins = <
+			MX6SLL_PAD_I2C2_SCL__I2C2_SCL   0x4001f8b1
+			MX6SLL_PAD_I2C2_SDA__I2C2_SDA   0x4001f8b1
+		>;
+	};
+
+	pinctrl_i2c2_sleep: i2c2grp-sleep {
+		fsl,pins = <
+			MX6SLL_PAD_I2C2_SCL__I2C2_SCL   0x400108b1
+			MX6SLL_PAD_I2C2_SDA__I2C2_SDA   0x400108b1
+		>;
+	};
+
+	pinctrl_i2c3: i2c3grp {
+		fsl,pins = <
+			MX6SLL_PAD_REF_CLK_24M__I2C3_SCL 0x4001f8b1
+			MX6SLL_PAD_REF_CLK_32K__I2C3_SDA 0x4001f8b1
+		>;
+	};
+
+	pinctrl_led: ledgrp {
+		fsl,pins = <
+			MX6SLL_PAD_GPIO4_IO17__GPIO4_IO17	0x10059
+		>;
+	};
+
+	pinctrl_lm3630a_bl_gpio: lm3630a-bl-gpiogrp {
+		fsl,pins = <
+			MX6SLL_PAD_EPDC_PWR_CTRL3__GPIO2_IO10   0x10059 /* HWEN */
+		>;
+	};
+
+	pinctrl_ricoh_gpio: ricoh-gpiogrp {
+		fsl,pins = <
+			MX6SLL_PAD_GPIO4_IO20__GPIO4_IO20	0x1b8b1 /* ricoh619 chg */
+			MX6SLL_PAD_GPIO4_IO19__GPIO4_IO19	0x1b8b1 /* ricoh619 irq */
+			MX6SLL_PAD_KEY_COL2__GPIO3_IO28		0x1b8b1 /* ricoh619 bat_low_int */
+		>;
+	};
+
+	pinctrl_uart1: uart1grp {
+		fsl,pins = <
+			MX6SLL_PAD_UART1_TXD__UART1_DCE_TX 0x1b0b1
+			MX6SLL_PAD_UART1_RXD__UART1_DCE_RX 0x1b0b1
+		>;
+	};
+
+	pinctrl_usbotg1: usbotg1grp {
+		fsl,pins = <
+			MX6SLL_PAD_EPDC_PWR_COM__USB_OTG1_ID 0x17059
+		>;
+	};
+
+	pinctrl_usdhc1: usdhc1grp {
+		fsl,pins = <
+			MX6SLL_PAD_SD1_CMD__SD1_CMD	0x17059
+			MX6SLL_PAD_SD1_CLK__SD1_CLK	0x17059
+			MX6SLL_PAD_SD1_DATA0__SD1_DATA0	0x17059
+			MX6SLL_PAD_SD1_DATA1__SD1_DATA1	0x17059
+			MX6SLL_PAD_SD1_DATA2__SD1_DATA2	0x17059
+			MX6SLL_PAD_SD1_DATA3__SD1_DATA3	0x17059
+			MX6SLL_PAD_SD1_DATA4__SD1_DATA4	0x17059
+			MX6SLL_PAD_SD1_DATA5__SD1_DATA5	0x17059
+			MX6SLL_PAD_SD1_DATA6__SD1_DATA6	0x17059
+			MX6SLL_PAD_SD1_DATA7__SD1_DATA7	0x17059
+		>;
+	};
+
+	pinctrl_usdhc1_100mhz: usdhc1grp_100mhz {
+		fsl,pins = <
+			MX6SLL_PAD_SD1_CMD__SD1_CMD	0x170b9
+			MX6SLL_PAD_SD1_CLK__SD1_CLK	0x170b9
+			MX6SLL_PAD_SD1_DATA0__SD1_DATA0	0x170b9
+			MX6SLL_PAD_SD1_DATA1__SD1_DATA1	0x170b9
+			MX6SLL_PAD_SD1_DATA2__SD1_DATA2	0x170b9
+			MX6SLL_PAD_SD1_DATA3__SD1_DATA3	0x170b9
+			MX6SLL_PAD_SD1_DATA4__SD1_DATA4	0x170b9
+			MX6SLL_PAD_SD1_DATA5__SD1_DATA5	0x170b9
+			MX6SLL_PAD_SD1_DATA6__SD1_DATA6	0x170b9
+			MX6SLL_PAD_SD1_DATA7__SD1_DATA7	0x170b9
+		>;
+	};
+
+	pinctrl_usdhc1_200mhz: usdhc1grp_200mhz {
+		fsl,pins = <
+			MX6SLL_PAD_SD1_CMD__SD1_CMD	0x170f9
+			MX6SLL_PAD_SD1_CLK__SD1_CLK	0x170f9
+			MX6SLL_PAD_SD1_DATA0__SD1_DATA0	0x170f9
+			MX6SLL_PAD_SD1_DATA1__SD1_DATA1	0x170f9
+			MX6SLL_PAD_SD1_DATA2__SD1_DATA2	0x170f9
+			MX6SLL_PAD_SD1_DATA3__SD1_DATA3	0x170f9
+			MX6SLL_PAD_SD1_DATA4__SD1_DATA4	0x170b9
+			MX6SLL_PAD_SD1_DATA5__SD1_DATA5	0x170b9
+			MX6SLL_PAD_SD1_DATA6__SD1_DATA6	0x170b9
+			MX6SLL_PAD_SD1_DATA7__SD1_DATA7	0x170b9
+		>;
+	};
+
+	pinctrl_usdhc1_sleep: usdhc1grp_sleep {
+		fsl,pins = <
+			MX6SLL_PAD_SD1_CMD__SD1_CMD	0x10059
+			MX6SLL_PAD_SD1_CLK__SD1_CLK	0x10059
+			MX6SLL_PAD_SD1_DATA0__SD1_DATA0	0x10059
+			MX6SLL_PAD_SD1_DATA1__SD1_DATA1	0x10059
+			MX6SLL_PAD_SD1_DATA2__SD1_DATA2	0x10059
+			MX6SLL_PAD_SD1_DATA3__SD1_DATA3	0x10059
+			MX6SLL_PAD_SD1_DATA4__SD1_DATA4	0x10059
+			MX6SLL_PAD_SD1_DATA5__SD1_DATA5	0x10059
+			MX6SLL_PAD_SD1_DATA6__SD1_DATA6	0x10059
+			MX6SLL_PAD_SD1_DATA7__SD1_DATA7	0x10059
+		>;
+	};
+
+	pinctrl_usdhc3: usdhc3grp {
+		fsl,pins = <
+			MX6SLL_PAD_SD3_CMD__SD3_CMD	0x11059
+			MX6SLL_PAD_SD3_CLK__SD3_CLK	0x11059
+			MX6SLL_PAD_SD3_DATA0__SD3_DATA0	0x11059
+			MX6SLL_PAD_SD3_DATA1__SD3_DATA1	0x11059
+			MX6SLL_PAD_SD3_DATA2__SD3_DATA2	0x11059
+			MX6SLL_PAD_SD3_DATA3__SD3_DATA3	0x11059
+		>;
+	};
+
+	pinctrl_usdhc3_100mhz: usdhc3grp_100mhz {
+		fsl,pins = <
+			MX6SLL_PAD_SD3_CMD__SD3_CMD	0x170b9
+			MX6SLL_PAD_SD3_CLK__SD3_CLK	0x170b9
+			MX6SLL_PAD_SD3_DATA0__SD3_DATA0	0x170b9
+			MX6SLL_PAD_SD3_DATA1__SD3_DATA1	0x170b9
+			MX6SLL_PAD_SD3_DATA2__SD3_DATA2	0x170b9
+			MX6SLL_PAD_SD3_DATA3__SD3_DATA3	0x170b9
+		>;
+	};
+
+	pinctrl_usdhc3_200mhz: usdhc3grp_200mhz {
+		fsl,pins = <
+			MX6SLL_PAD_SD3_CMD__SD3_CMD	0x170f9
+			MX6SLL_PAD_SD3_CLK__SD3_CLK	0x170f9
+			MX6SLL_PAD_SD3_DATA0__SD3_DATA0	0x170f9
+			MX6SLL_PAD_SD3_DATA1__SD3_DATA1	0x170f9
+			MX6SLL_PAD_SD3_DATA2__SD3_DATA2	0x170f9
+			MX6SLL_PAD_SD3_DATA3__SD3_DATA3	0x170f9
+		>;
+	};
+
+	pinctrl_usdhc3_sleep: usdhc3grp_sleep {
+		fsl,pins = <
+			MX6SLL_PAD_SD3_CMD__GPIO5_IO21	0x100c1
+			MX6SLL_PAD_SD3_CLK__GPIO5_IO18	0x100c1
+			MX6SLL_PAD_SD3_DATA0__GPIO5_IO19	0x100c1
+			MX6SLL_PAD_SD3_DATA1__GPIO5_IO20	0x100c1
+			MX6SLL_PAD_SD3_DATA2__GPIO5_IO16	0x100c1
+			MX6SLL_PAD_SD3_DATA3__GPIO5_IO17	0x100c1
+		>;
+	};
+
+	pinctrl_wifi_power: wifi-powergrp {
+		fsl,pins = <
+			MX6SLL_PAD_SD2_DATA6__GPIO4_IO29	0x10059	 /* WIFI_3V3_ON */
+		>;
+	};
+
+	pinctrl_wifi_reset: wifi-resetgrp {
+		fsl,pins = <
+			MX6SLL_PAD_SD2_DATA7__GPIO5_IO00	0x10059	 /* WIFI_RST */
+		>;
+	};
+};
+
+&leds {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_led>;
+};
+
+&lm3630a {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_lm3630a_bl_gpio>;
+};
+
+&reg_wifi {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_wifi_power>;
+};
+
+&ricoh619 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_ricoh_gpio>;
+};
+
+&uart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart1>;
+};
+
+&usdhc1 {
+	pinctrl-names = "default", "state_100mhz", "state_200mhz","sleep";
+	pinctrl-0 = <&pinctrl_usdhc1>;
+	pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
+	pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
+	pinctrl-3 = <&pinctrl_usdhc1_sleep>;
+};
+
+&usdhc3 {
+	pinctrl-names = "default", "state_100mhz", "state_200mhz","sleep";
+	pinctrl-0 = <&pinctrl_usdhc3>;
+	pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
+	pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
+	pinctrl-3 = <&pinctrl_usdhc3_sleep>;
+};
+
+&wifi_pwrseq {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_wifi_reset>;
+};