[PATCH] powerpc: dts: t4240: Change T4240 USB controller version
Change USB controller version to 2.5 in compatible string for T4240 Signed-off-by: Nikhil Badola nikhil.bad...@freescale.com --- arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi index a3d582e..7e2fc7c 100644 --- a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi @@ -498,13 +498,13 @@ /include/ qoriq-gpio-3.dtsi /include/ qoriq-usb2-mph-0.dtsi usb0: usb@21 { - compatible = fsl-usb2-mph-v2.4, fsl-usb2-mph; + compatible = fsl-usb2-mph-v2.5, fsl-usb2-mph; phy_type = utmi; port0; }; /include/ qoriq-usb2-dr-0.dtsi usb1: usb@211000 { - compatible = fsl-usb2-dr-v2.4, fsl-usb2-dr; + compatible = fsl-usb2-dr-v2.5, fsl-usb2-dr; dr_mode = host; phy_type = utmi; }; -- 1.7.11.7 ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH] powerpc: configs: Add VFAT file-system configs
Add CONFIG_NLS_CODEPAGE_437, CONFIG_NLS_CODEPAGE_850, CONFIG_NLS_ISO8859_1 in default configs for 85xx and 86xx socs. Required for mounting vfat file-systems on USB devices Signed-off-by: Ramneek Mehresh ramneek.mehr...@freescale.com Signed-off-by: Nikhil Badola nikhil.bad...@freescale.com --- arch/powerpc/configs/corenet32_smp_defconfig | 2 ++ arch/powerpc/configs/corenet64_smp_defconfig | 2 ++ arch/powerpc/configs/mpc85xx_defconfig | 3 +++ arch/powerpc/configs/mpc85xx_smp_defconfig | 3 +++ arch/powerpc/configs/mpc86xx_defconfig | 3 +++ 5 files changed, 13 insertions(+) diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig index 6a3c58a..688e9e4 100644 --- a/arch/powerpc/configs/corenet32_smp_defconfig +++ b/arch/powerpc/configs/corenet32_smp_defconfig @@ -165,6 +165,8 @@ CONFIG_NFS_FS=y CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y CONFIG_NFSD=m +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=m CONFIG_MAGIC_SYSRQ=y diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig index 4b07bad..f54eb44 100644 --- a/arch/powerpc/configs/corenet64_smp_defconfig +++ b/arch/powerpc/configs/corenet64_smp_defconfig @@ -157,6 +157,8 @@ CONFIG_NFS_FS=y CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y CONFIG_NFSD=m +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=m CONFIG_CRC_T10DIF=y diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index fa1bfd3..8b2d759 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig @@ -227,6 +227,9 @@ CONFIG_UDF_FS=m CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=y CONFIG_NTFS_FS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ISO8859_1=y CONFIG_PROC_KCORE=y CONFIG_TMPFS=y CONFIG_HUGETLBFS=y diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index 0b452eb..a3003b2 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig @@ -228,6 +228,9 @@ CONFIG_UDF_FS=m CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=y CONFIG_NTFS_FS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ISO8859_1=y CONFIG_PROC_KCORE=y CONFIG_TMPFS=y CONFIG_HUGETLBFS=y diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig index 35595ea..fc58aa8 100644 --- a/arch/powerpc/configs/mpc86xx_defconfig +++ b/arch/powerpc/configs/mpc86xx_defconfig @@ -145,6 +145,9 @@ CONFIG_UDF_FS=m CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=y CONFIG_NTFS_FS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ISO8859_1=y CONFIG_PROC_KCORE=y CONFIG_TMPFS=y CONFIG_ADFS_FS=m -- 1.7.11.7 ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH] Documentation: dts: fsl-usb: Document USB node compatible string for IP version
Document compatible string containing IP version in USB device tree node Signed-off-by: Nikhil Badola nikhil.bad...@freescale.com --- Documentation/devicetree/bindings/usb/fsl-usb.txt | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/fsl-usb.txt b/Documentation/devicetree/bindings/usb/fsl-usb.txt index 4779c02..5a3a0a8 100644 --- a/Documentation/devicetree/bindings/usb/fsl-usb.txt +++ b/Documentation/devicetree/bindings/usb/fsl-usb.txt @@ -10,7 +10,10 @@ Required properties : controllers, or fsl-usb2-dr for dual role USB controllers or fsl,mpc5121-usb2-dr for dual role USB controllers of MPC5121. Wherever applicable, the IP version of the USB controller should - also be mentioned (for eg. fsl-usb2-dr-v2.2 for bsc9132). + also be mentioned in another string. + For multi port host USB controller with IP version IP_Ver, it should be + fsl-usb2-mph-IP_Ver. For dual role USB controller with IP version + IP_Ver, it should be fsl-usb2-dr-IP_Ver. - phy_type : For multi port host USB controllers, should be one of ulpi, or serial. For dual role USB controllers, should be one of ulpi, utmi, utmi_wide, or serial. @@ -42,9 +45,9 @@ Optional properties : - fsl,invert-pwr-fault : boolean; for MPC5121 USB0 only. Indicates the PWR_FAULT signal polarity is inverted. -Example multi port host USB controller device node : +Example multi port host USB controller version 2.5 device node : usb@22000 { - compatible = fsl-usb2-mph; + compatible = fsl-usb2-mph-v2.5, fsl-usb2-mph; reg = 22000 1000; #address-cells = 1; #size-cells = 0; @@ -55,9 +58,9 @@ Example multi port host USB controller device node : port1; }; -Example dual role USB controller device node : +Example dual role USB controller version 2.5 device node : usb@23000 { - compatible = fsl-usb2-dr; + compatible = fsl-usb2-dr-v2.5, fsl-usb2-dr; reg = 23000 1000; #address-cells = 1; #size-cells = 0; -- 1.7.11.7 ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH] powerpc: dts: t208x: Change T208x USB controller version
Change USB controller version to 2.5 in compatible string for T2080/T2081 Signed-off-by: Nikhil Badola nikhil.bad...@freescale.com --- Checkpatch warnings handled by commit 61a8c2c6fe71082de3ea8629589dcdd0cc5c3f02 Documentation: dts: fsl-usb: Document USB node compatible string for IP version arch/powerpc/boot/dts/fsl/t2081si-post.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi index 97479f0..aecee96 100644 --- a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi @@ -410,7 +410,7 @@ /include/ qoriq-gpio-3.dtsi /include/ qoriq-usb2-mph-0.dtsi usb0: usb@21 { - compatible = fsl-usb2-mph-v2.4, fsl-usb2-mph; + compatible = fsl-usb2-mph-v2.5, fsl-usb2-mph; fsl,iommu-parent = pamu1; fsl,liodn-reg = guts 0x520; /* USB1LIODNR */ phy_type = utmi; @@ -418,7 +418,7 @@ }; /include/ qoriq-usb2-dr-0.dtsi usb1: usb@211000 { - compatible = fsl-usb2-dr-v2.4, fsl-usb2-dr; + compatible = fsl-usb2-dr-v2.5, fsl-usb2-dr; fsl,iommu-parent = pamu1; fsl,liodn-reg = guts 0x524; /* USB1LIODNR */ dr_mode = host; -- 1.7.11.7 ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH] powerpc : dma-mapping : Check null condition for dev-archdata.dma_ops
Modifies get_dma_ops() implementation on ppc arch to check null condition for dev-archdata.dma_ops; returns common dma_direct_ops structure in case its NULL Signed-off-by: Nikhil Badola nikhil.bad...@freescale.com --- arch/powerpc/include/asm/dma-mapping.h | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h index 150866b..d73bae8 100644 --- a/arch/powerpc/include/asm/dma-mapping.h +++ b/arch/powerpc/include/asm/dma-mapping.h @@ -86,10 +86,12 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) */ if (unlikely(dev == NULL)) return NULL; - - return dev-archdata.dma_ops; + if (dev-archdata.dma_ops) + return dev-archdata.dma_ops; + return dma_direct_ops; } + static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops) { dev-archdata.dma_ops = ops; -- 1.7.11.7 ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev