* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/p1023rds: Fix the error of bank-width of nor flash powerpc/85xx: enable caam crypto driver by default powerpc/85xx: enable the audio drivers in the defconfigs
Unified · Split
| @@ -387,7 +387,7 @@ · 386 unmodified lines | |||
| 387 | #size-cells = <1>; | 387 | #size-cells = <1>; |
| 388 | compatible = "cfi-flash"; | 388 | compatible = "cfi-flash"; |
| 389 | reg = <0x0 0x0 0x02000000>; | 389 | reg = <0x0 0x0 0x02000000>; |
| 390 | bank-width = <1>; | 390 | bank-width = <2>; |
| 391 | device-width = <1>; | 391 | device-width = <1>; |
| 392 | partition@0 { | 392 | partition@0 { |
| 393 | label = "ramdisk"; | 393 | label = "ramdisk"; |
| @@ -171,3 +171,4 @@ CONFIG_CRYPTO_SHA256=y · 170 unmodified lines | |||
| 171 | CONFIG_CRYPTO_SHA512=y | 171 | CONFIG_CRYPTO_SHA512=y |
| 172 | CONFIG_CRYPTO_AES=y | 172 | CONFIG_CRYPTO_AES=y |
| 173 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 173 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 174 | CONFIG_CRYPTO_DEV_FSL_CAAM=y | ||
| @@ -185,3 +185,4 @@ CONFIG_CRYPTO_SHA256=y · 184 unmodified lines | |||
| 185 | CONFIG_CRYPTO_SHA512=y | 185 | CONFIG_CRYPTO_SHA512=y |
| 186 | CONFIG_CRYPTO_AES=y | 186 | CONFIG_CRYPTO_AES=y |
| 187 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 187 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 188 | CONFIG_CRYPTO_DEV_FSL_CAAM=y | ||
| @@ -100,5 +100,8 @@ CONFIG_DEBUG_INFO=y · 99 unmodified lines | |||
| 100 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 100 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 101 | CONFIG_VIRQ_DEBUG=y | 101 | CONFIG_VIRQ_DEBUG=y |
| 102 | CONFIG_CRYPTO_PCBC=m | 102 | CONFIG_CRYPTO_PCBC=m |
| 103 | CONFIG_CRYPTO_SHA256=y | ||
| 104 | CONFIG_CRYPTO_SHA512=y | ||
| 105 | CONFIG_CRYPTO_AES=y | ||
| 103 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 106 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 104 | CONFIG_CRYPTO_DEV_TALITOS=y | 107 | CONFIG_CRYPTO_DEV_FSL_CAAM=y |
| @@ -139,6 +139,7 @@ CONFIG_SND=y · 138 unmodified lines | |||
| 139 | CONFIG_SND_INTEL8X0=y | 139 | CONFIG_SND_INTEL8X0=y |
| 140 | # CONFIG_SND_PPC is not set | 140 | # CONFIG_SND_PPC is not set |
| 141 | # CONFIG_SND_USB is not set | 141 | # CONFIG_SND_USB is not set |
| 142 | CONFIG_SND_SOC=y | ||
| 142 | CONFIG_HID_A4TECH=y | 143 | CONFIG_HID_A4TECH=y |
| 143 | CONFIG_HID_APPLE=y | 144 | CONFIG_HID_APPLE=y |
| 144 | CONFIG_HID_BELKIN=y | 145 | CONFIG_HID_BELKIN=y |
| @@ -140,6 +140,7 @@ CONFIG_SND=y · 139 unmodified lines | |||
| 140 | CONFIG_SND_INTEL8X0=y | 140 | CONFIG_SND_INTEL8X0=y |
| 141 | # CONFIG_SND_PPC is not set | 141 | # CONFIG_SND_PPC is not set |
| 142 | # CONFIG_SND_USB is not set | 142 | # CONFIG_SND_USB is not set |
| 143 | CONFIG_SND_SOC=y | ||
| 143 | CONFIG_HID_A4TECH=y | 144 | CONFIG_HID_A4TECH=y |
| 144 | CONFIG_HID_APPLE=y | 145 | CONFIG_HID_APPLE=y |
| 145 | CONFIG_HID_BELKIN=y | 146 | CONFIG_HID_BELKIN=y |