Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eab5c002 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-dt64-3' of... 

Merge tag 'amlogic-dt64-3' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into fixes

Amlogic 64-bit DT updates for v4.14 (round 3)
- updates for new MMC driver features/fixes
- support high-speed modes

* tag 'amlogic-dt64-3' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic

:
  ARM64: dts: meson-gxbb: nanopi-k2: enable sdr104 mode
  ARM64: dts: meson-gxbb: nanopi-k2: enable sdcard UHS modes
  ARM64: dts: meson-gxbb: p20x: enable sdcard UHS modes
  ARM64: dts: meson-gxl: libretech-cc: enable high speed modes
  ARM64: dts: meson-gxl: libretech-cc: add card regulator settle times
  ARM64: dts: meson-gxbb: nanopi-k2: add card regulator settle times
  ARM64: dts: meson: add mmc clk gate pins
  ARM64: dts: meson: remove cap-sd-highspeed from emmc nodes
  ARM64: dts: meson-gx: Use correct mmc clock source 0

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7ea696af 485a308f

arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi

+6 −4
Original line number Diff line number Diff line
@@ -168,7 +168,8 @@ 
&sd_emmc_a {

	status = "okay";

	pinctrl-0 = <&sdio_pins>;

	pinctrl-names = "default";

	pinctrl-1 = <&sdio_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";

	#address-cells = <1>;

	#size-cells = <0>;
@@ -194,7 +195,8 @@ 
&sd_emmc_b {

	status = "okay";

	pinctrl-0 = <&sdcard_pins>;

	pinctrl-names = "default";

	pinctrl-1 = <&sdcard_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";



	bus-width = <4>;

	cap-sd-highspeed;
@@ -212,10 +214,10 @@ 
&sd_emmc_c {

	status = "okay";

	pinctrl-0 = <&emmc_pins>;

	pinctrl-names = "default";

	pinctrl-1 = <&emmc_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";



	bus-width = <8>;

	cap-sd-highspeed;

	cap-mmc-highspeed;

	max-frequency = <200000000>;

	non-removable;

arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts

+14 −5
Original line number Diff line number Diff line
@@ -107,6 +107,9 @@ 


		states = <3300000 0>,

		         <1800000 1>;



		regulator-settling-time-up-us = <100>;

		regulator-settling-time-down-us = <5000>;

	};



	wifi_32k: wifi-32k {
@@ -250,7 +253,8 @@ 
&sd_emmc_a {

	status = "okay";

	pinctrl-0 = <&sdio_pins>, <&sdio_irq_pins>;

	pinctrl-names = "default";

	pinctrl-1 = <&sdio_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";

	#address-cells = <1>;

	#size-cells = <0>;
@@ -276,11 +280,16 @@ 
&sd_emmc_b {

	status = "okay";

	pinctrl-0 = <&sdcard_pins>;

	pinctrl-names = "default";

	pinctrl-1 = <&sdcard_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";



	bus-width = <4>;

	cap-sd-highspeed;

	max-frequency = <100000000>;

	sd-uhs-sdr12;

	sd-uhs-sdr25;

	sd-uhs-sdr50;

	sd-uhs-sdr104;

	max-frequency = <200000000>;

	disable-wp;



	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
@@ -294,10 +303,10 @@ 
&sd_emmc_c {

	status = "disabled";

	pinctrl-0 = <&emmc_pins>;

	pinctrl-names = "default";

	pinctrl-1 = <&emmc_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";



	bus-width = <8>;

	cap-sd-highspeed;

	max-frequency = <200000000>;

	non-removable;

	disable-wp;

arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts

+7 −5
Original line number Diff line number Diff line
@@ -232,7 +232,8 @@ 
&sd_emmc_a {

	status = "okay";

	pinctrl-0 = <&sdio_pins>;

	pinctrl-names = "default";

	pinctrl-1 = <&sdio_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";

	#address-cells = <1>;

	#size-cells = <0>;
@@ -253,7 +254,8 @@ 
&sd_emmc_b {

	status = "okay";

	pinctrl-0 = <&sdcard_pins>;

	pinctrl-names = "default";

	pinctrl-1 = <&sdcard_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";



	bus-width = <4>;

	cap-sd-highspeed;
@@ -271,10 +273,10 @@ 
&sd_emmc_c {

	status = "okay";

	pinctrl-0 = <&emmc_pins>;

	pinctrl-names = "default";

	pinctrl-1 = <&emmc_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";



	bus-width = <8>;

	cap-sd-highspeed;

	cap-mmc-highspeed;

	max-frequency = <200000000>;

	non-removable;

arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts

+5 −4
Original line number Diff line number Diff line
@@ -253,7 +253,8 @@ 
&sd_emmc_b {

	status = "okay";

	pinctrl-0 = <&sdcard_pins>;

	pinctrl-names = "default";

	pinctrl-1 = <&sdcard_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";



	bus-width = <4>;

	cap-sd-highspeed;
@@ -271,10 +272,10 @@ 
&sd_emmc_c {

	status = "okay";

	pinctrl-0 = <&emmc_pins>;

	pinctrl-names = "default";

	pinctrl-1 = <&emmc_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";



	bus-width = <8>;

	cap-sd-highspeed;

	max-frequency = <200000000>;

	non-removable;

	disable-wp;

arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi

+9 −4
Original line number Diff line number Diff line
@@ -194,7 +194,8 @@ 
&sd_emmc_a {

	status = "okay";

	pinctrl-0 = <&sdio_pins>;

	pinctrl-names = "default";

	pinctrl-1 = <&sdio_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";

	#address-cells = <1>;

	#size-cells = <0>;
@@ -220,10 +221,14 @@ 
&sd_emmc_b {

	status = "okay";

	pinctrl-0 = <&sdcard_pins>;

	pinctrl-names = "default";

	pinctrl-1 = <&sdcard_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";



	bus-width = <4>;

	cap-sd-highspeed;

	sd-uhs-sdr12;

	sd-uhs-sdr25;

	sd-uhs-sdr50;

	max-frequency = <100000000>;

	disable-wp;
@@ -238,10 +243,10 @@ 
&sd_emmc_c {

	status = "okay";

	pinctrl-0 = <&emmc_pins>;

	pinctrl-names = "default";

	pinctrl-1 = <&emmc_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";



	bus-width = <8>;

	cap-sd-highspeed;

	cap-mmc-highspeed;

	max-frequency = <200000000>;

	non-removable;