| Message ID | 1375342881-2155-4-git-send-email-g.liakhovetski@gmx.de (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | ba6094d6e8f30a538e08e9a892f3e37debd84413 |
| Headers | show |
On Thu, Aug 01, 2013 at 09:41:21AM +0200, Guennadi Liakhovetski wrote: > This patch adds MMCIF0, SDHI0 and SDHI1 DT nodes and a fixed voltage > reglator for them to the ape6evm-reference platform. > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> > --- > > v4: make SDHI0 Vcc 3.3V instead of 3.0V Hi Laurent, could you review this one too? > > arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 72 +++++++++++++++++++++++ > 1 files changed, 72 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts > index bbd09d8..6797fac 100644 > --- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts > +++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts > @@ -10,6 +10,7 @@ > > /dts-v1/; > /include/ "r8a73a4.dtsi" > +#include <dt-bindings/gpio/gpio.h> > > / { > model = "APE6EVM"; > @@ -24,6 +25,34 @@ > reg = <0 0x40000000 0 0x40000000>; > }; > > + vcc_mmc0: regulator@0 { > + compatible = "regulator-fixed"; > + regulator-name = "MMC0 Vcc"; > + regulator-min-microvolt = <2800000>; > + regulator-max-microvolt = <2800000>; > + regulator-always-on; > + }; > + > + vcc_sdhi0: regulator@1 { > + compatible = "regulator-fixed"; > + > + regulator-name = "SDHI0 Vcc"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + > + gpio = <&pfc 76 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + }; > + > + /* Common 3.3V rail, used by several devices on APE6EVM */ > + ape6evm_fixed_3v3: regulator@2 { > + compatible = "regulator-fixed"; > + regulator-name = "3V3"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; > + > lbsc { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -62,4 +91,47 @@ > renesas,groups = "scifa0_data"; > renesas,function = "scifa0"; > }; > + > + mmc0_pins: mmcif { > + renesas,groups = "mmc0_data8", "mmc0_ctrl"; > + renesas,function = "mmc0"; > + }; > + > + sdhi0_pins: sdhi0 { > + renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd"; > + renesas,function = "sdhi0"; > + }; > + > + sdhi1_pins: sdhi1 { > + renesas,groups = "sdhi1_data4", "sdhi1_ctrl"; > + renesas,function = "sdhi1"; > + }; > +}; > + > +&mmcif0 { > + vmmc-supply = <&vcc_mmc0>; > + bus-width = <8>; > + non-removable; > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc0_pins>; > + status = "okay"; > +}; > + > +&sdhi0 { > + vmmc-supply = <&vcc_sdhi0>; > + bus-width = <4>; > + toshiba,mmc-wrprotect-disable; > + pinctrl-names = "default"; > + pinctrl-0 = <&sdhi0_pins>; > + status = "okay"; > +}; > + > +&sdhi1 { > + vmmc-supply = <&ape6evm_fixed_3v3>; > + bus-width = <4>; > + broken-cd; > + toshiba,mmc-wrprotect-disable; > + pinctrl-names = "default"; > + pinctrl-0 = <&sdhi1_pins>; > + status = "okay"; > }; > -- > 1.7.2.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Guennadi, Thank you for the patch. On Thursday 01 August 2013 09:41:21 Guennadi Liakhovetski wrote: > This patch adds MMCIF0, SDHI0 and SDHI1 DT nodes and a fixed voltage > reglator for them to the ape6evm-reference platform. > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > > v4: make SDHI0 Vcc 3.3V instead of 3.0V > > arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 72 > +++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts > b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts index bbd09d8..6797fac > 100644 > --- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts > +++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts > @@ -10,6 +10,7 @@ > > /dts-v1/; > /include/ "r8a73a4.dtsi" > +#include <dt-bindings/gpio/gpio.h> > > / { > model = "APE6EVM"; > @@ -24,6 +25,34 @@ > reg = <0 0x40000000 0 0x40000000>; > }; > > + vcc_mmc0: regulator@0 { > + compatible = "regulator-fixed"; > + regulator-name = "MMC0 Vcc"; > + regulator-min-microvolt = <2800000>; > + regulator-max-microvolt = <2800000>; > + regulator-always-on; > + }; > + > + vcc_sdhi0: regulator@1 { > + compatible = "regulator-fixed"; > + > + regulator-name = "SDHI0 Vcc"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + > + gpio = <&pfc 76 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + }; > + > + /* Common 3.3V rail, used by several devices on APE6EVM */ > + ape6evm_fixed_3v3: regulator@2 { > + compatible = "regulator-fixed"; > + regulator-name = "3V3"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; > + > lbsc { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -62,4 +91,47 @@ > renesas,groups = "scifa0_data"; > renesas,function = "scifa0"; > }; > + > + mmc0_pins: mmcif { > + renesas,groups = "mmc0_data8", "mmc0_ctrl"; > + renesas,function = "mmc0"; > + }; > + > + sdhi0_pins: sdhi0 { > + renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd"; > + renesas,function = "sdhi0"; > + }; > + > + sdhi1_pins: sdhi1 { > + renesas,groups = "sdhi1_data4", "sdhi1_ctrl"; > + renesas,function = "sdhi1"; > + }; > +}; > + > +&mmcif0 { > + vmmc-supply = <&vcc_mmc0>; > + bus-width = <8>; > + non-removable; > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc0_pins>; > + status = "okay"; > +}; > + > +&sdhi0 { > + vmmc-supply = <&vcc_sdhi0>; > + bus-width = <4>; > + toshiba,mmc-wrprotect-disable; > + pinctrl-names = "default"; > + pinctrl-0 = <&sdhi0_pins>; > + status = "okay"; > +}; > + > +&sdhi1 { > + vmmc-supply = <&ape6evm_fixed_3v3>; > + bus-width = <4>; > + broken-cd; > + toshiba,mmc-wrprotect-disable; > + pinctrl-names = "default"; > + pinctrl-0 = <&sdhi1_pins>; > + status = "okay"; > };
On Thu, Aug 22, 2013 at 02:50:18AM +0200, Laurent Pinchart wrote: > Hi Guennadi, > > Thank you for the patch. > > On Thursday 01 August 2013 09:41:21 Guennadi Liakhovetski wrote: > > This patch adds MMCIF0, SDHI0 and SDHI1 DT nodes and a fixed voltage > > reglator for them to the ape6evm-reference platform. > > > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Thanks, I have queued this up in the dt3 branch. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts index bbd09d8..6797fac 100644 --- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts +++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts @@ -10,6 +10,7 @@ /dts-v1/; /include/ "r8a73a4.dtsi" +#include <dt-bindings/gpio/gpio.h> / { model = "APE6EVM"; @@ -24,6 +25,34 @@ reg = <0 0x40000000 0 0x40000000>; }; + vcc_mmc0: regulator@0 { + compatible = "regulator-fixed"; + regulator-name = "MMC0 Vcc"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-always-on; + }; + + vcc_sdhi0: regulator@1 { + compatible = "regulator-fixed"; + + regulator-name = "SDHI0 Vcc"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&pfc 76 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + /* Common 3.3V rail, used by several devices on APE6EVM */ + ape6evm_fixed_3v3: regulator@2 { + compatible = "regulator-fixed"; + regulator-name = "3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + lbsc { compatible = "simple-bus"; #address-cells = <1>; @@ -62,4 +91,47 @@ renesas,groups = "scifa0_data"; renesas,function = "scifa0"; }; + + mmc0_pins: mmcif { + renesas,groups = "mmc0_data8", "mmc0_ctrl"; + renesas,function = "mmc0"; + }; + + sdhi0_pins: sdhi0 { + renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd"; + renesas,function = "sdhi0"; + }; + + sdhi1_pins: sdhi1 { + renesas,groups = "sdhi1_data4", "sdhi1_ctrl"; + renesas,function = "sdhi1"; + }; +}; + +&mmcif0 { + vmmc-supply = <&vcc_mmc0>; + bus-width = <8>; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; + status = "okay"; +}; + +&sdhi0 { + vmmc-supply = <&vcc_sdhi0>; + bus-width = <4>; + toshiba,mmc-wrprotect-disable; + pinctrl-names = "default"; + pinctrl-0 = <&sdhi0_pins>; + status = "okay"; +}; + +&sdhi1 { + vmmc-supply = <&ape6evm_fixed_3v3>; + bus-width = <4>; + broken-cd; + toshiba,mmc-wrprotect-disable; + pinctrl-names = "default"; + pinctrl-0 = <&sdhi1_pins>; + status = "okay"; };
This patch adds MMCIF0, SDHI0 and SDHI1 DT nodes and a fixed voltage reglator for them to the ape6evm-reference platform. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> --- v4: make SDHI0 Vcc 3.3V instead of 3.0V arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 72 +++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-)