Skip to contentSkip to conversation

arm: khadas-vim: enable support for SPI NOR Flash

PATCH New Neil Armstrong 1 participant 6 messages Apr 20, 2020

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

cover arm: khadas-vim: enable support for SPI NOR Flash

This serie enables support of the on-board SPI NOR Flash found on the Khadas VIM2, VIM3 and VIM3L board.

Neil Armstrong (5):
arm64: dts: meson: sync dt and bindings from v5.7-rc1
arm: dts: meson-gxm-khadas-vim2-u-boot: enable SPI NOR flash
configs: khadas-vim2: enable support for SPI NOR flash
arm: dts: meson-khadas-vim3: enable SPI NOR flash
configs: khadas-vim3: enable support for SPI NOR flash

 arch/arm/dts/meson-axg-s400.dts               |   6 +-
 arch/arm/dts/meson-g12-common.dtsi            | 136 ++++++++++++++++--
 arch/arm/dts/meson-g12.dtsi                   |   1 +
 arch/arm/dts/meson-g12a-sei510.dts            |   4 +-
 arch/arm/dts/meson-g12a-u200.dts              |   2 +-
 .../meson-g12b-a311d-khadas-vim3-u-boot.dtsi  |   7 +
 arch/arm/dts/meson-g12b-khadas-vim3.dtsi      |   4 +-
 arch/arm/dts/meson-g12b-odroid-n2.dts         |  25 +++-
 arch/arm/dts/meson-gx.dtsi                    |  52 +++++++
 arch/arm/dts/meson-gxbb-odroidc2.dts          |   1 +
 arch/arm/dts/meson-gxl-s905x-p212.dtsi        |   9 +-
 .../arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi |  15 ++
 arch/arm/dts/meson-gxm-khadas-vim2.dts        |  89 +++---------
 arch/arm/dts/meson-gxm.dtsi                   |  28 ++++
 arch/arm/dts/meson-khadas-vim3-u-boot.dtsi    |  21 +++
 arch/arm/dts/meson-khadas-vim3.dtsi           |  24 +++-
 .../dts/meson-sm1-khadas-vim3l-u-boot.dtsi    |   7 +
 arch/arm/dts/meson-sm1-khadas-vim3l.dts       |   8 +-
 arch/arm/dts/meson-sm1-sei610.dts             |   3 +-
 arch/arm/dts/meson-sm1.dtsi                   |   1 +
 configs/khadas-vim2_defconfig                 |   8 ++
 configs/khadas-vim3_defconfig                 |   9 ++
 configs/khadas-vim3l_defconfig                |   9 ++
 include/dt-bindings/clock/g12a-clkc.h         |   2 +
 include/dt-bindings/clock/gxbb-clkc.h         |   1 +
 25 files changed, 371 insertions(+), 101 deletions(-)
 create mode 100644 arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-khadas-vim3-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi
Signature · 1 line
2.22.0
#1 lore raw

PATCH 1/5 arm64: dts: meson: sync dt and bindings from v5.7-rc1

Sync the device tree and dt-bindings from Linux v5.7-rc1 8f3d9f354286 ("Linux 5.7-rc1").

---
 arch/arm/dts/meson-axg-s400.dts          |   6 +-
 arch/arm/dts/meson-g12-common.dtsi       | 136 +++++++++++++++++++++--
 arch/arm/dts/meson-g12.dtsi              |   1 +
 arch/arm/dts/meson-g12a-sei510.dts       |   4 +-
 arch/arm/dts/meson-g12a-u200.dts         |   2 +-
 arch/arm/dts/meson-g12b-khadas-vim3.dtsi |   4 +-
 arch/arm/dts/meson-g12b-odroid-n2.dts    |  25 ++++-
 arch/arm/dts/meson-gx.dtsi               |  52 +++++++++
 arch/arm/dts/meson-gxbb-odroidc2.dts     |   1 +
 arch/arm/dts/meson-gxl-s905x-p212.dtsi   |   9 +-
 arch/arm/dts/meson-gxm-khadas-vim2.dts   |  89 +++------------
 arch/arm/dts/meson-gxm.dtsi              |  28 +++++
 arch/arm/dts/meson-khadas-vim3.dtsi      |  24 +++-
 arch/arm/dts/meson-sm1-khadas-vim3l.dts  |   8 +-
 arch/arm/dts/meson-sm1-sei610.dts        |   3 +-
 arch/arm/dts/meson-sm1.dtsi              |   1 +
 include/dt-bindings/clock/g12a-clkc.h    |   2 +
 include/dt-bindings/clock/gxbb-clkc.h    |   1 +
 18 files changed, 295 insertions(+), 101 deletions(-)
