From 0ad11cb3143997b15df5dc268e48ccb1c69cb29f Mon Sep 17 00:00:00 2001 From: Yueguie He Date: Mon, 18 Dec 2017 21:48:49 +0800 Subject: [PATCH] USB: add mass stoarge function PD#157133: USB: add mass storage function 1. add udisk partition to s400 emmc dts 2. add mass storage config Change-Id: I8e90403c2803e216b7f11a420c5087b3ef859746 Signed-off-by: Yueguie He --- arch/arm64/boot/dts/amlogic/axg_s400emmc.dts | 11 +++++++++-- arch/arm64/boot/dts/amlogic/axg_s400emmc_v03.dts | 11 +++++++++-- arch/arm64/configs/meson64_smarthome_defconfig | 1 + 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/axg_s400emmc.dts b/arch/arm64/boot/dts/amlogic/axg_s400emmc.dts index 51f37e139db3..6e206a46789f 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400emmc.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400emmc.dts @@ -694,7 +694,7 @@ }; partitions: partitions{ - parts = <11>; + parts = <12>; part-0 = <&logo>; part-1 = <&recovery>; part-2 = <&rsv>; @@ -705,7 +705,8 @@ part-7 = <&boot>; part-8 = <&system>; part-9 = <&cache>; - part-10 = <&data>; + part-10 = <&udisk>; + part-11 = <&data>; logo:logo{ pname = "logo"; @@ -760,6 +761,12 @@ size = <0x0 0x20000000>; mask = <2>; }; + udisk:udisk + { + pname = "udisk"; + size = <0x0 0x20000000>; + mask = <2>; + }; data:data { pname = "data"; diff --git a/arch/arm64/boot/dts/amlogic/axg_s400emmc_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s400emmc_v03.dts index c0e7b9d69c05..b1b21b0272ec 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400emmc_v03.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400emmc_v03.dts @@ -695,7 +695,7 @@ }; partitions: partitions{ - parts = <11>; + parts = <12>; part-0 = <&logo>; part-1 = <&recovery>; part-2 = <&rsv>; @@ -706,7 +706,8 @@ part-7 = <&boot>; part-8 = <&system>; part-9 = <&cache>; - part-10 = <&data>; + part-10 = <&udisk>; + part-11 = <&data>; logo:logo{ pname = "logo"; @@ -761,6 +762,12 @@ size = <0x0 0x20000000>; mask = <2>; }; + udisk:udisk + { + pname = "udisk"; + size = <0x0 0x20000000>; + mask = <2>; + }; data:data { pname = "data"; diff --git a/arch/arm64/configs/meson64_smarthome_defconfig b/arch/arm64/configs/meson64_smarthome_defconfig index 87c7e5d2aea8..51b620659447 100644 --- a/arch/arm64/configs/meson64_smarthome_defconfig +++ b/arch/arm64/configs/meson64_smarthome_defconfig @@ -421,6 +421,7 @@ CONFIG_USB_ISP1301=y CONFIG_USB_GADGET=y CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS_RNDIS=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_MTP=y CONFIG_USB_CONFIGFS_F_PTP=y