Three configs have been renamed and/or changed behaviour.
Clean that by using the new config name.
Then refresh the defconfig with make defconfig savedefconfig.
The refreshed defconfig does result in a not changed .config.
Applies on linux-next/master tag: next-20200407
Max Krummenacher (4):
arm64: defconfig: DRM_DUMB_VGA_DAC: follow changed config symbol name
arm64: defconfig: PCIE_TEGRA194: follow changed config symbol name
arm64: defconfig: ARCH_R8A7795: follow changed config symbol name
arm64: defconfig: refresh
arch/arm64/configs/defconfig | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
--
2.20.1
Completes commit b925adfceb52 ("soc: renesas: Add ARCH_R8A7795[01] for
existing R-Car H3") and commit 361c5dbb446e ("arm64: dts: renesas:
Remove use of ARCH_R8A7795").
CONFIG_ARCH_R8A7795 was split in CONFIG_ARCH_R8A77950 and
CONFIG_ARCH_R8A77951.
Signed-off-by: Max Krummenacher <[email protected]>
---
arch/arm64/configs/defconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 7e2690b449328..d43bd18bedf1e 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -848,7 +848,8 @@ CONFIG_QCOM_APR=m
CONFIG_ARCH_R8A774A1=y
CONFIG_ARCH_R8A774B1=y
CONFIG_ARCH_R8A774C0=y
-CONFIG_ARCH_R8A7795=y
+CONFIG_ARCH_R8A77950=y
+CONFIG_ARCH_R8A77951=y
CONFIG_ARCH_R8A77960=y
CONFIG_ARCH_R8A77961=y
CONFIG_ARCH_R8A77965=y
--
2.20.1
When adding PCIE EP functionality the config symbol name logic for
PCIE RC was also changed.
Fixes commit c57247f940e8e ("PCI: tegra: Add support for PCIe endpoint
mode in Tegra194")
Signed-off-by: Max Krummenacher <[email protected]>
---
arch/arm64/configs/defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index ae908c3f43c76..7e2690b449328 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -208,7 +208,7 @@ CONFIG_PCIE_QCOM=y
CONFIG_PCIE_ARMADA_8K=y
CONFIG_PCIE_KIRIN=y
CONFIG_PCIE_HISI_STB=y
-CONFIG_PCIE_TEGRA194=m
+CONFIG_PCIE_TEGRA194_HOST=m
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_FW_LOADER_USER_HELPER=y
--
2.20.1
Refresh with make defconfig savedefconfig
Signed-off-by: Max Krummenacher <[email protected]>
---
arch/arm64/configs/defconfig | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index d43bd18bedf1e..b65425f83e0b6 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -165,9 +165,9 @@ CONFIG_QRTR_SMD=m
CONFIG_QRTR_TUN=m
CONFIG_BPF_JIT=y
CONFIG_CAN=m
+CONFIG_CAN_FLEXCAN=m
CONFIG_CAN_RCAR=m
CONFIG_CAN_RCAR_CANFD=m
-CONFIG_CAN_FLEXCAN=m
CONFIG_BT=m
CONFIG_BT_HIDP=m
# CONFIG_BT_HS is not set
@@ -202,20 +202,19 @@ CONFIG_PCI_HOST_THUNDER_ECAM=y
CONFIG_PCIE_ROCKCHIP_HOST=m
CONFIG_PCIE_BRCMSTB=m
CONFIG_PCI_LAYERSCAPE=y
-CONFIG_PCIE_LAYERSCAPE_GEN4=y
CONFIG_PCI_HISI=y
CONFIG_PCIE_QCOM=y
CONFIG_PCIE_ARMADA_8K=y
CONFIG_PCIE_KIRIN=y
CONFIG_PCIE_HISI_STB=y
CONFIG_PCIE_TEGRA194_HOST=m
+CONFIG_PCIE_LAYERSCAPE_GEN4=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_FW_LOADER_USER_HELPER=y
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
CONFIG_HISILICON_LPC=y
CONFIG_SIMPLE_PM_BUS=y
-CONFIG_FSL_MC_BUS=y
CONFIG_MTD=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
@@ -494,10 +493,10 @@ CONFIG_SENSORS_INA3221=m
CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
CONFIG_CPU_THERMAL=y
CONFIG_THERMAL_EMULATION=y
-CONFIG_QORIQ_THERMAL=m
-CONFIG_SUN8I_THERMAL=y
CONFIG_IMX_SC_THERMAL=m
CONFIG_IMX8MM_THERMAL=m
+CONFIG_QORIQ_THERMAL=m
+CONFIG_SUN8I_THERMAL=y
CONFIG_ROCKCHIP_THERMAL=m
CONFIG_RCAR_THERMAL=y
CONFIG_RCAR_GEN3_THERMAL=y
@@ -610,9 +609,9 @@ CONFIG_DRM_MSM=m
CONFIG_DRM_TEGRA=m
CONFIG_DRM_PANEL_LVDS=m
CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_SIMPLE_BRIDGE=m
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
CONFIG_DRM_SII902X=m
+CONFIG_DRM_SIMPLE_BRIDGE=m
CONFIG_DRM_THINE_THC63LVD1024=m
CONFIG_DRM_TI_SN65DSI86=m
CONFIG_DRM_I2C_ADV7511=m
@@ -660,7 +659,6 @@ CONFIG_SND_SOC_WSA881X=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_AUDIO_GRAPH_CARD=m
CONFIG_I2C_HID=m
-CONFIG_USB_CONN_GPIO=m
CONFIG_USB=y
CONFIG_USB_OTG=y
CONFIG_USB_XHCI_HCD=y
@@ -795,14 +793,13 @@ CONFIG_QCOM_A53PLL=y
CONFIG_QCOM_CLK_APCS_MSM8916=y
CONFIG_QCOM_CLK_SMD_RPM=y
CONFIG_QCOM_CLK_RPMH=y
-CONFIG_IPQ_GCC_8074=y
CONFIG_IPQ_GCC_6018=y
+CONFIG_IPQ_GCC_8074=y
CONFIG_MSM_GCC_8916=y
CONFIG_MSM_GCC_8994=y
CONFIG_MSM_MMCC_8996=y
CONFIG_MSM_GCC_8998=y
CONFIG_QCS_GCC_404=y
-CONFIG_SDM_GCC_845=y
CONFIG_SDM_GPUCC_845=y
CONFIG_SDM_DISPCC_845=y
CONFIG_SM_GCC_8150=y
@@ -931,10 +928,10 @@ CONFIG_FPGA_REGION=m
CONFIG_OF_FPGA_REGION=m
CONFIG_TEE=y
CONFIG_OPTEE=y
+CONFIG_MUX_MMIO=y
CONFIG_SLIMBUS=m
CONFIG_SLIM_QCOM_CTRL=m
CONFIG_SLIM_QCOM_NGD_CTRL=m
-CONFIG_MUX_MMIO=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
--
2.20.1
This occurrence wasn't changed in the original rename commit.
Fixes commit 0411374bdf2b3 ("drm/bridge: dumb-vga-dac: Rename driver to
simple-bridge").
Signed-off-by: Max Krummenacher <[email protected]>
---
arch/arm64/configs/defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 24e534d850454..ae908c3f43c76 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -610,7 +610,7 @@ CONFIG_DRM_MSM=m
CONFIG_DRM_TEGRA=m
CONFIG_DRM_PANEL_LVDS=m
CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_DUMB_VGA_DAC=m
+CONFIG_DRM_SIMPLE_BRIDGE=m
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
CONFIG_DRM_SII902X=m
CONFIG_DRM_THINE_THC63LVD1024=m
--
2.20.1
On Tue, Apr 7, 2020 at 12:36 PM Max Krummenacher <[email protected]> wrote:
> This occurrence wasn't changed in the original rename commit.
>
> Fixes commit 0411374bdf2b3 ("drm/bridge: dumb-vga-dac: Rename driver to
> simple-bridge").
>
> Signed-off-by: Max Krummenacher <[email protected]>
Reviewed-by: Geert Uytterhoeven <[email protected]>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Hi Max,
On Tue, Apr 7, 2020 at 12:36 PM Max Krummenacher <[email protected]> wrote:
> Completes commit b925adfceb52 ("soc: renesas: Add ARCH_R8A7795[01] for
> existing R-Car H3") and commit 361c5dbb446e ("arm64: dts: renesas:
> Remove use of ARCH_R8A7795").
>
> CONFIG_ARCH_R8A7795 was split in CONFIG_ARCH_R8A77950 and
> CONFIG_ARCH_R8A77951.
>
> Signed-off-by: Max Krummenacher <[email protected]>
Thanks, as I was going to send a similar patch after v5.7-rc1:
Reviewed-by: Geert Uytterhoeven <[email protected]>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Hi Max,
Thank you for the patch.
On Tue, Apr 07, 2020 at 12:35:34PM +0200, Max Krummenacher wrote:
> This occurrence wasn't changed in the original rename commit.
>
> Fixes commit 0411374bdf2b3 ("drm/bridge: dumb-vga-dac: Rename driver to
> simple-bridge").
>
> Signed-off-by: Max Krummenacher <[email protected]>
My bad, sorry about the trouble.
Reviewed-by: Laurent Pinchart <[email protected]>
>
> ---
>
> arch/arm64/configs/defconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
> index 24e534d850454..ae908c3f43c76 100644
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@ -610,7 +610,7 @@ CONFIG_DRM_MSM=m
> CONFIG_DRM_TEGRA=m
> CONFIG_DRM_PANEL_LVDS=m
> CONFIG_DRM_PANEL_SIMPLE=m
> -CONFIG_DRM_DUMB_VGA_DAC=m
> +CONFIG_DRM_SIMPLE_BRIDGE=m
> CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
> CONFIG_DRM_SII902X=m
> CONFIG_DRM_THINE_THC63LVD1024=m
--
Regards,
Laurent Pinchart
Hi Max,
On Tue, Apr 7, 2020 at 12:36 PM Max Krummenacher <[email protected]> wrote:
> Three configs have been renamed and/or changed behaviour.
> Clean that by using the new config name.
> Then refresh the defconfig with make defconfig savedefconfig.
>
> The refreshed defconfig does result in a not changed .config.
>
> Applies on linux-next/master tag: next-20200407
>
> Max Krummenacher (4):
> arm64: defconfig: DRM_DUMB_VGA_DAC: follow changed config symbol name
> arm64: defconfig: PCIE_TEGRA194: follow changed config symbol name
> arm64: defconfig: ARCH_R8A7795: follow changed config symbol name
> arm64: defconfig: refresh
Probably CONFIG_DRM_DISPLAY_CONNECTOR should also be enabled for HDMI,
VGA, and composite display connectors on various boards since commit
0c275c30176b2e78 ("drm/bridge: Add bridge driver for display
connectors"), but it's not clear to me when exactly this became a
requirement, as before there was no code that looked for e.g.
vga-connector.
Laurent?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Hi Geert,
On Tue, Apr 07, 2020 at 03:16:14PM +0200, Geert Uytterhoeven wrote:
> On Tue, Apr 7, 2020 at 12:36 PM Max Krummenacher <[email protected]> wrote:
> > Three configs have been renamed and/or changed behaviour.
> > Clean that by using the new config name.
> > Then refresh the defconfig with make defconfig savedefconfig.
> >
> > The refreshed defconfig does result in a not changed .config.
> >
> > Applies on linux-next/master tag: next-20200407
> >
> > Max Krummenacher (4):
> > arm64: defconfig: DRM_DUMB_VGA_DAC: follow changed config symbol name
> > arm64: defconfig: PCIE_TEGRA194: follow changed config symbol name
> > arm64: defconfig: ARCH_R8A7795: follow changed config symbol name
> > arm64: defconfig: refresh
>
> Probably CONFIG_DRM_DISPLAY_CONNECTOR should also be enabled for HDMI,
> VGA, and composite display connectors on various boards since commit
> 0c275c30176b2e78 ("drm/bridge: Add bridge driver for display
> connectors"), but it's not clear to me when exactly this became a
> requirement, as before there was no code that looked for e.g.
> vga-connector.
> Laurent?
It's not required yet for R-Car DU, but I'm working on changing that :-)
If we can enable CONFIG_DRM_DISPLAY_CONNECTOR in defconfig as part of
this series, it would be useful for me.
--
Regards,
Laurent Pinchart
Hi Laurent, Geert,
Am Dienstag, den 07.04.2020, 17:16 +0300 schrieb Laurent Pinchart:
> Hi Geert,
>
> On Tue, Apr 07, 2020 at 03:16:14PM +0200, Geert Uytterhoeven wrote:
> > On Tue, Apr 7, 2020 at 12:36 PM Max Krummenacher <[email protected]> wrote:
> > > Three configs have been renamed and/or changed behaviour.
> > > Clean that by using the new config name.
> > > Then refresh the defconfig with make defconfig savedefconfig.
> > >
> > > The refreshed defconfig does result in a not changed .config.
> > >
> > > Applies on linux-next/master tag: next-20200407
> > >
> > > Max Krummenacher (4):
> > > arm64: defconfig: DRM_DUMB_VGA_DAC: follow changed config symbol name
> > > arm64: defconfig: PCIE_TEGRA194: follow changed config symbol name
> > > arm64: defconfig: ARCH_R8A7795: follow changed config symbol name
> > > arm64: defconfig: refresh
> >
> > Probably CONFIG_DRM_DISPLAY_CONNECTOR should also be enabled for HDMI,
> > VGA, and composite display connectors on various boards since commit
> > 0c275c30176b2e78 ("drm/bridge: Add bridge driver for display
> > connectors"), but it's not clear to me when exactly this became a
> > requirement, as before there was no code that looked for e.g.
> > vga-connector.
> > Laurent?
>
> It's not required yet for R-Car DU, but I'm working on changing that :-)
> If we can enable CONFIG_DRM_DISPLAY_CONNECTOR in defconfig as part of
> this series, it would be useful for me.
>
I will add CONFIG_DRM_DISPLAY_CONNECTOR in a V2 to "arm64: defconfig: DRM_DUMB_VGA_DAC:
follow changed config symbol name" with a comment in the commit comment that this is
recommended to go with the DRM_DUMB_VGA_DAC.
Regards
Max