From mboxrd@z Thu Jan 1 00:00:00 1970 From: heiko@sntech.de (Heiko =?ISO-8859-1?Q?St=FCbner?=) Date: Mon, 11 Aug 2014 16:38:31 +0200 Subject: [PATCHv10 5/5] ARM: dts: rockchip: unuse the slot-node and deprecate the supports-highspeed for dw-mmc In-Reply-To: <1407397082-32495-6-git-send-email-jh80.chung@samsung.com> References: <1407397082-32495-1-git-send-email-jh80.chung@samsung.com> <1407397082-32495-6-git-send-email-jh80.chung@samsung.com> Message-ID: <2216569.yZfKCR5Kzu@diego> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Am Donnerstag, 7. August 2014, 16:38:02 schrieb Jaehoon Chung: > dw-mmc controller can support multiple slots. > But, there are no use-cases anywhere. So we don't need to support the > slot-node for dw-mmc controller. > And "supports-highspeed" property in dw-mmc is deprecated. > "supports-highspeed" property can be replaced with "cap-sd/mmc-highspeed". > > Signed-off-by: Jaehoon Chung > Reviewed-by: Tushar Behera > Reviewed-by: Ulf Hansson > Reviewed-by: Heiko Stuebner > Acked-by: Seungwon Jeon I've added this one to my queue for 3.18 Heiko > --- > arch/arm/boot/dts/rk3066a-bqcurie2.dts | 15 ++++----------- > arch/arm/boot/dts/rk3188-radxarock.dts | 7 ++----- > 2 files changed, 6 insertions(+), 16 deletions(-) > > diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts > b/arch/arm/boot/dts/rk3066a-bqcurie2.dts index 042f821d..665dd56 100644 > --- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts > +++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts > @@ -150,12 +150,8 @@ > num-slots = <1>; > status = "okay"; > vmmc-supply = <&vcc_sd0>; > - > - slot at 0 { > - reg = <0>; > - bus-width = <4>; > - disable-wp; > - }; > + bus-width = <4>; > + disable-wp; > }; > > &mmc1 { /* wifi */ > @@ -166,11 +162,8 @@ > pinctrl-names = "default"; > pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>; > > - slot at 0 { > - reg = <0>; > - bus-width = <4>; > - disable-wp; > - }; > + bus-width = <4>; > + disable-wp; > }; > > &uart0 { > diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts > b/arch/arm/boot/dts/rk3188-radxarock.dts index 171b610..ef72faf 100644 > --- a/arch/arm/boot/dts/rk3188-radxarock.dts > +++ b/arch/arm/boot/dts/rk3188-radxarock.dts > @@ -181,11 +181,8 @@ > status = "okay"; > vmmc-supply = <&vcc_sd0>; > > - slot at 0 { > - reg = <0>; > - bus-width = <4>; > - disable-wp; > - }; > + bus-width = <4>; > + disable-wp; > }; > > &pinctrl {