| Message ID | 20160803231843.23012-1-khilman@baylibre.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Wed, Aug 03, 2016 at 04:18:42PM -0700, Kevin Hilman wrote: > Add binding and basic support for the SD/eMMC controller on Amlogic > S905/GXBB devices. > > Signed-off-by: Kevin Hilman <khilman@baylibre.com> > --- > .../devicetree/bindings/mmc/amlogic,meson-gxbb.txt | 29 +++++++++ > .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 74 ++++++++++++++++++++++ > arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 71 +++++++++++++++++++++ > arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 36 ++++++++++- > 4 files changed, 209 insertions(+), 1 deletion(-) > create mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt > > diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt > new file mode 100644 > index 000000000000..2bfdf47018c5 > --- /dev/null > +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt > @@ -0,0 +1,29 @@ > +Amlogic SD / eMMC controller for S905/GXBB family SoCs > + > +The MMC 5.1 compliant host controller on Amlogic provides the > +interface for SD, eMMC and SDIO devices. > + > +This file documents the properties in addition to those available in > +the MMC core bindings, documented by mmc.txt. > + > +Required properties: > +- compatible : contains "amlogic,meson-gxbb" > +- clocks : A list of phandle + clock-specifier pairs for the clocks listed in clock-names. > +- clock-names: Should contain the following: > + "core" - Main peripheral bus clock > + "clkin0" - Parent clock of internal mux > + "clkin1" - Other parent clock of internal mux > + The driver has an interal mux clock which switches between clkin0 and clkin1 depending on the > + clock rate requested by the MMC core. > + > +Example: > + > + sd_emmc_a: mmc@70000 { > + compatible = "amlogic,meson-gxbb-mmc"; > + reg = <0x0 0x70000 0x0 0x2000>; > + interrupts = < GIC_SPI 216 IRQ_TYPE_EDGE_RISING>; > + clocks = <&clkc CLKID_SD_EMMC_A>, <&xtal>, <&clkc CLKID_FCLK_DIV2>; > + clock-names = "core", "clkin0", "clkin1"; > + pinctrl-0 = <&emmc_pins>; > + }; > + > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts > index 90a84c514d3d..f41d8fe5c706 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts > @@ -73,6 +73,45 @@ > default-state = "off"; > }; > }; > + > + mmc_iv: gpio-regulator { > + compatible = "regulator-gpio"; > + > + regulator-name = "mmc-gpio-supply"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; > + > + gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; > + gpio-states = <0 1>; > + > + /* > + * Based on ODROID-C2 schematics: > + * signal name: IO_TF_3V3N_1V8, GPIOAO bit 3 > + */ > + states = <3300000 0 > + 1800000 1>; There are multiple things wrong in this node based on the regulator-gpio documentation. > + }; > + > + vcc1v8: regulator { > + compatible = "regulator-fixed"; > + regulator-name = "VCC1V8"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-always-on; > + }; > + > + vcc3v3: regulator { > + compatible = "regulator-fixed"; > + regulator-name = "VCC3V3"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; > + > + emmc_pwrseq: emmc-pwrseq { > + compatible = "mmc-pwrseq-emmc"; > + reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; > + }; > }; > > &uart_AO { > @@ -87,3 +126,38 @@ > pinctrl-names = "default"; > }; > > +&sd_emmc_b { > + status = "okay"; > + pinctrl-0 = <&sdcard_pins>; > + pinctrl-names = "default"; > + > + bus-width = <4>; > + cap-sd-highspeed; > + max-frequency = <100000000>; > + > + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; > + cd-inverted; > + > + vmmc-supply = <&mmc_iv>; > + voltage-ranges = <1800 3300>; > +}; > + > +&sd_emmc_c { > + status = "okay"; > + pinctrl-0 = <&emmc_pins>; > + pinctrl-names = "default"; > + > + bus-width = <8>; > + cap-sd-highspeed; > + max-frequency = <200000000>; > + non-removable; > + disable-wp; > + cap-mmc-highspeed; > + mmc-ddr-1_8v; > + mmc-hs200-1_8v; > + > + mmc-pwrseq = <&emmc_pwrseq>; > + voltage-ranges = <1800 3300>; > + vmmc-supply = <&vcc3v3>; > + vmmcq-sumpply = <&vcc1v8>; > +}; > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi > index f4f30f674b4c..77698815943a 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi > @@ -57,6 +57,42 @@ > device_type = "memory"; > reg = <0x0 0x0 0x0 0x40000000>; > }; > + > + mmc_iv: gpio-regulator { > + compatible = "regulator-gpio"; > + > + regulator-name = "mmc-gpio-supply"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; > + > + gpios = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>; > + gpio-states = <0 1>; > + > + /* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */ > + states = <1800000 0 > + 3300000 1>; > + }; > + > + vddio_boot: regulator { [...] > + vcc_3v3: regulator { This won't even compile as you have the same node name twice. > + compatible = "regulator-fixed"; > + regulator-name = "VCC_3V3"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; > + > + emmc_pwrseq: emmc-pwrseq { > + compatible = "mmc-pwrseq-emmc"; > + reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; > + }; > }; > > /* This UART is brought out to the DB9 connector */ > @@ -72,3 +108,38 @@ > pinctrl-names = "default"; > }; > > +&sd_emmc_b { > + status = "okay"; > + pinctrl-0 = <&sdcard_pins>; > + pinctrl-names = "default"; > + > + bus-width = <4>; > + cap-sd-highspeed; > + max-frequency = <100000000>; > + > + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; > + cd-inverted; > + > + voltage-ranges = <1800 3300>; > + vmmc-supply = <&mmc_iv>; > +}; > + > +&sd_emmc_c { > + status = "okay"; > + pinctrl-0 = <&emmc_pins>; > + pinctrl-names = "default"; > + > + bus-width = <8>; > + cap-sd-highspeed; > + cap-mmc-highspeed; > + max-frequency = <200000000>; > + non-removable; > + disable-wp; > + mmc-ddr-1_8v; > + mmc-hs200-1_8v; > + > + mmc-pwrseq = <&emmc_pwrseq>; > + voltage-ranges = <1800 3300>; > + vmmc-supply = <&vcc_3v3>; > + vmmcq-sumpply = <&vddio_boot>; > +}; > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > index 35c8b2beb05c..2c200f96467c 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > @@ -247,7 +247,8 @@ > mux { > groups = "emmc_nand_d07", > "emmc_cmd", > - "emmc_clk"; > + "emmc_clk", > + "emmc_ds"; > function = "emmc"; > }; > }; > @@ -330,6 +331,39 @@ > #address-cells = <2>; > #size-cells = <2>; > ranges = <0x0 0x0 0x0 0xd0000000 0x0 0x200000>; > + > + sd_emmc_a: mmc@70000 { > + compatible = "amlogic,meson-gxbb-mmc"; > + reg = <0x0 0x70000 0x0 0x2000>; > + interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>; > + clocks = <&clkc CLKID_SD_EMMC_A>, > + <&xtal>, > + <&clkc CLKID_FCLK_DIV2>; > + clock-names = "core", "clkin0", "clkin1"; > + status = "disabled"; > + }; > + > + sd_emmc_b: mmc@72000 { > + compatible = "amlogic,meson-gxbb-mmc"; > + reg = <0x0 0x72000 0x0 0x2000>; > + interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>; > + clocks = <&clkc CLKID_SD_EMMC_B>, > + <&xtal>, > + <&clkc CLKID_FCLK_DIV2>; > + clock-names = "core", "clkin0", "clkin1"; > + status = "disabled"; > + }; > + > + sd_emmc_c: mmc@74000 { > + compatible = "amlogic,meson-gxbb-mmc"; > + reg = <0x0 0x74000 0x0 0x2000>; > + interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>; > + clocks = <&clkc CLKID_SD_EMMC_C>, > + <&xtal>, > + <&clkc CLKID_FCLK_DIV2>; > + clock-names = "core", "clkin0", "clkin1"; > + status = "disabled"; > + }; > }; > > ethmac: ethernet@c9410000 { > -- > 2.9.0 > > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Rob, Rob Herring <robh@kernel.org> writes: > On Wed, Aug 03, 2016 at 04:18:42PM -0700, Kevin Hilman wrote: >> Add binding and basic support for the SD/eMMC controller on Amlogic >> S905/GXBB devices. >> >> Signed-off-by: Kevin Hilman <khilman@baylibre.com> [...] >> + mmc_iv: gpio-regulator { >> + compatible = "regulator-gpio"; >> + >> + regulator-name = "mmc-gpio-supply"; >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <3300000>; >> + >> + gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; >> + gpio-states = <0 1>; >> + >> + /* >> + * Based on ODROID-C2 schematics: >> + * signal name: IO_TF_3V3N_1V8, GPIOAO bit 3 >> + */ >> + states = <3300000 0 >> + 1800000 1>; > > There are multiple things wrong in this node based on the regulator-gpio > documentation. I see I got the property name wrong, and the number of elements wrong, and this fixes those issues: - gpio-states = <0 1>; + gpios-states = <0>; By "multiple", did you mean more than those 2? If so, I'm not seeing what else is wrong. [...] >> + mmc_iv: gpio-regulator { >> + compatible = "regulator-gpio"; >> + >> + regulator-name = "mmc-gpio-supply"; >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <3300000>; >> + >> + gpios = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>; >> + gpio-states = <0 1>; >> + >> + /* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */ >> + states = <1800000 0 >> + 3300000 1>; >> + }; >> + >> + vddio_boot: regulator { > [...] >> + vcc_3v3: regulator { > > This won't even compile as you have the same node name twice. Oops, it's wrong indeed, but in fact, it does compile, otherwise I would've caught that.. Even if I remove the labels, it still compiles. Interesting. Anyways, I'll make those unique node-names in the next spin. Thanks for the review, Kevin
+dtc list On Thu, Aug 4, 2016 at 5:58 PM, Kevin Hilman <khilman@baylibre.com> wrote: > Hi Rob, > > Rob Herring <robh@kernel.org> writes: > >> On Wed, Aug 03, 2016 at 04:18:42PM -0700, Kevin Hilman wrote: >>> Add binding and basic support for the SD/eMMC controller on Amlogic >>> S905/GXBB devices. >>> >>> Signed-off-by: Kevin Hilman <khilman@baylibre.com> > > [...] > >>> + mmc_iv: gpio-regulator { >>> + compatible = "regulator-gpio"; >>> + >>> + regulator-name = "mmc-gpio-supply"; >>> + regulator-min-microvolt = <1800000>; >>> + regulator-max-microvolt = <3300000>; >>> + >>> + gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; >>> + gpio-states = <0 1>; >>> + >>> + /* >>> + * Based on ODROID-C2 schematics: >>> + * signal name: IO_TF_3V3N_1V8, GPIOAO bit 3 >>> + */ >>> + states = <3300000 0 >>> + 1800000 1>; >> >> There are multiple things wrong in this node based on the regulator-gpio >> documentation. > > I see I got the property name wrong, and the number of elements wrong, > and this fixes those issues: > > - gpio-states = <0 1>; > + gpios-states = <0>; > > By "multiple", did you mean more than those 2? If so, I'm not seeing > what else is wrong. I was thinking it needed an enable-gpio property, but now I see that is separate from "gpios". > [...] > >>> + mmc_iv: gpio-regulator { >>> + compatible = "regulator-gpio"; >>> + >>> + regulator-name = "mmc-gpio-supply"; >>> + regulator-min-microvolt = <1800000>; >>> + regulator-max-microvolt = <3300000>; >>> + >>> + gpios = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>; >>> + gpio-states = <0 1>; >>> + >>> + /* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */ >>> + states = <1800000 0 >>> + 3300000 1>; >>> + }; >>> + >>> + vddio_boot: regulator { >> [...] >>> + vcc_3v3: regulator { >> >> This won't even compile as you have the same node name twice. > > Oops, it's wrong indeed, but in fact, it does compile, otherwise I > would've caught that.. Even if I remove the labels, it still compiles. > Interesting. Humm, news to me. I will have to do some testing unless the dtc folks have any insight. Rob
On Wed, Aug 03, 2016 at 04:18:42PM -0700, Kevin Hilman wrote: > Add binding and basic support for the SD/eMMC controller on Amlogic > S905/GXBB devices. > > Signed-off-by: Kevin Hilman <khilman@baylibre.com> > --- > .../devicetree/bindings/mmc/amlogic,meson-gxbb.txt | 29 +++++++++ > .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 74 ++++++++++++++++++++++ > arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 71 +++++++++++++++++++++ > arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 36 ++++++++++- > 4 files changed, 209 insertions(+), 1 deletion(-) > create mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt > > diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt > new file mode 100644 > index 000000000000..2bfdf47018c5 > --- /dev/null > +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt > @@ -0,0 +1,29 @@ > +Amlogic SD / eMMC controller for S905/GXBB family SoCs > + > +The MMC 5.1 compliant host controller on Amlogic provides the > +interface for SD, eMMC and SDIO devices. > + > +This file documents the properties in addition to those available in > +the MMC core bindings, documented by mmc.txt. > + > +Required properties: > +- compatible : contains "amlogic,meson-gxbb" I assume that should be "amlogic,meson-gxbb-mmc" instead of "amlogic,meson-gxbb", shouldn't it? > +- clocks : A list of phandle + clock-specifier pairs for the clocks listed in clock-names. > +- clock-names: Should contain the following: > + "core" - Main peripheral bus clock > + "clkin0" - Parent clock of internal mux > + "clkin1" - Other parent clock of internal mux > + The driver has an interal mux clock which switches between clkin0 and clkin1 depending on the > + clock rate requested by the MMC core. > + > +Example: > + > + sd_emmc_a: mmc@70000 { > + compatible = "amlogic,meson-gxbb-mmc"; > + reg = <0x0 0x70000 0x0 0x2000>; > + interrupts = < GIC_SPI 216 IRQ_TYPE_EDGE_RISING>; > + clocks = <&clkc CLKID_SD_EMMC_A>, <&xtal>, <&clkc CLKID_FCLK_DIV2>; > + clock-names = "core", "clkin0", "clkin1"; > + pinctrl-0 = <&emmc_pins>; > + }; > + Regards, Karsten
Karsten Merker <merker@debian.org> writes: > On Wed, Aug 03, 2016 at 04:18:42PM -0700, Kevin Hilman wrote: > >> Add binding and basic support for the SD/eMMC controller on Amlogic >> S905/GXBB devices. >> >> Signed-off-by: Kevin Hilman <khilman@baylibre.com> >> --- >> .../devicetree/bindings/mmc/amlogic,meson-gxbb.txt | 29 +++++++++ >> .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 74 ++++++++++++++++++++++ >> arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 71 +++++++++++++++++++++ >> arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 36 ++++++++++- >> 4 files changed, 209 insertions(+), 1 deletion(-) >> create mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt >> >> diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt >> new file mode 100644 >> index 000000000000..2bfdf47018c5 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt >> @@ -0,0 +1,29 @@ >> +Amlogic SD / eMMC controller for S905/GXBB family SoCs >> + >> +The MMC 5.1 compliant host controller on Amlogic provides the >> +interface for SD, eMMC and SDIO devices. >> + >> +This file documents the properties in addition to those available in >> +the MMC core bindings, documented by mmc.txt. >> + >> +Required properties: >> +- compatible : contains "amlogic,meson-gxbb" > > I assume that should be "amlogic,meson-gxbb-mmc" instead of > "amlogic,meson-gxbb", shouldn't it? Correct, thanks for the review. Kevin
Hi Kevin,
[auto build test ERROR on linus/master]
[also build test ERROR on v4.8-rc1 next-20160812]
[cannot apply to ulf.hansson-mmc/next robh/for-next]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Kevin-Hilman/ARM64-dts-meson-gxbb-add-MMC-support/20160804-072056
config: arm64-defconfig (attached as .config)
compiler: aarch64-linux-gnu-gcc (Debian 5.4.0-6) 5.4.0 20160609
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm64
All errors (new ones prefixed by >>):
>> Error: arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi:338.21-22 syntax error
>> FATAL ERROR: Unable to parse input tree
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
kbuild test robot <lkp@intel.com> writes: > Hi Kevin, > > [auto build test ERROR on linus/master] > [also build test ERROR on v4.8-rc1 next-20160812] > [cannot apply to ulf.hansson-mmc/next robh/for-next] > [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] > > url: https://github.com/0day-ci/linux/commits/Kevin-Hilman/ARM64-dts-meson-gxbb-add-MMC-support/20160804-072056 > config: arm64-defconfig (attached as .config) > compiler: aarch64-linux-gnu-gcc (Debian 5.4.0-6) 5.4.0 20160609 > reproduce: > wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross > chmod +x ~/bin/make.cross > # save the attached .config to linux build tree > make.cross ARCH=arm64 > > All errors (new ones prefixed by >>): > >>> Error: arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi:338.21-22 syntax error >>> FATAL ERROR: Unable to parse input tree This is due to a clock dependency[1] which is in the process of being queued in the clock tree. Kevin [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2016-August/446650.html
diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt new file mode 100644 index 000000000000..2bfdf47018c5 --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt @@ -0,0 +1,29 @@ +Amlogic SD / eMMC controller for S905/GXBB family SoCs + +The MMC 5.1 compliant host controller on Amlogic provides the +interface for SD, eMMC and SDIO devices. + +This file documents the properties in addition to those available in +the MMC core bindings, documented by mmc.txt. + +Required properties: +- compatible : contains "amlogic,meson-gxbb" +- clocks : A list of phandle + clock-specifier pairs for the clocks listed in clock-names. +- clock-names: Should contain the following: + "core" - Main peripheral bus clock + "clkin0" - Parent clock of internal mux + "clkin1" - Other parent clock of internal mux + The driver has an interal mux clock which switches between clkin0 and clkin1 depending on the + clock rate requested by the MMC core. + +Example: + + sd_emmc_a: mmc@70000 { + compatible = "amlogic,meson-gxbb-mmc"; + reg = <0x0 0x70000 0x0 0x2000>; + interrupts = < GIC_SPI 216 IRQ_TYPE_EDGE_RISING>; + clocks = <&clkc CLKID_SD_EMMC_A>, <&xtal>, <&clkc CLKID_FCLK_DIV2>; + clock-names = "core", "clkin0", "clkin1"; + pinctrl-0 = <&emmc_pins>; + }; + diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts index 90a84c514d3d..f41d8fe5c706 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -73,6 +73,45 @@ default-state = "off"; }; }; + + mmc_iv: gpio-regulator { + compatible = "regulator-gpio"; + + regulator-name = "mmc-gpio-supply"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; + gpio-states = <0 1>; + + /* + * Based on ODROID-C2 schematics: + * signal name: IO_TF_3V3N_1V8, GPIOAO bit 3 + */ + states = <3300000 0 + 1800000 1>; + }; + + vcc1v8: regulator { + compatible = "regulator-fixed"; + regulator-name = "VCC1V8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + vcc3v3: regulator { + compatible = "regulator-fixed"; + regulator-name = "VCC3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + emmc_pwrseq: emmc-pwrseq { + compatible = "mmc-pwrseq-emmc"; + reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; + }; }; &uart_AO { @@ -87,3 +126,38 @@ pinctrl-names = "default"; }; +&sd_emmc_b { + status = "okay"; + pinctrl-0 = <&sdcard_pins>; + pinctrl-names = "default"; + + bus-width = <4>; + cap-sd-highspeed; + max-frequency = <100000000>; + + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; + cd-inverted; + + vmmc-supply = <&mmc_iv>; + voltage-ranges = <1800 3300>; +}; + +&sd_emmc_c { + status = "okay"; + pinctrl-0 = <&emmc_pins>; + pinctrl-names = "default"; + + bus-width = <8>; + cap-sd-highspeed; + max-frequency = <200000000>; + non-removable; + disable-wp; + cap-mmc-highspeed; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + + mmc-pwrseq = <&emmc_pwrseq>; + voltage-ranges = <1800 3300>; + vmmc-supply = <&vcc3v3>; + vmmcq-sumpply = <&vcc1v8>; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi index f4f30f674b4c..77698815943a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi @@ -57,6 +57,42 @@ device_type = "memory"; reg = <0x0 0x0 0x0 0x40000000>; }; + + mmc_iv: gpio-regulator { + compatible = "regulator-gpio"; + + regulator-name = "mmc-gpio-supply"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + gpios = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>; + gpio-states = <0 1>; + + /* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */ + states = <1800000 0 + 3300000 1>; + }; + + vddio_boot: regulator { + compatible = "regulator-fixed"; + regulator-name = "VDDIO_BOOT"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + vcc_3v3: regulator { + compatible = "regulator-fixed"; + regulator-name = "VCC_3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + emmc_pwrseq: emmc-pwrseq { + compatible = "mmc-pwrseq-emmc"; + reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; + }; }; /* This UART is brought out to the DB9 connector */ @@ -72,3 +108,38 @@ pinctrl-names = "default"; }; +&sd_emmc_b { + status = "okay"; + pinctrl-0 = <&sdcard_pins>; + pinctrl-names = "default"; + + bus-width = <4>; + cap-sd-highspeed; + max-frequency = <100000000>; + + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; + cd-inverted; + + voltage-ranges = <1800 3300>; + vmmc-supply = <&mmc_iv>; +}; + +&sd_emmc_c { + status = "okay"; + pinctrl-0 = <&emmc_pins>; + pinctrl-names = "default"; + + bus-width = <8>; + cap-sd-highspeed; + cap-mmc-highspeed; + max-frequency = <200000000>; + non-removable; + disable-wp; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + + mmc-pwrseq = <&emmc_pwrseq>; + voltage-ranges = <1800 3300>; + vmmc-supply = <&vcc_3v3>; + vmmcq-sumpply = <&vddio_boot>; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index 35c8b2beb05c..2c200f96467c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -247,7 +247,8 @@ mux { groups = "emmc_nand_d07", "emmc_cmd", - "emmc_clk"; + "emmc_clk", + "emmc_ds"; function = "emmc"; }; }; @@ -330,6 +331,39 @@ #address-cells = <2>; #size-cells = <2>; ranges = <0x0 0x0 0x0 0xd0000000 0x0 0x200000>; + + sd_emmc_a: mmc@70000 { + compatible = "amlogic,meson-gxbb-mmc"; + reg = <0x0 0x70000 0x0 0x2000>; + interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>; + clocks = <&clkc CLKID_SD_EMMC_A>, + <&xtal>, + <&clkc CLKID_FCLK_DIV2>; + clock-names = "core", "clkin0", "clkin1"; + status = "disabled"; + }; + + sd_emmc_b: mmc@72000 { + compatible = "amlogic,meson-gxbb-mmc"; + reg = <0x0 0x72000 0x0 0x2000>; + interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>; + clocks = <&clkc CLKID_SD_EMMC_B>, + <&xtal>, + <&clkc CLKID_FCLK_DIV2>; + clock-names = "core", "clkin0", "clkin1"; + status = "disabled"; + }; + + sd_emmc_c: mmc@74000 { + compatible = "amlogic,meson-gxbb-mmc"; + reg = <0x0 0x74000 0x0 0x2000>; + interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>; + clocks = <&clkc CLKID_SD_EMMC_C>, + <&xtal>, + <&clkc CLKID_FCLK_DIV2>; + clock-names = "core", "clkin0", "clkin1"; + status = "disabled"; + }; }; ethmac: ethernet@c9410000 {
Add binding and basic support for the SD/eMMC controller on Amlogic S905/GXBB devices. Signed-off-by: Kevin Hilman <khilman@baylibre.com> --- .../devicetree/bindings/mmc/amlogic,meson-gxbb.txt | 29 +++++++++ .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 74 ++++++++++++++++++++++ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 71 +++++++++++++++++++++ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 36 ++++++++++- 4 files changed, 209 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt