linux-next: build failure after merge of the mediatek tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 6922 bytes --]

Hi all,

After merging the mediatek tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/soc/mediatek/mtk-scpsys.c:773:4: error: 'const struct scp_domain_data' has no member named 'subsys_clk_prefix'
  773 |   .subsys_clk_prefix = "isp",
      |    ^~~~~~~~~~~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:773:24: warning: initialization of 'unsigned int' from 'char *' makes integer from pointer without a cast [-Wint-conversion]
  773 |   .subsys_clk_prefix = "isp",
      |                        ^~~~~
drivers/soc/mediatek/mtk-scpsys.c:773:24: note: (near initialization for 'scp_domain_data_mt6765[3].bus_prot_mask')
drivers/soc/mediatek/mtk-scpsys.c:774:4: error: 'const struct scp_domain_data' has no member named 'bp_table'
  774 |   .bp_table = {
      |    ^~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:775:4: error: implicit declaration of function 'BUS_PROT' [-Werror=implicit-function-declaration]
  775 |    BUS_PROT(IFR_TYPE, 0x2A8, 0x2AC, 0, 0x258,
      |    ^~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:775:13: error: 'IFR_TYPE' undeclared here (not in a function)
  775 |    BUS_PROT(IFR_TYPE, 0x2A8, 0x2AC, 0, 0x258,
      |             ^~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:777:13: error: 'SMI_TYPE' undeclared here (not in a function)
  777 |    BUS_PROT(SMI_TYPE, 0x3C4, 0x3C8, 0, 0x3C0,
      |             ^~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:787:4: error: 'const struct scp_domain_data' has no member named 'basic_clk_id'
  787 |   .basic_clk_id = {"mm"},
      |    ^~~~~~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:787:3: warning: braces around scalar initializer
  787 |   .basic_clk_id = {"mm"},
      |   ^
drivers/soc/mediatek/mtk-scpsys.c:787:3: note: (near initialization for 'scp_domain_data_mt6765[1].bus_prot_mask')
drivers/soc/mediatek/mtk-scpsys.c:787:20: warning: initialization of 'u32' {aka 'unsigned int'} from 'char *' makes integer from pointer without a cast [-Wint-conversion]
  787 |   .basic_clk_id = {"mm"},
      |                    ^~~~
drivers/soc/mediatek/mtk-scpsys.c:787:20: note: (near initialization for 'scp_domain_data_mt6765[1].bus_prot_mask')
drivers/soc/mediatek/mtk-scpsys.c:788:4: error: 'const struct scp_domain_data' has no member named 'subsys_clk_prefix'
  788 |   .subsys_clk_prefix = "mm",
      |    ^~~~~~~~~~~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:788:24: error: cannot initialize array of 'enum clk_id' from a string literal with type array of 'char'
  788 |   .subsys_clk_prefix = "mm",
      |                        ^~~~
drivers/soc/mediatek/mtk-scpsys.c:788:24: note: (near initialization for 'scp_domain_data_mt6765[1].clk_id')
drivers/soc/mediatek/mtk-scpsys.c:789:4: error: 'const struct scp_domain_data' has no member named 'bp_table'
  789 |   .bp_table = {
      |    ^~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:789:3: warning: braces around scalar initializer
  789 |   .bp_table = {
      |   ^
drivers/soc/mediatek/mtk-scpsys.c:789:3: note: (near initialization for 'scp_domain_data_mt6765[1].caps')
drivers/soc/mediatek/mtk-scpsys.c:792:4: warning: excess elements in scalar initializer
  792 |    BUS_PROT(IFR_TYPE, 0x2A0, 0x2A4, 0, 0x228,
      |    ^~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:792:4: note: (near initialization for 'scp_domain_data_mt6765[1].caps')
drivers/soc/mediatek/mtk-scpsys.c:794:4: warning: excess elements in scalar initializer
  794 |    BUS_PROT(IFR_TYPE, 0x2A0, 0x2A4, 0, 0x228,
      |    ^~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:794:4: note: (near initialization for 'scp_domain_data_mt6765[1].caps')
drivers/soc/mediatek/mtk-scpsys.c:804:4: error: 'const struct scp_domain_data' has no member named 'bp_table'
  804 |   .bp_table = {
      |    ^~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:804:3: warning: braces around scalar initializer
  804 |   .bp_table = {
      |   ^
drivers/soc/mediatek/mtk-scpsys.c:804:3: note: (near initialization for 'scp_domain_data_mt6765[0].bus_prot_mask')
drivers/soc/mediatek/mtk-scpsys.c:807:4: warning: excess elements in scalar initializer
  807 |    BUS_PROT(IFR_TYPE, 0x2A8, 0x2AC, 0, 0x258,
      |    ^~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:807:4: note: (near initialization for 'scp_domain_data_mt6765[0].bus_prot_mask')
drivers/soc/mediatek/mtk-scpsys.c:809:4: warning: excess elements in scalar initializer
  809 |    BUS_PROT(IFR_TYPE, 0x2A0, 0x2A4, 0, 0x228,
      |    ^~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:809:4: note: (near initialization for 'scp_domain_data_mt6765[0].bus_prot_mask')
drivers/soc/mediatek/mtk-scpsys.c:819:4: error: 'const struct scp_domain_data' has no member named 'basic_clk_id'
  819 |   .basic_clk_id = {"mfg"},
      |    ^~~~~~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:819:3: warning: braces around scalar initializer
  819 |   .basic_clk_id = {"mfg"},
      |   ^
drivers/soc/mediatek/mtk-scpsys.c:819:3: note: (near initialization for 'scp_domain_data_mt6765[2].bus_prot_mask')
drivers/soc/mediatek/mtk-scpsys.c:819:20: warning: initialization of 'u32' {aka 'unsigned int'} from 'char *' makes integer from pointer without a cast [-Wint-conversion]
  819 |   .basic_clk_id = {"mfg"},
      |                    ^~~~~
drivers/soc/mediatek/mtk-scpsys.c:819:20: note: (near initialization for 'scp_domain_data_mt6765[2].bus_prot_mask')
drivers/soc/mediatek/mtk-scpsys.c:827:4: error: 'const struct scp_domain_data' has no member named 'bp_table'
  827 |   .bp_table = {
      |    ^~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:827:3: warning: braces around scalar initializer
  827 |   .bp_table = {
      |   ^
drivers/soc/mediatek/mtk-scpsys.c:827:3: note: (near initialization for 'scp_domain_data_mt6765[4].bus_prot_mask')
drivers/soc/mediatek/mtk-scpsys.c:830:4: warning: excess elements in scalar initializer
  830 |    BUS_PROT(IFR_TYPE, 0x2A0, 0x2A4, 0, 0x228,
      |    ^~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:830:4: note: (near initialization for 'scp_domain_data_mt6765[4].bus_prot_mask')
drivers/soc/mediatek/mtk-scpsys.c:840:4: error: 'const struct scp_domain_data' has no member named 'subsys_clk_prefix'
  840 |   .subsys_clk_prefix = "cam",
      |    ^~~~~~~~~~~~~~~~~
drivers/soc/mediatek/mtk-scpsys.c:840:24: warning: initialization of 'unsigned int' from 'char *' makes integer from pointer without a cast [-Wint-conversion]
  840 |   .subsys_clk_prefix = "cam",
      |                        ^~~~~
drivers/soc/mediatek/mtk-scpsys.c:840:24: note: (near initialization for 'scp_domain_data_mt6765[6].bus_prot_mask')
drivers/soc/mediatek/mtk-scpsys.c:841:4: error: 'const struct scp_domain_data' has no member named 'bp_table'
  841 |   .bp_table = {
      |    ^~~~~~~~

Caused by commit

  3742fd77013f ("soc: mediatek: add MT6765 scpsys and subdomain support")

I have used the mediatek tree from next-20191213 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]