Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9208a4e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* '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
parents 9e79e3e9 0c81e4b4

arch/powerpc/boot/dts/p1023rds.dts

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ 
			#size-cells = <1>;

			compatible = "cfi-flash";

			reg = <0x0 0x0 0x02000000>;

			bank-width = <1>;

			bank-width = <2>;

			device-width = <1>;

			partition@0 {

				label = "ramdisk";

arch/powerpc/configs/85xx/p1023rds_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -171,3 +171,4 @@ CONFIG_CRYPTO_SHA256=y 
CONFIG_CRYPTO_SHA512=y

CONFIG_CRYPTO_AES=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_DEV_FSL_CAAM=y

arch/powerpc/configs/corenet32_smp_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -185,3 +185,4 @@ CONFIG_CRYPTO_SHA256=y 
CONFIG_CRYPTO_SHA512=y

CONFIG_CRYPTO_AES=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_DEV_FSL_CAAM=y

arch/powerpc/configs/corenet64_smp_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -100,5 +100,8 @@ CONFIG_DEBUG_INFO=y 
CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_VIRQ_DEBUG=y

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_SHA512=y

CONFIG_CRYPTO_AES=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_DEV_TALITOS=y
 
CONFIG_CRYPTO_DEV_FSL_CAAM=y

arch/powerpc/configs/mpc85xx_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ CONFIG_SND=y 
CONFIG_SND_INTEL8X0=y

# CONFIG_SND_PPC is not set

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=y

CONFIG_HID_A4TECH=y

CONFIG_HID_APPLE=y

CONFIG_HID_BELKIN=y