arch/arm/dts/meson-axg-s400.dts +3 -3
index 4cd2d59518..cb1360ae12 100644
@@ -313,15 +313,15 @@
 			dai-tdm-slot-rx-mask-1 = <1 1>;
 			mclk-fs = <256>;
 
-			codec at 0 {
+			codec-0 {
 				sound-dai = <&lineout>;
 			};
 
-			codec at 1 {
+			codec-1 {
 				sound-dai = <&speaker_amp1>;
 			};
 
-			codec at 2 {
+			codec-2 {
 				sound-dai = <&linein>;
 			};
 
arch/arm/dts/meson-g12-common.dtsi +126 -10

173 lines not on this page · raw message

arch/arm/dts/meson-g12.dtsi +1 -0
index 03054c4788..55d39020ec 100644
@@ -56,6 +56,7 @@
 			 <&clkc_audio AUD_CLKID_PDM_DCLK>,
 			 <&clkc_audio AUD_CLKID_PDM_SYSCLK>;
 		clock-names = "pclk", "dclk", "sysclk";
+		resets = <&clkc_audio AUD_RESET_PDM>;
 		status = "disabled";
 	};
 
arch/arm/dts/meson-g12a-sei510.dts +2 -2
index 2ac9e3a43b..b00d0468c7 100644
@@ -269,7 +269,7 @@
 			dai-tdm-slot-tx-mask-3 = <1 1>;
 			mclk-fs = <256>;
 
-			codec at 0 {
+			codec {
 				sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
 			};
 		};
@@ -472,7 +472,7 @@
 /* eMMC */
 &sd_emmc_c {
 	status = "okay";
-	pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
+	pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>;
 	pinctrl-1 = <&emmc_clk_gate_pins>;
 	pinctrl-names = "default", "clk-gate";
 
arch/arm/dts/meson-g12a-u200.dts +1 -1
index 2a324f0136..a26bfe7255 100644
@@ -271,7 +271,7 @@
 /* eMMC */
 &sd_emmc_c {
 	status = "okay";
-	pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
+	pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>;
 	pinctrl-1 = <&emmc_clk_gate_pins>;
 	pinctrl-names = "default", "clk-gate";
 
arch/arm/dts/meson-g12b-khadas-vim3.dtsi +3 -1
index 554863429a..c33e85fbda 100644
@@ -8,6 +8,8 @@
 #include <dt-bindings/sound/meson-g12a-tohdmitx.h>
 
 / {
+	model = "Khadas VIM3";
+
 	vddcpu_a: regulator-vddcpu-a {
 		/*
 		 * MP8756GD Regulator.
@@ -48,7 +50,7 @@
 
 	sound {
 		compatible = "amlogic,axg-sound-card";
-		model = "G12A-KHADAS-VIM3";
+		model = "G12B-KHADAS-VIM3";
 		audio-aux-devs = <&tdmout_b>;
 		audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
 				"TDMOUT_B IN 1", "FRDDR_B OUT 1",
arch/arm/dts/meson-g12b-odroid-n2.dts +23 -2
index 0e54c1dc28..169ea283d4 100644
@@ -208,7 +208,7 @@
 
 	sound {
 		compatible = "amlogic,axg-sound-card";
-		model = "G12A-ODROIDN2";
+		model = "G12B-ODROID-N2";
 		audio-aux-devs = <&tdmout_b>;
 		audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
 				"TDMOUT_B IN 1", "FRDDR_B OUT 1",
@@ -435,7 +435,7 @@
 /* eMMC */
 &sd_emmc_c {
 	status = "okay";
-	pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
+	pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>;
 	pinctrl-1 = <&emmc_clk_gate_pins>;
 	pinctrl-names = "default", "clk-gate";
 
@@ -451,6 +451,27 @@
 	vqmmc-supply = <&flash_1v8>;
 };
 
+/*
+ * EMMC_D4, EMMC_D5, EMMC_D6 and EMMC_D7 pins are shared between SPI NOR pins
+ * and eMMC Data 4 to 7 pins.
+ * Replace emmc_data_8b_pins to emmc_data_4b_pins from sd_emmc_c pinctrl-0,
+ * and change bus-width to 4 then spifc can be enabled.
+ * The SW1 slide should also be set to the correct position.
+ */
+&spifc {
+	status = "disabled";
+	pinctrl-0 = <&nor_pins>;
+	pinctrl-names = "default";
+
+	mx25u64: spi-flash at 0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "mxicy,mx25u6435f", "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <104000000>;
+	};
+};
+
 &tdmif_b {
 	status = "okay";
 };
arch/arm/dts/meson-gx.dtsi +52 -0

88 lines not on this page · raw message

arch/arm/dts/meson-gxbb-odroidc2.dts +1 -0
index 6ded279c40..b46ef985bb 100644
@@ -248,6 +248,7 @@
 	status = "okay";
 	pinctrl-0 = <&remote_input_ao_pins>;
 	pinctrl-names = "default";
+	linux,rc-map-name = "rc-odroid";
 };
 
 &gpio_ao {
arch/arm/dts/meson-gxl-s905x-p212.dtsi +8 -1
index 43eb7d149e..6ac678f88b 100644
@@ -15,7 +15,6 @@
 / {
 	aliases {
 		serial0 = &uart_AO;
-		serial1 = &uart_A;
 		ethernet0 = &ethmac;
 	};
 
@@ -180,6 +179,14 @@
 	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
 	pinctrl-names = "default";
 	uart-has-rtscts;
+
+	bluetooth {
+		compatible = "brcm,bcm43438-bt";
+		shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
+		max-speed = <2000000>;
+		clocks = <&wifi32k>;
+		clock-names = "lpo";
+	};
 };
 
 &uart_AO {
arch/arm/dts/meson-gxm-khadas-vim2.dts +16 -73

115 lines not on this page · raw message

arch/arm/dts/meson-gxm.dtsi +28 -0
index 5ff64a0d2d..b6f89f108e 100644
@@ -49,6 +49,7 @@
 			enable-method = "psci";
 			next-level-cache = <&l2>;
 			clocks = <&scpi_dvfs 1>;
+			#cooling-cells = <2>;
 		};
 
 		cpu5: cpu at 101 {
@@ -58,6 +59,7 @@
 			enable-method = "psci";
 			next-level-cache = <&l2>;
 			clocks = <&scpi_dvfs 1>;
+			#cooling-cells = <2>;
 		};
 
 		cpu6: cpu at 102 {
@@ -67,6 +69,7 @@
 			enable-method = "psci";
 			next-level-cache = <&l2>;
 			clocks = <&scpi_dvfs 1>;
+			#cooling-cells = <2>;
 		};
 
 		cpu7: cpu at 103 {
@@ -76,6 +79,7 @@
 			enable-method = "psci";
 			next-level-cache = <&l2>;
 			clocks = <&scpi_dvfs 1>;
+			#cooling-cells = <2>;
 		};
 	};
 };
@@ -124,6 +128,30 @@
 	compatible = "amlogic,meson-gxm-aoclkc", "amlogic,meson-gx-aoclkc";
 };
 
+&cpu_cooling_maps {
+	map0 {
+		cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+				 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+				 <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+				 <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+				 <&cpu4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+				 <&cpu5 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+				 <&cpu6 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+				 <&cpu7 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+	};
+
+	map1 {
+		cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+				 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+				 <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+				 <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+				 <&cpu4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+				 <&cpu5 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+				 <&cpu6 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+				 <&cpu7 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+	};
+};
+
 &saradc {
 	compatible = "amlogic,meson-gxm-saradc", "amlogic,meson-saradc";
 };
arch/arm/dts/meson-khadas-vim3.dtsi +21 -3
index 90815fa25e..094ecf2222 100644
@@ -9,8 +9,6 @@
 #include <dt-bindings/gpio/meson-g12a-gpio.h>
 
 / {
-	model = "Khadas VIM3";
-
 	aliases {
 		serial0 = &uart_AO;
 		ethernet0 = &ethmac;
@@ -312,7 +310,7 @@
 /* eMMC */
 &sd_emmc_c {
 	status = "okay";
-	pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
+	pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>;
 	pinctrl-1 = <&emmc_clk_gate_pins>;
 	pinctrl-names = "default", "clk-gate";
 
@@ -328,6 +326,26 @@
 	vqmmc-supply = <&emmc_1v8>;
 };
 
+/*
+ * EMMC_D4, EMMC_D5, EMMC_D6 and EMMC_D7 pins are shared between SPI NOR CS
+ * and eMMC Data 4 to 7 pins.
+ * Replace emmc_data_8b_pins to emmc_data_4b_pins from sd_emmc_c pinctrl-0,
+ * and change bus-width to 4 then spifc can be enabled.
+ */
+&spifc {
+	status = "disabled";
+	pinctrl-0 = <&nor_pins>;
+	pinctrl-names = "default";
+
+	w25q32: spi-flash at 0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "winbond,w25q128fw", "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <104000000>;
+	};
+};
+
 &uart_A {
 	status = "okay";
 	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
arch/arm/dts/meson-sm1-khadas-vim3l.dts +4 -4
index 1001b376ca..dbbf29a0db 100644
@@ -72,9 +72,10 @@
 /*
  * The VIM3 on-board  MCU can mux the PCIe/USB3.0 shared differential
  * lines using a FUSB340TMX USB 3.1 SuperSpeed Data Switch between
- * an USB3.0 Type A connector and a M.2 Key M slot. The PHY driving
- * these differential lines is shared between the USB3.0 controller
- * and the PCIe Controller, thus only a single controller can use it.
+ * an USB3.0 Type A connector and a M.2 Key M slot.
+ * The PHY driving these differential lines is shared between
+ * the USB3.0 controller and the PCIe Controller, thus only
+ * a single controller can use it.
  * If the MCU is configured to mux the PCIe/USB3.0 differential lines
  * to the M.2 Key M slot, uncomment the following block to disable
  * USB3.0 from the USB Complex and enable the PCIe controller.
@@ -82,7 +83,6 @@
  * testing purposes, but instead rely on the firmware/bootloader to
  * update these nodes accordingly if PCIe mode is selected by the MCU.
  */
-
 /*
 &pcie {
 	status = "okay";
arch/arm/dts/meson-sm1-sei610.dts +2 -1
index a8bb3fa9fe..dfb2438851 100644
@@ -518,7 +518,7 @@
 /* eMMC */
 &sd_emmc_c {
 	status = "okay";
-	pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
+	pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>;
 	pinctrl-1 = <&emmc_clk_gate_pins>;
 	pinctrl-names = "default", "clk-gate";
 
@@ -593,6 +593,7 @@
 		compatible = "brcm,bcm43438-bt";
 		interrupt-parent = <&gpio_intc>;
 		interrupts = <95 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "host-wakeup";
 		shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
 		max-speed = <2000000>;
 		clocks = <&wifi32k>;
arch/arm/dts/meson-sm1.dtsi +1 -0
index d847a3fcbc..d4ec735fb1 100644
@@ -448,6 +448,7 @@
 			 <&clkc_audio AUD_CLKID_PDM_DCLK>,
 			 <&clkc_audio AUD_CLKID_PDM_SYSCLK>;
 		clock-names = "pclk", "dclk", "sysclk";
+		resets = <&clkc_audio AUD_RESET_PDM>;
 		status = "disabled";
 	};
 };
include/dt-bindings/clock/g12a-clkc.h +2 -0
index 0837c1a7ae..b0d65d73db 100644
@@ -143,5 +143,7 @@
 #define CLKID_CPU1_CLK				253
 #define CLKID_CPU2_CLK				254
 #define CLKID_CPU3_CLK				255
+#define CLKID_SPICC0_SCLK			258
+#define CLKID_SPICC1_SCLK			261
 
 #endif /* __G12A_CLKC_H */
include/dt-bindings/clock/gxbb-clkc.h +1 -0
index db0763e961..4073eb7a9d 100644
@@ -146,5 +146,6 @@
 #define CLKID_CTS_VDAC		201
 #define CLKID_HDMI_TX		202
 #define CLKID_HDMI		205
+#define CLKID_ACODEC		206
 
 #endif /* __GXBB_CLKC_H */
Signature · 1 line
2.22.0
#2 lore raw

PATCH 2/5 arm: dts: meson-gxm-khadas-vim2-u-boot: enable SPI NOR flash

In reply to Neil Armstrong

Activate the on-board SPI NOR Flash by enabling the SPI controller and disabling the DS eMMC pin in the VIM2 u-boot.dtsi file.

---
 arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi +15 -0
index c35158d7e9..bec9e05b09 100644
@@ -5,3 +5,18 @@
  */
 
 #include "meson-gx-u-boot.dtsi"
+
+/ {
+	aliases {
+		spi0 = &spifc;
+	};
+};
+
+&sd_emmc_c {
+	status = "okay";
+	pinctrl-0 = <&emmc_pins>;
+};
+
+&spifc {
+	status = "okay";
+};
Signature · 1 line
2.22.0
#3 lore raw

PATCH 3/5 configs: khadas-vim2: enable support for SPI NOR flash

In reply to Neil Armstrong

Add the necessary configs to use the SPI NOR flash.

---
 configs/khadas-vim2_defconfig | 8 ++++++++
 1 file changed, 8 insertions(+)
configs/khadas-vim2_defconfig +8 -0
index a533566410..5633f6da9c 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_ADC=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_LOADS is not set
 CONFIG_CMD_MMC=y
+CONFIG_CMD_SF_TEST=y
+CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
@@ -30,7 +32,10 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SARADC_MESON=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_MESON_GX=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_REALTEK=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
@@ -44,6 +49,9 @@ CONFIG_DEBUG_UART_MESON=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_MESON_SERIAL=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_MESON_SPIFC=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
Signature · 1 line
2.22.0
#4 lore raw

PATCH 4/5 arm: dts: meson-khadas-vim3: enable SPI NOR flash

In reply to Neil Armstrong

Enable the SPI flash controller and reduce the usable eMMC data pins to 4 to permit using the on-board SPI NOR Flash.

---
 .../meson-g12b-a311d-khadas-vim3-u-boot.dtsi  |  7 +++++++
 arch/arm/dts/meson-khadas-vim3-u-boot.dtsi    | 21 +++++++++++++++++++
 .../dts/meson-sm1-khadas-vim3l-u-boot.dtsi    |  7 +++++++
 3 files changed, 35 insertions(+)
 create mode 100644 arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-khadas-vim3-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi
arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi new file +7 -0
new file mode 100644
index 0000000000..f66eca14b1
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2020 BayLibre, SAS
+ * Author: Neil Armstrong <[email protected]>
+ */
+
+#include "meson-khadas-vim3-u-boot.dtsi"
arch/arm/dts/meson-khadas-vim3-u-boot.dtsi new file +21 -0
new file mode 100644
index 0000000000..81fd5be378
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2020 BayLibre, SAS
+ * Author: Neil Armstrong <[email protected]>
+ */
+
+/ {
+	aliases {
+		spi0 = &spifc;
+	};
+};
+
+&sd_emmc_c {
+	status = "okay";
+	pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_4b_pins>, <&emmc_ds_pins>;
+	bus-width = <4>;
+};
+
+&spifc {
+	status = "okay";
+};
arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi new file +7 -0
new file mode 100644
index 0000000000..f66eca14b1
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2020 BayLibre, SAS
+ * Author: Neil Armstrong <[email protected]>
+ */
+
+#include "meson-khadas-vim3-u-boot.dtsi"
Signature · 1 line
2.22.0
#5 lore raw

PATCH 5/5 configs: khadas-vim3: enable support for SPI NOR flash

In reply to Neil Armstrong

Enable the necessary configs to make usage of the SPI NOR Flash.

---
 configs/khadas-vim3_defconfig  | 9 +++++++++
 configs/khadas-vim3l_defconfig | 9 +++++++++
 2 files changed, 18 insertions(+)
configs/khadas-vim3_defconfig +9 -0
index 72987d9523..692138eb11 100644
@@ -18,6 +18,8 @@ CONFIG_MISC_INIT_R=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_LOADS is not set
 CONFIG_CMD_MMC=y
+CONFIG_CMD_SF_TEST=y
+CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
@@ -28,6 +30,10 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_MESON_GX=y
+CONFIG_MTD=y
+CONFIG_DM_MTD=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_REALTEK=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
@@ -41,6 +47,9 @@ CONFIG_DEBUG_UART_MESON=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_MESON_SERIAL=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_MESON_SPIFC=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/khadas-vim3l_defconfig +9 -0
index 7e2ad41bca..28c20c0d6d 100644
@@ -18,6 +18,8 @@ CONFIG_MISC_INIT_R=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_LOADS is not set
 CONFIG_CMD_MMC=y
+CONFIG_CMD_SF_TEST=y
+CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
@@ -28,6 +30,10 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_MESON_GX=y
+CONFIG_MTD=y
+CONFIG_DM_MTD=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_REALTEK=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
@@ -43,6 +49,9 @@ CONFIG_DEBUG_UART_MESON=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_MESON_SERIAL=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_MESON_SPIFC=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
Signature · 1 line
2.22.0