From 8d3dc5ed9dc96348071e5e2cb370581a24013fa0 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Thu, 2 Nov 2023 13:17:24 -0500 Subject: [PATCH] BeagleV-Fire: move dts patches to unified device-tree repo Signed-off-by: Robert Nelson --- .gitignore | 1 + 04_build_linux.sh | 19 +- .../0001-Add-BeagleV-Fire-device-tree.patch | 562 ------------------ ...aglev-fire-fix-eeprom-pagesize-merge.patch | 26 - ...e-fabric-fix-old-merge-removing-gpio.patch | 83 --- ...e-add-uart-i2c-symlinks-fix-old-merg.patch | 31 - ...3-mpfs-beaglev-fire-drop-user_button.patch | 31 - ...4-mpfs-beaglev-fire-add-mmc0-aliases.patch | 25 - patches/linux/mpfs_defconfig | 2 +- 9 files changed, 11 insertions(+), 769 deletions(-) delete mode 100644 patches/linux/0001-Add-BeagleV-Fire-device-tree.patch delete mode 100644 patches/linux/0010-mpfs-beaglev-fire-fix-eeprom-pagesize-merge.patch delete mode 100644 patches/linux/0011-mpfs-beaglev-fire-fabric-fix-old-merge-removing-gpio.patch delete mode 100644 patches/linux/0012-mpfs-beaglev-fire-add-uart-i2c-symlinks-fix-old-merg.patch delete mode 100644 patches/linux/0013-mpfs-beaglev-fire-drop-user_button.patch delete mode 100644 patches/linux/0014-mpfs-beaglev-fire-add-mmc0-aliases.patch diff --git a/.gitignore b/.gitignore index 2510621..7a7416d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ deploy/ubuntu* /u-boot/ /linux/ /gateware-snapshots/ +/device-tree/ diff --git a/04_build_linux.sh b/04_build_linux.sh index 8227125..7746034 100755 --- a/04_build_linux.sh +++ b/04_build_linux.sh @@ -8,7 +8,6 @@ cd ./linux/ if [ ! -f ./.patched ] ; then if [ -f arch/riscv/configs/mpfs_defconfig ] ; then - git am ../patches/linux/0001-Add-BeagleV-Fire-device-tree.patch git am ../patches/linux/0002-PCIe-Change-controller-and-bridge-base-address.patch git am ../patches/linux/0003-GPIO-Add-Microchip-CoreGPIO-driver.patch git am ../patches/linux/0004-ADC-Add-Microchip-MCP356X-driver.patch @@ -17,24 +16,24 @@ if [ ! -f ./.patched ] ; then git am ../patches/linux/0007-MMC-SPI-Hack-to-support-non-DMA-capable-SPI-ctrl.patch git am ../patches/linux/0008-Add-wireless-regdb-regulatory-database-file.patch git am ../patches/linux/0009-Makefile-build-mpfs-beaglev-fire.dtb.patch - git am ../patches/linux/0010-mpfs-beaglev-fire-fix-eeprom-pagesize-merge.patch - git am ../patches/linux/0011-mpfs-beaglev-fire-fabric-fix-old-merge-removing-gpio.patch - git am ../patches/linux/0012-mpfs-beaglev-fire-add-uart-i2c-symlinks-fix-old-merg.patch - git am ../patches/linux/0013-mpfs-beaglev-fire-drop-user_button.patch - git am ../patches/linux/0014-mpfs-beaglev-fire-add-mmc0-aliases.patch fi touch .patched fi -#if [ -f arch/riscv/configs/mpfs_defconfig ] ; then +if [ -f arch/riscv/configs/mpfs_defconfig ] ; then # cp -v ../patches/linux/Makefile arch/riscv/boot/dts/microchip/Makefile -# cp -v ../patches/linux/dts/mpfs-beaglev-fire.dts arch/riscv/boot/dts/microchip/ -# cp -v ../patches/linux/dts/mpfs-beaglev-fire-fabric.dtsi arch/riscv/boot/dts/microchip/ + cp -v ../device-tree/src/microchip/mpfs-beaglev-fire.dts arch/riscv/boot/dts/microchip/ + cp -v ../device-tree/src/microchip/mpfs-beaglev-fire-fabric.dtsi arch/riscv/boot/dts/microchip/ + #echo "************************************" + #git diff arch/riscv/boot/dts/microchip/ > log.txt ; cat log.txt ; rm log.txt + #echo "************************************" + #echo "Current Device Tree Changes (5 second wait)" + #sleep 5 #else # cp -v ../patches/linux/mainline/Makefile arch/riscv/boot/dts/microchip/Makefile # cp -v ../patches/linux/mainline/dts/mpfs-beaglev-fire.dts arch/riscv/boot/dts/microchip/ # cp -v ../patches/linux/mainline/dts/mpfs-beaglev-fire-fabric.dtsi arch/riscv/boot/dts/microchip/ -#fi +fi echo "make ARCH=riscv CROSS_COMPILE=${CC} clean" make ARCH=riscv CROSS_COMPILE=${CC} clean diff --git a/patches/linux/0001-Add-BeagleV-Fire-device-tree.patch b/patches/linux/0001-Add-BeagleV-Fire-device-tree.patch deleted file mode 100644 index 725112f..0000000 --- a/patches/linux/0001-Add-BeagleV-Fire-device-tree.patch +++ /dev/null @@ -1,562 +0,0 @@ -From 55aaa24d18a63b09b316b3c6d334985f293e8b25 Mon Sep 17 00:00:00 2001 -From: vauban353 -Date: Sun, 6 Aug 2023 09:42:33 +0100 -Subject: [PATCH 1/8] Add: BeagleV-Fire device tree. - ---- - .../microchip/mpfs-beaglev-fire-fabric.dtsi | 155 +++++++ - .../boot/dts/microchip/mpfs-beaglev-fire.dts | 380 ++++++++++++++++++ - 2 files changed, 535 insertions(+) - create mode 100644 arch/riscv/boot/dts/microchip/mpfs-beaglev-fire-fabric.dtsi - create mode 100644 arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts - -diff --git a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire-fabric.dtsi b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire-fabric.dtsi -new file mode 100644 -index 000000000..60ba0883a ---- /dev/null -+++ b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire-fabric.dtsi -@@ -0,0 +1,155 @@ -+// SPDX-License-Identifier: (GPL-2.0 OR MIT) -+/* Copyright (c) 2020-2021 Microchip Technology Inc */ -+ -+#include "dt-bindings/mailbox/miv-ihc.h" -+ -+/ { -+ compatible = "microchip,mpfs-icicle-reference-rtlv2210"; -+ -+ fabric-bus@40000000 { -+ compatible = "simple-bus"; -+ #address-cells = <2>; -+ #size-cells = <2>; -+ ranges = <0x0 0x40000000 0x0 0x40000000 0x0 0x20000000>, /* FIC3-FAB */ -+ <0x0 0x60000000 0x0 0x60000000 0x0 0x20000000>, /* FIC0, LO */ -+ <0x0 0xe0000000 0x0 0xe0000000 0x0 0x20000000>, /* FIC1, LO */ -+ <0x20 0x0 0x20 0x0 0x10 0x0>, /* FIC0,HI */ -+ <0x30 0x0 0x30 0x0 0x10 0x0>; /* FIC1,HI */ -+ -+// core_pwm0: pwm@40000000 { -+// compatible = "microchip,corepwm-rtl-v4"; -+// reg = <0x0 0x40000000 0x0 0xF0>; -+// microchip,sync-update-mask = /bits/ 32 <0>; -+// #pwm-cells = <2>; -+// clocks = <&fabric_clk3>; -+// status = "disabled"; -+// }; -+ -+ fabric_clk3: fabric-clk3 { -+ compatible = "fixed-clock"; -+ #clock-cells = <0>; -+ clock-frequency = <50000000>; -+ }; -+ -+ fabric_clk1: fabric-clk1 { -+ compatible = "fixed-clock"; -+ #clock-cells = <0>; -+ clock-frequency = <125000000>; -+ }; -+ -+ cape_gpios_p8: gpio@41100000 { -+ compatible = "microchip,core-gpio"; -+ reg = <0x0 0x41100000 0x0 0x1000>; -+ clocks = <&fabric_clk3>; -+ gpio-controller; -+ #gpio-cells = <2>; -+ ngpios=<16>; -+ gpio-line-names = "P8_PIN31", "P8_PIN32", "P8_PIN33", "P8_PIN34", -+ "P8_PIN35", "P8_PIN36", "P8_PIN37", "P8_PIN38", -+ "P8_PIN39", "P8_PIN40", "P8_PIN41", "P8_PIN42", -+ "P8_PIN43", "P8_PIN44", "P8_PIN45", "P8_PIN46"; -+ }; -+ -+ cape_gpios_p9: gpio@41200000 { -+ compatible = "microchip,core-gpio"; -+ reg = <0x0 0x41200000 0x0 0x1000>; -+ clocks = <&fabric_clk3>; -+ gpio-controller; -+ #gpio-cells = <2>; -+ ngpios=<21>; -+ gpio-line-names = "P9_PIN11", "P9_PIN12", "P9_PIN13", "P9_PIN14", -+ "P9_PIN15", "P9_PIN16", "P9_PIN17", "P9_PIN18", -+ "P9_PIN21", "P9_PIN22", "P9_PIN23", "P9_PIN24", -+ "P9_PIN25", "P9_PIN26", "P9_PIN27", "P9_PIN28", -+ "P9_PIN29", "P9_PIN31", "P9_PIN41", "P9_PIN42"; -+ }; -+ -+ hsi_gpios: gpio@44000000 { -+ compatible = "microchip,core-gpio"; -+ reg = <0x0 0x44000000 0x0 0x1000>; -+ clocks = <&fabric_clk3>; -+ gpio-controller; -+ #gpio-cells = <2>; -+ ngpios=<20>; -+ gpio-line-names = "B0_HSIO70N", "B0_HSIO71N", "B0_HSIO83N", "B0_HSIO73N_C2P_CLKN", -+ "B0_HSIO70P", "B0_HSIO71P", "B0_HSIO83P", "B0_HSIO73N_C2P_CLKP", -+ "XCVR1_RX_VALID", "XCVR1_LOCK", "XCVR1_ERROR", -+ "XCVR2_RX_VALID", "XCVR2_LOCK", "XCVR2_ERROR", -+ "XCVR3_RX_VALID", "XCVR3_LOCK", "XCVR3_ERROR", -+ "XCVR_0B_REF_CLK_PLL_LOCK", "XCVR_0C_REF_CLK_PLL_LOCK", "B0_HSIO81N"; -+ }; -+ }; -+ -+ ihc: mailbox { -+ compatible = "microchip,miv-ihc"; -+ interrupt-parent = <&plic>; -+ interrupts = ; -+ microchip,miv-ihc-remote-context-id = ; -+ #mbox-cells = <1>; -+ status = "disabled"; -+ }; -+ -+ fabric-pcie-bus@3000000000 { -+ compatible = "simple-bus"; -+ #address-cells = <2>; -+ #size-cells = <2>; -+ ranges = <0x0 0x40000000 0x0 0x40000000 0x0 0x20000000>, -+ <0x30 0x0 0x30 0x0 0x10 0x0>; -+ dma-ranges = <0x0 0x0 0x0 0x80000000 0x0 0x4000000>, -+ <0x0 0x4000000 0x0 0xc4000000 0x0 0x6000000>, -+ <0x0 0xa000000 0x0 0x8a000000 0x0 0x8000000>, -+ <0x0 0x12000000 0x14 0x12000000 0x0 0x10000000>, -+ <0x0 0x22000000 0x10 0x22000000 0x0 0x5e000000>; -+ -+ pcie: pcie@3000000000 { -+ compatible = "microchip,pcie-host-1.0"; -+ #address-cells = <0x3>; -+ #interrupt-cells = <0x1>; -+ #size-cells = <0x2>; -+ device_type = "pci"; -+ dma-noncoherent; -+ reg = <0x30 0x0 0x0 0x8000000>, <0x0 0x43000000 0x0 0x10000>; -+ reg-names = "cfg", "apb"; -+ bus-range = <0x0 0x7f>; -+ interrupt-parent = <&plic>; -+ interrupts = <119>; -+ interrupt-map = <0 0 0 1 &pcie_intc 0>, -+ <0 0 0 2 &pcie_intc 1>, -+ <0 0 0 3 &pcie_intc 2>, -+ <0 0 0 4 &pcie_intc 3>; -+ interrupt-map-mask = <0 0 0 7>; -+ clocks = <&ccc_nw CLK_CCC_PLL0_OUT1>, <&ccc_nw CLK_CCC_PLL0_OUT3>; -+ clock-names = "fic1", "fic3"; -+ ranges = <0x43000000 0x0 0x9000000 0x30 0x9000000 0x0 0xf000000>, -+ <0x1000000 0x0 0x8000000 0x30 0x8000000 0x0 0x1000000>, -+ <0x3000000 0x0 0x18000000 0x30 0x18000000 0x0 0x70000000>; -+ dma-ranges = <0x3000000 0x0 0x80000000 0x0 0x0 0x0 0x4000000>, -+ <0x3000000 0x0 0x84000000 0x0 0x4000000 0x0 0x6000000>, -+ <0x3000000 0x0 0x8a000000 0x0 0xa000000 0x0 0x8000000>, -+ <0x3000000 0x0 0x92000000 0x0 0x12000000 0x0 0x10000000>, -+ <0x3000000 0x0 0xa2000000 0x0 0x22000000 0x0 0x5e000000>; -+ msi-parent = <&pcie>; -+ msi-controller; -+ status = "disabled"; -+ -+ pcie_intc: interrupt-controller { -+ #address-cells = <0>; -+ #interrupt-cells = <1>; -+ interrupt-controller; -+ }; -+ }; -+ }; -+ -+ refclk_ccc: cccrefclk { -+ compatible = "fixed-clock"; -+ #clock-cells = <0>; -+ }; -+}; -+ -+&ccc_nw { -+ clocks = <&refclk_ccc>, <&refclk_ccc>, <&refclk_ccc>, <&refclk_ccc>, -+ <&refclk_ccc>, <&refclk_ccc>; -+ clock-names = "pll0_ref0", "pll0_ref1", "pll1_ref0", "pll1_ref1", -+ "dll0_ref", "dll1_ref"; -+ status = "okay"; -+}; -diff --git a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts -new file mode 100644 -index 000000000..743da3845 ---- /dev/null -+++ b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts -@@ -0,0 +1,380 @@ -+// SPDX-License-Identifier: (GPL-2.0 OR MIT) -+/* Copyright (c) 2020-2021 Microchip Technology Inc */ -+ -+/dts-v1/; -+ -+#include -+#include "mpfs.dtsi" -+#include "mpfs-beaglev-fire-fabric.dtsi" -+ -+/* Clock frequency (in Hz) of the rtcclk */ -+#define RTCCLK_FREQ 1000000 -+ -+/ { -+ #address-cells = <2>; -+ #size-cells = <2>; -+ model = "BeagleBoard BeagleV-Fire"; -+ compatible = "microchip,mpfs-icicle-reference-rtlv2210", "microchip,mpfs"; -+ -+ soc { -+ dma-ranges = <0x14 0x0 0x0 0x80000000 0x0 0x4000000>, -+ <0x14 0x4000000 0x0 0xc4000000 0x0 0x6000000>, -+ <0x14 0xa000000 0x0 0x8a000000 0x0 0x8000000>, -+ <0x14 0x12000000 0x14 0x12000000 0x0 0x10000000>, -+ <0x14 0x22000000 0x10 0x22000000 0x0 0x5e000000>; -+ }; -+ -+ aliases { -+ ethernet0 = &mac1; -+ serial0 = &mmuart0; -+ serial1 = &mmuart1; -+ serial2 = &mmuart2; -+ serial3 = &mmuart3; -+ serial4 = &mmuart4; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ cpus { -+ timebase-frequency = ; -+ }; -+ -+ kernel: memory@80000000 { -+ device_type = "memory"; -+ reg = <0x0 0x80000000 0x0 0x4000000>; -+ }; -+ -+ ddr_cached_low: memory@8a000000 { -+ device_type = "memory"; -+ reg = <0x0 0x8a000000 0x0 0x8000000>; -+ }; -+ -+ ddr_non_cached_low: memory@c4000000 { -+ device_type = "memory"; -+ reg = <0x0 0xc4000000 0x0 0x6000000>; -+ }; -+ -+ ddr_cached_high: memory@1022000000 { -+ device_type = "memory"; -+ reg = <0x10 0x22000000 0x0 0x5e000000>; -+ }; -+ -+ ddr_non_cached_high: memory@1412000000 { -+ device_type = "memory"; -+ reg = <0x14 0x12000000 0x0 0x10000000>; -+ }; -+ -+ reserved-memory { -+ #address-cells = <2>; -+ #size-cells = <2>; -+ ranges; -+ -+ hss: hss-buffer@103fc00000 { -+ compatible = "shared-dma-pool"; -+ reg = <0x10 0x3fc00000 0x0 0x400000>; -+ no-map; -+ }; -+ -+ dma_non_cached_low: non-cached-low-buffer { -+ compatible = "shared-dma-pool"; -+ size = <0x0 0x4000000>; -+ no-map; -+ linux,dma-default; -+ alloc-ranges = <0x0 0xc4000000 0x0 0x4000000>; -+ }; -+ -+ dma_non_cached_high: non-cached-high-buffer { -+ compatible = "shared-dma-pool"; -+ size = <0x0 0x10000000>; -+ no-map; -+ linux,dma-default; -+ alloc-ranges = <0x14 0x12000000 0x0 0x10000000>; -+ }; -+ }; -+ -+ imx219_vana: fixedregulator@0 { -+ compatible = "regulator-fixed"; -+ regulator-name = "imx219_vana"; -+ regulator-min-microvolt = <2800000>; -+ regulator-max-microvolt = <2800000>; -+ }; -+ imx219_vdig: fixedregulator@1 { -+ compatible = "regulator-fixed"; -+ regulator-name = "imx219_vdig"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ }; -+ imx219_vddl: fixedregulator@2 { -+ compatible = "regulator-fixed"; -+ regulator-name = "imx219_vddl"; -+ regulator-min-microvolt = <1200000>; -+ regulator-max-microvolt = <1200000>; -+ }; -+ -+ -+ imx219_clk: camera-clk { -+ compatible = "fixed-clock"; -+ #clock-cells = <0>; -+ clock-frequency = <24000000>; -+ }; -+ -+ -+}; -+ -+&gpio0 { -+ ngpios=<14>; -+ gpio-line-names = "", "", "", "", "", "", "", "", "", "", "", "", "SD_CARD_CS", "USER_BUTTON"; -+ status = "okay"; -+ -+ sd_card_cs { -+ gpio-hog; -+ gpios = <12 12>; -+ output_high; -+ line-name = "SD_CARD_CS"; -+ }; -+ -+ user_button { -+ gpio-hog; -+ gpios = <13 13>; -+ input; -+ line-name = "USER_BUTTON"; -+ }; -+}; -+ -+&gpio1 { -+ ngpios=<24>; -+ gpio-line-names = "", "", "", "", "", "", "", "", "", "", -+ "", "", "", "", "", "", "", "", "", "", -+ "ADC_IRQn", "", "", "USB_OCn"; -+ status = "okay"; -+ -+ adc_irqn { -+ gpio-hog; -+ gpios = <20 20>; -+ input; -+ line-name = "ADC_IRQn"; -+ }; -+ -+ user_button { -+ gpio-hog; -+ gpios = <23 23>; -+ input; -+ line-name = "USB_OCn"; -+ }; -+ -+}; -+ -+&gpio2 { -+ interrupts = <53>, <53>, <53>, <53>, -+ <53>, <53>, <53>, <53>, -+ <53>, <53>, <53>, <53>, -+ <53>, <53>, <53>, <53>, -+ <53>, <53>, <53>, <53>, -+ <53>, <53>, <53>, <53>, -+ <53>, <53>, <53>, <53>, -+ <53>, <53>, <53>, <53>; -+ gpio-line-names = "P8_PIN3_USER_LED_0", "P8_PIN4_USER_LED_1", "P8_PIN5_USER_LED_2", -+ "P8_PIN6_USER_LED_3", "P8_PIN7_USER_LED_4", "P8_PIN8_USER_LED_5", -+ "P8_PIN9_USER_LED_6", "P8_PIN10_USER_LED_7", "P8_PIN11_USER_LED_8", -+ "P8_PIN12_USER_LED_9", "P8_PIN13_USER_LED_10", "P8_PIN14_USER_LED_11", -+ "P8_PIN15", "P8_PIN16", "P8_PIN17", "P8_PIN18", "P8_PIN19", -+ "P8_PIN20", "P8_PIN21", "P8_PIN22", "P8_PIN23", "P8_PIN24", -+ "P8_PIN25", "P8_PIN26", "P8_PIN27", "P8_PIN28", "P8_PIN29", -+ "P8_PIN30", -+ "M2_W_DISABLE1", "M2_W_DISABLE2", -+ "VIO_ENABLE", "SD_DET"; -+ status = "okay"; -+ -+ vio_enable { -+ gpio-hog; -+ gpios = <30 30>; -+ output_high; -+ line-name = "VIO_ENABLE"; -+ }; -+ -+ sd_det { -+ gpio-hog; -+ gpios = <31 31>; -+ input; -+ line-name = "SD_DET"; -+ }; -+}; -+ -+&i2c0 { -+ status = "okay"; -+}; -+ -+&i2c1 { -+ status = "okay"; -+ eeprom: eeprom@50 { -+ compatible = "atmel,24c32"; -+ reg = pagesize = <32>; -+ reg = <0x50>; -+ }; -+ -+ imx219: sensor@10 { -+ compatible = "sony,imx219"; -+ reg = <0x10>; -+ clocks = <&imx219_clk>; -+ VANA-supply = <&imx219_vana>; /* 2.8v */ -+ VDIG-supply = <&imx219_vdig>; /* 1.8v */ -+ VDDL-supply = <&imx219_vddl>; /* 1.2v */ -+ -+ port { -+ imx219_0: endpoint { -+// remote-endpoint = <&csi1_ep>; -+ data-lanes = <1 2>; -+ clock-noncontinuous; -+ link-frequencies = /bits/ 64 <456000000>; -+ }; -+ }; -+ }; -+ -+ -+}; -+ -+&mac0 { -+ dma-noncoherent; -+ status = "okay"; -+ phy-mode = "sgmii"; -+ phy-handle = <&phy0>; -+ phy0: ethernet-phy@0 { -+ reg = <0>; -+ }; -+}; -+ -+&mac1 { -+ dma-noncoherent; -+ status = "okay"; -+ phy-mode = "sgmii"; -+ phy-handle = <&phy1>; -+ phy1: ethernet-phy@0 { -+ reg = <0>; -+ }; -+}; -+ -+&mbox { -+ status = "okay"; -+}; -+ -+//&mmc { -+// status = "okay"; -+// bus-width = <8>; -+// disable-wp; -+// cap-mmc-highspeed; -+// mmc-ddr-1_8v; -+// mmc-hs200-1_8v; -+//}; -+ -+&mmc { -+ dma-noncoherent; -+ bus-width = <4>; -+ disable-wp; -+ cap-sd-highspeed; -+ cap-mmc-highspeed; -+ mmc-ddr-1_8v; -+ mmc-hs200-1_8v; -+ sd-uhs-sdr12; -+ sd-uhs-sdr25; -+ sd-uhs-sdr50; -+ sd-uhs-sdr104; -+ status = "okay"; -+}; -+ -+ -+&mmuart0 { -+ status = "okay"; -+}; -+ -+&mmuart1 { -+ status = "okay"; -+}; -+ -+//&mmuart2 { -+// status = "okay"; -+//}; -+ -+//&mmuart3 //{ -+// statu//s = "okay"; -+//};// -+// -+//&mmuart4 { -+// status = "okay"; -+//}; -+ -+//&pcie { -+// status = "okay"; -+//}; -+ -+&qspi { -+ status = "okay"; -+ cs-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>, <&gpio0 12 GPIO_ACTIVE_LOW>; -+ num-cs = <2>; -+ -+ -+ mcp3464: mcp3464@0 { -+ compatible = "microchip,mcp3464r"; -+ reg = <0>; /* CE0 */ -+ spi-cpol; -+ spi-cpha; -+ spi-max-frequency = <15000000>; -+ status = "okay"; -+ microchip,hw-device-address = <1>; -+ }; -+ -+ mmc-slot@1 { -+ compatible = "mmc-spi-slot"; -+ reg = <1>; -+ gpios = <&gpio2 31 1>; -+ voltage-ranges = <3300 3300>; -+ spi-max-frequency = <15000000>; -+ disable-wp; -+ }; -+}; -+ -+&refclk { -+ clock-frequency = <125000000>; -+}; -+ -+&refclk_ccc { -+ clock-frequency = <50000000>; -+}; -+ -+&rtc { -+ status = "okay"; -+}; -+ -+&spi0 { -+ status = "okay"; -+}; -+ -+&spi1 { -+ status = "okay"; -+}; -+ -+&syscontroller { -+ microchip,bitstream-flash = <&sys_ctrl_flash>; -+ status = "okay"; -+}; -+ -+&syscontroller_qspi { -+ status = "okay"; -+ -+ sys_ctrl_flash: flash@0 { // MT25QL01GBBB8ESF-0SIT -+ compatible = "jedec,spi-nor"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ spi-max-frequency = <20000000>; -+ spi-rx-bus-width = <1>; -+ reg = <0>; -+ }; -+}; -+ -+ -+&usb { -+ dma-noncoherent; -+ status = "okay"; -+ dr_mode = "otg"; -+}; --- -2.39.2 - diff --git a/patches/linux/0010-mpfs-beaglev-fire-fix-eeprom-pagesize-merge.patch b/patches/linux/0010-mpfs-beaglev-fire-fix-eeprom-pagesize-merge.patch deleted file mode 100644 index 2d031e7..0000000 --- a/patches/linux/0010-mpfs-beaglev-fire-fix-eeprom-pagesize-merge.patch +++ /dev/null @@ -1,26 +0,0 @@ -From aa372dad67f6ebb5743821fb121b9534e9b36f67 Mon Sep 17 00:00:00 2001 -From: Robert Nelson -Date: Tue, 10 Oct 2023 10:11:54 -0500 -Subject: [PATCH 10/10] mpfs-beaglev-fire: fix eeprom pagesize merge - -Signed-off-by: Robert Nelson ---- - arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts -index 4e4cf9673743..b4f1090f9664 100644 ---- a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts -+++ b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts -@@ -210,7 +210,7 @@ &i2c1 { - status = "okay"; - eeprom: eeprom@50 { - compatible = "atmel,24c32"; -- reg = pagesize = <32>; -+ pagesize = <32>; - reg = <0x50>; - }; - --- -2.39.2 - diff --git a/patches/linux/0011-mpfs-beaglev-fire-fabric-fix-old-merge-removing-gpio.patch b/patches/linux/0011-mpfs-beaglev-fire-fabric-fix-old-merge-removing-gpio.patch deleted file mode 100644 index ae5015d..0000000 --- a/patches/linux/0011-mpfs-beaglev-fire-fabric-fix-old-merge-removing-gpio.patch +++ /dev/null @@ -1,83 +0,0 @@ -From fb1cbdba969522930a5320e14749333f22a5f1db Mon Sep 17 00:00:00 2001 -From: Robert Nelson -Date: Tue, 10 Oct 2023 10:21:14 -0500 -Subject: [PATCH 11/11] mpfs-beaglev-fire-fabric: fix old merge removing - gpio/core_pwm - -Signed-off-by: Robert Nelson ---- - .../microchip/mpfs-beaglev-fire-fabric.dtsi | 51 ------------------- - 1 file changed, 51 deletions(-) - -diff --git a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire-fabric.dtsi b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire-fabric.dtsi -index 60ba0883aeb2..9737144e441a 100644 ---- a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire-fabric.dtsi -+++ b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire-fabric.dtsi -@@ -16,15 +16,6 @@ fabric-bus@40000000 { - <0x20 0x0 0x20 0x0 0x10 0x0>, /* FIC0,HI */ - <0x30 0x0 0x30 0x0 0x10 0x0>; /* FIC1,HI */ - --// core_pwm0: pwm@40000000 { --// compatible = "microchip,corepwm-rtl-v4"; --// reg = <0x0 0x40000000 0x0 0xF0>; --// microchip,sync-update-mask = /bits/ 32 <0>; --// #pwm-cells = <2>; --// clocks = <&fabric_clk3>; --// status = "disabled"; --// }; -- - fabric_clk3: fabric-clk3 { - compatible = "fixed-clock"; - #clock-cells = <0>; -@@ -36,48 +27,6 @@ fabric_clk1: fabric-clk1 { - #clock-cells = <0>; - clock-frequency = <125000000>; - }; -- -- cape_gpios_p8: gpio@41100000 { -- compatible = "microchip,core-gpio"; -- reg = <0x0 0x41100000 0x0 0x1000>; -- clocks = <&fabric_clk3>; -- gpio-controller; -- #gpio-cells = <2>; -- ngpios=<16>; -- gpio-line-names = "P8_PIN31", "P8_PIN32", "P8_PIN33", "P8_PIN34", -- "P8_PIN35", "P8_PIN36", "P8_PIN37", "P8_PIN38", -- "P8_PIN39", "P8_PIN40", "P8_PIN41", "P8_PIN42", -- "P8_PIN43", "P8_PIN44", "P8_PIN45", "P8_PIN46"; -- }; -- -- cape_gpios_p9: gpio@41200000 { -- compatible = "microchip,core-gpio"; -- reg = <0x0 0x41200000 0x0 0x1000>; -- clocks = <&fabric_clk3>; -- gpio-controller; -- #gpio-cells = <2>; -- ngpios=<21>; -- gpio-line-names = "P9_PIN11", "P9_PIN12", "P9_PIN13", "P9_PIN14", -- "P9_PIN15", "P9_PIN16", "P9_PIN17", "P9_PIN18", -- "P9_PIN21", "P9_PIN22", "P9_PIN23", "P9_PIN24", -- "P9_PIN25", "P9_PIN26", "P9_PIN27", "P9_PIN28", -- "P9_PIN29", "P9_PIN31", "P9_PIN41", "P9_PIN42"; -- }; -- -- hsi_gpios: gpio@44000000 { -- compatible = "microchip,core-gpio"; -- reg = <0x0 0x44000000 0x0 0x1000>; -- clocks = <&fabric_clk3>; -- gpio-controller; -- #gpio-cells = <2>; -- ngpios=<20>; -- gpio-line-names = "B0_HSIO70N", "B0_HSIO71N", "B0_HSIO83N", "B0_HSIO73N_C2P_CLKN", -- "B0_HSIO70P", "B0_HSIO71P", "B0_HSIO83P", "B0_HSIO73N_C2P_CLKP", -- "XCVR1_RX_VALID", "XCVR1_LOCK", "XCVR1_ERROR", -- "XCVR2_RX_VALID", "XCVR2_LOCK", "XCVR2_ERROR", -- "XCVR3_RX_VALID", "XCVR3_LOCK", "XCVR3_ERROR", -- "XCVR_0B_REF_CLK_PLL_LOCK", "XCVR_0C_REF_CLK_PLL_LOCK", "B0_HSIO81N"; -- }; - }; - - ihc: mailbox { --- -2.39.2 - diff --git a/patches/linux/0012-mpfs-beaglev-fire-add-uart-i2c-symlinks-fix-old-merg.patch b/patches/linux/0012-mpfs-beaglev-fire-add-uart-i2c-symlinks-fix-old-merg.patch deleted file mode 100644 index 62643bf..0000000 --- a/patches/linux/0012-mpfs-beaglev-fire-add-uart-i2c-symlinks-fix-old-merg.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0b2a75cd64db0121c023de5ffa6b135b4f5a4a3e Mon Sep 17 00:00:00 2001 -From: Robert Nelson -Date: Tue, 10 Oct 2023 10:34:52 -0500 -Subject: [PATCH 12/12] mpfs-beaglev-fire: add uart/i2c symlinks, fix old merge - -Signed-off-by: Robert Nelson ---- - arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts -index b4f1090f9664..962d39a46050 100644 ---- a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts -+++ b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts -@@ -378,3 +378,13 @@ &usb { - status = "okay"; - dr_mode = "otg"; - }; -+ -+// UARTs -+//bone_uart_4: &mmuart4 { -+// symlink = "bone/uart/4"; -+//}; -+ -+// I2Cs -+bone_i2c_2: &i2c0 { -+ symlink = "bone/i2c/2"; -+}; --- -2.39.2 - diff --git a/patches/linux/0013-mpfs-beaglev-fire-drop-user_button.patch b/patches/linux/0013-mpfs-beaglev-fire-drop-user_button.patch deleted file mode 100644 index fa2cd83..0000000 --- a/patches/linux/0013-mpfs-beaglev-fire-drop-user_button.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6e60fa8df1c8c5aa5105c84b261973b815b3611c Mon Sep 17 00:00:00 2001 -From: Robert Nelson -Date: Tue, 10 Oct 2023 10:43:53 -0500 -Subject: [PATCH 13/13] mpfs-beaglev-fire: drop user_button - -Signed-off-by: Robert Nelson ---- - arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts -index 962d39a46050..d954a5cc3063 100644 ---- a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts -+++ b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts -@@ -134,13 +134,6 @@ sd_card_cs { - output_high; - line-name = "SD_CARD_CS"; - }; -- -- user_button { -- gpio-hog; -- gpios = <13 13>; -- input; -- line-name = "USER_BUTTON"; -- }; - }; - - &gpio1 { --- -2.39.2 - diff --git a/patches/linux/0014-mpfs-beaglev-fire-add-mmc0-aliases.patch b/patches/linux/0014-mpfs-beaglev-fire-add-mmc0-aliases.patch deleted file mode 100644 index 7f3a82b..0000000 --- a/patches/linux/0014-mpfs-beaglev-fire-add-mmc0-aliases.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ef62b6373be63fd94291d8ee0b76efe1121c12d3 Mon Sep 17 00:00:00 2001 -From: Robert Nelson -Date: Tue, 10 Oct 2023 10:58:39 -0500 -Subject: [PATCH 14/14] mpfs-beaglev-fire: add mmc0 aliases - -Signed-off-by: Robert Nelson ---- - arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts -index d954a5cc3063..ca7f789031b1 100644 ---- a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts -+++ b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts -@@ -25,6 +25,7 @@ soc { - }; - - aliases { -+ mmc0 = &mmc; - ethernet0 = &mac1; - serial0 = &mmuart0; - serial1 = &mmuart1; --- -2.39.2 - diff --git a/patches/linux/mpfs_defconfig b/patches/linux/mpfs_defconfig index f124e74..b386d13 100644 --- a/patches/linux/mpfs_defconfig +++ b/patches/linux/mpfs_defconfig @@ -26,7 +26,7 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set # CONFIG_WERROR is not set -CONFIG_LOCALVERSION="-20231012" +CONFIG_LOCALVERSION="-20231102" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="" CONFIG_DEFAULT_INIT=""