regenerate patches

merge-requests/5/head
Lucien Morey 5 months ago
parent bc73848b57
commit e6e5d07c4a

@ -11,7 +11,7 @@ diff --git a/drivers/pci/controller/pcie-microchip-host.c b/drivers/pci/controll
index 56306f514..b1b3b7820 100644
--- a/drivers/pci/controller/pcie-microchip-host.c
+++ b/drivers/pci/controller/pcie-microchip-host.c
@@ -26,8 +26,8 @@
@@ -30,8 +30,8 @@
#define MC_ATT_MASK GENMASK_ULL(63, 31)
/* PCIe Bridge Phy and Controller Phy offsets */
@ -20,8 +20,8 @@ index 56306f514..b1b3b7820 100644
+#define MC_PCIE1_BRIDGE_ADDR 0x00004000u
+#define MC_PCIE1_CTRL_ADDR 0x00006000u
#define MC_PCIE_BRIDGE_ADDR (MC_PCIE1_BRIDGE_ADDR)
#define MC_PCIE_CTRL_ADDR (MC_PCIE1_CTRL_ADDR)
/* PCIe Bridge Phy Regs */
#define PCIE_PCI_IRQ_DW0 0xa8
--
2.39.2

@ -35,14 +35,14 @@ diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index d5ca37205..5b3f027ac 100644
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -68,6 +68,7 @@ obj-$(CONFIG_MAX9611) += max9611.o
obj-$(CONFIG_MCP320X) += mcp320x.o
@@ -75,6 +75,7 @@ obj-$(CONFIG_MCP320X) += mcp320x.o
obj-$(CONFIG_MCP3422) += mcp3422.o
obj-$(CONFIG_MCP3564) += mcp3564.o
obj-$(CONFIG_MCP3911) += mcp3911.o
+obj-$(CONFIG_MCP356X) += mcp356x.o
obj-$(CONFIG_MEDIATEK_MT6360_ADC) += mt6360-adc.o
obj-$(CONFIG_MEDIATEK_MT6370_ADC) += mt6370-adc.o
obj-$(CONFIG_MEDIATEK_MT6577_AUXADC) += mt6577_auxadc.o
obj-$(CONFIG_MEN_Z188_ADC) += men_z188_adc.o
diff --git a/drivers/iio/adc/mcp356x.c b/drivers/iio/adc/mcp356x.c
new file mode 100644
index 000000000..22d59413d

@ -11,17 +11,17 @@ diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
index 7a14688f8..effb399b1 100644
--- a/drivers/media/i2c/imx219.c
+++ b/drivers/media/i2c/imx219.c
@@ -1181,6 +1181,9 @@ static int imx219_identify_module(struct imx219 *imx219)
@@ -1012,6 +1012,9 @@ static int imx219_identify_module(struct imx219 *imx219)
int ret;
u32 val;
u64 val;
+ printk(KERN_INFO "imx219_identify_module()\n");
+
+
ret = imx219_read_reg(imx219, IMX219_REG_CHIP_ID,
IMX219_REG_VALUE_16BIT, &val);
ret = cci_read(imx219->regmap, IMX219_REG_CHIP_ID, &val, NULL);
if (ret) {
@@ -1195,6 +1198,9 @@ static int imx219_identify_module(struct imx219 *imx219)
dev_err(&client->dev, "failed to read chip id %x\n",
@@ -1025,6 +1028,9 @@ static int imx219_identify_module(struct imx219 *imx219)
return -EIO;
}
@ -31,7 +31,7 @@ index 7a14688f8..effb399b1 100644
return 0;
}
@@ -1402,6 +1408,8 @@ static int imx219_probe(struct i2c_client *client)
@@ -1234,6 +1240,8 @@ static int imx219_probe(struct i2c_client *client)
struct imx219 *imx219;
int ret;

@ -12,11 +12,11 @@ diff --git a/arch/riscv/boot/dts/microchip/Makefile b/arch/riscv/boot/dts/microc
index 48c9d3d071f3..4e3529217d9a 100644
--- a/arch/riscv/boot/dts/microchip/Makefile
+++ b/arch/riscv/boot/dts/microchip/Makefile
@@ -5,4 +5,5 @@ dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += mpfs-m100pfsevp.dtb
dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += mpfs-polarberry.dtb
dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += mpfs-video-kit.dtb
dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += mpfs-tysom-m.dtb
+dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += mpfs-beaglev-fire.dtb
@@ -11,4 +11,5 @@ dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-m100pfsevp-emmc.dtb
dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-polarberry.dtb
dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-video-kit.dtb
dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-tysom-m.dtb
+dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-beaglev-fire.dtb
obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
--
2.39.2

Loading…
Cancel
Save