Add BCM2835-SPI0 to BCM2835
Subsystems (3)
v3 cover Add BCM2835-SPI0 to BCM2835
This patch series implements the SPI controller for BCM2835 boards.
Please disregard v1 and v2 as I ran into issues with email submission.
Rayhan Faizel (2):
hw/ssi: Implement BCM2835 SPI Controller
hw/arm: Connect SPI Controller to BCM2835
docs/system/arm/raspi.rst | 3 +- hw/arm/Kconfig | 1 + hw/arm/bcm2835_peripherals.c | 17 +- hw/ssi/Kconfig | 4 + hw/ssi/bcm2835_spi.c | 288 +++++++++++++++++++++++++++ hw/ssi/meson.build | 1 + include/hw/arm/bcm2835_peripherals.h | 3 +- include/hw/ssi/bcm2835_spi.h | 81 ++++++++ 8 files changed, 392 insertions(+), 6 deletions(-) create mode 100644 hw/ssi/bcm2835_spi.c create mode 100644 include/hw/ssi/bcm2835_spi.h
Signature · 1 line
2.34.1
PATCH v3 1/2 hw/ssi: Implement BCM2835 SPI Controller
This patch adds the SPI controller for the BCM2835. Polling and interrupt modes of transfer are supported. DMA and LoSSI modes are currently unimplemented.
--- docs/system/arm/raspi.rst | 3 +- hw/ssi/Kconfig | 4 + hw/ssi/bcm2835_spi.c | 288 +++++++++++++++++++++++++++++++++++ hw/ssi/meson.build | 1 + include/hw/ssi/bcm2835_spi.h | 81 ++++++++++ 5 files changed, 375 insertions(+), 2 deletions(-) create mode 100644 hw/ssi/bcm2835_spi.c create mode 100644 include/hw/ssi/bcm2835_spi.h
docs/system/arm/raspi.rst +1 -2
@@ -33,11 +33,10 @@ Implemented devices * USB2 host controller (DWC2 and MPHI) * MailBox controller (MBOX) * VideoCore firmware (property) - + * Peripheral SPI controller (SPI) Missing devices --------------- - * Peripheral SPI controller (SPI) * Analog to Digital Converter (ADC) * Pulse Width Modulation (PWM)
hw/ssi/Kconfig +4 -0
@@ -20,3 +20,7 @@ config XILINX_SPIPS config STM32F2XX_SPI bool select SSI + +config BCM2835_SPI + bool + select SSI
hw/ssi/bcm2835_spi.c new file +288 -0
288 lines not on this page · raw message
hw/ssi/meson.build +1 -0
@@ -11,3 +11,4 @@ system_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-ospi.c')) system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_spi.c')) system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_spi.c')) system_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_spi_host.c')) +system_ss.add(when: 'CONFIG_BCM2835_SPI', if_true: files('bcm2835_spi.c'))
include/hw/ssi/bcm2835_spi.h new file +81 -0
81 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v3 2/2 hw/arm: Connect SPI Controller to BCM2835
In reply to Rayhan FaizelThis patch will allow the SPI controller to be accessible from BCM2835 based boards as SPI0. SPI driver is usually disabled by default and config.txt does not work.
Instead, dtmerge can be used to apply spi=on on a bcm2835 dts file.
--- hw/arm/Kconfig | 1 + hw/arm/bcm2835_peripherals.c | 17 ++++++++++++++--- include/hw/arm/bcm2835_peripherals.h | 3 ++- 3 files changed, 17 insertions(+), 4 deletions(-)
hw/arm/Kconfig +1 -0
@@ -425,6 +425,7 @@ config RASPI select PL011 # UART select SDHCI select USB_DWC2 + select BCM2835_SPI config STM32F100_SOC bool
hw/arm/bcm2835_peripherals.c +14 -3
@@ -144,6 +144,10 @@ static void bcm2835_peripherals_init(Object *obj)/* Power Management */ object_initialize_child (obj,"powermgt" , &s->powermgt,TYPE_BCM2835_POWERMGT ); + +/* SPI */ +object_initialize_child (obj,"bcm2835-spi0" , &s->spi[0 ], +TYPE_BCM2835_SPI ); }static void bcm2835_peripherals_realize (DeviceState *dev,Error **errp)
@@ -399,14 +403,21 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)return ; } -memory_region_add_subregion (&s->peri_mr,PM_OFFSET , -sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->powermgt),0 )); +/* SPI */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->spi[0 ]), errp)) { +return ; + } + +memory_region_add_subregion (&s->peri_mr,SPI0_OFFSET , +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->spi[0 ]),0 )); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->spi[0 ]),0 , +qdev_get_gpio_in_named (DEVICE (&s->ic),BCM2835_IC_GPU_IRQ , +INTERRUPT_SPI ));create_unimp (s, &s->txp,"bcm2835-txp" ,TXP_OFFSET ,0x1000 );create_unimp (s, &s->armtmr,"bcm2835-sp804" ,ARMCTRL_TIMER0_1_OFFSET ,0x40 );create_unimp (s, &s->i2s,"bcm2835-i2s" ,I2S_OFFSET ,0x100 );create_unimp (s, &s->smi,"bcm2835-smi" ,SMI_OFFSET ,0x100 ); -create_unimp (s, &s->spi[0 ],"bcm2835-spi0" ,SPI0_OFFSET ,0x20 );create_unimp (s, &s->bscsl,"bcm2835-spis" ,BSC_SL_OFFSET ,0x100 );create_unimp (s, &s->i2c[0 ],"bcm2835-i2c0" ,BSC0_OFFSET ,0x20 );create_unimp (s, &s->i2c[1 ],"bcm2835-i2c1" ,BSC1_OFFSET ,0x20 );
include/hw/arm/bcm2835_peripherals.h +2 -1
@@ -31,6 +31,7 @@#include "hw/gpio/bcm2835_gpio.h" #include "hw/timer/bcm2835_systmr.h" #include "hw/usb/hcd-dwc2.h" +#include "hw/ssi/bcm2835_spi.h" #include "hw/misc/unimp.h" #include "qom/object.h"
@@ -66,7 +67,7 @@ struct BCM2835PeripheralState {BCM2835GpioState gpio;Bcm2835ThermalState thermal;UnimplementedDeviceState i2s; -UnimplementedDeviceState spi[1 ]; +BCM2835SPIState spi[1 ];UnimplementedDeviceState i2c[3 ];UnimplementedDeviceState otp;UnimplementedDeviceState dbus;
Signature · 1 line
2.34.1