Commit 4d7b3fd9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.19/ti-sysc-signed' of... 

Merge tag 'omap-for-v5.19/ti-sysc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/drivers

Driver changes for omaps

One patch to remove commas from sentinels for ti-sysc.

* tag 'omap-for-v5.19/ti-sysc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  bus: ti-sysc: Drop commas after SoC match table sentinels
parents 44745569 b6cd9be3

drivers/bus/ti-sysc.c

+2 −2
Original line number Diff line number Diff line
@@ -3049,7 +3049,7 @@ static const struct soc_device_attribute sysc_soc_match[] = { 
	SOC_FLAG("AM43*", SOC_AM4),

	SOC_FLAG("DRA7*", SOC_DRA7),



	{ /* sentinel */ },

	{ /* sentinel */ }

};



/*
@@ -3070,7 +3070,7 @@ static const struct soc_device_attribute sysc_soc_feat_match[] = { 
	SOC_FLAG("OMAP3615/AM3715", DIS_IVA),

	SOC_FLAG("OMAP3621", DIS_ISP),



	{ /* sentinel */ },

	{ /* sentinel */ }

};



static int sysc_add_disabled(unsigned long base)